activity_feed 1.3.0 → 1.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm use ruby-1.9.3-p0@activity_feed_gem --create
+rvm use ruby-1.9.3@activity_feed_gem --create

data/CHANGELOG.markdown

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.4.0
+
+* Added support for [Mongoid](http://www.mongoid.org)
+
 ## 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

data/README.markdown

@@ -15,7 +15,7 @@ or:
 `gem 'activity_feed'`
 
 Make sure your redis server is running! Redis configuration is outside the scope of this README, but 
-check out the Redis documentation, http://redis.io/documentation.
+check out the [Redis documentation](http://redis.io/documentation).
 
 ## Configuration
 
@@ -42,23 +42,14 @@ ActivityFeed.redis = $redis
 ActivityFeed defaults to using memory-backed persistence, storing the full item as JSON in Redis.
 
 ```ruby
-ruby-1.9.2-p290 :001 > require 'redis'
- => true 
-ruby-1.9.2-p290 :002 > $redis = Redis.new(:host => 'localhost', :port => 6379)
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :003 > require 'activity_feed'
- => true 
-ruby-1.9.2-p290 :004 > ActivityFeed.redis = $redis
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :005 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
- => #<ActivityFeed::Memory::Item:0x00000100ceaaa8 @attributes={:user_id=>1, :nickname=>"David Czarnecki", :type=>"activity-type", :text=>"Text"}, @user_id=1, @nickname="David Czarnecki", @type="activity-type", @text="Text"> 
-ruby-1.9.2-p290 :006 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
- => #<ActivityFeed::Memory::Item:0x000001022b0c48 @attributes={:user_id=>1, :nickname=>"David Czarnecki", :type=>"activity-type", :text=>"More text"}, @user_id=1, @nickname="David Czarnecki", @type="activity-type", @text="More text"> 
-ruby-1.9.2-p290 :007 > feed = ActivityFeed::Feed.new(1)
- => #<ActivityFeed::Feed:0x00000103023b78 @feederboard=#<Leaderboard:0x00000103023a88 @leaderboard_name="activity:feed:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)>>> 
-ruby-1.9.2-p290 :008 > feed.page(1)
- => [{"user_id"=>1, "nickname"=>"David Czarnecki", "type"=>"activity-type", "text"=>"More text"}, {"user_id"=>1, "nickname"=>"David Czarnecki", "type"=>"activity-type", "text"=>"Text"}] 
-ruby-1.9.2-p290 :009 > 
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+require 'activity_feed'
+ActivityFeed.redis = $redis
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
+feed = ActivityFeed::Feed.new(1)
+feed.page(1)
 ```
 
 ### ActiveRecord persistence
@@ -73,55 +64,41 @@ ActivityFeed.persistence = :active_record
 Example:
 
 ```ruby
-ruby-1.9.2-p290 :001 > require 'active_record'
- => true 
-ruby-1.9.2-p290 :002 > 
-ruby-1.9.2-p290 :003 >   ActiveRecord::Base.establish_connection(
-ruby-1.9.2-p290 :004 >       :adapter => "sqlite3",
-ruby-1.9.2-p290 :005 >       :database => ":memory:"
-ruby-1.9.2-p290 :006?>   )
- => #<ActiveRecord::ConnectionAdapters::ConnectionPool:0x00000101329cc0 @spec=#<ActiveRecord::Base::ConnectionSpecification:0x00000101329d38 @config={:adapter=>"sqlite3", :database=>":memory:"}, @adapter_method="sqlite3_connection">, @reserved_connections={}, @connection_mutex=#<Monitor:0x00000101329bd0 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x00000101329b80>>, @queue=#<MonitorMixin::ConditionVariable:0x00000101329b30 @monitor=#<Monitor:0x00000101329bd0 @mon_owner=nil, @mon_count=0, @mon_mutex=#<Mutex:0x00000101329b80>>, @cond=#<ConditionVariable:0x00000101329b08 @waiters=[], @waiters_mutex=#<Mutex:0x00000101329978>>>, @timeout=5, @size=5, @connections=[], @checked_out=[], @automatic_reconnect=true, @tables={}, @visitor=nil, @columns={}, @columns_hash={}, @column_defaults={}, @primary_keys={}> 
-ruby-1.9.2-p290 :007 > 
-ruby-1.9.2-p290 :008 >   ActiveRecord::Migration.verbose = false
- => false 
-ruby-1.9.2-p290 :009 > 
-ruby-1.9.2-p290 :010 >   ActiveRecord::Schema.define do
-ruby-1.9.2-p290 :011 >       create_table :activity_feed_items, :force => true do |t|
-ruby-1.9.2-p290 :012 >           t.integer :user_id
-ruby-1.9.2-p290 :013?>         t.string :nickname
-ruby-1.9.2-p290 :014?>         t.string :type
-ruby-1.9.2-p290 :015?>         t.string :title
-ruby-1.9.2-p290 :016?>         t.text :text
-ruby-1.9.2-p290 :017?>         t.string :url
-ruby-1.9.2-p290 :018?>         t.string :icon
-ruby-1.9.2-p290 :019?>         t.boolean :sticky
-ruby-1.9.2-p290 :020?>         
-ruby-1.9.2-p290 :021 >           t.timestamps
-ruby-1.9.2-p290 :022?>       end
-ruby-1.9.2-p290 :023?>   
-ruby-1.9.2-p290 :024 >       add_index :activity_feed_items, :user_id
-ruby-1.9.2-p290 :025?>   end
- => nil 
-ruby-1.9.2-p290 :026 > 
-ruby-1.9.2-p290 :027 >   require 'redis'
- => true 
-ruby-1.9.2-p290 :028 > $redis = Redis.new(:host => 'localhost', :port => 6379)
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :029 > require 'activity_feed'
- => true 
-ruby-1.9.2-p290 :030 > ActivityFeed.redis = $redis
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :031 > ActivityFeed.persistence = :active_record
- => :active_record 
-ruby-1.9.2-p290 :032 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
- => #<ActivityFeed::ActiveRecord::Item id: 1, user_id: 1, nickname: "David Czarnecki", type: nil, title: nil, text: "Text", url: nil, icon: nil, sticky: nil, created_at: "2011-09-14 15:08:22", updated_at: "2011-09-14 15:08:22"> 
-ruby-1.9.2-p290 :033 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
- => #<ActivityFeed::ActiveRecord::Item id: 2, user_id: 1, nickname: "David Czarnecki", type: nil, title: nil, text: "More text", url: nil, icon: nil, sticky: nil, created_at: "2011-09-14 15:08:25", updated_at: "2011-09-14 15:08:25"> 
-ruby-1.9.2-p290 :034 > feed = ActivityFeed::Feed.new(1)
- => #<ActivityFeed::Feed:0x000001030f1898 @feederboard=#<Leaderboard:0x000001030f1578 @leaderboard_name="activity:feed:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)>>> 
-ruby-1.9.2-p290 :035 > feed.page(1)
- => [#<ActivityFeed::ActiveRecord::Item id: 2, user_id: 1, nickname: "David Czarnecki", type: nil, title: nil, text: "More text", url: nil, icon: nil, sticky: nil, created_at: "2011-09-14 15:08:25", updated_at: "2011-09-14 15:08:25">, #<ActivityFeed::ActiveRecord::Item id: 1, user_id: 1, nickname: "David Czarnecki", type: nil, title: nil, text: "Text", url: nil, icon: nil, sticky: nil, created_at: "2011-09-14 15:08:22", updated_at: "2011-09-14 15:08:22">] 
-ruby-1.9.2-p290 :036 > 
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :database => ":memory:"
+)
+
+ActiveRecord::Migration.verbose = false
+
+ActiveRecord::Schema.define do
+  create_table :activity_feed_items, :force => true do |t|
+    t.integer :user_id
+    t.string :nickname
+    t.string :type
+    t.string :title
+    t.text :text
+    t.string :url
+    t.string :icon
+    t.boolean :sticky
+    
+    t.timestamps
+  end
+
+  add_index :activity_feed_items, :user_id
+end
+
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+require 'activity_feed'
+ActivityFeed.redis = $redis
+ActivityFeed.persistence = :active_record
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
+feed = ActivityFeed::Feed.new(1)
+feed.page(1)
 ```
 
 ### MongoMapper persistence
@@ -142,31 +119,52 @@ MongoMapper.database = 'activity_feeds_production'
 ```
 
 ```ruby
-ruby-1.9.2-p290 :001 > require 'mongo_mapper'
- => true 
-ruby-1.9.2-p290 :002 > MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
- => #<Mongo::Connection:0x00000100c7d520 @host_to_try=["localhost", 27017], @port=nil, @host=nil, @slave_ok=nil, @auths=[], @id_lock=#<Mutex:0x00000100c7d480>, @pool_size=1, @timeout=5.0, @op_timeout=nil, @connection_mutex=#<Mutex:0x00000100c7d458>, @safe=false, @safe_mutexes={#<TCPSocket:(closed)>=>#<Mutex:0x00000100c6f8a8>, #<TCPSocket:fd 5>=>#<Mutex:0x00000100c6db70>}, @queue=#<ConditionVariable:0x00000100c7d390 @waiters=[], @waiters_mutex=#<Mutex:0x00000100c7d340>>, @primary=["localhost", 27017], @primary_pool=#<Mongo::Pool:0x00000100c6f128 @connection=#<Mongo::Connection:0x00000100c7d520 ...>, @port=27017, @host="localhost", @size=1, @timeout=5.0, @connection_mutex=#<Mutex:0x00000100c6f100>, @queue=#<ConditionVariable:0x00000100c6f0b0 @waiters=[], @waiters_mutex=#<Mutex:0x00000100c6f060>>, @socket_ops={#<TCPSocket:fd 5>=>[]}, @sockets=[#<TCPSocket:fd 5>], @pids={#<TCPSocket:fd 5>=>61344}, @checked_out=[]>, @logger=nil, @read_primary=true> 
-ruby-1.9.2-p290 :003 > MongoMapper.database = 'activity_feed_gem_test'
- => "activity_feed_gem_test" 
-ruby-1.9.2-p290 :004 > require 'redis'
- => true 
-ruby-1.9.2-p290 :005 > $redis = Redis.new(:host => 'localhost', :port => 6379)
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :006 > require 'activity_feed'
- => true 
-ruby-1.9.2-p290 :007 > ActivityFeed.redis = $redis
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)> 
-ruby-1.9.2-p290 :008 > ActivityFeed.persistence = :mongo_mapper
- => :mongo_mapper 
-ruby-1.9.2-p290 :009 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
- => #<ActivityFeed::MongoMapper::Item _id: BSON::ObjectId('4e70dcc512dac1efa0000001'), created_at: 2011-09-14 16:56:37 UTC, nickname: "David Czarnecki", text: "Text", type: "activity-type", updated_at: 2011-09-14 16:56:37 UTC, user_id: 1> 
-ruby-1.9.2-p290 :010 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
- => #<ActivityFeed::MongoMapper::Item _id: BSON::ObjectId('4e70dcc512dac1efa0000003'), created_at: 2011-09-14 16:56:37 UTC, nickname: "David Czarnecki", text: "More text", type: "activity-type", updated_at: 2011-09-14 16:56:37 UTC, user_id: 1> 
-ruby-1.9.2-p290 :011 > feed = ActivityFeed::Feed.new(1)
- => #<ActivityFeed::Feed:0x00000100c583d8 @feederboard=#<Leaderboard:0x00000100c58298 @leaderboard_name="activity:feed:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.12)>>> 
-ruby-1.9.2-p290 :012 > feed.page(1)
- => [#<ActivityFeed::MongoMapper::Item _id: BSON::ObjectId('4e70dcc512dac1efa0000003'), created_at: 2011-09-14 16:56:37 UTC, nickname: "David Czarnecki", text: "More text", type: "activity-type", updated_at: 2011-09-14 16:56:37 UTC, user_id: 1>, #<ActivityFeed::MongoMapper::Item _id: BSON::ObjectId('4e70dcc512dac1efa0000001'), created_at: 2011-09-14 16:56:37 UTC, nickname: "David Czarnecki", text: "Text", type: "activity-type", updated_at: 2011-09-14 16:56:37 UTC, user_id: 1>] 
-ruby-1.9.2-p290 :013 > 
+require 'mongo_mapper'
+MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
+MongoMapper.database = 'activity_feed_gem_test'
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+require 'activity_feed'
+ActivityFeed.redis = $redis
+ActivityFeed.persistence = :mongo_mapper
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
+feed = ActivityFeed::Feed.new(1)
+feed.page(1)
+```
+
+### Mongoid persistence
+
+ActivityFeed can also use Mongoid to persist the items to more durable storage while 
+keeping the IDs for the activity feed items in Redis. You can set this using:
+
+```ruby
+ActivityFeed.persistence = :mongoid
+```
+
+Make sure Mongoid is configured correctly before setting this option. 
+If using Activity Feed outside of Rails, you can do: 
+
+```ruby
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db("activity_feed_gem_test")
+end
+```
+
+```ruby
+require 'mongoid'
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db("activity_feed_gem_test")
+end
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+require 'activity_feed'
+ActivityFeed.redis = $redis
+ActivityFeed.persistence = :mongoid
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
+feed = ActivityFeed::Feed.new(1)
+feed.page(1)
 ```
 
 ### Ohm persistence
@@ -174,25 +172,15 @@ ruby-1.9.2-p290 :013 >
 ActivityFeed can also use Ohm to persist the items in Redis. You can set this using:
 
 ```ruby
-ruby-1.9.2-p290 :001 > require 'redis'
- => true 
-ruby-1.9.2-p290 :002 > $redis = Redis.new(:host => 'localhost', :port => 6379)
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.5)> 
-ruby-1.9.2-p290 :003 > require 'activity_feed'
- => true 
-ruby-1.9.2-p290 :004 > ActivityFeed.redis = $redis
- => #<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.5)> 
-ruby-1.9.2-p290 :005 > ActivityFeed.persistence = :ohm
- => :ohm 
-ruby-1.9.2-p290 :006 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
- => #<ActivityFeed::Ohm::Item:1 created_at="2011-10-08 17:40:03 UTC" updated_at="2011-10-08 17:40:03 UTC" user_id=1 nickname="David Czarnecki" type="activity-type" title=nil text="Text" url=nil icon=nil sticky=nil> 
-ruby-1.9.2-p290 :007 > ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
- => #<ActivityFeed::Ohm::Item:2 created_at="2011-10-08 17:40:25 UTC" updated_at="2011-10-08 17:40:25 UTC" user_id=1 nickname="David Czarnecki" type="activity-type" title=nil text="More text" url=nil icon=nil sticky=nil> 
-ruby-1.9.2-p290 :008 > feed = ActivityFeed::Feed.new(1)
- => #<ActivityFeed::Feed:0x007fd009bc05f8 @feederboard=#<Leaderboard:0x007fd009bc0508 @leaderboard_name="activity:feed:1", @page_size=25, @redis_connection=#<Redis client v2.2.2 connected to redis://localhost:6379/0 (Redis v2.2.5)>>> 
-ruby-1.9.2-p290 :009 > feed.page(1)
- => [#<ActivityFeed::Ohm::Item:2 created_at="2011-10-08 17:40:25 UTC" updated_at="2011-10-08 17:40:25 UTC" user_id="1" nickname="David Czarnecki" type="activity-type" title=nil text="More text" url=nil icon=nil sticky=nil>, #<ActivityFeed::Ohm::Item:1 created_at="2011-10-08 17:40:03 UTC" updated_at="2011-10-08 17:40:03 UTC" user_id="1" nickname="David Czarnecki" type="activity-type" title=nil text="Text" url=nil icon=nil sticky=nil>] 
-ruby-1.9.2-p290 :010 > 
+require 'redis'
+$redis = Redis.new(:host => 'localhost', :port => 6379)
+require 'activity_feed'
+ActivityFeed.redis = $redis
+ActivityFeed.persistence = :ohm
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'Text')
+ActivityFeed.create_item(:user_id => 1, :nickname => 'David Czarnecki', :type => 'activity-type', :text => 'More text')
+feed = ActivityFeed::Feed.new(1)
+feed.page(1)
 ```
 
 ### Custom persistence
@@ -241,42 +229,22 @@ You can control aggregation globally by setting the ActivityFeed.aggregate prope
 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 > 
+require 'activity_feed'
+require 'pp'
+$redis = Redis.new(:host => '127.0.0.1', :port => 6379)
+ActivityFeed.redis = $redis
+ActivityFeed.persistence = :ohm
+
+1.upto(5) do |index|
+  item = ActivityFeed.create_item(:user_id => 1, :nickname => 'nickname_1', :text => "text_#{index}")
+  sleep(1)
+  another_item = ActivityFeed.create_item(:user_id => 2, :nickname => 'nickname_2', :text => "test_nickname2_#{index}")
+  sleep(1)
+  ActivityFeed.aggregate_item(another_item, 1)
+end
+
+feed = ActivityFeed::Feed.new(1)
+pp feed.page(1, true)
 ```
 
 ### Updating and Removing Activity Feed Items
@@ -288,10 +256,6 @@ 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
@@ -305,3 +269,4 @@ ActivityFeed.delete_item(user_id, item_id, aggregate = false)
 ## Copyright
 
 Copyright (c) 2011-2012 David Czarnecki. See LICENSE.txt for further details.
+

data/activity_feed.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('database_cleaner')
   s.add_development_dependency('fabrication')
   
+  s.add_development_dependency('mongoid')
   s.add_development_dependency('mongo_mapper')
   s.add_development_dependency('mongo_ext')
   s.add_development_dependency('bson_ext')

data/lib/activity_feed.rb

@@ -26,6 +26,9 @@ module ActivityFeed
     when :mongo_mapper
       require 'activity_feed/mongo_mapper/item'
       klazz = ActivityFeed::MongoMapper::Item
+    when :mongoid
+      require 'activity_feed/mongoid/item'
+      klazz = ActivityFeed::Mongoid::Item
     when :ohm
       require 'activity_feed/ohm/item'
       klazz = ActivityFeed::Ohm::Item
@@ -50,7 +53,7 @@ module ActivityFeed
   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
+    when :active_record, :mongo_mapper, :mongoid
       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)
