social_stream-base 0.13.2 → 0.14.0

data/lib/social_stream/controllers/helpers.rb

@@ -31,104 +31,102 @@ module SocialStream
         end
       end
 
-      module InstanceMethods
-        # Current subject represented by the user. Defaults to the own user
-        def current_subject
-          @current_subject ||=
-            current_subject_from_params  ||
-            current_subject_from_session ||
-              current_user
-        end
-
-        # Set represented subject
-        def current_subject= instance
-          session[:subject_type] = instance.class.to_s
-          session[:subject_id]   = instance.id
+      # Current subject represented by the user. Defaults to the own user
+      def current_subject
+        @current_subject ||=
+          current_subject_from_params  ||
+          current_subject_from_session ||
+            current_user
+      end
 
-          @current_subject = instance
-        end
-          
-        def current_actor
-          current_subject.actor
-        end
+      # Set represented subject
+      def current_subject= instance
+        session[:subject_type] = instance.class.to_s
+        session[:subject_id]   = instance.id
 
-        # Returns the {SocialStream::Models::Subject subject} that is in the path, or
-        # the {#current_subject} if some {User} is logged in.
-        #
-        # Requirements: the controller must inherit from +InheritedResources::Base+ and the method
-        # {ClassMethods#belongs_to_subjects} must be called
-        #
-        #   class PostsController < InheritedResources::Base
-        #     belongs_to_subjects :optional => true
-        #   end
-        #
-        #   # /users/demo/posts
-        #   profile_subject #=> User demo
-        #
-        #   # /groups/test/posts
-        #   profile_subject #=> Group test
-        #
-        #   # /posts
-        #   profile_subject #=> current_subject
-        #
-        #
-        def profile_subject
-          @profile_subject ||= association_chain[-1] || current_subject
-        end
+        @current_subject = instance
+      end
+        
+      def current_actor
+        current_subject.actor
+      end
 
-        # Go to sign in page if {#profile_subject} is blank
-        def profile_subject!
-          @profile_subject ||= association_chain[-1] || warden.authenticate!
-        end
+      # Returns the {SocialStream::Models::Subject subject} that is in the path, or
+      # the {#current_subject} if some {User} is logged in.
+      #
+      # Requirements: the controller must inherit from +InheritedResources::Base+ and the method
+      # {ClassMethods#belongs_to_subjects} must be called
+      #
+      #   class PostsController < InheritedResources::Base
+      #     belongs_to_subjects :optional => true
+      #   end
+      #
+      #   # /users/demo/posts
+      #   profile_subject #=> User demo
+      #
+      #   # /groups/test/posts
+      #   profile_subject #=> Group test
+      #
+      #   # /posts
+      #   profile_subject #=> current_subject
+      #
+      #
+      def profile_subject
+        @profile_subject ||= association_chain[-1] || current_subject
+      end
 
-        # Profile subject is suitable for paths like:
-        #   /users/demo/posts
-        #
-        # This method tries {#profile_subject} first and then {#current_subject}
-        def profile_or_current_subject
-          profile_subject || current_subject
-        rescue
-          current_subject
-        end
+      # Go to sign in page if {#profile_subject} is blank
+      def profile_subject!
+        @profile_subject ||= association_chain[-1] || warden.authenticate!
+      end
 
-        # A {User} must be logged in and is equal to {#profile_subject}
-        def profile_subject_is_current?
-          user_signed_in? && profile_subject == current_subject
-        end
+      # Profile subject is suitable for paths like:
+      #   /users/demo/posts
+      #
+      # This method tries {#profile_subject} first and then {#current_subject}
+      def profile_or_current_subject
+        profile_subject || current_subject
+      rescue
+        current_subject
+      end
 
-        # Override Cancan#current_ability method to use {#current_subject}
-        def current_ability
-          @current_ability ||=
-            Ability.new(current_subject)
-        end
+      # A {User} must be logged in and is equal to {#profile_subject}
+      def profile_subject_is_current?
+        user_signed_in? && profile_subject == current_subject
+      end
 
-        private
+      # Override Cancan#current_ability method to use {#current_subject}
+      def current_ability
+        @current_ability ||=
+          Ability.new(current_subject)
+      end
 
-        # Get represented subject from params[:s]
-        def current_subject_from_params
-          return unless params[:s].present?
+      private
 
-          subject = Actor.find_by_slug!(params[:s]).subject
+      # Get represented subject from params[:s]
+      def current_subject_from_params
+        return unless params[:s].present?
 
