activity_feed 1.1.1 → 1.2

data/CHANGELOG.markdown

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.2
+
+* Support aggregate feeds
+
 ## 1.1.1
 
 * Removing activemodel dependency since that is not needed

data/README.markdown

@@ -24,6 +24,8 @@ ActivityFeed.redis = Redis.new(:host => '127.0.0.1', :port => 6379)
 ActivityFeed.namespace = 'activity'
 ActivityFeed.key = 'feed'
 ActivityFeed.persistence = :memory # (or :active_record or :mongo_mapper or :ohm)
+ActivityFeed.aggregate = true
+ActivityFeed.aggregate_key = 'aggregate'
 ```
 
 ## Usage
@@ -167,7 +169,7 @@ ruby-1.9.2-p290 :012 > feed.page(1)
 ruby-1.9.2-p290 :013 > 
 ```
 
-### Ohm-backed persistence
+### Ohm persistence
 
 ActivityFeed can also use Ohm to persist the items in Redis. You can set this using:
 
@@ -216,6 +218,55 @@ ActivityFeed::Foo::Item
 The custom class should implement a find(item_or_item_id) method that does "the right thing". 
 Consult the specs to see this working if you have questions.
 
+### Feeds and Aggregation Feeds
+
+activity_feed uses the following key in adding the item to Redis: `ActivityFeed.namespace:ActivityFeed.key:self.user_id`. By default, activity_feed in the `create_item` call will 
+also add the item in Redis to an aggregate feed using the key: `ActivityFeed.namespace:ActivityFeed.key:ActivityFeed.aggregate_key:self.user_id`.
+
+You can control aggregation globally by setting the ActivityFeed.aggregate property to either `true` or `false`. You can override the global aggregation setting on the 
+`create_item` call by passing either `true` or `false` as the 2nd argument.
+
+Below is an example of an aggregate feed:
+
+```ruby
+ruby-1.9.2-p290 :001 > require 'activity_feed'
+ => true 
+ruby-1.9.2-p290 :002 > require 'pp'
+ => true 
+ruby-1.9.2-p290 :003 > 
+ruby-1.9.2-p290 :004 >   $redis = Redis.new(:host => '127.0.0.1', :port => 6379)
+ => #<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.4.4)> 
+ruby-1.9.2-p290 :005 > ActivityFeed.redis = $redis
+ => #<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.4.4)> 
+ruby-1.9.2-p290 :006 > ActivityFeed.persistence = :ohm
+ => :ohm 
+ruby-1.9.2-p290 :007 > 
+ruby-1.9.2-p290 :008 >   1.upto(5) do |index|
+ruby-1.9.2-p290 :009 >       item = ActivityFeed.create_item(:user_id => 1, :nickname => 'nickname_1', :text => "text_#{index}")
+ruby-1.9.2-p290 :010?>     sleep(1)
+ruby-1.9.2-p290 :011?>     another_item = ActivityFeed.create_item(:user_id => 2, :nickname => 'nickname_2', :text => "test_nickname2_#{index}")
+ruby-1.9.2-p290 :012?>     sleep(1)
+ruby-1.9.2-p290 :013?>     ActivityFeed.aggregate_item(another_item, 1)
+ruby-1.9.2-p290 :014?>   end
+ => 1 
+ruby-1.9.2-p290 :015 > 
+ruby-1.9.2-p290 :016 >   feed = ActivityFeed::Feed.new(1)
+ => #<ActivityFeed::Feed:0x000001014b9298 @feederboard=#<Leaderboard:0x000001014b91a8 @leaderboard_name="activity:feed:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.4.4)>>, @feederboard_aggregate=#<Leaderboard:0x000001014b9090 @leaderboard_name="activity:feed:aggregate:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://127.0.0.1:6379/0 (Redis v2.4.4)>>> 
+ruby-1.9.2-p290 :017 > pp feed.page(1, true)
+[#<ActivityFeed::Ohm::Item:10 created_at="2011-11-29 21:18:40 UTC" updated_at="2011-11-29 21:18:40 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_5" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:9 created_at="2011-11-29 21:18:39 UTC" updated_at="2011-11-29 21:18:39 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_5" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:8 created_at="2011-11-29 21:18:38 UTC" updated_at="2011-11-29 21:18:38 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_4" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:7 created_at="2011-11-29 21:18:37 UTC" updated_at="2011-11-29 21:18:37 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_4" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:6 created_at="2011-11-29 21:18:36 UTC" updated_at="2011-11-29 21:18:36 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_3" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:5 created_at="2011-11-29 21:18:35 UTC" updated_at="2011-11-29 21:18:35 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_3" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:4 created_at="2011-11-29 21:18:34 UTC" updated_at="2011-11-29 21:18:34 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_2" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:3 created_at="2011-11-29 21:18:33 UTC" updated_at="2011-11-29 21:18:33 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_2" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:2 created_at="2011-11-29 21:18:32 UTC" updated_at="2011-11-29 21:18:32 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_1" url=nil icon=nil sticky=nil>,
+ #<ActivityFeed::Ohm::Item:1 created_at="2011-11-29 21:18:31 UTC" updated_at="2011-11-29 21:18:31 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_1" url=nil icon=nil sticky=nil>]
+ => [#<ActivityFeed::Ohm::Item:10 created_at="2011-11-29 21:18:40 UTC" updated_at="2011-11-29 21:18:40 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_5" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:9 created_at="2011-11-29 21:18:39 UTC" updated_at="2011-11-29 21:18:39 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_5" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:8 created_at="2011-11-29 21:18:38 UTC" updated_at="2011-11-29 21:18:38 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_4" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:7 created_at="2011-11-29 21:18:37 UTC" updated_at="2011-11-29 21:18:37 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_4" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:6 created_at="2011-11-29 21:18:36 UTC" updated_at="2011-11-29 21:18:36 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_3" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:5 created_at="2011-11-29 21:18:35 UTC" updated_at="2011-11-29 21:18:35 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_3" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:4 created_at="2011-11-29 21:18:34 UTC" updated_at="2011-11-29 21:18:34 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_2" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:3 created_at="2011-11-29 21:18:33 UTC" updated_at="2011-11-29 21:18:33 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_2" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:2 created_at="2011-11-29 21:18:32 UTC" updated_at="2011-11-29 21:18:32 UTC" user_id="2" nickname="nickname_2" type=nil title=nil text="test_nickname2_1" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:1 created_at="2011-11-29 21:18:31 UTC" updated_at="2011-11-29 21:18:31 UTC" user_id="1" nickname="nickname_1" type=nil title=nil text="text_1" url=nil icon=nil sticky=nil>] 
+ruby-1.9.2-p290 :018 > 
+```
+
 ## Contributing to Activity Feed
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/lib/activity_feed.rb