@@ -67,6 +70,8 @@ module ActivityFeed
       JSON.parse(item_or_item_id)
     when :mongo_mapper
       ActivityFeed::MongoMapper::Item.find(item_or_item_id)
+    when :mongoid
+      ActivityFeed::Mongoid::Item.find(item_or_item_id)
     when :ohm
       ActivityFeed::Ohm::Item[item_or_item_id]
     else

data/lib/activity_feed/mongoid/item.rb

@@ -0,0 +1,31 @@
+require 'mongoid'
+
+module ActivityFeed
+  module Mongoid
+    class Item
+      include ::Mongoid::Document    
+      include ::Mongoid::Timestamps
+
+      field :user_id, type: Integer
+      validates_presence_of :user_id
+
+      field :nickname, type: String
+      field :type, type: String
+      field :title, type: String
+      field :text, type: String
+      field :url, type: String
+      field :icon, type: String
+      field :sticky, type: Boolean
+
+      index :user_id
+
+      after_save :update_redis
+
+      private
+
+      def update_redis
+        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), self.created_at.to_i, self.id)
+      end
+    end
+  end
+end

data/lib/activity_feed/version.rb

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

data/spec/activity_feed_spec.rb

@@ -34,6 +34,18 @@ describe ActivityFeed do
       ActivityFeed::MongoMapper::Item.count.should be(1)
     end
 
