activity_feed 2.2.2 → 2.3.0

data/.rspec

@@ -1,2 +1,3 @@
 --color
---format nested
+--format nested
+--order random

data/CHANGELOG.markdown

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 2.3.0 (2013-05-03)
+
+* Added `check_item?(user_id, item_id, aggregate = ActivityFeed.aggregate)` to see if an item is in an activity feed.
+
+## 2.2.2 (2012-09-12)
+
+* Added `add_item(...)` as an alias for `update_item(...)`.
+
 ## 2.2.1 (2012-08-27)
 
 * Added `total_pages` and `total_items` as aliases for `total_pages_in_feed` and `total_items_in_feed`, respectively.

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in activity_feed.gemspec
 gemspec

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011-2012 David Czarnecki
+Copyright (c) 2011-2013 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

@@ -287,6 +287,7 @@ ActivityFeed.add_item(user_id, item_id, timestamp, aggregate = ActivityFeed.aggr
 
 ActivityFeed.aggregate_item(user_id, item_id, timestamp)
 ActivityFeed.remove_item(user_id, item_id)
+ActivityFeed.check_item?(user_id, item_id, aggregate = ActivityFeed.aggregate)
 
 # Feed-related
 
@@ -315,4 +316,4 @@ ActivityFeed.remove_feeds(user_id)
 
 ## Copyright
 
-Copyright (c) 2011-2012 David Czarnecki. See LICENSE.txt for further details.
+Copyright (c) 2011-2013 David Czarnecki. See LICENSE.txt for further details.

data/Rakefile

@@ -12,6 +12,7 @@ end
 
 task :default  => :spec
 
+desc "Run the specs against Ruby 1.8.7 and 1.9.3"
 task :test_rubies do
   system "rvm ruby-1.8.7@activity_feed_gem,ruby-1.9.3@activity_feed_gem do rake spec"
 end

data/lib/activity_feed/item.rb

@@ -42,5 +42,17 @@ module ActivityFeed
       feederboard = ActivityFeed.feederboard_for(user_id, true)
       feederboard.remove_member(item_id)
     end
+
+    # Check to see if an item is in the activity feed for a given +user_id+.
+    #
+    # @param user_id [String] User ID.
+    # @param item_id [String] Item ID.
+    # @param aggregate [boolean, false] Whether or not to check the aggregate activity feed.
+    def check_item?(user_id, item_id, aggregate = ActivityFeed.aggregate)
+      feederboard_individual = ActivityFeed.feederboard_for(user_id, false)
+      feederboard_aggregate = ActivityFeed.feederboard_for(user_id, true)
+
+      aggregate ? feederboard_aggregate.check_member?(item_id) : feederboard_individual.check_member?(item_id)
+    end
   end
 end

data/lib/activity_feed/version.rb

@@ -1,3 +1,3 @@
 module ActivityFeed
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

data/spec/activity_feed/feed_spec.rb

@@ -53,15 +53,15 @@ describe ActivityFeed::Feed do
     describe 'without aggregation' do
       it 'should return activity feed items between the starting and ending timestamps' do
         Timecop.travel(Time.local(2012, 6, 19, 4, 0, 0))
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 1, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 4, 30, 0))
-        ActivityFeed.update_item('david', 2, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 2, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 5, 30, 0))
-        ActivityFeed.update_item('david', 3, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 3, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 6, 37, 0))
-        ActivityFeed.update_item('david', 4, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 4, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 8, 17, 0))
-        ActivityFeed.update_item('david', 5, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 5, Time.now.to_i)
         Timecop.return
 
         feed = ActivityFeed.feed_between_timestamps('david', Time.local(2012, 6, 19, 4, 43, 0).to_i, Time.local(2012, 6, 19, 8, 16, 0).to_i)
@@ -74,15 +74,15 @@ describe ActivityFeed::Feed do
     describe 'with aggregation' do
       it 'should return activity feed items between the starting and ending timestamps' do
         Timecop.travel(Time.local(2012, 6, 19, 4, 0, 0))
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 1, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 4, 30, 0))
-        ActivityFeed.update_item('david', 2, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 2, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 5, 30, 0))
-        ActivityFeed.update_item('david', 3, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 3, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 6, 37, 0))
-        ActivityFeed.update_item('david', 4, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 4, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 8, 17, 0))
-        ActivityFeed.update_item('david', 5, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 5, Time.now.to_i, true)
         Timecop.return
 
         feed = ActivityFeed.feed_between_timestamps('david', Time.local(2012, 6, 19, 4, 43, 0).to_i, Time.local(2012, 6, 19, 8, 16, 0).to_i, true)