@@ -10,6 +10,8 @@ module ActivityFeed
   mattr_accessor :namespace
   mattr_accessor :key
   mattr_accessor :persistence
+  mattr_accessor :aggregate_key
+  mattr_accessor :aggregate  
     
   def self.persistence=(type = :memory)
     @@persistence_type = type
@@ -34,12 +36,25 @@ module ActivityFeed
     @@persistence = klazz
   end
   
-  def self.create_item(attributes)
+  def self.create_item(attributes, aggregate = ActivityFeed.aggregate)
     item = @@persistence.new(attributes)
     item.save
-    item
+    ActivityFeed.aggregate_item(item) if aggregate
+    item    
   end
   
+  def self.aggregate_item(item, user_id = nil)
+    user_id_for_aggregate = user_id.nil? ? item.user_id : user_id
+    case @@persistence_type
+    when :active_record, :mongo_mapper
+      ActivityFeed.redis.zadd(ActivityFeed.feed_key(user_id_for_aggregate, true), item.created_at.to_i, item.id)
+    when :ohm
+      ActivityFeed.redis.zadd(ActivityFeed.feed_key(user_id_for_aggregate, true), DateTime.parse(item.created_at).to_i, item.id)
+    else
+      ActivityFeed.redis.zadd(ActivityFeed.feed_key(user_id_for_aggregate, true), DateTime.now.to_i, item.attributes.to_json)
+    end
+  end  
+  
   def self.load_item(item_or_item_id)
     case @@persistence_type
     when :active_record
