From 71e77d59b37270cae0993c7bc78c6f2f045ad24e Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Thu, 12 May 2011 13:54:55 -0700
Subject: [PATCH] Revert to including all helpers everywhere, because the rest
 of the team prefers it that way

---
 app/controllers/application_controller.rb     |  2 --
 app/controllers/aspects_controller.rb         |  1 -
 app/controllers/contacts_controller.rb        |  1 -
 app/controllers/likes_controller.rb           |  5 ++--
 app/controllers/people_controller.rb          |  1 -
 app/controllers/photos_controller.rb          |  1 -
 app/controllers/services_controller.rb        |  1 -
 app/controllers/sockets_controller.rb         |  1 -
 app/controllers/status_messages_controller.rb |  1 -
 app/controllers/tags_controller.rb            |  2 +-
 app/controllers/users_controller.rb           |  1 -
 app/helpers/application_helper.rb             |  4 ----
 app/helpers/aspects_helper.rb                 |  8 -------
 app/helpers/people_helper.rb                  |  4 ----
 app/helpers/stream_helper.rb                  | 23 ++++++++++++++++++
 app/helpers/tags_helper.rb                    |  3 ---
 spec/helpers/application_helper_spec.rb       |  9 +------
 spec/helpers/stream_helper_spec.rb            | 24 +++++++++++++++++++
 18 files changed, 51 insertions(+), 41 deletions(-)
 create mode 100644 app/helpers/stream_helper.rb
 create mode 100644 spec/helpers/stream_helper_spec.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 8b94c832d..595d963a8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,8 +3,6 @@
 #   the COPYRIGHT file.
 
 class ApplicationController < ActionController::Base
-  clear_helpers
-  helper :layout, :error_messages, :markdownify, :aspect_global
   has_mobile_fu
   protect_from_forgery :except => :receive
 
diff --git a/app/controllers/aspects_controller.rb b/app/controllers/aspects_controller.rb
index 782a841bf..6da08ba72 100644
--- a/app/controllers/aspects_controller.rb
+++ b/app/controllers/aspects_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class AspectsController < ApplicationController
-  helper :comments, :aspect_memberships, :likes
   before_filter :authenticate_user!
   before_filter :save_sort_order, :only => :index
   before_filter :ensure_page, :only => :index
diff --git a/app/controllers/contacts_controller.rb b/app/controllers/contacts_controller.rb
index 7bf524143..a567fc838 100644
--- a/app/controllers/contacts_controller.rb
+++ b/app/controllers/contacts_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class ContactsController < ApplicationController
-  helper :aspect_memberships
   before_filter :authenticate_user!
 
   def new
diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb
index 7d53b614a..46c56fd0b 100644
--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -4,11 +4,10 @@
 
 class LikesController < ApplicationController
   include ApplicationHelper
-  helper :likes
   before_filter :authenticate_user!
-  
+
   respond_to :html, :mobile, :json
-  
+
   def create
     target = current_user.find_visible_post_by_id params[:post_id]
     positive = (params[:positive] == 'true') ? true : false
diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb
index 5b7b26a11..c008e2a7d 100644
--- a/app/controllers/people_controller.rb
+++ b/app/controllers/people_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class PeopleController < ApplicationController
-  helper :comments, :likes
   before_filter :authenticate_user!, :except => [:show]
 
   respond_to :html
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index ee21b325d..94f40d728 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class PhotosController < ApplicationController
-  helper :comments, :people
   before_filter :authenticate_user!
 
   respond_to :html, :json
diff --git a/app/controllers/services_controller.rb b/app/controllers/services_controller.rb
index 77154cec9..ae855f4ae 100644
--- a/app/controllers/services_controller.rb
+++ b/app/controllers/services_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See #   the COPYRIGHT file.
 
 class ServicesController < ApplicationController
-  helper :aspect_memberships
   before_filter :authenticate_user!
 
   def index
diff --git a/app/controllers/sockets_controller.rb b/app/controllers/sockets_controller.rb
index d565f7936..7ed70b1cb 100644
--- a/app/controllers/sockets_controller.rb
+++ b/app/controllers/sockets_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class SocketsController < ApplicationController
-  helper :comments, :likes
   include ApplicationHelper
   include SocketsHelper
   include Rails.application.routes.url_helpers
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index e8120b459..37f71917b 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class StatusMessagesController < ApplicationController
-  helper :comments, :likes
   before_filter :authenticate_user!
 
   respond_to :html
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index 5cd085592..e0d88b8dc 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -3,7 +3,6 @@
 #   the COPYRIGHT file.
 
 class TagsController < ApplicationController
-  helper :comments, :likes
   skip_before_filter :count_requests
   skip_before_filter :set_invites
   skip_before_filter :which_action_and_user
@@ -41,6 +40,7 @@ class TagsController < ApplicationController
   end
 
   def show