@@ -160,15 +160,15 @@ describe ActivityFeed::Feed do
     describe 'without aggregation' do
       it 'should trim activity feed items between the starting and ending timestamps' do
         Timecop.travel(Time.local(2012, 6, 19, 4, 0, 0))
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 1, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 4, 30, 0))
-        ActivityFeed.update_item('david', 2, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 2, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 5, 30, 0))
-        ActivityFeed.update_item('david', 3, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 3, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 6, 37, 0))
-        ActivityFeed.update_item('david', 4, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 4, Time.now.to_i)
         Timecop.travel(Time.local(2012, 6, 19, 8, 17, 0))
-        ActivityFeed.update_item('david', 5, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 5, Time.now.to_i)
         Timecop.return
 
         ActivityFeed.trim_feed('david', Time.local(2012, 6, 19, 4, 29, 0).to_i, Time.local(2012, 6, 19, 8, 16, 0).to_i)
@@ -182,15 +182,15 @@ describe ActivityFeed::Feed do
     describe 'with aggregation' do
       it 'should trim activity feed items between the starting and ending timestamps' do
         Timecop.travel(Time.local(2012, 6, 19, 4, 0, 0))
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 1, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 4, 30, 0))
-        ActivityFeed.update_item('david', 2, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 2, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 5, 30, 0))
-        ActivityFeed.update_item('david', 3, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 3, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 6, 37, 0))
-        ActivityFeed.update_item('david', 4, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 4, Time.now.to_i, true)
         Timecop.travel(Time.local(2012, 6, 19, 8, 17, 0))
-        ActivityFeed.update_item('david', 5, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 5, Time.now.to_i, true)
         Timecop.return
 
         ActivityFeed.trim_feed('david', Time.local(2012, 6, 19, 4, 29, 0).to_i, Time.local(2012, 6, 19, 8, 16, 0).to_i, true)

data/spec/activity_feed/item_spec.rb

@@ -6,7 +6,7 @@ describe ActivityFeed::Item do
     describe 'without aggregation' do
       it 'should correctly build an activity feed' do
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 1, Time.now.to_i)
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_true
       end
     end
@@ -15,7 +15,7 @@ describe ActivityFeed::Item do
       it 'should correctly build an activity feed with an aggregate activity_feed' do
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_false
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 1, Time.now.to_i, true)
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_true
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_true
       end
@@ -26,7 +26,7 @@ describe ActivityFeed::Item do
     describe 'without aggregation' do
       it 'should correctly build an activity feed' do
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
-        ActivityFeed.add_item('david', 1, DateTime.now.to_i)
+        ActivityFeed.add_item('david', 1, Time.now.to_i)
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_true
       end
     end
@@ -36,7 +36,7 @@ describe ActivityFeed::Item do
     it 'should correctly add an item into an aggregate activity feed' do
       ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
       ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_false
-      ActivityFeed.aggregate_item('david', 1, DateTime.now.to_i)
+      ActivityFeed.aggregate_item('david', 1, Time.now.to_i)
       ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
       ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_true
     end
@@ -47,7 +47,7 @@ describe ActivityFeed::Item do
       it 'should remove an item from an activity feed' do
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_false
         ActivityFeed.redis.zcard(ActivityFeed.feed_key('david')).should eql(0)
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i)
+        ActivityFeed.update_item('david', 1, Time.now.to_i)
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_true
         ActivityFeed.redis.zcard(ActivityFeed.feed_key('david')).should eql(1)
         ActivityFeed.remove_item('david', 1)
@@ -61,7 +61,7 @@ describe ActivityFeed::Item do
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_false
         ActivityFeed.redis.zcard(ActivityFeed.feed_key('david')).should eql(0)
         ActivityFeed.redis.zcard(ActivityFeed.feed_key('david', true)).should eql(0)