@@ -55,7 +70,17 @@ module ActivityFeed
     end
   end
   
+  def self.feed_key(user_id, aggregate = false)
+    if aggregate
+      "#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{ActivityFeed.aggregate_key}:#{user_id}"
+    else
+      "#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}"
+    end
+  end
+  
   self.namespace = 'activity'
   self.key = 'feed'
+  self.aggregate_key = 'aggregate'
+  self.aggregate = true
   self.persistence = :memory
 end

data/lib/activity_feed/active_record/item.rb

@@ -10,7 +10,7 @@ module ActivityFeed
       private
 
       def update_redis
-        ActivityFeed.redis.zadd("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{self.user_id}", self.created_at.to_i, self.id)
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), self.created_at.to_i, self.id)
       end
     end
   end

data/lib/activity_feed/feed.rb

@@ -3,24 +3,27 @@ require 'leaderboard'
 module ActivityFeed
   class Feed
     def initialize(user_id)
-      @feederboard = Leaderboard.new("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}", Leaderboard::DEFAULT_OPTIONS, {:redis_connection => ActivityFeed.redis})
+      @feederboard = Leaderboard.new(ActivityFeed.feed_key(user_id), Leaderboard::DEFAULT_OPTIONS, {:redis_connection => ActivityFeed.redis})
+      @feederboard_aggregate = Leaderboard.new(ActivityFeed.feed_key(user_id, true), Leaderboard::DEFAULT_OPTIONS, {:redis_connection => ActivityFeed.redis})
     end
     
-    def page(page)
+    def page(page, aggregate = false)
       feed_items = []
-      @feederboard.leaders(page).each do |feed_item|
+      
+      feed = aggregate ? @feederboard_aggregate : @feederboard
+      feed.leaders(page).each do |feed_item|
         feed_items << ActivityFeed.load_item(feed_item[:member])
       end
 
       feed_items
     end
     
-    def total_pages
-      @feederboard.total_pages
+    def total_pages(aggregate = false)
+      aggregate ? @feederboard_aggregate.total_pages : @feederboard.total_pages
     end
     
-    def total_items
-      @feederboard.total_members
+    def total_items(aggregate = false)
+      aggregate ? @feederboard_aggregate.total_members : @feederboard.total_members
     end
   end
 end

data/lib/activity_feed/memory/item.rb

@@ -21,11 +21,15 @@ module ActivityFeed
           self.send("#{key}=", value)
         end      
       end
+      
+      def attributes
+        @attributes
+      end
     
       def save
         raise 'user_id MUST be defined in the attributes' if user_id.blank?
       
-        ActivityFeed.redis.zadd("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{self.user_id}", DateTime.now.to_i, @attributes.to_json)
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), DateTime.now.to_i, @attributes.to_json)
       end
     end
   end

data/lib/activity_feed/mongo_mapper/item.rb

@@ -23,7 +23,7 @@ module ActivityFeed
       private
 
       def update_redis
-        ActivityFeed.redis.zadd("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{self.user_id}", self.created_at.to_i, self.id)
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), self.created_at.to_i, self.id)
       end
     end
   end

data/lib/activity_feed/ohm/item.rb

@@ -21,7 +21,7 @@ module ActivityFeed
       private
 
       def update_redis
-        ActivityFeed.redis.zadd("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{self.user_id}", self.created_at.to_i, self.id)
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), DateTime.parse(self.created_at).to_i, self.id)
       end
     end
   end

data/lib/activity_feed/version.rb

@@ -1,3 +1,3 @@
 module ActivityFeed
-  VERSION = "1.1.1"
+  VERSION = "1.2"
 end

data/spec/activity_feed/custom/item.rb

