acts_as_stream 0.0.3.alpha.2 → 0.0.3.alpha.6

data/lib/acts_as_stream/connector.rb

@@ -1,26 +1,35 @@
 module ActsAsStream
   module Connector
 
-    def register_new_activity! package = nil
+    def register_new_activity! package = nil, key = nil
       return if package.nil?
       id = increment!
       ActsAsStream.redis.multi do
+        time = Time.now.to_f
         #Add the key and package to the system
         ActsAsStream.redis.set "#{base_key}:#{id}", package
         #Add the id to a sorted set scored by time
-        ActsAsStream.redis.zadd "#{base_key}:sorted", Time.now.to_f, id
+        ActsAsStream.redis.zadd "#{base_key}:sorted", time, id
+        if key.present?
+          ActsAsStream.redis.zadd key, time, id
+        end
       end
       id
     end
 
-    def deregister_activity! ident
+    def deregister_activity! ident, key = nil, mentions_key = nil
       return if ident.nil?
       ActsAsStream.redis.multi do
         ActsAsStream.redis.del "#{base_key}:#{ident}"
         ActsAsStream.redis.zrem "#{base_key}:sorted", ident
+        if key.present?
+          ActsAsStream.redis.zrem key, ident
+        end
       end
       deregister_followers! ident
-      deregister_mentioned! ident
+      if mentions_key.present?
+        deregister_mentioned! ident, mentions_key
+      end
     end
 
     def register_followers! options = {}
@@ -50,18 +59,23 @@ module ActsAsStream
     end
 
     def register_mentions! options = {}
-      options.assert_valid_keys(:mentioned_keys, :activity_id)
+      options.assert_valid_keys(:mentioned_keys, :activity_id, :key)
       return if options[:mentioned_keys].nil? or options[:activity_id].nil?
       raise ":mentioned_keys must be an array of keys" if not options[:mentioned_keys].is_a? Array
+      time = Time.now.to_f
       ActsAsStream.redis.multi do
         options[:mentioned_keys].each do |key|
-          ActsAsStream.redis.zadd key, Time.now.to_f, options[:activity_id]
+          ActsAsStream.redis.zadd key, time, options[:activity_id]
           ActsAsStream.redis.lpush "#{base_key}:mentions:#{options[:activity_id]}", key
         end
+        if options[:key].present?
+          ActsAsStream.redis.zadd options[:key], time, options[:activity_id]
+        end
       end
+      time
     end
 
-    def deregister_mentioned! activity_id = nil
+    def deregister_mentioned! activity_id = nil, key = nil
       return if activity_id.nil?
       mentioned_key = "#{base_key}:mentions:#{activity_id}"
       return if mentioned_key.nil?
@@ -73,26 +87,27 @@ module ActsAsStream
           ActsAsStream.redis.zrem f, activity_id
         end
         ActsAsStream.redis.del "#{base_key}:mentions:#{activity_id}"
+        ActsAsStream.redis.zrem key, activity_id
       end
     end
     
-    def get_activity_for follower_key, options = {}
+    def get_activity_for key, options = {}
+      offsets = get_offsets({:key => key}.merge options)
+      ActsAsStream.redis.zrevrange(key, offsets[:start], offsets[:end], :with_scores => false).map{|i| get_activity i}
+    end
+
+    def get_offsets(options = {})
       options = {:page => 1, :page_size => ActsAsStream.page_size}.merge options
       options[:page] = 1 if options[:page] < 1
 
-      if options[:page] > total_pages(follower_key, options[:page_size])
-        options[:page] = total_pages(follower_key, options[:page_size])
+      if options[:page] > total_pages(options[:key], options[:page_size])
+        options[:page] = total_pages(options[:key], options[:page_size])
       end
 
       starting_offset = ((options[:page] - 1) * options[:page_size])
       starting_offset = 0 if starting_offset < 0
       ending_offset = (starting_offset + options[:page_size]) - 1
-
-      ActsAsStream.redis.zrevrange(follower_key, starting_offset, ending_offset, :with_scores => false).map{|i| get_activity i}
-    end
-
-    def get_activity_since follower_key, since = 2.days.ago
-
+      {:start => starting_offset, :end => ending_offset}
     end
 
     def get_activity id

data/lib/acts_as_stream/stream_activity.rb