-        ActivityFeed.update_item('david', 1, DateTime.now.to_i, true)
+        ActivityFeed.update_item('david', 1, Time.now.to_i, true)
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david')).should be_true
         ActivityFeed.redis.exists(ActivityFeed.feed_key('david', true)).should be_true
         ActivityFeed.redis.zcard(ActivityFeed.feed_key('david')).should eql(1)
@@ -72,4 +72,24 @@ describe ActivityFeed::Item do
       end
     end
   end
+
+  describe '#check_item?' do
+    describe 'without aggregation' do
+      it 'should return whether or not an item exists in the feed' do
+        ActivityFeed.aggregate = false
+        ActivityFeed.check_item?('david', 1).should be_false
+        ActivityFeed.add_item('david', 1, Time.now.to_i)
+        ActivityFeed.check_item?('david', 1).should be_true
+      end
+    end
+
+    describe 'with aggregation' do
+      it 'should return whether or not an item exists in the feed' do
+        ActivityFeed.aggregate = true
+        ActivityFeed.check_item?('david', 1, true).should be_false
+        ActivityFeed.add_item('david', 1, Time.now.to_i)
+        ActivityFeed.check_item?('david', 1, true).should be_true
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ require 'support/active_record'
 
 RSpec.configure do |config|
   config.mock_with :rspec
-  
+
   config.before(:all) do
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.clean_with(:truncation)
@@ -18,6 +18,7 @@ RSpec.configure do |config|
 
     ActivityFeed.configure do |configuration|
       configuration.item_loader = nil
+      configuration.aggregate = false
       configuration.redis = Redis.new(:db => 15)
     end
 
@@ -25,18 +26,18 @@ RSpec.configure do |config|
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean    
+    DatabaseCleaner.clean
 
     ActivityFeed.redis.quit
   end
 
   # Helper method to add items to a given feed.
-  # 
+  #
   # @param items_to_add [int] Number of items to add to the feed.
   def add_items_to_feed(user_id, items_to_add = 5, aggregate = ActivityFeed.aggregate)
     1.upto(items_to_add) do |index|
-      ActivityFeed.update_item(user_id, index, DateTime.now.to_i, aggregate)
-      Timecop.travel(DateTime.now + 10)
+      ActivityFeed.update_item(user_id, index, Time.now.to_i, aggregate)
+      Timecop.travel(Time.now + 10)
     end
 
     Timecop.return

data/spec/support/mongoid.rb

@@ -1,8 +1,12 @@
 require 'mongoid'
 
-Mongoid.configure do |config|
-  config.master = Mongo::Connection.new.db("activity_feed_gem_test")
-end
+# If using Mongoid 2.x
+# Mongoid.configure do |config|
+#   config.master = Mongo::Connection.new.db("activity_feed_gem_test")
+# end
+
+# If using Mongoid 3.x
+Mongoid.load!("#{File.dirname(__FILE__)}/mongoid.yml", :test)
 
 DatabaseCleaner[:mongoid].strategy = :truncation
 
@@ -23,7 +27,11 @@ module ActivityFeed
       field :icon, :type=> String
       field :sticky, :type=> Boolean
 
-      index :user_id
+      # If using Mongoid 2.x
+      # index :user_id
+
+      # If using Mongoid 3.x
+      index({ user_id: 1})
 
       after_save :update_activity_feed
 

data/spec/support/mongoid.yml

@@ -0,0 +1,6 @@
+test:
+  sessions:
+    default:
+      database: activity_feed_gem_test
+      hosts:
+        - localhost:27017

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_feed
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -200,6 +200,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/mongoid.rb
+- spec/support/mongoid.yml
 - spec/version_spec.rb
 homepage: https://github.com/agoragames/activity_feed
 licenses: []
@@ -215,7 +216,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3848997138192536076
+      hash: 4479539862674226365
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -224,10 +225,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3848997138192536076
+      hash: 4479539862674226365
 requirements: []
 rubyforge_project: activity_feed
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Activity feeds backed by Redis
@@ -239,4 +240,5 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/active_record.rb
 - spec/support/mongoid.rb
+- spec/support/mongoid.yml
 - spec/version_spec.rb