-          unless subject.represented_by?(current_user)
-            raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
-          end
+        subject = Actor.find_by_slug!(params[:s]).subject
 
-          if subject != current_user
-            flash[:notice] ||= ""
-            flash[:notice] += t('representation.notice',
-                                :subject => subject.name)
-          end
+        unless subject.represented_by?(current_user)
+          raise CanCan::AccessDenied.new("Not authorized!", :represent, subject.name)
+        end
 
-          self.current_subject = subject
+        if subject != current_user
+          flash[:notice] ||= ""
+          flash[:notice] += t('representation.notice',
+                              :subject => subject.name)
         end
 
-        # Get represented subject from session
-        def current_subject_from_session
-          return unless session[:subject_type].present? && session[:subject_id].present?
+        self.current_subject = subject
+      end
 
-          session[:subject_type].constantize.find session[:subject_id]
-        end
+      # Get represented subject from session
+      def current_subject_from_session
+        return unless session[:subject_type].present? && session[:subject_id].present?
+
+        session[:subject_type].constantize.find session[:subject_id]
       end
     end
   end

data/lib/social_stream/controllers/i18n_integration.rb

@@ -8,21 +8,19 @@ module SocialStream
          before_filter :set_locale
       end
 
-      module InstanceMethods
-        # Set locale as per params, user preference or default
-        def set_locale
-          I18n.locale = params[:locale] || user_preferred_locale || extract_locale_from_accept_language_header || I18n.default_locale
-        end
+      # Set locale as per params, user preference or default
+      def set_locale
+        I18n.locale = params[:locale] || user_preferred_locale || extract_locale_from_accept_language_header || I18n.default_locale
+      end
 
-        private
-	def extract_locale_from_accept_language_header
-	  return nil if request.env['HTTP_ACCEPT_LANGUAGE'].nil?
-	  (request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).map{|l| l.to_sym} & I18n.available_locales).first
-	end
+      private
+      def extract_locale_from_accept_language_header
+        return nil if request.env['HTTP_ACCEPT_LANGUAGE'].nil?
+        (request.env['HTTP_ACCEPT_LANGUAGE'].scan(/^[a-z]{2}/).map{|l| l.to_sym} & I18n.available_locales).first
+      end
 
-	def user_preferred_locale
-          current_user.language if user_signed_in?
-	end
+      def user_preferred_locale
+        current_user.language if user_signed_in?
       end
     end
   end

data/lib/social_stream/controllers/objects.rb

@@ -25,14 +25,11 @@ module SocialStream
         end
       end
 
-      module InstanceMethods
+      protected
 
-        protected
-
-        def set_author_ids
-          resource_params.first[:author_id] = current_subject.try(:actor_id)
-          resource_params.first[:user_author_id] = current_user.try(:actor_id)
-        end
+      def set_author_ids
+        resource_params.first[:author_id] = current_subject.try(:actor_id)
+        resource_params.first[:user_author_id] = current_user.try(:actor_id)
       end
     end
   end

data/lib/social_stream/controllers/subjects.rb

@@ -7,11 +7,9 @@ module SocialStream
         inherit_resources
       end
 
-      module InstanceMethods
-        # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
-        def profile_subject
-          !resource.new_record? && resource || current_subject
-        end
+      # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
+      def profile_subject
+        !resource.new_record? && resource || current_subject
       end
     end
   end

data/lib/social_stream/models/channeled.rb

@@ -3,6 +3,18 @@ module SocialStream
     # Models that have author, user_author and owner, properties saved in {Channel}.
     # Currently {Activity} and {ActivityObject}
     module Channeled
+      # Add the method {#channeled} to ActiveRecord
+      module ActiveRecord
+        extend ActiveSupport::Concern
+
+        module ClassMethods
+          # This class is channeled. See {Channel}
+          def channeled
+            include SocialStream::Models::Channeled
+          end
+        end
+      end
+
       extend ActiveSupport::Concern
 
       included do
@@ -14,36 +26,22 @@ module SocialStream
         before_validation :check_existing_channel
       end
 
-      module InstanceMethods
-
-        protected
+      protected
 
-        # Use existing channel, do not create a new one
-        def check_existing_channel
-          return unless channel!.new_record?
+      # Use existing channel, do not create a new one
+      def check_existing_channel
+        return unless channel!.new_record?
 