@@ -30,5 +30,14 @@ module ActsAsStream
       # then, if everything is fine, bundle it up into a JSON string
       opts.to_json
     end
+    
+    def parse package
+      package = JSON.parse(package)
+      package.keys.each{|k| package[k.to_sym] = package[k]; package.delete(k)}
+      package[:who].keys.each{|k| package[:who] = k.titleize.constantize.find(package[:who][k]["id"].to_i)}
+      package[:object].keys.each{|k| package[:object] = k.titleize.constantize.find(package[:object][k]["id"].to_i)}
+      package
+    end
+
   end
 end

data/lib/acts_as_stream/streamable_object.rb

@@ -8,7 +8,12 @@ module ActsAsStream
     module ClassMethods
 
       def acts_as_stream options = {}
-        cattr_accessor :activity_scope, :activity_attr, :activity_key_base, :followers_attr, :mentions_scope
+        cattr_accessor :activity_scope,
+                       :activity_attr,
+                       :activity_key_base,
+                       :followers_attr,
+                       :mentions_scope,
+                       :mentions_key_base
         self.activity_scope = options[:activity_scope] || ActsAsStream.activity_scope
         self.mentions_scope = options[:mentions_scope] || ActsAsStream.mentions_scope
         self.activity_attr = options[:activity_attr] || ActsAsStream.activity_attr
@@ -16,6 +21,7 @@ module ActsAsStream
         self.followers_attr = options[:followers_attr] || :all_followers
         send :include, ActsAsStream::StreamableObject::InstanceMethods
         unless options[:ignore_mentions]
+          self.mentions_key_base = "#{ActsAsStream.namespace}:#{self.mentions_scope}"
           send :include, ActsAsStream::StreamableObject::MentionsMethods
         end
       end
@@ -27,22 +33,23 @@ module ActsAsStream
         {self.class.name.tableize.singularize => {'id' => self.id, activity_attr.to_s => self.send(activity_attr)}}
       end
       def streamable_object_id
-        self.send(self.class.activity_attr)
+        "#{self.class.name.tableize.singularize}:#{self.send(self.class.activity_attr)}"
       end
       def activity_key
-        "#{self.class.activity_key_base}:#{streamable_object_id}"
+        "#{self.class.activity_key_base}:by:#{streamable_object_id}"
       end
       def following_key
-        "#{ActsAsStream.namespace}:#{self.class.name.tableize.singularize}:#{streamable_object_id}:#{activity_scope}"
+        "#{self.class.activity_key_base}:for:#{streamable_object_id}"
       end
       def register_activity! package
-        act_id = ActsAsStream.register_new_activity! package
+        act_id = ActsAsStream.register_new_activity! package, activity_key
         self.register_followers! act_id
         act_id
       end
 
       def delete_activity act_id
-        ActsAsStream.deregister_activity! act_id
+        ActsAsStream.deregister_activity! act_id, activity_key
+        ActsAsStream.deregister_mentions! act_id, mentions_key if respond_to? mentions_key
       end
 
       def register_followers! act_id
@@ -60,22 +67,28 @@ module ActsAsStream
         ActsAsStream.package options
       end
 
-      def get_activity options = {}
-        if options == :all
-          ActsAsStream.get_activity_for following_key,
-                                        :page_size => activity_count,
-                                        :page => 1
-        elsif options[:since]
-          time = options[:since]
-
-        else
-          options = {:page_size => ActsAsStream.page_size, :page => 1}.merge options
-          ActsAsStream.get_activity_for following_key, :page_size => options[:page_size], :page => options[:page]
-        end
+      def get_activity_for(options = {})
+        options = {:whom => :others}.merge options
+        self.send("get_#{options[:whom]}_activity", options)
+      end
+      def get_own_activity(options = {})
+        options[:key] = activity_key
+        get_activity options
+      end
+      def get_others_activity(options = {})
+        options[:key] = following_key
+        get_activity options
       end
+      def activity_count since=nil
+        since ||= self.created_at.to_i
+        ActsAsStream.redis.zcount following_key, "(#{since}", "+inf"
+      end
+      private
 
