seymour 0.0.7 → 0.0.8

data/lib/seymour/version.rb

@@ -1,3 +1,3 @@
 module Seymour
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/seymour.gemspec

@@ -21,14 +21,12 @@ Gem::Specification.new do |s|
   # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
 
   s.add_dependency "rails", "~> 3.0"
-  s.add_dependency "redis-namespace"
+  # s.add_dependency "redis-namespace"
 
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency 'steak'
-  s.add_development_dependency 'capybara'
-  s.add_development_dependency 'ammeter'
-  s.add_development_dependency 'database_cleaner'
-  s.add_development_dependency 'factory_girl_rails'
+  s.add_development_dependency "rspec-rails", '~> 2.8.0'
+  s.add_development_dependency 'capybara', '~> 1.1.0'
+  s.add_development_dependency 'ammeter', '~> 0.2.0'
+  s.add_development_dependency 'database_cleaner', '~> 0.7.1'
+  s.add_development_dependency 'factory_girl_rails', '~> 1.2.0'
   s.add_development_dependency "sqlite3"
 end

data/spec/dummy/db/schema.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -13,8 +14,8 @@
 ActiveRecord::Schema.define(:version => 20111015001158) do
 
   create_table "activities", :force => true do |t|
-    t.integer  "subject_id"
-    t.string   "subject_type"
+    t.integer  "auditable_id"
+    t.string   "auditable_type"
     t.integer  "actor_id"
     t.datetime "created_at"
     t.datetime "updated_at"

data/spec/seymour/distributable_spec.rb

@@ -61,12 +61,19 @@ describe Seymour::Distributable do
           DistributableActivity.feeds_for(activity).size.should == 2
         end
 
-        it "should assign owner to correct feed type" do
-          feed_1, feed_2 = DistributableActivity.feeds_for(activity)
-          feed_1.should be_a(UserFeed)
-          feed_1.owner.should == @user
-          feed_2.should be_a(AdminFeed)
-          feed_2.owner.should == @admin
+        it "should return all assigned feed types" do
+          feed_classes = DistributableActivity.feeds_for(activity).map(&:class)
+          feed_classes.should include(UserFeed)
+          feed_classes.should include(AdminFeed)
+        end
+
+        it "should assign owners to correct feed type" do
+          feeds = DistributableActivity.feeds_for(activity)
+          user_feed   = feeds.detect { |feed| feed.is_a?(UserFeed) }
+          admin_feed  = feeds.detect { |feed| feed.is_a?(AdminFeed) }
+
+          user_feed.owner.should  == @user
+          admin_feed.owner.should == @admin
         end
 
         it "should use default batch size if iterating on arel scope" do

data/spec/seymour/feed_spec.rb

@@ -2,9 +2,32 @@ require 'spec_helper'
 
 describe Seymour::Feed do
 
-  let(:owner) { mock_model(User) }
+  module FactoryHelper
+    def new_owner
+      stub_model(User)
+    end
+
+    def new_activity(attrs = {})
+      mock_model(Activity, attrs)
+    end
+  end
+  include FactoryHelper
+
+  let(:owner) { new_owner }
   let(:feed)  { Seymour::Feed.new(owner) }
 
+  class ListFeed < Seymour::Feed
+    key do
+      "feed::#{owner.id}"
+    end
+
+    store :list
+  end
+
+  class ZsetFeed < Seymour::Feed
+    store :zset
+  end
+
   describe "class methods" do
     describe "feed_classes" do
       it "should provide a list of feed sub classes" do
@@ -14,11 +37,34 @@ describe Seymour::Feed do
 
     describe "distribute" do
       it "should call activity distribute on activity" do
-        activity    = mock_model(Activity)
+        activity    = new_activity
         activity.should_receive(:distribute)
         Seymour::Feed.distribute(activity)
       end
     end