+    it 'should allow you to create a new item using :mongoid' do
+      user_id = 1
+      ActivityFeed.persistence = :mongoid
+      
+      ActivityFeed::Mongoid::Item.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')
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id)).should be(1)      
+      ActivityFeed.redis.zcard(ActivityFeed.feed_key(user_id, true)).should be(1)      
+      ActivityFeed::Mongoid::Item.count.should be(1)
+    end
+
     it 'should allow you to create a new item using :active_record' do
       user_id = 1
       ActivityFeed.persistence = :active_record
@@ -90,6 +102,15 @@ describe ActivityFeed do
       loaded_item.should == item
     end
 
+    it 'should allow you to load an item using :mongoid' do
+      user_id = 1
+      ActivityFeed.persistence = :mongoid
+      
+      item = ActivityFeed.create_item(:user_id => user_id, :text => 'This is text for my activity feed')
+      loaded_item = ActivityFeed.load_item(item.id)
+      loaded_item.should == item
+    end
+
     it 'should allow you to load an item using :active_record' do
       user_id = 1
       ActivityFeed.persistence = :active_record
@@ -235,6 +256,24 @@ describe ActivityFeed do
       Timecop.return
     end
 
+    it "should allow you to update an item from the personal activity feed using :mongoid" do
+      ActivityFeed.persistence = :mongoid
+
+      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 == item_3.id
+
+      ActivityFeed.update_item(user_id, item_1.id, DateTime.now.to_i)
+      feed.page(1).first.id.should == item_1.id
+      Timecop.return
+    end
+
     it "should allow you to update an item from the personal aggregate feed" do
       ActivityFeed.persistence = :ohm
 

