Run whitespace:cleanup

README.md

@@ -18,7 +18,7 @@ instructions.
 You are welcome to contribute, add to and extend Diaspora however you see fit.  We
 will do our best to incorporate everything that meets our guidelines.
 
-Please do not rebase our tree into yours.  
+Please do not rebase our tree into yours.
 See [here](http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg39091.html)
 for when to rebase.
 

app/controllers/aspects_controller.rb

@@ -56,7 +56,7 @@ class AspectsController < ApplicationController
 
     respond_with @aspect
   end
-  
+
   def manage
     @aspect = :manage
     @remote_requests = Request.for_user(current_user).all

app/controllers/publics_controller.rb

@@ -30,7 +30,7 @@ class PublicsController < ApplicationController
 
   def hub
     if params['hub.mode'] == 'subscribe' || params['hub.mode'] == 'unsubscribe'
-      render :text => params['hub.challenge'], :status => 202, :layout => false 
+      render :text => params['hub.challenge'], :status => 202, :layout => false
     end
   end
 

app/controllers/status_messages_controller.rb

@@ -12,11 +12,11 @@ class StatusMessagesController < ApplicationController
     params[:status_message][:to] = params[:aspect_ids]
 
     data = clean_hash params[:status_message]
-    
+
     if @logged_in && params[:status_message][:public] == 'true'
       id = 'me'
       type = 'feed'
-      
+
       Rails.logger.info("Sending a message: #{params[:status_message][:message]} to Facebook")
       @res = MiniFB.post(@access_token, id, :type=>type,
                          :metadata=>true, :params=>{:message => params[:status_message][:message]})

app/controllers/users_controller.rb

@@ -27,16 +27,16 @@ class UsersController < ApplicationController
 
     params[:user].delete(:password) if params[:user][:password].blank?
     params[:user].delete(:password_confirmation) if params[:user][:password].blank? and params[:user][:password_confirmation].blank?
-    
+
     if params[:user][:password] && params[:user][:password_confirmation]
       if @user.update_attributes(:password => params[:user][:password], :password_confirmation => params[:user][:password_confirmation])
         flash[:notice] = "Password Changed"
       else
         flash[:error] = "Password Change Failed"
       end
-      
+
     end
-    
+
     @user.update_profile data
     redirect_to edit_user_path(@user)
 

app/models/fb_status.rb

@@ -3,14 +3,14 @@
 #   the COPYRIGHT file.
 
 
-class FbStatus 
+class FbStatus
   include MongoMapper::Document
 
   key :graph_id, String
   key :author_id, String
   key :author_name, String
   key :message, String
-  key :updated_time, Time 
+  key :updated_time, Time
 
   timestamps!
 
@@ -18,7 +18,7 @@ class FbStatus
 
   def self.from_api(hash)
     #just keeping them in memory for now