+    @aspect = :tag
     if current_user
       @posts = StatusMessage.joins(:contacts).where(:pending => false).where(
         Contact.arel_table[:user_id].eq(current_user.id).or(
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 343bc64fb..431259e51 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -2,7 +2,6 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 class UsersController < ApplicationController
-  helper :language
   require File.join(Rails.root, 'lib/diaspora/ostatus_builder')
   require File.join(Rails.root, 'lib/diaspora/exporter')
   require File.join(Rails.root, 'lib/collect_user_photos')
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7a522dbd8..a5da5dd7e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -7,10 +7,6 @@ module ApplicationHelper
     timeago(obj.created_at)
   end
 
-  def time_for_sort(post)
-    post.created_at
-  end
-
   def timeago(time, options={})
     options[:class] ||= "timeago"
     content_tag(:abbr, time.to_s, options.merge(:title => time.iso8601)) if time
diff --git a/app/helpers/aspects_helper.rb b/app/helpers/aspects_helper.rb
index 8cc08efe1..8d0dc56d4 100644
--- a/app/helpers/aspects_helper.rb
+++ b/app/helpers/aspects_helper.rb
@@ -3,14 +3,6 @@
 #   the COPYRIGHT file.
 
 module AspectsHelper
-  def next_page_path
-    aspects_path(:max_time => @posts.last.send(session[:sort_order].to_sym).to_i, :a_ids => params[:a_ids])
-  end
-
-  def time_for_sort post
-    post.send(session[:sort_order].to_sym)
-  end
-
   def remove_link(aspect)
     if aspect.contacts.size == 0
       link_to I18n.t('aspects.helper.remove'), aspect, :method => :delete, :confirm => I18n.t('aspects.helper.are_you_sure')
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index 490200756..b149abca8 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -27,8 +27,4 @@ module PeopleHelper
       I18n.l bday, :format => I18n.t('date.formats.birthday_with_year')
     end
   end
-
-  def next_page_path
-    person_path(@person, :max_time => @posts.last.created_at.to_i)
-  end
 end
diff --git a/app/helpers/stream_helper.rb b/app/helpers/stream_helper.rb
new file mode 100644
index 000000000..3fe8aca2b
--- /dev/null
+++ b/app/helpers/stream_helper.rb
@@ -0,0 +1,23 @@
+#   Copyright (c) 2010, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+module StreamHelper
+  def next_page_path
+    if controller.instance_of?(TagsController)
+      tag_path(@tag, :max_time => @posts.last.created_at.to_i)
+    elsif controller.instance_of?(PeopleController)
+      person_path(@person, :max_time => @posts.last.created_at.to_i)
+    elsif controller.instance_of?(AspectsController)
+      aspects_path(:max_time => @posts.last.send(session[:sort_order].to_sym).to_i, :a_ids => params[:a_ids])
+    end
+  end
+
+  def time_for_sort post
+    if controller.instance_of?(AspectsController)
+      post.send(session[:sort_order].to_sym)
+    else
+      post.created_at
+    end
+  end
+end
diff --git a/app/helpers/tags_helper.rb b/app/helpers/tags_helper.rb
index ee29ec44e..d27480223 100644
--- a/app/helpers/tags_helper.rb
+++ b/app/helpers/tags_helper.rb
@@ -3,7 +3,4 @@
 #   the COPYRIGHT file.
 
 module TagsHelper
-  def next_page_path
-    tag_path(@tag, :max_time => @posts.last.created_at.to_i)
-  end
 end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index de2f93b56..49068f492 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -71,11 +71,4 @@ describe ApplicationHelper do
       person_link(@person).should_not include("<h1>")
     end
   end
-
-  describe "#time_for_sort" do
-    it "returns created_at" do
-      post = @user.post(:status_message, :text => "hello", :public => true, :to => 'all')
-      time_for_sort(post).should == post.created_at
-    end
-  end
-end
\ No newline at end of file
+end
diff --git a/spec/helpers/stream_helper_spec.rb b/spec/helpers/stream_helper_spec.rb
new file mode 100644
index 000000000..ebb6ce0b7
--- /dev/null
+++ b/spec/helpers/stream_helper_spec.rb
@@ -0,0 +1,24 @@
+#   Copyright (c) 2011, Diaspora Inc.  This file is
+#   licensed under the Affero General Public License version 3 or later.  See
+#   the COPYRIGHT file.
+
+require 'spec_helper'
+
+describe StreamHelper do
+  before do
+    @post = Factory(:status_message)
+  end
+  describe "#time_for_sort" do
+    it "returns sort_order for an aspectscontroller" do
+      sort_order = :stored_in_session
+      stub!(:controller).and_return(AspectsController.new)
+      stub!(:session).and_return({:sort_order => sort_order})
+      @post.should_receive(sort_order)
+      time_for_sort(@post)
+    end
+    it "returns post.created_at otherwise" do
+      stub!(:controller).and_return(mock())
+      time_for_sort(@post).should == @post.created_at
+    end
+  end
+end