seymour 0.0.8 → 0.0.9

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.9 (2012-9-21)
+
+* Bumps to redis-namespace v1.2.1
+* Adds redis-namespace back to gemspec
+* Update development dependencies
+
 ## 0.0.8 (2012-2-06)
 
 * travis build status; clean Gemfile dependencies

data/Gemfile

@@ -1,7 +1,6 @@
 source :rubygems
 
 gemspec
-gem 'redis-namespace', :git => "git://github.com/defunkt/redis-namespace.git"
 
 # Declare any dependencies that are still in development here instead of in
 # your gemspec. These might include edge Rails or gems from your path or

data/Gemfile.ci

@@ -2,3 +2,4 @@ source :rubygems
 
 gemspec
 gem 'redis-namespace', :git => "git://github.com/defunkt/redis-namespace.git"
+gem 'ammeter', :git => "git://github.com/alexrothenberg/ammeter"

data/README.md

@@ -1,8 +1,8 @@
 # Seymour
 
-Feed me activities, Seymour, please!
+Activities feeds with Redis. Feed me, Seymour, please!
 
-Seymour is a library for distributing activity items to  Redis-backed activity feeds
+Seymour is a library for distributing activity items to Redis-backed activity feeds
 in a Rails application.
 
 [![Build Status](https://secure.travis-ci.org/rossta/seymour.png)](http://travis-ci.org/rossta/seymour)

data/lib/generators/seymour/feed/feed_generator.rb

@@ -11,22 +11,3 @@ module Seymour
 
   end
 end
-# module Draper
-#   class DecoratorGenerator < Rails::Generators::NamedBase
-#     source_root File.expand_path('../templates', __FILE__)
-#
-#     DECORATORS_ROOT = 'app/decorators/'
-#     APPLICATION_DECORATOR = 'application_decorator.rb'
-#     APPLICATION_DECORATOR_PATH = DECORATORS_ROOT + APPLICATION_DECORATOR
-#
-#     def build_model_and_application_decorators
-#       empty_directory "app/decorators"
-#       unless File.exists?(APPLICATION_DECORATOR_PATH)
-#         template APPLICATION_DECORATOR, APPLICATION_DECORATOR_PATH
-#       end
-#       template 'decorator.rb', "#{DECORATORS_ROOT}#{singular_name}_decorator.rb"
-#     end
-#
-#     hook_for :test_framework
-#   end
-# end

data/lib/seymour/distributable.rb

@@ -47,6 +47,7 @@ module Seymour
             feed_classes, options = mapping
             [feed_classes].flatten.each do |feed_class_name|
               try_find_each(activity.send(audience_name), options) do |member|
+                
                 feed = feed_class_name.constantize.new(member)
                 yield feed if block_given?
                 feeds << feed
@@ -69,28 +70,29 @@ module Seymour
           #   relation.send(:with_exclusive_scope) &block
           # end
           activity_audience.find_each(options, &block)
-        else
+        elsif activity_audience.respond_to?(:each)
           activity_audience.each &block
+        elsif !activity_audience.nil?
+          yield activity_audience
         end
       end
 
     end
 
-    module InstanceMethods
+    # instance methods
 
-      def distribute
-        self.class.distribute(self)
-      end
-
-      def remove
-        self.class.remove(self)
-      end
+    def distribute
+      self.class.distribute(self)
+    end
 
-      def feeds
-        self.class.feeds_for(self)
-      end
+    def remove
+      self.class.remove(self)
+    end
 
+    def feeds
+      self.class.feeds_for(self)
     end
+
   end
 
 

data/lib/seymour/renderable.rb

@@ -6,31 +6,26 @@ module Seymour
   module Renderable
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-
-      def render_html
-        render("seymour/render", "activity", "seymour.activity" => self)
-      rescue RenderError
-        return nil
-      end
-
-      def render(controller_name, action_name, env = {})
-        # TODO define proper server name
-          # { "REQUEST_URI" => "", "SERVER_NAME" => 'http://www.example.com' }.merge(env))
+    def render_html
+      render("seymour/render", "activity", "seymour.activity" => self)
+    rescue RenderError
+      return nil
+    end
 
-        env = Rack::MockRequest.env_for("/",
-          { "REQUEST_URI" => "", "SERVER_NAME" => '' }.merge(env))
+    def render(controller_name, action_name, env = {})
+      # TODO define proper server name
+        # { "REQUEST_URI" => "", "SERVER_NAME" => 'http://www.example.com' }.merge(env))
 
-        controller_class = "#{controller_name}_controller".classify.constantize
+      env = Rack::MockRequest.env_for("/",
+        { "REQUEST_URI" => "", "SERVER_NAME" => '' }.merge(env))
 
-        status, headers, response = controller_class.action(action_name.to_sym).call(env)
-        raise RenderError.new("#{controller_name}##{action_name}") unless status.to_i == 200
-        response.body
-      end
+      controller_class = "#{controller_name}_controller".classify.constantize
 
+      status, headers, response = controller_class.action(action_name.to_sym).call(env)
+      raise RenderError.new("#{controller_name}##{action_name}") unless status.to_i == 200
+      response.body
     end
 
-
   end
 
 end

data/lib/seymour/version.rb

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

data/seymour.gemspec

@@ -21,12 +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-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 "rspec-rails"
+  s.add_development_dependency 'capybara'
+  s.add_development_dependency 'database_cleaner'
+  s.add_development_dependency 'factory_girl_rails'
   s.add_development_dependency "sqlite3"
+  s.add_development_dependency 'ammeter'
 end

data/spec/factories/factories.rb

@@ -0,0 +1,13 @@
+FactoryGirl.define do
+  factory :user do |f|
+    f.name "Bob"
+  end
+
+  factory :comment do |f|
+    f.author { FactoryGirl.create(:user) }
+  end
+
+  factory :test_activity do |f|
+    f.actor { FactoryGirl.create(:user) }
+  end
+end

data/spec/seymour/distributable_spec.rb

@@ -8,16 +8,23 @@ describe Seymour::Distributable do
     audience :events,       :batch_size => 100
     audience :soccer_teams, :feed => "TeamFeed"
     audience :followers,    :feed => %w[ DashboardFeed EmailDigest ]
+    audience :for_one,      :feed => "UserFeed"
 
-    AUDIENCES = [:users, :admin, :soccer_teams, :events, :followers]
+    GROUP_AUDIENCES = [:users, :admin, :soccer_teams, :events, :followers]
 
-    AUDIENCES.each do |audience_name|
+    GROUP_AUDIENCES.each do |audience_name|
       attr_writer audience_name
 
       define_method(audience_name) do
         instance_variable_get("@#{audience_name}") || []
       end
     end
+
+    attr_writer :for_one
+    def for_one
+      @for_one || nil
+    end
+
   end
 
   describe "class methods" do
@@ -28,6 +35,8 @@ describe Seymour::Distributable do
         audience_names.should include(:admin)
         audience_names.should include(:soccer_teams)
         audience_names.should include(:events)
+        audience_names.should include(:followers)
+        audience_names.should include(:for_one)
       end
 
       it "should list activity feed classes" do
@@ -57,17 +66,17 @@ describe Seymour::Distributable do
       end
 
       describe "feeds_for" do
-        it "should build feed for each audience member" do
+        it "builds feed for each audience member" do
           DistributableActivity.feeds_for(activity).size.should == 2
         end
 
-        it "should return all assigned feed types" do
+        it "returns 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
+        it "assigns 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) }
@@ -76,17 +85,28 @@ describe Seymour::Distributable do
           admin_feed.owner.should == @admin
         end
 
-        it "should use default batch size if iterating on arel scope" do
+        it "uses default batch size if iterating on arel scope" do
           activity.users = User.scoped
           activity.users.should_receive(:find_each).with(:batch_size => 500)
           DistributableActivity.feeds_for(activity)
         end
 
-        it "should use specified batch size if iterating on arel scope" do
+        it "uses specified batch size if iterating on arel scope" do
           activity.events = Event.scoped
           activity.events.should_receive(:find_each).with(:batch_size => 100)
           DistributableActivity.feeds_for(activity)
         end
+
+        it "returns feed for non-enumerable audience (of one)" do
+          activity.users = []
+          activity.admin = []
+          activity.for_one = @user
+          feeds = DistributableActivity.feeds_for(activity)
+          feeds.size.should == 1
+          feeds.map(&:class).should include(UserFeed)
+          feeds.map(&:owner).should include(@user)
+        end
+
       end
     end
 

data/spec/seymour/dummy/test_activity_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe "TestActivity" do
 
   describe "TestActivity in dummy app" do
-    let(:activity)  { Factory(:test_activity) }
+    let(:activity)  { FactoryGirl.create(:test_activity) }
     let(:user)      { activity.actor }
 
     describe "render_html" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seymour
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-07 00:00:00.000000000Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70364335980540 !ruby/object:Gem::Requirement
+  requirement: &70212259063200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,65 +21,76 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70364335980540
+  version_requirements: *70212259063200
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &70364335979780 !ruby/object:Gem::Requirement
+  name: redis-namespace
+  requirement: &70212259078560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70364335979780
+  version_requirements: *70212259078560
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &70364335979220 !ruby/object:Gem::Requirement
+  name: rspec-rails
+  requirement: &70212259076840 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364335979220
+  version_requirements: *70212259076840
 - !ruby/object:Gem::Dependency
-  name: ammeter
-  requirement: &70364335978720 !ruby/object:Gem::Requirement
+  name: capybara
+  requirement: &70212259074960 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364335978720
+  version_requirements: *70212259074960
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70364335975300 !ruby/object:Gem::Requirement
+  requirement: &70212259073280 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364335975300
+  version_requirements: *70212259073280
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70364335974740 !ruby/object:Gem::Requirement
+  requirement: &70212259085340 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364335974740
+  version_requirements: *70212259085340
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70364335974340 !ruby/object:Gem::Requirement
+  requirement: &70212259083120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70212259083120
+- !ruby/object:Gem::Dependency
+  name: ammeter
+  requirement: &70212259082400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70364335974340
+  version_requirements: *70212259082400
 description: Activity feed distribution for Rails applications
 email:
 - rosskaff@gmail.com
@@ -174,7 +185,7 @@ files:
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
-- spec/dummy/spec/factories.rb
+- spec/factories/factories.rb
 - spec/generators/seymour/feed/feed_generator_spec.rb
 - spec/redis-spec.conf
 - spec/seymour/distributable_spec.rb
@@ -200,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3725206422773974737
+      hash: 2321509907141063680
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3725206422773974737
+      hash: 2321509907141063680
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10

data/spec/dummy/spec/factories.rb

@@ -1,11 +0,0 @@
-Factory.define :user do |f|
-  f.name "Bob"
-end
-
-Factory.define :comment do |f|
-  f.author { Factory(:user) }
-end
-
-Factory.define :test_activity do |f|
-  f.actor { Factory(:user) }
-end