activity_feed 1.2.1 → 1.3.0

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format nested

data/CHANGELOG.markdown

@@ -1,9 +1,18 @@
 # CHANGELOG
 
+## 1.3.0
+
+* `ActivityFeed.update_item(user_id, item_id, timestamp, aggregate = false)` allows for updating an activity feed item in the personal or aggregate feed
+* `ActivityFeed.delete_item(user_id, item_id, aggregate = false)` allows for removing an activity feed item from the personal or aggregate feed
+
+## 1.2.2
+
+* `ActivityFeed.create_item(attributes, aggregate)` can take an array of user_ids as its 2nd parameter if you want to fan out to the aggregation on create
+
 ## 1.2.1
 
-* ActivityFeed.feed(user_id) will now return an instance of ActivityFeed::Feed
-* ActivityFeed::Ohm::Item will now return all of its attributes when calling to_json 
+* `ActivityFeed.feed(user_id)` will now return an instance of ActivityFeed::Feed
+* `ActivityFeed::Ohm::Item` will now return all of its attributes when calling `to_json`
 
 ## 1.2
 

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 David Czarnecki
+Copyright (c) 2011-2012 David Czarnecki
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -279,6 +279,19 @@ ruby-1.9.2-p290 :017 > pp feed.page(1, true)
 ruby-1.9.2-p290 :018 > 
 ```
 
+### Updating and Removing Activity Feed Items
+
+You can use the following methods to update and removing activity feed items, respectively:
+
+```ruby
+ActivityFeed.update_item(user_id, item_id, timestamp, aggregate = false)
+ActivityFeed.delete_item(user_id, item_id, aggregate = false)
+```
+
+## Future Plans
+
+* Suggestions?
+
 ## 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
@@ -291,4 +304,4 @@ ruby-1.9.2-p290 :018 >
 
 ## Copyright
 
-Copyright (c) 2011 David Czarnecki. See LICENSE.txt for further details.
+Copyright (c) 2011-2012 David Czarnecki. See LICENSE.txt for further details.

data/activity_feed.gemspec

@@ -33,6 +33,8 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency('ohm')
   s.add_development_dependency('ohm-contrib')
+
+  s.add_development_dependency('timecop')
    
   s.add_dependency('activesupport')
   s.add_dependency('i18n')

data/lib/activity_feed/version.rb

@@ -1,3 +1,3 @@
 module ActivityFeed
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/activity_feed.rb

@@ -39,7 +39,11 @@ module ActivityFeed
   def self.create_item(attributes, aggregate = ActivityFeed.aggregate)
     item = @@persistence.new(attributes)
     item.save
-    ActivityFeed.aggregate_item(item) if aggregate
+    if aggregate
+      ([item.user_id] | Array(aggregate)).each do |aggregation_id|
+        ActivityFeed.aggregate_item(item, aggregation_id)
+      end
+    end
     item    
   end
   
@@ -69,7 +73,21 @@ module ActivityFeed
       @@persistence.find(item_or_item_id)    
     end
   end
-  
+
+  def self.update_item(user_id, item_id, timestamp, aggregate = false)
+    unless @@persistence_type == :memory
+      key = feed_key(user_id, aggregate)
+      ActivityFeed.redis.zadd(key, timestamp, item_id)
+    end
+  end
+
+  def self.delete_item(user_id, item_id, aggregate = false)
+    unless @@persistence_type == :memory
+      key = feed_key(user_id, aggregate)
+      ActivityFeed.redis.zrem(key, item_id)
+    end
+  end
+
   def self.feed_key(user_id, aggregate = false)
     if aggregate
       "#{ActivityFeed.namespace}:#{ActivityFeed.key}:#{ActivityFeed.aggregate_key}:#{user_id}"
@@ -85,6 +103,6 @@ module ActivityFeed
   self.namespace = 'activity'
   self.key = 'feed'
   self.aggregate_key = 'aggregate'
-  self.aggregate = true
+  self.aggregate = []
   self.persistence = :memory
 end

data/spec/activity_feed_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'timecop'
 
 describe ActivityFeed do
   it 'should have defaults set' do
@@ -7,7 +8,7 @@ describe ActivityFeed do
     ActivityFeed.persistence = :memory
     ActivityFeed.persistence.should be(ActivityFeed::Memory::Item)
     ActivityFeed.aggregate_key.should eql('aggregate')
-    ActivityFeed.aggregate.should be(true)
+    ActivityFeed.aggregate.should == []
   end
   
   describe 'creating' do
@@ -145,4 +146,111 @@ describe ActivityFeed do
       feed.total_items.should be(1)
     end
   end
+
+  describe "create_item" do
+    let(:user_id) { 1 }
+    let(:friend_ids) { [99, 1337] }
+    let(:item_attrs) {
+      { "user_id" => user_id, "text" => 'This is my happy activity' }
+    }
+    
+    context "with no explicit aggregation set" do
+      it "just creates the item and saves it to the user's feed" do
+        ActivityFeed.create_item(item_attrs)
+        ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)
+        feed = ActivityFeed::Feed.new(user_id)
+        feed.page(1).first.should == item_attrs
+      end
+    end
+    
+    context "with the optional second parameter set to a falsy value" do
+      it "only creates the item--without adding it to the aggregation feed" do
+        ActivityFeed.create_item(item_attrs, false)
+        feed = ActivityFeed::Feed.new(user_id)
+        feed.page(1).size.should be(1) # user-only feed
+        feed.page(1, true).should be_empty # aggregation feed
+      end
+    end
+    
+    context "with a list of aggregation ids as a second parameter" do
+      it "creates the item and aggregates it out to all the feeds" do
+        ActivityFeed.create_item(item_attrs, friend_ids)
+        ( friend_ids << user_id ).each do |id|
+          feed = ActivityFeed::Feed.new(id)
+          feed.page(1, true).first.should == item_attrs
+        end
+      end
+    end    
+  end
+
+  describe "delete_item" do
+    let(:user_id) { 1 }
+    let(:item_attrs) {
+      { "user_id" => user_id, "text" => 'This is my happy activity' }
+    }
+
+    context "non-memory backed persistence" do
+      before(:each) do
+        ActivityFeed.persistence = :ohm
+        @item = ActivityFeed.create_item(item_attrs, true)
+      end
+
+      it "should allow you to delete an item from the personal activity feed" do
+        feed = ActivityFeed::Feed.new(user_id)
+        feed.total_items.should == 1
+        ActivityFeed.delete_item(user_id, @item.id)
+        feed.total_items.should == 0
+      end
+
+      it "should allow you to delete an item from the personal aggregate feed" do
+        feed = ActivityFeed::Feed.new(user_id)
+        feed.total_items(true).should == 1
+        ActivityFeed.delete_item(user_id, @item.id, true)
+        feed.total_items(true).should == 0
+      end
+    end
+  end
+
+  describe "update_item" do
+    let(:user_id) { 1 }
+    let(:item_attrs) {
+      { "user_id" => user_id, "text" => 'This is my happy activity' }
+    }
+
+    it "should allow you to update an item from the personal activity feed" do
+      ActivityFeed.persistence = :ohm
+
+      item_1 = ActivityFeed.create_item(item_attrs, false)
+      Timecop.travel(DateTime.now + 10)
+      item_2 = ActivityFeed.create_item(item_attrs, false)
+      Timecop.travel(DateTime.now + 10)
+      item_3 = ActivityFeed.create_item(item_attrs, false)
+      Timecop.travel(DateTime.now + 10)
+
+      feed = ActivityFeed::Feed.new(user_id)
+      feed.page(1).first.id.should == '3'
+
+      ActivityFeed.update_item(user_id, 1, DateTime.now.to_i)
+      feed.page(1).first.id.should == '1'
+      Timecop.return
+    end
+
+    it "should allow you to update an item from the personal aggregate feed" do
+      ActivityFeed.persistence = :ohm
+
+      item_1 = ActivityFeed.create_item(item_attrs, true)
+      Timecop.travel(DateTime.now + 10)
+      item_2 = ActivityFeed.create_item(item_attrs, true)
+      Timecop.travel(DateTime.now + 10)
+      item_3 = ActivityFeed.create_item(item_attrs, true)
+      Timecop.travel(DateTime.now + 10)
+
+      feed = ActivityFeed::Feed.new(user_id)
+      feed.page(1, true).first.id.should == '3'
+
+      ActivityFeed.update_item(user_id, 1, DateTime.now.to_i, true)
+      feed.page(1, true).first.id.should == '1'
+      Timecop.return
+    end
+  end
 end

data/spec/item_spec.rb

@@ -49,7 +49,7 @@ describe 'ActivityFeed::Item' do
   it 'should output all the attributes for an item for Ohm' do
     item = Fabricate.build(ActivityFeed::Ohm::Item)
     
-    hash = JSON.parse(JSON.generate(item))
+    hash = JSON.parse(item.to_json)
     hash.keys.size.should be(8)
   end
 end

data/spec/spec_helper.rb

@@ -46,6 +46,10 @@ require 'activity_feed'
 
 ActivityFeed.redis = $redis
 
+require 'activity_feed/active_record/item'
+require 'activity_feed/memory/item'
+require 'activity_feed/mongo_mapper/item'
+require 'activity_feed/ohm/item'
 require 'activity_feed/custom/item'
 
 RSpec.configure do |config|

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.2.1'
+    ActivityFeed::VERSION.should == '1.3.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_feed
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-05 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160989100 !ruby/object:Gem::Requirement
+  requirement: &2152337140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160989100
+  version_requirements: *2152337140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160988660 !ruby/object:Gem::Requirement
+  requirement: &2152334740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160988660
+  version_requirements: *2152334740
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2160988200 !ruby/object:Gem::Requirement
+  requirement: &2152332900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160988200
+  version_requirements: *2152332900
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &2160987760 !ruby/object:Gem::Requirement
+  requirement: &2152331820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160987760
+  version_requirements: *2152331820
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2160987340 !ruby/object:Gem::Requirement
+  requirement: &2152352640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160987340
+  version_requirements: *2152352640
 - !ruby/object:Gem::Dependency
   name: mongo_ext
-  requirement: &2160986860 !ruby/object:Gem::Requirement
+  requirement: &2152350760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160986860
+  version_requirements: *2152350760
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2160986440 !ruby/object:Gem::Requirement
+  requirement: &2152349740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160986440
+  version_requirements: *2152349740
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160985960 !ruby/object:Gem::Requirement
+  requirement: &2152348380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160985960
+  version_requirements: *2152348380
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2160846320 !ruby/object:Gem::Requirement
+  requirement: &2152346760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160846320
+  version_requirements: *2152346760
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &2160845880 !ruby/object:Gem::Requirement
+  requirement: &2152367940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160845880
+  version_requirements: *2152367940
 - !ruby/object:Gem::Dependency
   name: ohm-contrib
-  requirement: &2160845460 !ruby/object:Gem::Requirement
+  requirement: &2152367000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160845460
+  version_requirements: *2152367000
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &2152365760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2152365760
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160845000 !ruby/object:Gem::Requirement
+  requirement: &2152364200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160845000
+  version_requirements: *2152364200
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2160844520 !ruby/object:Gem::Requirement
+  requirement: &2152363160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +164,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160844520
+  version_requirements: *2152363160
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160844000 !ruby/object:Gem::Requirement
+  requirement: &2152361640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +175,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160844000
+  version_requirements: *2152361640
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2160843300 !ruby/object:Gem::Requirement
+  requirement: &2152384420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +186,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160843300
+  version_requirements: *2152384420
 - !ruby/object:Gem::Dependency
   name: leaderboard
-  requirement: &2160842220 !ruby/object:Gem::Requirement
+  requirement: &2152382940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,7 +197,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160842220
+  version_requirements: *2152382940
 description: Activity feeds backed by Redis
 email:
 - dczarnecki@agoragames.com
@@ -195,6 +206,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - .rvmrc
 - CHANGELOG.markdown
 - Gemfile
@@ -230,7 +242,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 680484865266501391
+      hash: 4587144125303236754
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 680484865266501391
+      hash: 4587144125303236754
 requirements: []
 rubyforge_project: activity_feed
 rubygems_version: 1.8.10