data/spec/feed_spec.rb

@@ -34,6 +34,18 @@ describe ActivityFeed::Feed do
     feed.page(1).size.should be(5)
   end
 
+  it 'should pull up the correct list of ActivityFeed::Mongoid::Item when calling #page using :mongoid' do    
+    ActivityFeed.persistence = :mongoid
+    ActivityFeed::Mongoid::Item.count.should be(0)
+    1.upto(5) do |index|
+      item = ActivityFeed.create_item(:user_id => 1, :nickname => 'nickname_1', :text => "text_#{index}")
+    end
+    ActivityFeed::Mongoid::Item.count.should be(5)
+    
+    feed = ActivityFeed::Feed.new(1)
+    feed.page(1).size.should be(5)
+  end
+
   it 'should pull up the correct list of ActivityFeed::Ohm::Item when calling #page using :ohm' do    
     ActivityFeed.persistence = :ohm
     ActivityFeed::Ohm::Item.all.count.should be(0)

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'rubygems'
 require 'rspec'
 require 'redis'
 require 'mongo_mapper'
+require 'mongoid'
 require 'database_cleaner'
 require 'fabrication'
 require 'json'
@@ -10,7 +11,12 @@ $redis = Redis.new(:host => '127.0.0.1', :port => 6379)
 
 # TODO: Move to spec/mongo_mapper
 MongoMapper.connection = Mongo::Connection.new('localhost', 27017)