-    self.new( 
+    self.new(
                   :graph_id     => hash['id'],
                   :author_id    => hash['from']['id'],
                   :author_name  => hash['from']['name'],
@@ -26,6 +26,6 @@ class FbStatus
                   :updated_time => Time.parse(hash['updated_time'])
             )
   end
-  
+
 end
 

app/models/user.rb

@@ -254,7 +254,7 @@ class User
   def self.instantiate!( opts = {} )
     opts[:person][:diaspora_handle] = "#{opts[:username]}@#{APP_CONFIG[:terse_pod_url]}"
     opts[:person][:url] = APP_CONFIG[:pod_url]
-    
+
     opts[:serialized_private_key] = generate_key
     opts[:person][:serialized_public_key] = opts[:serialized_private_key].public_key
     User.create(opts)
@@ -288,7 +288,7 @@ class User
   def self.generate_key
     OpenSSL::PKey::RSA::generate 4096
   end
-  
+
   def encryption_key
     OpenSSL::PKey::RSA.new( serialized_private_key )
   end

app/views/aspects/public.html.haml

@@ -12,7 +12,7 @@
 - content_for :publish do
   - if @logged_in
     = render "shared/publisher", :aspect_ids => :public
-  - else 
+  - else
     = render "shared/publisher", :aspect_ids => :all
 
 %ul#stream

app/views/shared/_aspect_friends.haml

@@ -8,8 +8,8 @@
     = person_image_link(friend)
   - if @logged_in && (@aspect == :public)
     %h3 Facebook Friends
-    - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")                                                                                            
-    - @fb_friends[:data].each do |friend|            
+    - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
+    - @fb_friends[:data].each do |friend|
       = image_tag( "http://graph.facebook.com/#{friend[:id]}/picture" )
   -unless (@aspect == :all) || (@aspect == :public)
     = link_to (image_tag('add_friend_button.png', :height => "50px", :width => "50px")), "#add_request_pane", :id => 'add_request_button'

app/views/users/_services.haml

@@ -10,7 +10,7 @@
   %p
     - if @logged_in
       = connected_fb_as(@access_token)
-      
+
       %p
       - @fb_friends = MiniFB.get(@access_token, 'me', :type => "friends")
       - @fb_friends[:data].each do |friend|

app/views/users/edit.html.haml

@@ -26,5 +26,5 @@
 
 #services.settings_pane
   = render 'users/services'
-    
+
 

config/locales/diaspora/ar.yml

@@ -193,7 +193,7 @@ ar:
       new_request:
           add_a_new_friend_to: "إضافة صديق جديد إلى"
           enter_a_diaspora_username: ":Diaspora أدخل اسم مستخدم"
-          your_diaspora_username_is: "%{diaspora_handle} :هو Diaspora اسم المستخدم الخاص" 
+          your_diaspora_username_is: "%{diaspora_handle} :هو Diaspora اسم المستخدم الخاص"
           friends_username: "صديق اسم المستخدم"
       destroy:
           success: ".أنت الآن أصدقاء"

config/locales/diaspora/cs.yml

@@ -57,7 +57,7 @@ cs:
       new_album:
           create: "vytvořit"
           add_a_new_album: "Přidat nové album"
-      show: 
+      show:
           edit_album: "Upravit album"
           albums: "alba"
           updated: "aktualizované"

config/locales/diaspora/he.yml

@@ -46,7 +46,7 @@ he:
       new_album:
           create: "יצירה"
           add_a_new_album: "הוספת אלבום חדש"
-      show: 
+      show:
           edit_album: "עריכת אלבום"
           albums: "אלבומים"
           updated: "תאריך העדכון"

config/routes.rb

@@ -9,7 +9,7 @@ Diaspora::Application.routes.draw do
   resources :requests,        :except => [:edit, :update]
   resources :photos,          :except => [:index]
   resources :albums
-  
+
   # added public route to user
   match 'public/:username', :to => 'users#public'
   resources :users,               :except => [:create, :new, :show]

features/step_definitions/web_steps.rb

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -191,7 +191,7 @@ Then /^the "([^"]*)" checkbox(?: within "([^"]*)")? should not be checked$/ do |
     end
   end
 end
- 
+
 Then /^(?:|I )should be on (.+)$/ do |page_name|
   current_path = URI.parse(current_url).path
   if current_path.respond_to? :should
@@ -205,8 +205,8 @@ Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
   query = URI.parse(current_url).query
   actual_params = query ? CGI.parse(query) : {}
   expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')} 
-  
+  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
+
   if actual_params.respond_to? :should
     actual_params.should == expected_params
   else

features/support/env.rb

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 
@@ -24,7 +24,7 @@ Capybara.default_selector = :css
 
 WebMock.disable_net_connect!(:allow_localhost => true)
 
-# If you set this to false, any error raised from within your app will bubble 
+# If you set this to false, any error raised from within your app will bubble
 # up to your step definition and out to cucumber unless you catch it somewhere
 # on the way. You can make Rails rescue errors and render error pages on a
 # per-scenario basis by tagging a scenario or feature with the @allow-rescue tag.

lib/diaspora/ostatus_builder.rb

@@ -62,9 +62,9 @@ module Diaspora
       @user.visible_posts(:person_id => @user.person.id, :public=>true).inject("") do |xml,curr|
         if curr.respond_to?(:to_activity)
           unless xml
-            curr.to_activity 
+            curr.to_activity
           else
-            xml + curr.to_activity 
+            xml + curr.to_activity
           end
         end
       end

lib/salmon/salmon.rb

@@ -53,7 +53,7 @@ module Salmon
       salmon.magic_sig = MagicSigEnvelope.create(user , user.person.aes_encrypt(activity, aes_key_hash))
       salmon
     end
-   
+
     def self.parse(xml, user)
       slap = self.new
       doc = Nokogiri::XML(xml)

lib/tasks/cucumber.rake

@@ -1,6 +1,6 @@
 # IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
-# It is recommended to regenerate this file in the future when you upgrade to a 
-# newer version of cucumber-rails. Consider adding your own code to a new file 
+# It is recommended to regenerate this file in the future when you upgrade to a
+# newer version of cucumber-rails. Consider adding your own code to a new file
 # instead of editing this one. Cucumber will automatically load all features/**/*.rb
 # files.
 

script/ubuntu-setup.bash

@@ -11,7 +11,7 @@
 # USAGE: ./script/ubuntu-setup.bash
 # Do NOT run this script as root.
 
-# Set extented globbing 
+# Set extented globbing
 shopt -s extglob
 
 # fail on error
@@ -23,29 +23,29 @@ We need to do some actions as an ordinary user. We use sudo where necessary." &&
 # Check if the user has sudo privileges.
 sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; }
 