@@ -17,6 +17,10 @@ module ActivityFeed
           self.send("#{key}=", value)
         end      
       end
+      
+      def attributes
+        @attributes
+      end
 
       def self.find(item)
         JSON.parse(item)
@@ -25,7 +29,7 @@ module ActivityFeed
       def save
         raise 'user_id MUST be defined in the attributes' if user_id.blank?
 
-        ActivityFeed.redis.zadd("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{self.user_id}", DateTime.now.to_i, @attributes.to_json)
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), DateTime.now.to_i, @attributes.to_json)
       end
     end
   end

data/spec/activity_feed_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 
 describe ActivityFeed do
-  it 'should have defaults set for :namespace and :key' do
+  it 'should have defaults set' do
     ActivityFeed.namespace.should eql('activity')
     ActivityFeed.key.should eql('feed')
     ActivityFeed.persistence = :memory
     ActivityFeed.persistence.should be(ActivityFeed::Memory::Item)
+    ActivityFeed.aggregate_key.should eql('aggregate')
+    ActivityFeed.aggregate.should be(true)
   end
   
   describe 'creating' do
@@ -13,9 +15,10 @@ describe ActivityFeed do
       user_id = 1
       ActivityFeed.persistence = :memory
       
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(0)
-      ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
     end
     
     it 'should allow you to create a new item using :mongo_mapper' do
@@ -23,9 +26,10 @@ describe ActivityFeed do
       ActivityFeed.persistence = :mongo_mapper
       
       ActivityFeed::MongoMapper::Item.count.should be(0)
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(0)
-      ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
       ActivityFeed::MongoMapper::Item.count.should be(1)
     end
 
@@ -34,9 +38,10 @@ describe ActivityFeed do
       ActivityFeed.persistence = :active_record
       
       ActivityFeed::ActiveRecord::Item.count.should be(0)
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(0)
-      ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
       ActivityFeed::ActiveRecord::Item.count.should be(1)
     end
 
@@ -45,9 +50,22 @@ describe ActivityFeed do
       ActivityFeed.persistence = :ohm
       
       ActivityFeed::Ohm::Item.all.count.should be(0)
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(0)
-      ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
+      ActivityFeed::Ohm::Item.all.count.should be(1)
+    end
+
+    it 'should allow you to create a new item and not aggregate the item' do
+      user_id = 1
+      ActivityFeed.persistence = :ohm
+      
+      ActivityFeed::Ohm::Item.all.count.should be(0)
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item({:user_id => user_id, :text => 'This is text for my activity feed'}, false)
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(0)
       ActivityFeed::Ohm::Item.all.count.should be(1)
     end
   end
@@ -99,9 +117,11 @@ describe ActivityFeed do
       user_id = 1
       ActivityFeed.persistence = :custom
 
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(0)
-      ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
-      ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{user_id}").should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(0)
+      activity_feed_item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)      
+      ActivityFeed.aggregate_item(activity_feed_item)
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
     end
     
     it 'should allow you to load an item using a custom persistence handler class' do

data/spec/feed_spec.rb

@@ -64,6 +64,22 @@ describe ActivityFeed::Feed do
     feed.total_pages.should be(2)
   end
   
+  describe 'feed aggregation' do
+    it 'should pull up the correct list of items from an aggregated activity feed' do
+      ActivityFeed.persistence = :ohm
+      1.upto(5) do |index|
+        item = ActivityFeed.create_item(:user_id => 1, :nickname => 'nickname_1', :text => "text_#{index}")
+        another_item = ActivityFeed.create_item(:user_id => 2, :nickname => 'nickname_2', :text => "test_another_item_#{index}")
+        ActivityFeed.aggregate_item(another_item, 1)
+      end
+      
+      feed = ActivityFeed::Feed.new(1)
+      feed.total_pages(true).should be(1)
+      feed.total_items(true).should be(10)
+      feed.page(1, true).size.should be(10)
+    end
+  end
+  
   describe 'custom persistence' do
     it 'should allow you to pull up the correct list of ActivityFeed::Custom::Item when calling #page using :custom' do
       ActivityFeed.persistence = :custom

