social_stream-base 0.20.0 → 0.20.1

data/lib/social_stream-base.rb

@@ -26,6 +26,12 @@ module SocialStream
     autoload :Supertype, 'social_stream/models/supertype'
   end
 
+  module Population
+    autoload :ActivityObject, 'social_stream/population/activity_object'
+    autoload :PowerLaw,       'social_stream/population/power_law'
+    autoload :Timestamps,     'social_stream/population/timestamps'
+  end
+
   module Routing
     module Constraints
       autoload :Custom, 'social_stream/routing/constraints/custom'
@@ -34,6 +40,8 @@ module SocialStream
     end
   end
 
+  autoload :Search, 'social_stream/search'
+
   module Views
     autoload :List,     'social_stream/views/list'
     autoload :Location, 'social_stream/views/location'

data/lib/social_stream/base/dependencies.rb

@@ -1,4 +1,6 @@
-# Monkey path Ruby on Rails
+# Hash deep merge
+require 'deep_merge'
+# Monkey patch Ruby on Rails
 require 'rails/social_stream'
 # Database foreign keys
 require 'foreigner'

data/lib/social_stream/base/thinking-sphinx.rb

@@ -9,7 +9,9 @@ module SocialStream
             indexes activity_object.tags.name,   :as => :tags
 
             has created_at
-            has activity_object.author_action(:actor_id), :as => :author_id
+            has activity_object.author_actions(:actor_id), :as => :author_id
+            has activity_object.owner_actions(:actor_id),  :as => :owner_id
+            has activity_object.activity_object_audiences(:relation_id), :as => :relation_ids
           end
         end
       end

data/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.20.0".freeze
+    VERSION = "0.20.1".freeze
   end
 end

data/lib/social_stream/controllers/helpers.rb

@@ -12,22 +12,12 @@ module SocialStream
       end
 
       module ClassMethods
-        # Add to controllers that have nested subjects. Examples are:
+        # Get the class relative to controller name
         #
-        #   class ProfilesController < InheritedResources::Base
-        #     belongs_to_subjects(:singleton => true) # provides /users/demo/profile
-        #   end
+        #   Post #=> in PostsController
         #
-        #   class ActivitiesController < InheritedResources::Base
-        #     belongs_to_subjects # provides /users/demo/activities
-        #   end
-        #
-        def belongs_to_subjects(options = {})
-          opts = { :polymorphic => true, :finder => :find_by_slug! }.update(options)
-
-          args = SocialStream.subjects + [ opts ]
-
-          belongs_to *args
+        def model_class
+          controller_name.classify.constantize
         end
       end
 
@@ -52,14 +42,7 @@ module SocialStream
       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
+      # nil if it is not provided
       #
       #   # /users/demo/posts
       #   profile_subject #=> User demo
@@ -68,26 +51,35 @@ module SocialStream
       #   profile_subject #=> Group test
       #
       #   # /posts
-      #   profile_subject #=> current_subject
+      #   profile_subject #=> nil
       #
       #
       def profile_subject
-        @profile_subject ||= association_chain[-1] || current_subject
+        @profile_subject ||= find_profile_subject
+      end
+
+      # Is {#profile_subject} provided?
+      def profile_subject?
+        profile_subject.present?
       end
 
-      # Go to sign in page if {#profile_subject} is blank
+      # Raise error if {#profile_subject} is not provided
       def profile_subject!
-        @profile_subject ||= association_chain[-1] || warden.authenticate!
+        profile_subject || warden.authenticate!
       end
 
-      # Profile subject is suitable for paths like:
-      #   /users/demo/posts
+      # Returns the {SocialStream::Models::Subject subject} that is in the path, or
+      # the {#current_subject} if some {User} is logged in.
       #
       # This method tries {#profile_subject} first and then {#current_subject}
       def profile_or_current_subject
         profile_subject || current_subject
-      rescue
-        current_subject
+      end
+
+      # This method tries {#profile_or_current_subject} but tries to
+      # authenticate if the user is not logged in
+      def profile_or_current_subject!
+        profile_or_current_subject || warden.authenticate!
       end
 
       # A {User} must be logged in and is equal to {#profile_subject}
@@ -128,6 +120,20 @@ module SocialStream
 
         session[:subject_type].constantize.find session[:subject_id]
       end
+
+      def find_profile_subject
+        SocialStream.subjects.each do |type|
+          id = params["#{ type }_id"]
+
+          next if id.blank?
+
+          subject_class = type.to_s.classify.constantize
+
+          return subject_class.find_by_slug! id
+        end
+
+        nil
+      end
     end
   end
 end

data/lib/social_stream/controllers/objects.rb

@@ -10,7 +10,7 @@ module SocialStream
 
 	after_filter :increment_visit_count, :only => :show
 
-        load_and_authorize_resource :except => :index
+        load_and_authorize_resource :except => [ :index, :search ]
 
         respond_to :html, :js
 
@@ -20,11 +20,50 @@ module SocialStream
 
       # Methods that should be included after the included block
       module UpperInstanceMethods
+        def search
+          collection_variable_set self.class.model_class.search(params[:q], search_options)
+
+          render :layout => false
+        end
+
         def destroy
           @post_activity = resource.post_activity
 
           destroy!
         end
