activity_feed 1.4.0 → 2.0.0.rc1

data/spec/activity_feed/utility_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe ActivityFeed::Utility do
+  describe '#feed_key' do
+    it 'should return the correct key for the non-aggregate feed' do
+      ActivityFeed.feed_key('david').should == 'activity_feed:david'
+    end
+
+    it 'should return the correct key for an aggregate feed' do
+      ActivityFeed.feed_key('david', true).should == 'activity_feed:aggregate:david'
+    end
+  end
+
+  describe '#feederboard_for' do
+    it 'should create a leaderboard using an existing Redis connection' do
+      feederboard_david = ActivityFeed.feederboard_for('david')
+      feederboard_person = ActivityFeed.feederboard_for('person')
+
+      feederboard_david.should_not be_nil
+      feederboard_person.should_not be_nil
+      ActivityFeed.redis.info["connected_clients"].to_i.should be(1)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,82 +1,44 @@
-require 'rubygems'
-require 'rspec'
-require 'redis'
-require 'mongo_mapper'
-require 'mongoid'
-require 'database_cleaner'
-require 'fabrication'
-require 'json'
-
-$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_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'
-
-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
-
-DatabaseCleaner[:active_record].strategy = :transaction
-DatabaseCleaner[:mongo_mapper].strategy = :truncation
-DatabaseCleaner[:mongoid].strategy = :truncation
-
 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/mongoid/item'
-require 'activity_feed/ohm/item'
-require 'activity_feed/custom/item'
+require 'timecop'
+require 'database_cleaner'
+require 'support/mongoid'
+require 'support/active_record'
 
 RSpec.configure do |config|
   config.mock_with :rspec
   
-  config.before(:suite) do
+  config.before(:all) do
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.clean_with(:truncation)
-    $redis.flushdb
   end
 
   config.before(:each) do
-    ActivityFeed.persistence = :memory
     DatabaseCleaner.start
     DatabaseCleaner.clean
+
+    ActivityFeed.configure do |configuration|
+      configuration.item_loader = nil
+      configuration.redis = Redis.new(:db => 15)
+    end
+
+    ActivityFeed.redis.flushdb
   end
 
   config.after(:each) do
-    DatabaseCleaner.clean
-    $redis.flushdb
-  end  
+    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)
+    end
+
+    Timecop.return
+  end
 end

data/spec/support/active_record.rb

@@ -0,0 +1,38 @@
+require 'active_record'
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+ActiveRecord::Migration.verbose = false
+
+DatabaseCleaner[:active_record].strategy = :transaction
+
+ActiveRecord::Schema.define do
+  create_table :activity_feed_items, :force => true do |t|
+    t.string :user_id
+    t.string :nickname
+    t.string :type
+    t.string :title
+    t.text :body
+    
+    t.timestamps
+  end
+end
+
+module ActivityFeed
+  module ActiveRecord
+    class Item < ::ActiveRecord::Base
+      set_table_name 'activity_feed_items'
+        
+      after_save :update_activity_feed
+
+      private
+
+      def update_activity_feed
+        ActivityFeed.update_item(self.user_id, self.id, self.created_at.to_i)
+      end
+    end
+  end
+end

data/spec/support/mongoid.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'mongoid'
+
+Mongoid.configure do |config|
+  config.master = Mongo::Connection.new.db("activity_feed_gem_test")
+end
+
+DatabaseCleaner[:mongoid].strategy = :truncation
+
+module ActivityFeed
+  module Mongoid
+    class Item
+      include ::Mongoid::Document    
+      include ::Mongoid::Timestamps
+
+      field :user_id, :type => String
+      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_activity_feed
+
+      private
+
+      def update_activity_feed
+        ActivityFeed.update_item(self.user_id, self.id, self.created_at.to_i)
+      end
+    end
+  end
+end

data/spec/version_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe ActivityFeed do
+describe 'ActivityFeed::VERSION' do
   it "should be the correct version" do
-    ActivityFeed::VERSION.should == '1.4.0'
+    ActivityFeed::VERSION.should == '2.0.0.rc1'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: activity_feed
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 2.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - David Czarnecki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fabrication
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -91,38 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mongo_mapper
-  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_ext
-  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: bson_ext
   requirement: !ruby/object:Gem::Requirement
@@ -172,39 +140,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: ohm
-  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: ohm-contrib
-  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: timecop
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -219,70 +155,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: leaderboard
   requirement: !ruby/object:Gem::Requirement
@@ -316,19 +188,18 @@ files:
 - Rakefile
 - activity_feed.gemspec
 - lib/activity_feed.rb
-- lib/activity_feed/active_record/item.rb
+- lib/activity_feed/configuration.rb
 - 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/item.rb
+- lib/activity_feed/utility.rb
 - lib/activity_feed/version.rb
