diff --git a/README.md b/README.md
index 57bb01c4e4aa330cbe728daad80375786e01a7ed..c1e81ee732e548baf746edd5a15c6b4b55da7fd2 100644
--- a/README.md
+++ b/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.
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 3d750d41f20d6bfdc5afc0d8bb367d70c1083b40..de20fa5678a059af6b21489ef9e106991bcb3457 100644
--- a/app/controllers/aspects_controller.rb
+++ b/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
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 311fdf73f7b55f436f666ff6b82a4be2aba1a363..f57b945404dfa6d8f4ad2e616d6bfd71ec33fc24 100644
--- a/app/controllers/publics_controller.rb
+++ b/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
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index b072564bb9246f854a5c4e2fb44fc1f23025dcd5..6f384b3634f924cf6e1a72c47ccff0f9ed55a87e 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/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]})
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ab8939b87d7f4e224fbf75586d7903e5795e5289..9b41b1fc9b215d11e9d8a566fd4e1abf8ce27b45 100644
--- a/app/controllers/users_controller.rb
+++ b/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)
diff --git a/app/models/fb_status.rb b/app/models/fb_status.rb
index fd190c2c72f5b6274c16cb2d2c2a7378882d3869..40d9cb16e8060f9a23b8fb24370798b1340fe8d9 100644
--- a/app/models/fb_status.rb
+++ b/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
diff --git a/app/models/user.rb b/app/models/user.rb
index 15c3515c2dd75b334ea580085958c5943a48da8a..238397bdcb3b16c255f97372daabd856cfebd350 100644
--- a/app/models/user.rb
+++ b/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
diff --git a/app/views/aspects/public.html.haml b/app/views/aspects/public.html.haml
index f04b63489e8172cb6091767b058edf2b28849208..e85cae2762d866c1ee5b4ceb91128f109e80eb7e 100644
--- a/app/views/aspects/public.html.haml
+++ b/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
diff --git a/app/views/shared/_aspect_friends.haml b/app/views/shared/_aspect_friends.haml
index e24dc5537082f566498eac870e299c92e23ab26d..8c22700aad139e6d4a68221429534d05ea569e38 100644
--- a/app/views/shared/_aspect_friends.haml
+++ b/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'
diff --git a/app/views/users/_services.haml b/app/views/users/_services.haml
index fd1894d117d622a3f05dc16f167f222c2feb667a..648fbe1612b76b1673806bad5b43eee14288da55 100644
--- a/app/views/users/_services.haml
+++ b/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|
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index a3f090027880c82dde29aded7294134600b7bc21..81fc639e72e6ff0b8c3f5ae00269518cf2110d62 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -26,5 +26,5 @@
#services.settings_pane
= render 'users/services'
-
+
diff --git a/config/locales/diaspora/ar.yml b/config/locales/diaspora/ar.yml
index f4643462117d43ce90217e9eaf0dc4d13e12c4c5..cddf877063dd13351e56ea6da52a526830917f1e 100644
--- a/config/locales/diaspora/ar.yml
+++ b/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: ".أنت الآن أصدقاء"
diff --git a/config/locales/diaspora/cs.yml b/config/locales/diaspora/cs.yml
index 898428db2d55b44ef8a8639ebbb06bcf86220023..7b454f8133ecdb10a58bfe6f213fc18aad0a7941 100644
--- a/config/locales/diaspora/cs.yml
+++ b/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é"
diff --git a/config/locales/diaspora/he.yml b/config/locales/diaspora/he.yml
index 1105a3bcb0253785b765c402f5c173d46c04a667..221a7c5f7c0bd5133461f95d8de7fa1cee8be6a7 100644
--- a/config/locales/diaspora/he.yml
+++ b/config/locales/diaspora/he.yml
@@ -46,7 +46,7 @@ he:
new_album:
create: "יצירה"
add_a_new_album: "הוספת ××œ×‘×•× ×—×“×©"
- show:
+ show:
edit_album: "עריכת ×לבו×"
albums: "×לבומי×"
updated: "ת×ריך העדכון"
diff --git a/config/routes.rb b/config/routes.rb
index 2827c4cc771f3127e89495b2f9dc6d1b6c8397de..12fae72e6c4af839372002e29e02d0b476a08680 100644
--- a/config/routes.rb
+++ b/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]
diff --git a/features/step_definitions/web_steps.rb b/features/step_definitions/web_steps.rb
index 0f0af8aa21238dba5a61badfccc3a32a209c4e1e..5a55297041acc5a7de5ed5f54ca4f92c19ebae66 100644
--- a/features/step_definitions/web_steps.rb
+++ b/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
diff --git a/features/support/env.rb b/features/support/env.rb
index bcb1fdd000b72b839bff6e36da212663e13cf00d..2fb86c4dc89df0d4d65ffbf33cb2107bff557c9c 100644
--- a/features/support/env.rb
+++ b/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.
diff --git a/lib/diaspora/ostatus_builder.rb b/lib/diaspora/ostatus_builder.rb
index 92e12122a522cacb38c4d74a9a8cdb0000d19211..48db7fd86f9a27c5dbf587e4b02966be3b490248 100644
--- a/lib/diaspora/ostatus_builder.rb
+++ b/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
diff --git a/lib/salmon/salmon.rb b/lib/salmon/salmon.rb
index d9352ef41df753c4578d1c523b0207e1a1f86802..e7690a578c2a7f8f63ab9b8cb23300c38c684367 100644
--- a/lib/salmon/salmon.rb
+++ b/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)
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 15d405ad4c1ff74a4982eab90ea06326006724c9..055af1c6cc9d4acd69e8d9601f6d6eb4fe19b058 100644
--- a/lib/tasks/cucumber.rake
+++ b/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.
diff --git a/script/ubuntu-setup.bash b/script/ubuntu-setup.bash
index c335fcf65aa705ec58cfcc1df30493a3127b5fb5..666eac818c9039a5cd1c3fe66a9e43d4f1973c84 100755
--- a/script/ubuntu-setup.bash
+++ b/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
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index d8d700bd8504fc2581ca480cdb4a74d3c13606b9..22e71befb372eb8c725d4718b68d4bf3b4fec718 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/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
diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb
index 272775771a60152c1cec605ab09abcb540d950db..0352d2bf2c96639642b9627f00a2ee446e41125d 100644
--- a/spec/controllers/users_controller_spec.rb
+++ b/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
diff --git a/spec/lib/diaspora_parser_spec.rb b/spec/lib/diaspora_parser_spec.rb
index 530dca21150987e0efb6ed104ec53252f8a7fc0f..d5722fd65aab481b73f713d062632942eabd7872 100644
--- a/spec/lib/diaspora_parser_spec.rb
+++ b/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)
diff --git a/spec/lib/salmon_salmon_spec.rb b/spec/lib/salmon_salmon_spec.rb
index e10ad5b48d5f0dd1575c3aafd7aecda6a6baf97a..40f928c18e3dd42b5cf4bf820070cc94ea9310f8 100644
--- a/spec/lib/salmon_salmon_spec.rb
+++ b/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
diff --git a/spec/models/fb_status_spec.rb b/spec/models/fb_status_spec.rb
index 368f8bd160f2f718354ed7a395a0f522bae910d2..2ab232fce0fb5e700019dc1e28de27721799bfc7 100644
--- a/spec/models/fb_status_spec.rb
+++ b/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
diff --git a/spec/user_encryption_spec.rb b/spec/user_encryption_spec.rb
index 2188b106e46c93500d2f81543087d6ddf5fee9d9..a7fd8c5482ec47a116f61cbaddb33cda386a2a11 100644
--- a/spec/user_encryption_spec.rb
+++ b/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