recommendable 1.0.0 → 1.1.1

data/CHANGELOG.markdown

@@ -1,8 +1,14 @@
 Changelog
 =========
 
-1.0.0 (current version)
----------------------
+1.1.0 (current version)
+-----------------------
+* Support for Sidekiq, Resque, DelayedJob and Rails::Queueing (issue #28)
+  * You must manually bundle Sidekiq, Resque, or DelayedJob. Rails::Queueing is available as a fallback for Rails 4.x
+* Use [apotonick/hooks](https://github.com/apotonick/hooks) to implement callbacks (issue #25). See the [detailed README](http://davidcelis.com/recommendable) for more info on usage.
+
+1.0.0
+-----
 * Dynamic finders now return ActiveRecord::Relations! This means you can chain other ActiveRecord query methods like so:
 
 ```ruby

data/Gemfile

@@ -1,17 +1,3 @@
 source 'http://rubygems.org'
 # Add dependencies required to use your gem here.
-gem 'rails',        '>= 3.1.0'
-gem 'redis',        '>= 2.2.0'
-gem 'resque',       '~> 1.19.0'
-gem 'resque-loner', '~> 1.2.0'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'sqlite3'
-  gem 'minitest'
-  gem 'shoulda'
-  gem 'miniskirt'
-  gem 'yard',    '~> 0.6.0'
-  gem 'bundler', '>= 1.0.0'
-end
+gemspec

data/Gemfile.lock

@@ -1,118 +1,111 @@
+PATH
+  remote: .
+  specs:
+    recommendable (1.1.1)
+      hooks
+      rails (>= 3.0.0)
+      redis (~> 2.2.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.0)
-      actionpack (= 3.2.0)
-      mail (~> 2.4.0)
-    actionpack (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
+    actionmailer (3.2.6)
+      actionpack (= 3.2.6)
+      mail (~> 2.4.4)
+    actionpack (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.0)
+      journey (~> 1.0.1)
       rack (~> 1.4.0)
-      rack-cache (~> 1.1)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.2)
-    activemodel (3.2.0)
-      activesupport (= 3.2.0)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.6)
+      activesupport (= 3.2.6)
       builder (~> 3.0.0)
-    activerecord (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-      arel (~> 3.0.0)
+    activerecord (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.0)
-      activemodel (= 3.2.0)
-      activesupport (= 3.2.0)
-    activesupport (3.2.0)
+    activeresource (3.2.6)
+      activemodel (= 3.2.6)
+      activesupport (= 3.2.6)
+    activesupport (3.2.6)
       i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (3.0.0)
+    arel (3.0.2)
     builder (3.0.0)
     erubis (2.7.0)
     hike (1.2.1)
+    hooks (0.2.0)
     i18n (0.6.0)
-    journey (1.0.0)
-    json (1.6.5)
-    mail (2.4.1)
+    journey (1.0.4)
+    json (1.7.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.17.2)
+    mime-types (1.19)
     miniskirt (1.1.1)
       activesupport (>= 2.2)
-    minitest (2.10.1)
-    multi_json (1.0.4)
+    minitest (3.2.0)
+    multi_json (1.3.6)
     polyglot (0.3.3)
-    rack (1.4.0)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    rack-protection (1.2.0)
-      rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.2.0)
-      actionmailer (= 3.2.0)
-      actionpack (= 3.2.0)
-      activerecord (= 3.2.0)
-      activeresource (= 3.2.0)
-      activesupport (= 3.2.0)
+    rails (3.2.6)
+      actionmailer (= 3.2.6)
+      actionpack (= 3.2.6)
+      activerecord (= 3.2.6)
+      activeresource (= 3.2.6)
+      activesupport (= 3.2.6)
       bundler (~> 1.0)
-      railties (= 3.2.0)
-    railties (3.2.0)
-      actionpack (= 3.2.0)
-      activesupport (= 3.2.0)
+      railties (= 3.2.6)
+    railties (3.2.6)
+      actionpack (= 3.2.6)
+      activesupport (= 3.2.6)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
     redis (2.2.2)
-    redis-namespace (1.0.3)
-      redis (< 3.0.0)
-    resque (1.19.0)
-      multi_json (~> 1.0)
-      redis-namespace (~> 1.0.2)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-    resque-loner (1.2.0)
-      resque (~> 1.0)
-    shoulda (2.11.3)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.1.2)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+    sprockets (2.1.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.5)
-    thor (0.14.6)
+    sqlite3 (1.3.6)
+    thor (0.15.4)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
+    tzinfo (0.3.33)
     yard (0.6.8)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler
   miniskirt
   minitest
-  rails (>= 3.1.0)
-  redis (>= 2.2.0)
-  resque (~> 1.19.0)
-  resque-loner (~> 1.2.0)
+  recommendable!
   shoulda
   sqlite3
   yard (~> 0.6.0)

data/README.markdown

@@ -4,8 +4,11 @@ Recommendable is an engine for Rails 3 applications to quickly add the ability f
 
 Requirements
 ------------
-* Ruby 1.9.2 (1.9.x if using from git. May run on 1.8.7, I don't know)
-* Rails 3.x
+* Ruby 1.9.x
+* Rails 3.x or 4.x
+* Sidekiq or Resque (or DelayedJob)
+
+Bundling one of the queueing systems above is highly recommended to avoid having to manually refresh users' recommendations. If running on Rails 4, the built-in queueing system is supported. If you bundle [Sidekiq][sidekiq], [Resque][resque], or [DelayedJob][delayed_job], Recommendable will use your bundled queueing system instead. If bundling Resque, you should also include ['resque-loner'][resque-loner] in your Gemfile to ensure your users only get queued once (Sidekiq does this by default, and there is no current way to avoid duplicate jobs in DelayedJob).
 
 Installation
 ------------
@@ -13,7 +16,7 @@ Installation
 Add the following to your Rails application's `Gemfile`:
 
 ``` ruby
-  gem "recommendable", :git => "git://github.com/davidcelis/recommendable"
+  gem 'recommendable'
 ```
 
 After bundling, run the installation generator:
@@ -22,15 +25,17 @@ After bundling, run the installation generator:
 $ rails g recommendable:install
 ```
 
-Double check `config/initializers/recommendable.rb` for options on configuring your Redis connection. After a user likes or dislikes something new, they are placed in a Resque queue to have their recommendation updated. Start up resque like so:
+Double check `config/initializers/recommendable.rb` for options on configuring your Redis connection. After a user likes or dislikes something new, they are placed in a queue to have their recommendations updated. If you're using the basic Rails 4.0 queue, you don't need to do anything explicit. If using Sidekiq, Resque, or DelayedJob, start your workers from the command line:
 
 ``` bash
+# sidekiq
+$ bundle exec sidekiq -q recommendable
+# resque
 $ QUEUE=recommendable rake environment resque:work
+# delayed_job
+$ rake jobs:work
 ```
 
-You can run this command multiple times if you wish to start more than one
-worker. For more options on this task, head over to [defunkt/resque][resque].
-
 Usage
 -----
 
@@ -53,28 +58,39 @@ Installing Redis
 
 Recommendable requires Redis to deliver recommendations. The collaborative filtering logic is based almost entirely on set math, and Redis is blazing fast for this. _NOTE: Your redis database MUST be persistent._
 
-### Homebrew
+### Mac OS X
 
-For Mac OS X users, homebrew is by far the easiest way to install Redis.
+For Mac OS X users, homebrew is by far the easiest way to install Redis. Make sure to read the caveats after installation!
 
 ``` bash
 $ brew install redis
 ```
 
-### Via Resque
+### Linux
 
-Resque (which is also a dependency of recommendable) includes Rake tasks that
-will install and run Redis for you:
+For Linux users, there is a package on apt-get.
 
 ``` bash
-$ git clone git://github.com/defunkt/resque.git
-$ cd resque
-$ rake redis:install dtach:install
-$ rake redis:start
+$ sudo apt-get install redis-server
+$ redis-server
 ```
 
 Redis will now be running on localhost:6379. After a second, you can hit `ctrl-\` to detach and keep Redis running in the background.
 
+### Redis problems?
+
+Oops, did you kill your Redis database? Not to worry. Likes, Dislikes, Ignores,
+and StashedItems are stored as models in your regular database. As long as these
+still exist, you can regenerate the similarity values and recommendations on the
+fly. But try not to have to do it!
+
+``` ruby
+Users.all.each do |user|
+  user.send :update_similarities
+  user.send :update_recommendations
+end
+```
+
 Contributing to recommendable
 -----------------------------
 
@@ -102,7 +118,10 @@ Copyright © 2012 David Celis. See LICENSE.txt for
 further details.
 
 [stars]: http://davidcelis.com/blog/2012/02/01/why-i-hate-five-star-ratings/
+[sidekiq]: https://github.com/mperham/sidekiq
+[delayed_job]: https://github.com/tobi/delayed_job
 [resque]: https://github.com/defunkt/resque
+[resque-loner]: https://github.com/jayniz/resque-loner
 [forking]: http://help.github.com/forking/
 [pull requests]: http://help.github.com/pull-requests/
 [collaborative filtering]: http://davidcelis.com/blog/2012/02/07/collaborative-filtering-with-likes-and-dislikes/

data/app/workers/recommendable/delayed_job_worker.rb

@@ -0,0 +1,17 @@
+module Recommendable
+  if defined?(Delayed::Job)
+    class DelayedJobWorker
+      attr_accessor :user_id
+  
+      def initialize(user_id)
+        @user_id = user_id
+      end
+      
+      def perform
+        user = Recommendable.user_class.find(self.user_id)
+        user.send :update_similarities
+        user.send :update_recommendations
+      end
+    end
+  end
+end

data/app/workers/recommendable/rails_worker.rb

@@ -0,0 +1,17 @@
+module Recommendable
+  if defined?(Rails::Queueing)
+    class RailsWorker
+      attr_accessor :user_id
+  
+      def initialize(user_id)
+        @user_id = user_id
+      end
+      
+      def run
+        user = Recommendable.user_class.find(self.user_id)
+        user.send :update_similarities
+        user.send :update_recommendations
+      end
+    end
+  end
+end

data/app/workers/recommendable/resque_worker.rb

@@ -0,0 +1,14 @@
+module Recommendable
+  if defined?(Resque)
+    class ResqueWorker
+      include Resque::Plugins::UniqueJob if defined?(Resque::Plugins::UniqueJob)
+      @queue = :recommendable
+      
+      def self.perform(user_id)
+        user = Recommendable.user_class.find(user_id)
+        user.send :update_similarities
+        user.send :update_recommendations
+      end
+    end
+  end
+end

data/app/workers/recommendable/sidekiq_worker.rb

@@ -0,0 +1,14 @@
+module Recommendable
+  if defined?(Sidekiq)
+    class SidekiqWorker
+      include ::Sidekiq::Worker
+      sidekiq_options :queue => :recommendable
+      
+      def perform(user_id)
+        user = Recommendable.user_class.find(user_id)
+        user.send :update_similarities
+        user.send :update_recommendations
+      end
+    end
+  end
+end

data/lib/generators/recommendable/templates/initializer.rb

@@ -1,6 +1,4 @@
 require "redis"
-require "resque"
-require "resque-loner"
 
 # Recommendable requires a connection to a running redis-server. Either create
 # a new instance based on a host/port or UNIX socket, or pass in an existing
@@ -10,12 +8,6 @@ require "resque-loner"
 # Connect to Redis via a UNIX socket instead
 <% unless options.redis_socket %># <% end %>Recommendable.redis = Redis.new(:sock => "<%= options.redis_socket %>")
 
-# Resque also needs a connection to Redis. If you are currently initializing
-# Resque somewhere else, leave this commented out. Otherwise, let it use the
-# same Redis connection as Recommendable. If redis is running on localhost:6379,
-# you can leave this commented out.
-# Resque.redis = Recommendable.redis
-
 # Tell Redis which database to use (usually between 0 and 15). The default of 0
 # is most likely okay unless you have another application using that database.
 # Recommendable.redis.select "0"

data/lib/recommendable/acts_as_recommended_to.rb

@@ -25,9 +25,38 @@ module Recommendable
           include StashMethods
           include IgnoreMethods
           include RecommendationMethods
+          include Hooks
 
           before_destroy :remove_from_similarities, :remove_recommendations
 
+          # This is just until apotonick merges my change into his published gem. I promise.
+          define_hook :before_like
+          define_hook :after_like
+          define_hook :before_unlike
+          define_hook :after_unlike
+          define_hook :before_dislike
+          define_hook :after_dislike
+          define_hook :before_undislike
+          define_hook :after_undislike
+          define_hook :before_stash
+          define_hook :after_stash
+          define_hook :before_unstash
+          define_hook :after_unstash
+          define_hook :before_ignore
+          define_hook :after_ignore
+          define_hook :before_unignore
+          define_hook :after_unignore
+
+          %w(like dislike ignore).each do |action|
+            send "before_#{action}", lambda { |obj| completely_unrecommend obj }
+          end
+
+          %w(like unlike dislike undislike).each do |action|
+            send "after_#{action}", lambda { |obj| obj.send(:update_score) and Recommendable.enqueue(self.id) }
+          end
+          
+          before_stash { |obj| unignore(obj) and unpredict(obj) }
+
           def method_missing method, *args, &block
             if method.to_s =~ /^(liked|disliked)_(.+)_in_common_with$/
               begin
@@ -75,14 +104,15 @@ module Recommendable
       #
       # @param [Object] object the object you want self to like.
       # @return true if object has been liked
-      # @raise [RecordNotRecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
+      # @raise [UnrecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
       def like object
-        raise RecordNotRecommendableError unless object.recommendable?
+        raise UnrecommendableError unless object.recommendable?
         return if likes? object
-        completely_unrecommend object
+
+        run_hook :before_like, object
         likes.create! :likeable_id => object.id, :likeable_type => object.class
-        object.send :update_score
-        Recommendable.enqueue self.id
+        run_hook :after_like, object
+
         true
       end
       
@@ -99,9 +129,11 @@ module Recommendable
       # @param [Object] object the object you want to remove from self's likes
       # @return true if object is unliked, nil if nothing happened
       def unlike object
-        if likes.where(:likeable_id => object.id, :likeable_type => object.class.base_class.to_s).first.try(:destroy)
-          object.send :update_score
-          Recommendable.enqueue self.id
+        like = likes.where(:likeable_id => object.id, :likeable_type => object.class.base_class.to_s)
+        if like.exists?
+          run_hook :before_unlike, object
+          like.first.destroy
+          run_hook :after_unlike, object
           true
         end
       end
@@ -153,14 +185,15 @@ module Recommendable
       #
       # @param [Object] object the object you want self to dislike.
       # @return true if object has been disliked
-      # @raise [RecordNotRecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
+      # @raise [UnrecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
       def dislike object
-        raise RecordNotRecommendableError unless object.recommendable?
+        raise UnrecommendableError unless object.recommendable?
         return if dislikes? object
-        completely_unrecommend object
+        
+        run_hook :before_dislike, object
         dislikes.create! :dislikeable_id => object.id, :dislikeable_type => object.class
-        object.send :update_score
-        Recommendable.enqueue self.id
+        run_hook :after_dislike, object
+
         true
       end
       
@@ -177,9 +210,11 @@ module Recommendable
       # @param [Object] object the object you want to remove from self's dislikes
       # @return true if object is removed from self's dislikes, nil if nothing happened
       def undislike object
-        if dislikes.where(:dislikeable_id => object.id, :dislikeable_type => object.class.base_class.to_s).first.try(:destroy)
-          object.send :update_score
-          Recommendable.enqueue self.id
+        dislike = dislikes.where(:dislikeable_id => object.id, :dislikeable_type => object.class.base_class.to_s)
+        if dislike.exists?
+          run_hook :before_undislike, object
+          dislike.first.destroy
+          run_hook :after_undislike, object
           true
         end
       end
@@ -231,13 +266,15 @@ module Recommendable
       #
       # @param [Object] object the object you want self to stash.
       # @return true if object has been stashed
-      # @raise [RecordNotRecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
+      # @raise [UnrecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
       def stash object
-        raise RecordNotRecommendableError unless object.recommendable?
+        raise UnrecommendableError unless object.recommendable?
         return if rated?(object) || stashed?(object)
-        unignore object
-        unpredict object
+
+        run_hook :before_stash, object
         stashed_items.create! :stashable_id => object.id, :stashable_type => object.class
+        run_hook :after_stash, object
+
         true
       end
       
@@ -254,7 +291,13 @@ module Recommendable
       # @param [Object] object the object you want to remove from self's stash
       # @return true if object is stashed, nil if nothing happened
       def unstash object
-        true if stashed_items.where(:stashable_id => object.id, :stashable_type => object.class.base_class.to_s).first.try(:destroy)
+        stash = stashed_items.where(:stashable_id => object.id, :stashable_type => object.class.base_class.to_s)
+        if stash.exists?
+          run_hook :before_unstash, object
+          stash.first.destroy
+          run_hook :after_unstash, object
+          true
+        end
       end
       
       # Get a list of records that self has currently stashed for later
@@ -290,12 +333,15 @@ module Recommendable
       #
       # @param [Object] object the object you want self to ignore.
       # @return true if object has been ignored
-      # @raise [RecordNotRecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
+      # @raise [UnrecommendableError] if you have not declared the passed object's model to `act_as_recommendable`
       def ignore object
-        raise RecordNotRecommendableError unless object.recommendable?
+        raise UnrecommendableError unless object.recommendable?
         return if ignored? object
-        completely_unrecommend object
+        
+        run_hook :before_ignore, object
         ignores.create! :ignorable_id => object.id, :ignorable_type => object.class
+        run_hook :after_ignore, object
+
         true
       end
       
@@ -312,7 +358,13 @@ module Recommendable
       # @param [Object] object the object you want to remove from self's ignores
       # @return true if object is removed from self's ignores, nil if nothing happened
       def unignore object
-        true if ignores.where(:ignorable_id => object.id, :ignorable_type => object.class.base_class.to_s).first.try(:destroy)
+        ignore = ignores.where(:ignorable_id => object.id, :ignorable_type => object.class.base_class.to_s)
+        if ignore.exists?
+          run_hook :before_unignore, object
+          ignore.first.destroy
+          run_hook :after_unignore, object
+          true
+        end
       end
       
       # Get a list of records that self is currently ignoring
@@ -694,6 +746,7 @@ module Recommendable
         destroy_recommended_to_sets
       end
 
+      # @private
       def remove_from_similarities
         Recommendable.redis.del similarity_set
 
@@ -704,6 +757,7 @@ module Recommendable
         true
       end
 
+      # @private
       def remove_recommendations
         Recommendable.recommendable_classes.each do |klass|
           Recommendable.redis.del predictions_set_for(klass)

data/lib/recommendable/exceptions.rb

@@ -1,4 +1,4 @@
 module Recommendable
-  class RecordNotRecommendableError < StandardError
+  class UnrecommendableError < StandardError
   end
 end

data/lib/recommendable/version.rb

@@ -1,3 +1,3 @@
 module Recommendable
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 end

data/lib/recommendable.rb

@@ -5,6 +5,7 @@ require 'recommendable/acts_as_recommendable'
 require 'recommendable/exceptions'
 require 'recommendable/railtie' if defined?(Rails)
 require 'recommendable/version'
+require 'hooks'
 
 module Recommendable
   mattr_accessor :redis, :user_class
@@ -15,6 +16,17 @@ module Recommendable
   end
 
   def self.enqueue(user_id)
-    Resque.enqueue RecommendationRefresher, user_id
+    if defined? Sidekiq
+      SidekiqWorker.perform_async user_id
+    elsif defined? Resque
+      Resque.enqueue ResqueWorker, user_id
+    elsif defined? Delayed::Job
+      Delayed::Job.enqueue DelayedJobWorker.new(user_id)
+    elsif defined? Rails::Queueing
+      unless Rails.queue.any? { |w| w.user_id == user_id }
+        Rails.queue.push RailsWorker.new(user_id)
+        Rails.application.queue_consumer.start
+      end
+    end
   end
 end

data/recommendable.gemspec

@@ -2,31 +2,29 @@
 require File.expand_path('lib/recommendable/version')
 
 Gem::Specification.new do |s|
-  s.name = "recommendable"
+  s.name = 'recommendable'
   s.version = Recommendable::VERSION
   s.date = Time.now.strftime('%Y-%m-%d')
   
-  s.authors = ["David Celis"]
-  s.email = "david@davidcelis.com"
-  s.homepage = "http://github.com/davidcelis/recommendable"
+  s.authors = ['David Celis']
+  s.email = 'david@davidcelis.com'
+  s.homepage = 'http://github.com/davidcelis/recommendable'
   
-  s.summary = "Add like-based and/or dislike-based recommendations to your app."
-  s.description = "Allow a model (typically User) to Like and/or Dislike models in your app. Generate recommendations quickly using redis."
+  s.summary = 'Add like-based and/or dislike-based recommendations to your app.'
+  s.description = 'Allow a model (typically User) to Like and/or Dislike models in your app. Generate recommendations quickly using redis.'
   
   s.files = `git ls-files`.split("\n")
   s.has_rdoc = 'yard'
   
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency "minitest"
-  s.add_development_dependency "shoulda"
-  s.add_development_dependency "yard", "~> 0.6.0"
-  s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "jeweler", "~> 1.6.4"
-  s.add_development_dependency "rcov"
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'minitest'
+  s.add_development_dependency 'miniskirt'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'yard', '~> 0.6.0'
+  s.add_development_dependency 'bundler'
   
-  s.add_dependency "rails", ">= 3.0.0"
-  s.add_dependency "redis", "~> 2.2.0"
-  s.add_dependency "resque", ">= 1.19.0"
-  s.add_dependency "resque-loner", "~> 1.2.0"
+  s.add_dependency 'rails', '>= 3.0.0'
+  s.add_dependency 'redis', '~> 2.2.0'
+  s.add_dependency 'hooks'
 end
 

data/spec/dummy/config/initializers/recommendable.rb

@@ -1,6 +1,4 @@
 require "redis"
-require "resque"
-require "resque-loner"
 
 # What class will be liking/disliking objects and receiving recommendations?
 Recommendable.user_class = "User"

data/spec/models/dislike_spec.rb

@@ -8,7 +8,7 @@ class DislikeSpec < MiniTest::Spec
     
     it "should not be created for an object that does not act_as_recommendedable" do
       django = PhpFramework.create(:name => "django")
-      proc { @user.dislike(django) }.must_raise Recommendable::RecordNotRecommendableError
+      proc { @user.dislike(django) }.must_raise Recommendable::UnrecommendableError
     end
     
     it "should be created for an object that does act_as_recommendable" do
@@ -24,4 +24,4 @@ class DislikeSpec < MiniTest::Spec
       Recommendable::Dislike.count.must_equal 1
     end
   end
-end
+end

data/spec/models/ignore_spec.rb

@@ -8,7 +8,7 @@ class IgnoreSpec < MiniTest::Spec
     
     it "should not be created for an object that does not act_as_recommendedable" do
       web2py = PhpFramework.create(:name => "web2py")
-      proc { @user.ignore(web2py) }.must_raise Recommendable::RecordNotRecommendableError
+      proc { @user.ignore(web2py) }.must_raise Recommendable::UnrecommendableError
     end
     
     it "should be created for an object that does act_as_recommendable" do
@@ -24,4 +24,4 @@ class IgnoreSpec < MiniTest::Spec
       Recommendable::Ignore.count.must_equal 1
     end
   end
-end
+end

data/spec/models/like_spec.rb

@@ -8,7 +8,7 @@ class LikeSpec < MiniTest::Spec
     
     it "should not be created for an object that does not act_as_recommendedable" do
       cake = PhpFramework.create(:name => "CakePHP")
-      proc { @user.like(cake) }.must_raise Recommendable::RecordNotRecommendableError
+      proc { @user.like(cake) }.must_raise Recommendable::UnrecommendableError
     end
     
     it "should be created for an object that does act_as_recommendable" do
@@ -25,4 +25,4 @@ class LikeSpec < MiniTest::Spec
       Recommendable::Like.count.must_equal 1
     end
   end
-end
+end

data/spec/models/stash_spec.rb

@@ -8,7 +8,7 @@ class StashSpec < MiniTest::Spec
     
     it "should not be created for an object that does not act_as_recommendedable" do
       web2py = PhpFramework.create(:name => "web2py")
-      proc { @user.stash(web2py) }.must_raise Recommendable::RecordNotRecommendableError
+      proc { @user.stash(web2py) }.must_raise Recommendable::UnrecommendableError
     end
     
     it "should be created for an object that does act_as_recommendable" do

data/spec/models/user_spec.rb

@@ -189,10 +189,10 @@ class UserSpec < MiniTest::Spec
       it "should not be able to rate or ignore an item that is not recommendable." do
         @cakephp = Factory(:php_framework)
         
-        proc { @user.like(@cakephp) }.must_raise    Recommendable::RecordNotRecommendableError
-        proc { @user.dislike(@cakephp) }.must_raise Recommendable::RecordNotRecommendableError
-        proc { @user.ignore(@cakephp) }.must_raise  Recommendable::RecordNotRecommendableError
-        proc { @user.stash(@cakephp) }.must_raise  Recommendable::RecordNotRecommendableError
+        proc { @user.like(@cakephp) }.must_raise    Recommendable::UnrecommendableError
+        proc { @user.dislike(@cakephp) }.must_raise Recommendable::UnrecommendableError
+        proc { @user.ignore(@cakephp) }.must_raise  Recommendable::UnrecommendableError
+        proc { @user.stash(@cakephp) }.must_raise  Recommendable::UnrecommendableError
         
         proc { @cakephp.liked_by }.must_raise    NoMethodError
         proc { @cakephp.disliked_by }.must_raise NoMethodError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-27 00:00:00.000000000 Z
+date: 2012-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -44,7 +44,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: shoulda
+  name: miniskirt
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,45 +60,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: bundler
+  name: shoulda
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,9 +90,9 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rcov
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -156,13 +140,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: resque
+  name: hooks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,23 +154,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.19.0
-- !ruby/object:Gem::Dependency
-  name: resque-loner
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '0'
 description: Allow a model (typically User) to Like and/or Dislike models in your
   app. Generate recommendations quickly using redis.
 email: david@davidcelis.com
@@ -207,7 +175,10 @@ files:
 - app/models/recommendable/ignore.rb
 - app/models/recommendable/like.rb
 - app/models/recommendable/stash.rb
-- app/workers/recommendable/recommendation_refresher.rb
+- app/workers/recommendable/delayed_job_worker.rb
+- app/workers/recommendable/rails_worker.rb
+- app/workers/recommendable/resque_worker.rb
+- app/workers/recommendable/sidekiq_worker.rb
 - config/routes.rb
 - db/migrate/20120124193723_create_likes.rb
 - db/migrate/20120124193728_create_dislikes.rb

data/app/workers/recommendable/recommendation_refresher.rb

@@ -1,12 +0,0 @@
-module Recommendable
-  class RecommendationRefresher
-    include Resque::Plugins::UniqueJob
-    @queue = :recommendable
-    
-    def self.perform(user_id)
-      user = Recommendable.user_class.find(user_id)
-      user.send :update_similarities
-      user.send :update_recommendations
-    end
-  end
-end