-MongoMapper.database = 'activity_feed_gem_test'
+MongoMapper.database = 'activity_feed_gem_test_mongo_mapper'
+
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db("activity_feed_gem_test_mongoid")
+  # config.mongoid.logger = false
+end
 
 # TODO: Move to spec/active_record
 require 'active_record'
@@ -41,6 +47,7 @@ end
 
 DatabaseCleaner[:active_record].strategy = :transaction
 DatabaseCleaner[:mongo_mapper].strategy = :truncation
+DatabaseCleaner[:mongoid].strategy = :truncation
 
 require 'activity_feed'
 
@@ -49,6 +56,7 @@ ActivityFeed.redis = $redis
 require 'activity_feed/active_record/item'
 require 'activity_feed/memory/item'
 require 'activity_feed/mongo_mapper/item'
+require 'activity_feed/mongoid/item'
 require 'activity_feed/ohm/item'
 require 'activity_feed/custom/item'
 

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_feed
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152337140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152337140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152334740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152334740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2152332900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152332900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fabrication
-  requirement: &2152331820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152331820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &2152352640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152352640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mongo_ext
-  requirement: &2152350760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152350760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &2152349740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152349740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2152348380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152348380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &2152346760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +165,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152346760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ohm
-  requirement: &2152367940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +181,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152367940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ohm-contrib
-  requirement: &2152367000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +197,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152367000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152365760 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +213,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152365760
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2152364200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +229,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152364200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2152363160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +245,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152363160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152361640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +261,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152361640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2152384420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +277,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152384420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: leaderboard
-  requirement: &2152382940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,7 +293,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152382940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Activity feeds backed by Redis
 email:
 - dczarnecki@agoragames.com
@@ -219,6 +320,7 @@ files:
 - lib/activity_feed/feed.rb
 - lib/activity_feed/memory/item.rb
 - lib/activity_feed/mongo_mapper/item.rb
+- lib/activity_feed/mongoid/item.rb
 - lib/activity_feed/ohm/item.rb
 - lib/activity_feed/version.rb
 - spec/activity_feed/custom/item.rb
@@ -242,7 +344,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4587144125303236754
+      hash: -660248918297139575
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -251,10 +353,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4587144125303236754
+      hash: -660248918297139575
 requirements: []
 rubyforge_project: activity_feed
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Activity feeds backed by Redis