-# Check if universal repository is enabled 
+# Check if universal repository is enabled
 grep -i universe /etc/apt/sources.list > /dev/null || \
     { echo "Please enable universe repository" ; exit 1 ; }
 
 # Make sure that we only install the latest version of packages
 sudo apt-get update
 
-# Check if wget is installed 
+# Check if wget is installed
 test wget || { echo "Installing wget.." && sudo apt-get install wget \
     && echo "Installed wget.." ; }
 
-# Install build tools 
+# Install build tools
 echo "Installing build tools.."
 sudo apt-get -y --no-install-recommends install \
     build-essential libxslt1.1 libxslt1-dev libxml2
 echo "..Done installing build tools"
 
-# Install Ruby 1.8.7 
-echo "Installing ruby-full Ruby 1.8.7.." 
+# Install Ruby 1.8.7
+echo "Installing ruby-full Ruby 1.8.7.."
 sudo apt-get -y --no-install-recommends install ruby-full
 echo "..Done installing Ruby"
 
-# Install Rake 
+# Install Rake
 echo "Installing rake.."
 sudo apt-get -y  --no-install-recommends install rake
 echo "..Done installing rake"
@@ -121,8 +121,8 @@ echo "Fetching and installing ruby gems.."
         echo "."
         sudo ln -s /usr/bin/gem1.8 /usr/bin/gem
         echo "."
-    fi  
-) 
+    fi
+)
 echo "Done installing the gems.."
 
 # Install bundler

spec/controllers/publics_controller_spec.rb

@@ -24,7 +24,7 @@ describe PublicsController do
 
       user.reload
       user.visible_post_ids.include?(message.id).should be false
-      
+
       xml = user2.salmon(message).xml_for(user.person)
 
       post :receive, :id => user.person.id, :xml => xml

spec/controllers/users_controller_spec.rb

@@ -20,11 +20,11 @@ describe UsersController do
 
       it "doesn't overwrite the profile photo when an empty string is passed in" do
         image_url = @user.person.profile.image_url
-        put("update", :id => @user.id, "user"=> {"profile"=> 
+        put("update", :id => @user.id, "user"=> {"profile"=>
           {"image_url"   => "",
             "last_name"  => @user.person.profile.last_name,
             "first_name" => @user.person.profile.first_name}})
-        
+
         @user.person.profile.image_url.should == image_url
       end
     end
@@ -33,33 +33,33 @@ describe UsersController do
       it 'should change a users password ' do
         old_password = @user.encrypted_password
 
-        put("update", :id => @user.id, "user"=> {"password" => "foobaz", 'password_confirmation' => "foobaz","profile"=> 
+        put("update", :id => @user.id, "user"=> {"password" => "foobaz", 'password_confirmation' => "foobaz","profile"=>
             {"image_url"   => "",
             "last_name"  => @user.person.profile.last_name,
-            "first_name" => @user.person.profile.first_name}}) 
+            "first_name" => @user.person.profile.first_name}})
 
         @user.reload
         @user.encrypted_password.should_not == old_password
       end
 
-      it 'should not change a password if they do not match' do 
-        old_password = @user.encrypted_password 
-        put("update", :id => @user.id, "user"=> {"password" => "foobarz", 'password_confirmation' => "not_the_same","profile"=> 
+      it 'should not change a password if they do not match' do
+        old_password = @user.encrypted_password
+        put("update", :id => @user.id, "user"=> {"password" => "foobarz", 'password_confirmation' => "not_the_same","profile"=>
             {"image_url"   => "",
             "last_name"  => @user.person.profile.last_name,
-            "first_name" => @user.person.profile.first_name}}) 
+            "first_name" => @user.person.profile.first_name}})
           @user.reload
           @user.encrypted_password.should == old_password
       end