+
+        private
+
+        def collection
+          collection_variable_get ||
+            collection_variable_set(build_collection)
+        end
+
+        def build_collection
+          collection =
+            self.class.model_class # @posts = Post
+
+          # /users/demo/posts
+          if profile_subject?
+            # get posts posted to demo's wall
+            collection = collection.owned_by(profile_subject)
+
+            # if current_subject != demo, auth filter results
+            unless profile_subject_is_current?
+              collection = collection.shared_with(current_subject)
+            end
+          else
+            # auth filter results
+            collection = collection.shared_with(current_subject)
+
+            # if logged in, show the posts from the people following
+            if user_signed_in?
+              collection = collection.followed_by(current_subject)
+            end
+          end
+
+          collection = collection.page(params[:page])
+        end
       end
 
       protected
@@ -37,6 +76,55 @@ module SocialStream
         resource_params.first[:author_id] = current_subject.try(:actor_id)
         resource_params.first[:user_author_id] = current_user.try(:actor_id)
       end
+
+      def collection_variable_get
+        instance_variable_get "@#{ controller_name }"
+      end
+
+      def collection_variable_set value
+        instance_variable_set "@#{ controller_name }", value
+      end
+
+      private
+      
+      def search_options
+        opts = search_scope_options
+
+        # profile_subject
+        if profile_subject.present?
+          opts.deep_merge!( { :with => { :owner_id => profile_subject.actor_id } } )
+        end
+
+        # Authentication
+        opts.deep_merge!({ :with => { :relation_ids => Relation.ids_shared_with(current_subject) } } )
+
+        # Pagination
+        opts.merge!({
+          :order => :created_at,
+          :sort_mode => :desc,
+          :per_page => params[:per_page] || self.class.model_class.default_per_page,
+          :page => params[:page]
+        })
+
+        opts
+      end
+
+      def search_scope_options
+        if params[:scope].blank? || ! user_signed_in?
+          return {}
+        end
+
+        case params[:scope]
+        when "me"
+          { :with => { :author_id => [ current_subject.author_id ] } }
+        when "net"
+          { :with => { :author_id => current_subject.following_actor_and_self_ids } }
+        when "other"
+          { :without => { :author_id => current_subject.following_actor_and_self_ids } }
+        else
+          raise "Unknown search scope #{ params[:scope] }"
+        end
+      end
     end
   end
 end

data/lib/social_stream/controllers/subjects.rb

@@ -4,12 +4,14 @@ module SocialStream
       extend ActiveSupport::Concern
 
       included do
+        include SocialStream::Controllers::Helpers
+
         inherit_resources
       end
 
       # Overwrite {SocialStream::Controllers::Helpers::InstanceMethods#profile_subject}
       def profile_subject
-        !resource.new_record? && resource || current_subject
+        self.class.model_class.find_by_slug(params[:id])
       end
     end
   end

data/lib/social_stream/models/object.rb

@@ -11,6 +11,9 @@ module SocialStream
         has_many :received_actions,
                  :through => :activity_object
 
+        has_many :activity_object_audiences,
+                 :through => :activity_object
+
         unless self == Actor
           validates_presence_of :author_id, :owner_id, :user_author_id
 
@@ -29,6 +32,21 @@ module SocialStream
           joins(:activity_object).
             merge(ActivityObject.not_authored_by(subject))
         }
+
+        scope :owned_by, lambda { |subject|
+          joins(:activity_object).
+            merge(ActivityObject.owned_by(subject))
+        }
+
+        scope :shared_with, lambda { |subject|
+          joins(:activity_object).
+            merge(ActivityObject.shared_with(subject))
+        }
+
+        scope :followed_by, lambda { |subject|
+          joins(:activity_object).
+            merge(ActivityObject.followed_by(subject))
+        }
       end
     end
   end

data/lib/social_stream/models/subject.rb

@@ -71,6 +71,8 @@ module SocialStream
           indexes actor.slug
                 
           has created_at
+          has Relation::Public.instance.id.to_s, :type => :integer, :as => :relation_ids
+          
         end
       end
       

data/lib/social_stream/population/activity_object.rb

@@ -0,0 +1,55 @@
+module SocialStream
+  module Population
+    class ActivityObject
+      def initialize(klass, &block)
+        puts "#{ klass.name } population"
+        start_time = Time.now
+
+        50.times do
+          author = Actor.all[rand(Actor.all.size)]
+          owner = author
+          relation_ids = [Relation::Public.instance.id]
+
+          populate klass, author, owner, relation_ids, &block
+        end
+
+        if SocialStream.relation_model == :custom
+          PowerLaw.new(Tie.allowing('create', 'activity').all) do |t|
+
+            author = t.receiver
+            owner  = t.sender
+            relation_ids = Array(t.relation_id)
+
+            populate klass, author, owner, relation_ids, &block
+          end
+        end
+
+        end_time = Time.now
+        puts '   -> ' +  (end_time - start_time).round(4).to_s + 's'
+      end
+
+      def populate klass, author, owner, relation_ids, &block
+        user_author = ( author.subject_type == "User" ? author : author.user_author )
+        timestamps = Timestamps.new
+
+        o = klass.new
+
+        o.created_at = timestamps.created
+        o.updated_at = timestamps.updated
+        o.author_id  = author.id
+        o.owner_id   = owner.id
+        o.user_author_id = user_author.id
+        o.relation_ids = relation_ids
+
+        yield o
+
+        o.save!
+
+        o.post_activity.update_attributes(:created_at => o.created_at,
+                                          :updated_at => o.updated_at)
+
+        o
+      end
+    end
+  end
+end