+
+    describe "key" do
+      it "should override default feed key" do
+        feed = ListFeed.new(owner)
+        feed.key.should == "feed::#{owner.id}"
+      end
+    end
+
+    describe "store" do
+      it "should default to list feed" do
+        feed.store.should be_a(Seymour::Store::List)
+      end
+
+      it "should set type of storage to list" do
+        feed = ListFeed.new(owner)
+        feed.store.should be_a(Seymour::Store::List)
+      end
+
+      it "should set type of storage to zset" do
+        feed = ZsetFeed.new(owner)
+        feed.store.should be_a(Seymour::Store::Zset)
+      end
+    end
   end
 
   describe "activity_ids" do
@@ -27,118 +73,262 @@ describe Seymour::Feed do
     end
   end
 
-  describe "push" do
-    it "prepends id of given activity to activity_ids" do
-      feed.push mock_model(Activity, :id => 123)
-      feed.activity_ids.should == [123]
+  describe "owner" do
+    it "should return given owner" do
+      feed.owner.should == owner
+    end
+  end
 
-      feed.push mock_model(Activity, :id => 456)
-      feed.activity_ids.should == [456, 123]
+  describe "key" do
+    it "should return default" do
+      feed.send(:key).should == "#{owner.class.name}:#{owner.id}/seymour::feed"
     end
+  end
+
+  describe "list feed" do
+    describe "push" do
+      it "prepends id of given activity to activity_ids" do
+        feed.push new_activity(:id => 123)
+        feed.activity_ids.should == [123]
+
+        feed.push new_activity(:id => 456)
+        feed.activity_ids.should == [456, 123]
+      end
+
+      it "new feed with same owner pushes to same list" do
+        new_feed = Seymour::Feed.new(owner)
 
-    it "new feed with same owner pushes to same list" do
-      new_feed = Seymour::Feed.new(owner)
+        feed.push new_activity(:id => 123)
+        new_feed.push new_activity(:id => 456)
 
-      feed.push mock_model(Activity, :id => 123)
-      new_feed.push mock_model(Activity, :id => 456)
+        feed.activity_ids.should == [456, 123]
+        new_feed.activity_ids.should == [456, 123]
+      end
+
+      it "new feed with different owner pushes to different list" do
+        new_owner = mock_model(User)
+        new_feed = Seymour::Feed.new(new_owner)
+
+        feed.push new_activity(:id => 123)
+        new_feed.push new_activity(:id => 456)
+
+        feed.activity_ids.should == [123]
+        new_feed.activity_ids.should == [456]
+      end
 
-      feed.activity_ids.should == [456, 123]
-      new_feed.activity_ids.should == [456, 123]
     end
 
-    it "new feed with different owner pushes to different list" do
-      new_owner = mock_model(User)
-      new_feed = Seymour::Feed.new(new_owner)
+    describe "bulk_push" do
+      it "should accept multiple values" do
+        feed.bulk_push [new_activity(:id => 123), new_activity(:id => 456)]
+        feed.activity_ids.should == [456, 123]
+      end
 
-      feed.push mock_model(Activity, :id => 123)
-      new_feed.push mock_model(Activity, :id => 456)
+      it "should not append duplicates" do
+        feed.bulk_push [new_activity(:id => 123), new_activity(:id => 456), new_activity(:id => 123)]
+        feed.activity_ids.should == [456, 123]
+      end
+    end
 
-      feed.activity_ids.should == [123]
-      new_feed.activity_ids.should == [456]
+    describe "sort" do
+      it "should sort list in desc order by default" do
+        feed.bulk_push [new_activity(:id => 456), new_activity(:id => 123)]
+        feed.sort!
+        feed.activity_ids.should == [456, 123]
+      end
     end
 
-  end
+    describe "insert_and_order" do
+      it "should insert activities into the list" do
+        activities = [new_activity(:id => 123), new_activity(:id => 456)]
+        feed.insert_and_order(activities)
 
