acts_as_stream 0.0.3.alpha.7 → 0.0.4.alpha.2

data/lib/acts_as_stream/connector.rb

@@ -5,7 +5,7 @@ module ActsAsStream
       return if package.nil?
       id = increment!
       ActsAsStream.redis.multi do
-        time = Time.now.to_f
+        time = Time.now.to_i
         #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
@@ -38,15 +38,15 @@ module ActsAsStream
       raise ":following_keys must be an array of keys" if not options[:following_keys].is_a? Array
       ActsAsStream.redis.multi do
         options[:following_keys].each do |key|
-          ActsAsStream.redis.zadd key, Time.now.to_f, options[:activity_id]
-          ActsAsStream.redis.lpush "#{base_key}:followers:#{options[:activity_id]}", key
+          ActsAsStream.redis.zadd key, Time.now.to_i, options[:activity_id]
+          ActsAsStream.redis.lpush "#{base_key}:#{options[:activity_id]}:followers", key
         end
       end
     end
 
     def deregister_followers! activity_id = nil
       return if activity_id.nil?
-      followers_key = "#{base_key}:followers:#{activity_id}"
+      followers_key = "#{base_key}:#{activity_id}:followers"
       len = ActsAsStream.redis.llen followers_key
       followers = ActsAsStream.redis.lrange followers_key, 0, len
       return if followers.nil?
@@ -54,21 +54,19 @@ module ActsAsStream
         followers.each do |f|
           ActsAsStream.redis.zrem f, activity_id
         end
-        ActsAsStream.redis.del "#{base_key}:followers:#{activity_id}"
+        ActsAsStream.redis.del "#{base_key}:#{activity_id}:followers"
       end
     end
 
     def register_mentions! options = {}
       options.assert_valid_keys(:mentioned_keys, :activity_id, :key)
-      return if options[:mentioned_keys].nil? or options[:activity_id].nil?
+      raise "Not all arguments present, need all of [:mentioned_keys, :activity_id, :key]" if options[:mentioned_keys].nil? or options[:activity_id].nil? or options[:key].nil?
       raise ":mentioned_keys must be an array of keys" if not options[:mentioned_keys].is_a? Array
-      time = Time.now.to_f
+      time = Time.now.to_i
       ActsAsStream.redis.multi do
         options[:mentioned_keys].each do |key|
           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.lpush "#{base_key}:#{options[:activity_id]}:mentions", key
           ActsAsStream.redis.zadd options[:key], time, options[:activity_id]
         end
       end
@@ -76,8 +74,8 @@ module ActsAsStream
     end
 
     def deregister_mentioned! activity_id = nil, key = nil
-      return if activity_id.nil?
-      mentioned_key = "#{base_key}:mentions:#{activity_id}"
+      raise "Need activity id and a key" if activity_id.nil? or key.nil?
+      mentioned_key = "#{base_key}:#{activity_id}:mentions"
       return if mentioned_key.nil?
       len = ActsAsStream.redis.llen mentioned_key
       mentioned = ActsAsStream.redis.lrange mentioned_key, 0, len
@@ -86,7 +84,7 @@ module ActsAsStream
         mentioned.each do |f|
           ActsAsStream.redis.zrem f, activity_id
         end
-        ActsAsStream.redis.del "#{base_key}:mentions:#{activity_id}"
+        ActsAsStream.redis.del "#{base_key}:#{activity_id}:mentions"
         ActsAsStream.redis.zrem key, activity_id
       end
     end
@@ -113,6 +111,9 @@ module ActsAsStream
     def get_activity id
       ActsAsStream.redis.get "#{base_key}:#{id}"
     end
+    def get_activity_mentions id
+      ActsAsStream.redis.lrange "#{base_key}:#{id}:mentions", 0, -1
+    end
 
     def total_pages key, page_size = ActsAsStream.page_size
       (ActsAsStream.redis.zcard(key) / page_size.to_f).ceil

data/lib/acts_as_stream/stream_activity.rb

@@ -2,31 +2,24 @@ module ActsAsStream
   module StreamActivity
 
     def package options = {}
-      options.assert_valid_keys(:who, :action, :time, :object, :ignore_stream_hash_on)
+      options.assert_valid_keys(:who, :action, :time, :object)
       raise "You need at least a :who and an :action! to create an activity package" if options[:who].nil? or options[:action].nil?
-      opts = {:time => Time.now.to_i, :ignore_stream_hash_on => []}.merge options
+      opts = {:time => Time.now.to_i}.merge options
       # Try to ensure :time is in seconds
       opts[:time] = opts[:time].to_i if opts[:time].is_a?(Time)
 
-      # If Objects provide the :to_stream_hash method, use it.
-      if opts[:ignore_stream_hash_on].present?
-        #convenience, make sure it's an array so we can use include? instead of "include? or equals"
-        opts[:ignore_stream_hash_on] = [opts[:ignore_stream_hash_on]] unless opts[:ignore_stream_hash_on].is_a?(Array)
-      end
-
       [:who, :object].each do |opt|
         #unless we are ignoring the stream hash for this object, use StreamableObject.stream_hash