data/spec/item_spec.rb

@@ -14,9 +14,11 @@ describe 'ActivityFeed::Item' do
   it 'should add the feed item ID to redis' do
     item = Fabricate.build(ActivityFeed.persistence)
           
-    ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{item.user_id}").should be(0)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id)).should be(0)
     item.save
-    ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{item.user_id}").should be(1)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id)).should be(1)
+    ActivityFeed.aggregate_item(item)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id, true)).should be(1)
   end
   
   it 'should have default attributes for .title .url .icon and .sticky' do
@@ -31,12 +33,16 @@ describe 'ActivityFeed::Item' do
   it 'should not create a new item in Redis after saving, only on create' do
     item = Fabricate.build(ActivityFeed::Memory::Item)
     
-    ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{item.user_id}").should be(0)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id)).should be(0)
     item.save
-    ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{item.user_id}").should be(1)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id)).should be(1)
+    ActivityFeed.aggregate_item(item)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id, true)).should be(1)
     
     item.text = 'updated text'
     item.save
-    ActivityFeed.redis.zcard("#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{item.user_id}").should be(1)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id)).should be(1)
+    ActivityFeed.aggregate_item(item)
+    ActivityFeed.redis.zcard(ActivityFeed.feed_key(item.user_id, true)).should be(1)
   end
 end

data/spec/version_spec.rb

@@ -2,6 +2,6 @@ require 'spec_helper'
 
 describe ActivityFeed do
   it "should be the correct version" do
-    ActivityFeed::VERSION.should == '1.1.1'
+    ActivityFeed::VERSION.should == '1.2'
   end
 end

metadata

@@ -1,199 +1,203 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: activity_feed
-version: !ruby/object:Gem::Version
-  version: 1.1.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: "1.2"
 platform: ruby
-authors:
+authors: 
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-08 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-11-30 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &70162674967220 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674967220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70162674966800 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674966800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: database_cleaner
-  requirement: &70162674966380 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674966380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: fabrication
-  requirement: &70162674965960 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674965960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  requirement: &70162674965540 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674965540
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: mongo_ext
-  requirement: &70162674965120 !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674965120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: bson_ext
-  requirement: &70162674964700 !ruby/object:Gem::Requirement
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674964700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: activerecord
-  requirement: &70162674964280 !ruby/object:Gem::Requirement
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674964280
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70162674963860 !ruby/object:Gem::Requirement
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674963860
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: ohm
-  requirement: &70162674963440 !ruby/object:Gem::Requirement
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674963440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: ohm-contrib
-  requirement: &70162674963020 !ruby/object:Gem::Requirement
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70162674963020
-- !ruby/object:Gem::Dependency
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &70162674962600 !ruby/object:Gem::Requirement
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70162674962600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
   name: i18n
-  requirement: &70162674962180 !ruby/object:Gem::Requirement
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70162674962180
-- !ruby/object:Gem::Dependency
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70162674961760 !ruby/object:Gem::Requirement
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70162674961760
-- !ruby/object:Gem::Dependency
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
   name: redis
-  requirement: &70162674961340 !ruby/object:Gem::Requirement
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70162674961340
-- !ruby/object:Gem::Dependency
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
   name: leaderboard
-  requirement: &70162674960920 !ruby/object:Gem::Requirement
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
   prerelease: false
-  version_requirements: *70162674960920
+  version_requirements: *id016
 description: Activity feeds backed by Redis
-email:
+email: 
 - dczarnecki@agoragames.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
 - CHANGELOG.markdown
@@ -218,29 +222,38 @@ files:
 - spec/version_spec.rb
 homepage: https://github.com/agoragames/activity_feed
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2506402929405040614
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 2506402929405040614
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: activity_feed
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Activity feeds backed by Redis
-test_files:
+test_files: 
 - spec/activity_feed/custom/item.rb
 - spec/activity_feed_spec.rb
 - spec/fabricators/item_fabricator.rb