Merge branch 'master' of github.com:diaspora/diaspora

app/helpers/application_helper.rb

@@ -4,7 +4,6 @@
 
 
 module ApplicationHelper
-
   def current_aspect?(aspect)
     !@aspect.is_a?(Symbol) && @aspect.id == aspect.id
   end
@@ -68,5 +67,4 @@ module ApplicationHelper
   def post_yield_tag(post)
     (':' + post.id.to_s).to_sym
   end
-
 end

app/helpers/dashboards_helper.rb

@@ -4,8 +4,7 @@
 
 
 module DashboardsHelper
-
   def title_for_page
-      'home'
+    'home'
   end
 end

app/helpers/photos_helper.rb

@@ -4,7 +4,6 @@
 
 
 module PhotosHelper
-
   def linked_scaled_photo(photo, album)
     link_to (image_tag photo.url(:scaled_full)), photo_path(album.next_photo(photo)), :rel => "prefetch"
   end

app/helpers/publics_helper.rb

@@ -9,7 +9,6 @@ module PublicsHelper
     subscriber ||= Subscriber.new(:url => opts[:callback], :topic => opts[:topic])
 
     if subscriber.save
-
       if opts[:verify] == 'sync'
         204
       elsif opts[:verify] == 'async'

app/helpers/requests_helper.rb

@@ -4,7 +4,6 @@
 
 
 module RequestsHelper
-
   def subscription_mode(profile)
     if diaspora?(profile)
       :friend
@@ -40,5 +39,4 @@ module RequestsHelper
     end
     { action => person }
   end
-
 end

app/helpers/sockets_helper.rb

@@ -33,7 +33,4 @@ module SocketsHelper
 
     action_hash.to_json
   end
-
-
-
 end

lib/message_handler.rb

@@ -31,7 +31,7 @@ class MessageHandler
         http.callback { process; process}
       when :get
         http = EventMachine::HttpRequest.new(query.destination).get :timeout => TIMEOUT
-        http.callback {send_to_seed(query, http.response); process}
+        http.callback {process}
       else
         raise "message is not a type I know!"
       end
@@ -47,10 +47,6 @@ class MessageHandler
     } unless @queue.size == 0
   end
 
-  def send_to_seed(message, http_response)
-    #DO SOMETHING!
-  end
-
   def size
     @queue.size
   end

spec/lib/message_handler_spec.rb

@@ -123,7 +123,6 @@ describe MessageHandler do
       request = FakeHttpRequest.new(:success)
       request.should_receive(:get).exactly(1).times.and_return(request)
       request.should_receive(:post).exactly(1).times.and_return(request)
-      @handler.should_receive(:send_to_seed).once
 
       EventMachine::HttpRequest.stub!(:new).and_return(request)