-- spec/activity_feed/custom/item.rb
-- spec/activity_feed_spec.rb
-- spec/fabricators/item_fabricator.rb
-- spec/feed_spec.rb
-- spec/item_spec.rb
+- spec/activity_feed/configuration_spec.rb
+- spec/activity_feed/feed_spec.rb
+- spec/activity_feed/item_spec.rb
+- spec/activity_feed/utility_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/mongoid.rb
 - spec/version_spec.rb
 homepage: https://github.com/agoragames/activity_feed
 licenses: []
@@ -344,16 +215,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -660248918297139575
+      hash: 2514115119128722927
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -660248918297139575
+      version: 1.3.1
 requirements: []
 rubyforge_project: activity_feed
 rubygems_version: 1.8.23
@@ -361,10 +229,11 @@ signing_key:
 specification_version: 3
 summary: Activity feeds backed by Redis
 test_files:
-- spec/activity_feed/custom/item.rb
-- spec/activity_feed_spec.rb
-- spec/fabricators/item_fabricator.rb
-- spec/feed_spec.rb
-- spec/item_spec.rb
+- spec/activity_feed/configuration_spec.rb
+- spec/activity_feed/feed_spec.rb
+- spec/activity_feed/item_spec.rb
+- spec/activity_feed/utility_spec.rb
 - spec/spec_helper.rb
+- spec/support/active_record.rb
+- spec/support/mongoid.rb
 - spec/version_spec.rb

data/lib/activity_feed/active_record/item.rb

@@ -1,17 +0,0 @@
-require 'active_record'
-
-module ActivityFeed
-  module ActiveRecord
-    class Item < ::ActiveRecord::Base
-      set_table_name 'activity_feed_items'
-        
-      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/memory/item.rb

@@ -1,36 +0,0 @@
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/date_time/conversions'
-require 'json'
-
-module ActivityFeed
-  module Memory
-    class Item
-      attr_accessor :user_id
-      attr_accessor :nickname
-      attr_accessor :type
-      attr_accessor :title
-      attr_accessor :text
-      attr_accessor :url
-      attr_accessor :icon
-      attr_accessor :sticky
-
-      def initialize(attributes = {})
-        @attributes = attributes
-      
-        attributes.each do |key,value|
-          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.feed_key(self.user_id), DateTime.now.to_i, @attributes.to_json)
-      end
-    end
-  end
-end

data/lib/activity_feed/mongo_mapper/item.rb

@@ -1,30 +0,0 @@
-require 'mongo_mapper'
-
-module ActivityFeed
-  module MongoMapper
-    class Item
-      include ::MongoMapper::Document    
-
-      key :user_id, Integer, :required => true, :numeric => true
-      key :nickname, String
-      key :type, String
-      key :title, String
-      key :text, String
-      key :url, String
-      key :icon, String
-      key :sticky, Boolean
-
-      timestamps!
-
-      self.ensure_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/mongoid/item.rb

@@ -1,31 +0,0 @@
-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/ohm/item.rb

@@ -1,41 +0,0 @@
-require 'ohm'
-require 'ohm/contrib'
-
-module ActivityFeed
-  module Ohm
-    class Item < ::Ohm::Model
-      include ::Ohm::Callbacks
-      include ::Ohm::Timestamping
-      
-      attribute :user_id
-      attribute :nickname
-      attribute :type
-      attribute :title
-      attribute :text
-      attribute :url
-      attribute :icon
-      attribute :sticky      
-      
-      after :save, :update_redis
-      
-      def to_hash
-        super.merge(
-          :user_id => user_id,
-          :nickname => nickname,
-          :type => type,
-          :title => title,
-          :text => text,
-          :url => url,
-          :icon => icon,
-          :sticky => sticky
-        )
-      end
-      
-      private
-
-      def update_redis
-        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), DateTime.parse(self.created_at).to_i, self.id)
-      end
-    end
-  end
-end

data/spec/activity_feed/custom/item.rb

@@ -1,36 +0,0 @@
-module ActivityFeed
-  module Custom
-    class Item
-      attr_accessor :user_id
-      attr_accessor :nickname
-      attr_accessor :type
-      attr_accessor :title
-      attr_accessor :text
-      attr_accessor :url
-      attr_accessor :icon
-      attr_accessor :sticky
-
-      def initialize(attributes = {})
-        @attributes = attributes
-
-        attributes.each do |key,value|
-          self.send("#{key}=", value)
-        end      
-      end
-      
-      def attributes
-        @attributes
-      end
-
-      def self.find(item)
-        JSON.parse(item)
-      end
-
-      def save
-        raise 'user_id MUST be defined in the attributes' if user_id.blank?
-
-        ActivityFeed.redis.zadd(ActivityFeed.feed_key(self.user_id), DateTime.now.to_i, @attributes.to_json)
-      end
-    end
-  end
-end