-  describe "bulk_push" do
-    it "should accept multiple values" do
-      feed.bulk_push [mock_model(Activity, :id => 123), mock_model(Activity, :id => 456)]
-      feed.activity_ids.should == [456, 123]
+        feed.activity_ids.should == [456, 123]
+      end
+
+      it "should reorder activities by id" do
+        feed.push new_activity(:id => 123)
+        feed.push new_activity(:id => 456)
+
+        activities = [new_activity(:id => 234), new_activity(:id => 789)]
+
+        feed.insert_and_order(activities)
+
+        feed.activity_ids.should == [789, 456, 234, 123]
+      end
+
+      it "should not allow duplicates" do
+        feed.push new_activity(:id => 123)
+        feed.push new_activity(:id => 456)
+
+        activities = [new_activity(:id => 123), new_activity(:id => 789)]
+
+        feed.insert_and_order(activities)
+
+        feed.activity_ids.should == [789, 456, 123]
+      end
     end
 
-    it "should not append duplicates" do
-      feed.bulk_push [mock_model(Activity, :id => 123), mock_model(Activity, :id => 456), mock_model(Activity, :id => 123)]
-      feed.activity_ids.should == [456, 123]
+    describe "remove" do
+      it "removes activity from list by id" do
+        activity_1 = new_activity(:id => 456)
+        activity_2 = new_activity(:id => 789)
+        feed.push activity_1
+        feed.push activity_2
+
+        feed.remove activity_1
+
+        feed.activity_ids.should == [activity_2.id]
+      end
     end
-  end
 
-  describe "sort" do
-    it "should sort list in desc order by default" do
-      feed.bulk_push [mock_model(Activity, :id => 456), mock_model(Activity, :id => 123)]
-      feed.sort!
-      feed.activity_ids.should == [456, 123]
+    describe "remove_id" do
+      it "removes activity_id from list" do
+        activity_1 = new_activity(:id => 456)
+        activity_2 = new_activity(:id => 789)
+        feed.push activity_1
+        feed.push activity_2
+
+        feed.remove_id activity_1.id
+
+        feed.activity_ids.should == [activity_2.id]
+      end
     end
   end
 
-  describe "insert_and_order" do
-    it "should insert activities into the list" do
-      activities = [mock_model(Activity, :id => 123), mock_model(Activity, :id => 456)]
-      feed.insert_and_order(activities)
+  describe "zset" do
+    let(:feed)  { ZsetFeed.new(owner) }
 
-      feed.activity_ids.should == [456, 123]
-    end
+    describe "push" do
+      it "returns ids sorted by score, highest to lowest" do
+        feed.push new_activity(:id => 123, :score => 1)
+        feed.push new_activity(:id => 456, :score => 3)
+        feed.activity_ids.should == [456, 123]
+      end
 
-    it "should reorder activities by id" do
-      feed.push mock_model(Activity, :id => 123)
-      feed.push mock_model(Activity, :id => 456)
+      it "returns accepts score as second arg" do
+        feed.push new_activity(:id => 123), 2
+        feed.push new_activity(:id => 456), 1
+        feed.activity_ids.should == [123, 456]
+      end
+
+      it "returns ordered by id when scores equal" do
+        feed.push new_activity(:id => 456), 1
+        feed.push new_activity(:id => 123), 1
+        feed.activity_ids.should == [456, 123]
+      end
 
-      activities = [mock_model(Activity, :id => 234), mock_model(Activity, :id => 789)]
+      it "does not add duplicates but updates score" do
+        feed.push new_activity(:id => 123), 2
+        feed.push new_activity(:id => 456), 1
+        feed.push new_activity(:id => 456), 3
+        feed.activity_ids.should == [456, 123]
+      end
+    end
 
-      feed.insert_and_order(activities)
+    describe "bulk_push" do
+      it "should accept multiple values" do
+        feed.bulk_push [new_activity(:id => 123, :score => 1), new_activity(:id => 456, :score => 3)]
+        feed.activity_ids.should == [456, 123]
+      end
 
-      feed.activity_ids.should == [789, 456, 234, 123]
+      it "should not append duplicates" do
+        feed.bulk_push [new_activity(:id => 123, :score => 2),
+          new_activity(:id => 456, :score => 1), new_activity(:id => 123, :score => 3)]
+        feed.activity_ids.should == [123, 456]
+      end
     end
 