-  
 
-      it 'should not update if the password fields are left blank' do 
-        
-          old_password = @user.encrypted_password 
-          put("update", :id => @user.id, "user"=> {"password" => "", 'password_confirmation' => "","profile"=> 
+
+      it 'should not update if the password fields are left blank' do
+
+          old_password = @user.encrypted_password
+          put("update", :id => @user.id, "user"=> {"password" => "", 'password_confirmation' => "","profile"=>
               {"image_url"   => "",
               "last_name"  => @user.person.profile.last_name,
-              "first_name" => @user.person.profile.first_name}}) 
+              "first_name" => @user.person.profile.first_name}})
             @user.reload
             @user.encrypted_password.should == old_password
       end

spec/lib/diaspora_parser_spec.rb

@@ -8,7 +8,7 @@ describe Diaspora::Parser do
   before do
     @user = Factory.create(:user, :email => "bob@aol.com")
     @aspect = @user.aspect(:name => 'spies')
-    
+
     @user3 = Factory.create :user
     @person = @user3.person
     @user2 = Factory.create(:user)

spec/lib/salmon_salmon_spec.rb

@@ -11,17 +11,17 @@ describe Salmon do
   let(:post){ user.post :status_message, :message => "hi", :to => user.aspect(:name => "sdg").id }
 
   let!(:created_salmon) {Salmon::SalmonSlap.create(user, post.to_diaspora_xml)}
-    
+
   describe '#create' do
 
     it 'has data in the magic envelope' do
       created_salmon.magic_sig.data.should_not be nil
     end
-    
+
     it 'has no parsed_data' do
       created_salmon.parsed_data.should be nil
     end
-    
+
     it 'sets aes and iv key' do
       created_salmon.aes_key.should_not be nil
       created_salmon.iv.should_not be nil
@@ -33,7 +33,7 @@ describe Salmon do
       user.aes_decrypt(decoded_string, key_hash).should == post.to_diaspora_xml
     end
   end
- 
+
   describe '#xml_for' do
     let(:xml)   {created_salmon.xml_for user2.person}
 
@@ -50,7 +50,7 @@ describe Salmon do
 
   context 'marshaling' do
     let(:xml)   {created_salmon.xml_for user2.person}
-    let(:parsed_salmon) { Salmon::SalmonSlap.parse(xml, user2)} 
+    let(:parsed_salmon) { Salmon::SalmonSlap.parse(xml, user2)}
 
     it 'should parse out the aes key' do
       parsed_salmon.aes_key.should == created_salmon.aes_key

spec/models/fb_status_spec.rb

@@ -7,9 +7,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe FbStatus do
-  
+
   let(:fb_status) { Factory.create :fb_status }
-  
+
   it 'is valid' do
     fb_status.should be_valid
   end
@@ -22,7 +22,7 @@ describe FbStatus do
     it 'has graph_id' do
       status_from_json.graph_id.should == json_object['id']
     end
-    
+
     it 'has author_id' do
       status_from_json.author_id.should == json_object['from']['id']
     end
@@ -39,5 +39,5 @@ describe FbStatus do
       status_from_json.updated_time.should == Time.parse(json_object['updated_time'])
     end
   end
-  
+
 end

spec/user_encryption_spec.rb

@@ -9,7 +9,7 @@ describe 'user encryption' do
     unstub_mocha_stubs
     @user = Factory.create(:user)
     @aspect = @user.aspect(:name => 'dudes')
-    
+
     @user2 = Factory.create(:user)
     @aspect2 = @user2.aspect(:name => 'dudes')
   end