-        unless opts[:ignore_stream_hash_on].include?(opt) or not opts[opt].respond_to?(:to_stream_hash)
+        begin
           begin
             opts[opt] = opts[opt].to_stream_hash
           rescue NoMethodError
-            raise "The class #{opts[opt].class.name} does not have a method called #{opts[opt].activity_attr}. Perhaps you should look at your ActsAsStream configuration, or set :activity_attr"
+            raise "The model #{opts[opt].class.name} does not have a method called #{opts[opt].activity_attr}. Perhaps you should look at your ActsAsStream configuration, or set :activity_attr"
           end
+        rescue
+          raise "The model #{opts[opt].class.name} does not respond to the :to_stream_hash method. Make that happen, or use a custom packager"
         end
       end
-
-      opts.delete(:ignore_stream_hash_on)
-
       # then, if everything is fine, bundle it up into a JSON string
       opts.to_json
     end
@@ -45,6 +38,11 @@ module ActsAsStream
       rescue
         raise "Cannot translate :object into an instantiated model. Perhaps the model used as the :object in this activity did not have a :to_stream_hash method? The :object value is:\n #{package[:object]}"
       end
+      begin
+        package[:time] = Time.at package[:time].to_i
+      rescue
+        raise "Cannot translate Time given :time value in package of #{package[:time]}"
+      end
       package
     end
 

data/lib/acts_as_stream/streamable_object.rb

@@ -30,7 +30,7 @@ module ActsAsStream
     module InstanceMethods
 
       def to_stream_hash
-        {self.class.name.tableize.singularize => {'id' => self.id, activity_attr.to_s => self.send(activity_attr)}}
+        {self.class.name.tableize.singularize.to_sym => {:id => self.id, activity_attr.to_sym => self.send(activity_attr)}}
       end
       def streamable_object_id
         "#{self.class.name.tableize.singularize}:#{self.send(self.class.activity_attr)}"
@@ -80,8 +80,8 @@ module ActsAsStream
         get_activity options
       end
       def activity_count since=nil
-        since ||= self.created_at.to_i
-        ActsAsStream.redis.zcount following_key, "(#{since}", "+inf"
+        since = since.present? ? "(#{since}" : "-inf"
+        ActsAsStream.redis.zcount following_key, since, "+inf"
       end
       private
 
@@ -95,6 +95,7 @@ module ActsAsStream
 
     module MentionsMethods
       def register_mentions!(options = {})
+        options = {:key => mentions_key}.merge options
         options[:mentioned_keys] = [options[:mentioned_keys]] unless options[:mentioned_keys].is_a?(Array)
         ActsAsStream.register_mentions! options
       end

data/lib/acts_as_stream/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_stream
 version: !ruby/object:Gem::Version
-  version: 0.0.3.alpha.7
+  version: 0.0.4.alpha.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-18 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70253535091600 !ruby/object:Gem::Requirement
+  requirement: &70352780730440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70253535091600
+  version_requirements: *70352780730440
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70253535091000 !ruby/object:Gem::Requirement
+  requirement: &70352780729720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70253535091000
+  version_requirements: *70352780729720
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70253535090120 !ruby/object:Gem::Requirement
+  requirement: &70352780728960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535090120
+  version_requirements: *70352780728960
 - !ruby/object:Gem::Dependency
   name: acts_as_amico
-  requirement: &70253535089340 !ruby/object:Gem::Requirement
+  requirement: &70352780728140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535089340
+  version_requirements: *70352780728140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70253535088760 !ruby/object:Gem::Requirement
+  requirement: &70352780727580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535088760
+  version_requirements: *70352780727580
 - !ruby/object:Gem::Dependency
   name: spork
-  requirement: &70253535088080 !ruby/object:Gem::Requirement
+  requirement: &70352780726880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.9.0.rc
   type: :development
   prerelease: false
-  version_requirements: *70253535088080
+  version_requirements: *70352780726880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70253535087420 !ruby/object:Gem::Requirement
+  requirement: &70352780726260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535087420
+  version_requirements: *70352780726260
 - !ruby/object:Gem::Dependency
   name: guard-spork
-  requirement: &70253535086720 !ruby/object:Gem::Requirement
+  requirement: &70352780725500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535086720
+  version_requirements: *70352780725500
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70253535086000 !ruby/object:Gem::Requirement
+  requirement: &70352780724740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535086000
+  version_requirements: *70352780724740
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70253535085300 !ruby/object:Gem::Requirement
+  requirement: &70352780724040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535085300
+  version_requirements: *70352780724040
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70253535084580 !ruby/object:Gem::Requirement
+  requirement: &70352780723380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535084580
+  version_requirements: *70352780723380
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70253535099120 !ruby/object:Gem::Requirement
+  requirement: &70352780737980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70253535099120
+  version_requirements: *70352780737980
 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!