Trim whitespace

mhartl · mhartl · commit b123a2758241 · 2013-06-17T08:10:17.000-07:00
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
@@ -6,7 +6,7 @@ def home
       @feed_items = current_user.feed.paginate(page: params[:page])
     end
   end
-  
+
   def help
   end
 
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -1,5 +1,5 @@
 class UsersController < ApplicationController
-  before_filter :signed_in_user, 
+  before_filter :signed_in_user,
                 only: [:index, :edit, :update, :destroy, :following, :followers]
   before_filter :correct_user,   only: [:edit, :update]
   before_filter :admin_user,     only: :destroy
diff --git a/app/models/micropost.rb b/app/models/micropost.rb
@@ -10,7 +10,7 @@ class Micropost < ActiveRecord::Base
   def self.from_users_followed_by(user)
     followed_user_ids = "SELECT followed_id FROM relationships
                          WHERE follower_id = :user_id"
-    where("user_id IN (#{followed_user_ids}) OR user_id = :user_id", 
+    where("user_id IN (#{followed_user_ids}) OR user_id = :user_id",
           user_id: user.id)
   end
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -5,7 +5,7 @@
     <%= stylesheet_link_tag    "application", media: "all" %>
     <%= javascript_include_tag "application" %>
     <%= csrf_meta_tags %>
-    <%= render 'layouts/shim' %>    
+    <%= render 'layouts/shim' %>
   </head>
   <body>
     <%= render 'layouts/header' %>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -26,7 +26,7 @@
       sample application.
     </h2>
 
-    <%= link_to "Sign up now!", signup_path, 
+    <%= link_to "Sign up now!", signup_path,
                                 class: "btn btn-large btn-primary" %>
   </div>
 
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title, "Edit user") %> 
+<% provide(:title, "Edit user") %>
 <h1>Update your profile</h1>
 
 <div class="row">
diff --git a/spec/factories.rb b/spec/factories.rb
@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :user do
     sequence(:name)  { |n| "Person #{n}" }
-    sequence(:email) { |n| "person_#{n}@example.com"}   
+    sequence(:email) { |n| "person_#{n}@example.com"}
     password "foobar"
     password_confirmation "foobar"
 
diff --git a/spec/models/micropost_spec.rb b/spec/models/micropost_spec.rb
@@ -19,7 +19,7 @@
       expect do
         Micropost.new(user_id: user.id)
       end.to raise_error(ActiveModel::MassAssignmentSecurity::Error)
-    end    
+    end
   end
 
   describe "when user_id is not present" do
diff --git a/spec/models/relationship_spec.rb b/spec/models/relationship_spec.rb
@@ -15,7 +15,7 @@
       expect do
         Relationship.new(follower_id: follower.id)
       end.to raise_error(ActiveModel::MassAssignmentSecurity::Error)
-    end    
+    end
   end
 
   describe "follower methods" do
diff --git a/spec/requests/authentication_pages_spec.rb b/spec/requests/authentication_pages_spec.rb
@@ -25,7 +25,7 @@
         it { should_not have_selector('div.alert.alert-error') }
       end
     end
-    
+
     describe "with valid information" do
       let(:user) { FactoryGirl.create(:user) }
       before do
@@ -78,7 +78,7 @@
             end
 
             it "should render the default (profile) page" do
-              page.should have_selector('title', text: user.name) 
+              page.should have_selector('title', text: user.name)
             end
           end
         end
@@ -133,7 +133,7 @@
 
         describe "submitting to the destroy action" do
           before { delete relationship_path(1) }
-          specify { response.should redirect_to(signin_url) }          
+          specify { response.should redirect_to(signin_url) }
         end
       end
     end
@@ -162,7 +162,7 @@
 
       describe "submitting a DELETE request to the Users#destroy action" do
         before { delete user_path(user) }
-        specify { response.should redirect_to(root_url) }        
+        specify { response.should redirect_to(root_url) }
       end
     end
   end
diff --git a/spec/requests/micropost_pages_spec.rb b/spec/requests/micropost_pages_spec.rb
@@ -18,7 +18,7 @@
 
       describe "error messages" do
         before { click_button "Post" }
-        it { should have_content('error') } 
+        it { should have_content('error') }
       end
     end
 
@@ -30,7 +30,7 @@
       end
     end
   end
-  
+
   describe "micropost destruction" do
     before { FactoryGirl.create(:micropost, user: user) }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<% provide(:title, "Edit user") %>`
	`1`	`+<% provide(:title, "Edit user") %>`
`2`	`2`	`<h1>Update your profile</h1>`
`3`	`3`
`4`	`4`	`<div class="row">`