-      def activity_count
-        ActsAsStream.redis.zcard following_key
+      def get_activity(options = {})
+        options[:page_size] = activity_count if options[:all] and activity_count > 0
+        options = {:page_size => ActsAsStream.page_size, :page => 1}.merge options
+        ActsAsStream.get_activity_for options[:key], :page_size => options[:page_size], :page => options[:page]
       end
 
     end
@@ -83,11 +96,36 @@ module ActsAsStream
     module MentionsMethods
       def register_mentions!(options = {})
         options[:mentioned_keys] = [options[:mentioned_keys]] unless options[:mentioned_keys].is_a?(Array)
-        ActsAsStream.register_mentions! :mentioned_keys => options[:mentioned_keys], :activity_id => options[:activity_id]
+        ActsAsStream.register_mentions! options
+      end
+      def mentioned_by_others_key
+        "#{self.class.mentions_key_base}:of:#{streamable_object_id}"
       end
       def mentions_key
-        "#{ActsAsStream.namespace}:#{self.class.name.tableize.singularize}:#{streamable_object_id}:#{mentions_scope}"
+        "#{self.class.mentions_key_base}:by:#{streamable_object_id}"
+      end
+      def mentions_count since = nil
+        since ||= 0
+        ActsAsStream.redis.zcount mentioned_by_others_key, "(#{since}", "+inf"
       end
+      def get_mentions_activity(options = {})
+        options[:key] = mentioned_by_others_key
+        get_activity options
+      end
+      def get_own_mentions_activity(options = {})
+        options[:key] = mentions_key
+        get_activity options
+      end
+
+      private
+
+      def get_mentions(options = {})
+        options[:page_size] = mentions_count if options[:all]
+        options = {:page_size => ActsAsStream.page_size, :page => 1}.merge options
+        ActsAsStream.get_activity_for options[:key], :page_size => options[:page_size], :page => options[:page]
+      end
+
+
     end
   end
 end

data/lib/acts_as_stream/version.rb

@@ -1,3 +1,3 @@
 module ActsAsStream
-  VERSION = "0.0.3.alpha.2"
+  VERSION = "0.0.3.alpha.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_stream
 version: !ruby/object:Gem::Version
-  version: 0.0.3.alpha.2
+  version: 0.0.3.alpha.6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70342865651640 !ruby/object:Gem::Requirement
+  requirement: &70193007625380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70342865651640
+  version_requirements: *70193007625380
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70342865651060 !ruby/object:Gem::Requirement
+  requirement: &70193007624560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70342865651060
+  version_requirements: *70193007624560
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70342865650140 !ruby/object:Gem::Requirement
+  requirement: &70193007623860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865650140
+  version_requirements: *70193007623860
 - !ruby/object:Gem::Dependency
   name: acts_as_amico
-  requirement: &70342865649360 !ruby/object:Gem::Requirement
+  requirement: &70193007622960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865649360
+  version_requirements: *70193007622960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70342865648560 !ruby/object:Gem::Requirement
+  requirement: &70193007622120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865648560
+  version_requirements: *70193007622120
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70342865663040 !ruby/object:Gem::Requirement
+  requirement: &70193007620420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70342865663040
+  version_requirements: *70193007620420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70342865662280 !ruby/object:Gem::Requirement
+  requirement: &70193007636080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865662280
+  version_requirements: *70193007636080
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70342865661640 !ruby/object:Gem::Requirement
+  requirement: &70193007635340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865661640
+  version_requirements: *70193007635340
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70342865660340 !ruby/object:Gem::Requirement
+  requirement: &70193007634780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865660340
+  version_requirements: *70193007634780
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70342865659380 !ruby/object:Gem::Requirement
+  requirement: &70193007633440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865659380
+  version_requirements: *70193007633440
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70342865658460 !ruby/object:Gem::Requirement
+  requirement: &70193007632400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865658460
+  version_requirements: *70193007632400
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70342865657200 !ruby/object:Gem::Requirement
+  requirement: &70193007631020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342865657200
+  version_requirements: *70193007631020
 description: Rails injectable Redis-backed activity stream system. This is an alpha
   release of code that I just wrote and put into production on 3/11/12. Send feedback
   and post bugs to the Github page, but use at your own risk!
@@ -161,7 +161,7 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README.md
-homepage: http://github.com/mettadore/acts_as_stream.git
+homepage: http://github.com/mettadore/acts_as_stream
 licenses: []
 post_install_message: 
 rdoc_options: []