activity_feed 2.1.0 → 2.2.0

data/CHANGELOG.markdown

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 2.2.0 (2012-08-20)
+
+* Added `expire_feed(user_id, seconds, aggregate = ActivityFeed.aggregate)` and `expire_feed_at(user_id, timestamp, aggregate = ActivityFeed.aggregate)` methods to expire an activity feed after a given number of seconds or at a given time stamp, respectively.
+
 ## 2.1.0 (2012-08-13)
 
 * Added `full_feed(user_id, aggregate = ActivityFeed.aggregate)` method to be able to retrieve an entire activity feed

data/README.markdown

@@ -293,6 +293,8 @@ ActivityFeed.feed_between_timestamps(user_id, starting_timestamp, ending_timesta
 ActivityFeed.total_pages_in_feed(user_id, aggregate = ActivityFeed.aggregate, page_size = ActivityFeed.page_size)
 ActivityFeed.total_items_in_feed(user_id, aggregate = ActivityFeed.aggregate)
 ActivityFeed.trim_feed(user_id, starting_timestamp, ending_timestamp, aggregate = ActivityFeed.aggregate)
+ActivityFeed.expire_feed(user_id, seconds, aggregate = ActivityFeed.aggregate)
+ActivityFeed.expire_feed_at(user_id, timestamp, aggregate = ActivityFeed.aggregate)
 ActivityFeed.remove_feeds(user_id)
 ```
 

data/lib/activity_feed/feed.rb

@@ -119,5 +119,23 @@ module ActivityFeed
     def trim_feed(user_id, starting_timestamp, ending_timestamp, aggregate = ActivityFeed.aggregate)
       ActivityFeed.feederboard_for(user_id, aggregate).remove_members_in_score_range(starting_timestamp, ending_timestamp)
     end
+
+    # Expire an activity feed after a set number of seconds.
+    #
+    # @param user_id [String] User ID.
+    # @param seconds [int] Number of seconds after which the activity feed will be expired.
+    # @param aggregate [boolean, false] Whether or not to expire the aggregate activity feed or not.
+    def expire_feed(user_id, seconds, aggregate = ActivityFeed.aggregate)
+      ActivityFeed.redis.expire(ActivityFeed.feed_key(user_id, aggregate), seconds)
+    end
+
+    # Expire an activity feed at a given timestamp.
+    #
+    # @param user_id [String] User ID.
+    # @param timestamp [int] Timestamp after which the activity feed will be expired.
+    # @param aggregate [boolean, false] Whether or not to expire the aggregate activity feed or not.
+    def expire_feed_at(user_id, timestamp, aggregate = ActivityFeed.aggregate)
+      ActivityFeed.redis.expireat(ActivityFeed.feed_key(user_id, aggregate), timestamp)
+    end
   end
 end

data/lib/activity_feed/version.rb

@@ -1,3 +1,3 @@
 module ActivityFeed
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/activity_feed/feed_spec.rb

@@ -242,52 +242,28 @@ describe ActivityFeed::Feed do
         feed[0].should == item
       end
     end
+  end
 
-    describe 'item_loader exception handling' do
-      it 'should call the item_loader_exception_handler if it is set and there is an exception loading an activity feed item' do
-        ActivityFeed.item_loader = Proc.new do |id|
-          begin
-            ActivityFeed::Mongoid::Item.find(id)
-          rescue Mongoid::Errors::DocumentNotFound
-          end
-        end
+  describe '#expire_feed' do
+    it 'should set an expiration on an activity feed' do
+      add_items_to_feed('david', Leaderboard::DEFAULT_PAGE_SIZE)
 
-        ActivityFeed.update_item('david', '4fe4c5f3421aa9b89c000001', Time.now.to_i, false)
-        feed = ActivityFeed.feed('david', 1)
-        feed.length.should == 0
+      ActivityFeed.expire_feed('david', 10)    
+      ActivityFeed.redis.ttl(ActivityFeed.feed_key('david')).tap do |ttl|
+        ttl.should be > 1
+        ttl.should be <= 10
       end
+    end
+  end
 
-      it 'should still load an activity feed, but call the item_loader_exception_handler if it is set and there is an exception loading an activity feed item' do
-        ActivityFeed.item_loader = Proc.new do |id|
-          begin
-            ActivityFeed::Mongoid::Item.find(id)
-          rescue Mongoid::Errors::DocumentNotFound
-          end
-        end
-
-        item = ActivityFeed::Mongoid::Item.create(
-          :user_id => 'david',
-          :nickname => 'David Czarnecki',
-          :type => 'some_activity',
-          :title => 'Great activity',
-          :text => 'This is text for the feed item',
-          :url => 'http://url.com'
-        )
-
-        ActivityFeed.update_item('david', '4fe4c5f3421aa9b89c000001', DateTime.now.to_i)
-
-        another_item = ActivityFeed::Mongoid::Item.create(
-          :user_id => 'david',
-          :nickname => 'David Czarnecki',
-          :type => 'some_activity',
-          :title => 'Great activity',
-          :text => 'This is more text for the feed item',
-          :url => 'http://url.com'
-        )
-
-        feed = ActivityFeed.feed('david', 1)
+  describe '#expire_feed_at' do
+    it 'should set an expiration timestamp on an activity feed' do
+      add_items_to_feed('david', Leaderboard::DEFAULT_PAGE_SIZE)
 
-        feed.length.should == 2
+      ActivityFeed.expire_feed_at('david', (Time.now + 10).to_i)
+      ActivityFeed.redis.ttl(ActivityFeed.feed_key('david')).tap do |ttl|
+        ttl.should be > 1
+        ttl.should be <= 10
       end
     end
   end

data/spec/version_spec.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_feed
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -215,7 +215,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2201344879016856649
+      hash: -3462149266482733398
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2201344879016856649
+      hash: -3462149266482733398
 requirements: []
 rubyforge_project: activity_feed
 rubygems_version: 1.8.24