-          existing_channel =
-            Channel.
-              where(:author_id      => author_id,
-                    :owner_id       => owner_id,
-                    :user_author_id => user_author_id).
-              first
+        existing_channel =
+          Channel.
+            where(:author_id      => author_id,
+                  :owner_id       => owner_id,
+                  :user_author_id => user_author_id).
+            first
 
-          return if existing_channel.blank?
+        return if existing_channel.blank?
 
-          self.channel = existing_channel
-        end
-      end
-
-      module ActiveRecord
-        extend ActiveSupport::Concern
-
-        module ClassMethods
-          # This class is channeled. See {Channel}
-          def channeled
-            include SocialStream::Models::Channeled
-          end
-        end
+        self.channel = existing_channel
       end
     end
   end

data/lib/social_stream/models/object.rb

@@ -1,5 +1,3 @@
-require 'active_support/concern'
-
 module SocialStream
   module Models
     # Additional features for models that are Activity Objects
@@ -31,79 +29,77 @@ module SocialStream
         }
       end
 
-      module InstanceMethods
-        # Was the author represented with this {SocialStream::Models::Object object} was created?
-        def represented_author?
-          author_id == user_author_id
-        end
+      # Was the author represented with this {SocialStream::Models::Object object} was created?
+      def represented_author?
+        author_id == user_author_id
+      end
 
-        # All the activities with this object
-        def activities
-          Activity.
-            includes(:activity_objects => self.class.to_s.underscore).
-            where("#{ self.class.quoted_table_name }.id" => self.id)
-        end
+      # All the activities with this object
+      def activities
+        Activity.
+          includes(:activity_objects => self.class.to_s.underscore).
+          where("#{ self.class.quoted_table_name }.id" => self.id)
+      end
 
-        # Build the post activity when this object is not saved
-        def build_post_activity
-          Activity.new :author       => author,
-                       :user_author  => user_author,
-                       :owner        => owner,
-                       :relation_ids => Array(_relation_ids)
-        end
+      # Build the post activity when this object is not saved
+      def build_post_activity
+        Activity.new :author       => author,
+                     :user_author  => user_author,
+                     :owner        => owner,
+                     :relation_ids => Array(_relation_ids)
+      end
 
-        def _contact
-          @_contact ||= author && owner && author.contact_to!(owner)
-        end
+      def _contact
+        @_contact ||= author && owner && author.contact_to!(owner)
+      end
 
-        def _contact_id
-          _contact.try(:id)
-        end
+      def _contact_id
+        _contact.try(:id)
+      end
 
-        def _relation_ids
-          @_relation_ids ||=
-            if _contact_id.nil?
-              nil
+      def _relation_ids
+        @_relation_ids ||=
+          if _contact_id.nil?
+            nil
+          else
+            # FIXME: repeated in Activity#fill_relations
+            if _contact.reflexive?
+              _contact.sender.relation_customs.map(&:id)
             else
-              # FIXME: repeated in Activity#fill_relations
-              if _contact.reflexive?
-                _contact.sender.relation_customs.map(&:id)
-              else
-                 _contact.
-                   receiver.
-                   relation_customs.
-                   allow(_contact.sender, 'create', 'activity').
-                   map(&:id)
-              end
+               _contact.
+                 receiver.
+                 relation_customs.
+                 allow(_contact.sender, 'create', 'activity').
+                 map(&:id)
             end
-        end
+          end
+      end
 
-        def _activity_parent
-          @_activity_parent ||= Activity.find(_activity_parent_id)
-        end
+      def _activity_parent
+        @_activity_parent ||= Activity.find(_activity_parent_id)
+      end
 
-        private
+      private
 
-        def create_post_activity
-          create_activity "post"
-        end
+      def create_post_activity
+        create_activity "post"
+      end
 
-        def create_update_activity
-          return if _contact_id.blank?
-          
-          create_activity "update"
-        end
+      def create_update_activity
+        return if _contact_id.blank?
+        
+        create_activity "update"
+      end
 
-        def create_activity(verb)
-          a = Activity.new :verb         => verb,
-                           :channel      => channel,
-                           :relation_ids => _relation_ids,
-                           :parent_id    => _activity_parent_id
+      def create_activity(verb)
+        a = Activity.new :verb         => verb,
+                         :channel      => channel,
+                         :relation_ids => _relation_ids,
+                         :parent_id    => _activity_parent_id
 
-          a.activity_objects << activity_object
+        a.activity_objects << activity_object
 
-          a.save!
-        end
+        a.save!
       end
     end
   end