-    it "should not allow duplicates" do
-      feed.push mock_model(Activity, :id => 123)
-      feed.push mock_model(Activity, :id => 456)
+    describe "union" do
+      it "should store union of given feeds" do
+        feed_1 = ZsetFeed.new(new_owner)
+        feed_2 = ZsetFeed.new(new_owner)
 
-      activities = [mock_model(Activity, :id => 123), mock_model(Activity, :id => 789)]
+        feed_1.push new_activity(:id => 456), 2
+        feed_2.push new_activity(:id => 123), 1
+        feed_2.push new_activity(:id => 789), 3
 
-      feed.insert_and_order(activities)
+        feed_1.activity_ids.should == [456]
+        feed_2.activity_ids.should == [789, 123]
 
-      feed.activity_ids.should == [789, 456, 123]
+        feed.union([feed_1, feed_2]).should == 3
+        feed.activity_ids.should == [789, 456, 123]
+      end
     end
-  end
 
-  describe "remove" do
-    it "removes activity from list by id" do
-      activity_1 = mock_model(Activity, :id => 456)
-      activity_2 = mock_model(Activity, :id => 789)
-      feed.push activity_1
-      feed.push activity_2
+    describe "intersect" do
+      it "should store intersection of given feeds" do
+        feed_1 = ZsetFeed.new(new_owner)
+        feed_2 = ZsetFeed.new(new_owner)
+
+        feed_1.push new_activity(:id => 456), 2
+        feed_2.push new_activity(:id => 456), 1
+        feed_2.push new_activity(:id => 789), 3
 
-      feed.remove activity_1
+        feed_1.activity_ids.should == [456]
+        feed_2.activity_ids.should == [789, 456]
 
-      feed.activity_ids.should == [activity_2.id]
+        feed.intersect([feed_1, feed_2])
+        feed.activity_ids.should == [456]
+      end
     end
-  end
 
-  describe "remove_id" do
-    it "removes activity_id from list" do
-      activity_1 = mock_model(Activity, :id => 456)
-      activity_2 = mock_model(Activity, :id => 789)
-      feed.push activity_1
-      feed.push activity_2
+    #
+    # describe "insert_and_order" do
+    #   it "should insert activities into the list" do
+    #     activities = [new_activity(:id => 123), new_activity(:id => 456)]
+    #     feed.insert_and_order(activities)
+    #
+    #     feed.activity_ids.should == [456, 123]
+    #   end
+    #
+    #   it "should reorder activities by id" do
+    #     feed.push new_activity(:id => 123)
+    #     feed.push new_activity(:id => 456)
+    #
+    #     activities = [new_activity(:id => 234), new_activity(:id => 789)]
+    #
+    #     feed.insert_and_order(activities)
+    #
+    #     feed.activity_ids.should == [789, 456, 234, 123]
+    #   end
+    #
+    #   it "should not allow duplicates" do
+    #     feed.push new_activity(:id => 123)
+    #     feed.push new_activity(:id => 456)
+    #
+    #     activities = [new_activity(:id => 123), new_activity(:id => 789)]
+    #
+    #     feed.insert_and_order(activities)
+    #
+    #     feed.activity_ids.should == [789, 456, 123]
+    #   end
+    # end
+    #
+    describe "remove" do
+      it "removes activity from list by id" do
+        activity_1 = new_activity(:id => 456)
+        activity_2 = new_activity(:id => 789)
+        feed.push activity_1, 2
+        feed.push activity_2, 1
+
+        feed.remove activity_1
+
+        feed.activity_ids.should == [activity_2.id]
+      end
+    end
 
-      feed.remove_id activity_1.id
+    describe "remove_id" do
+      it "removes activity_id from list" do
+        activity_1 = new_activity(:id => 456)
+        activity_2 = new_activity(:id => 789)
+        feed.push activity_1, 2
+        feed.push activity_2, 1
 
-      feed.activity_ids.should == [activity_2.id]
-    end
-  end
+        feed.remove_id activity_1.id
 
-  describe "owner" do
-    it "should return given owner" do
-      feed.owner.should == owner
+        feed.activity_ids.should == [activity_2.id]
+      end
     end
   end
 end