recommendable 1.1.3 → 1.1.4

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    recommendable (1.1.1)
+    recommendable (1.1.3)
       hooks
       rails (>= 3.0.0)
-      redis (~> 2.2.0)
+      redis (>= 2.2.0)
 
 GEM
   remote: http://rubygems.org/
@@ -79,7 +79,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    redis (2.2.2)
+    redis (3.0.1)
     shoulda (3.0.1)
       shoulda-context (~> 1.0.0)
       shoulda-matchers (~> 1.0.0)

data/app/workers/recommendable/sidekiq_worker.rb

@@ -2,7 +2,7 @@ module Recommendable
   if defined?(Sidekiq)
     class SidekiqWorker
       include ::Sidekiq::Worker
-      sidekiq_options :queue => :recommendable
+      sidekiq_options :queue => :recommendable, :unique => true
       
       def perform(user_id)
         user = Recommendable.user_class.find(user_id)

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

@@ -11,3 +11,18 @@ require "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"
+
+# If using Sidekiq, uncomment the following or place it in config/initializers/sidekiq.rb:
+# Sidekiq.configure_server do |config| 	
+#   require 'sidekiq/middleware/server/unique_jobs'
+#   config.server_middleware do |chain|
+#     chain.add Sidekiq::Middleware::Server::UniqueJobs
+#   end	 	
+# end
+# 
+# Sidekiq.configure_client do |config|	 	
+#   require 'sidekiq/middleware/client/unique_jobs'
+#   config.client_middleware do |chain|
+#     chain.add Sidekiq::Middleware::Client::UniqueJobs
+#   end
+# end

data/lib/recommendable.rb

@@ -6,6 +6,8 @@ require 'recommendable/exceptions'
 require 'recommendable/railtie' if defined?(Rails)
 require 'recommendable/version'
 require 'hooks'
+require 'sidekiq/middleware/client/unique_jobs' if defined?(Sidekiq)
+require 'sidekiq/middleware/server/unique_jobs' if defined?(Sidekiq)
 
 module Recommendable
   mattr_accessor :redis, :user_class

data/lib/recommendable/acts_as_recommendable.rb

@@ -121,8 +121,20 @@ module Recommendable
     protected :redis_key
     
     module LikeableMethods
+      # Retrieve the number of likes this object has received. Cached in Redis.
+      # @return [Fixnum] the number of times this object has been liked
+      def like_count
+        Recommendable.redis.get("#{redis_key}:like_count").to_i
+      end
+
       private
 
+      # Updates the cache for how many times this object has been liked.
+      # @private
+      def update_like_count
+        Recommendable.redis.set "#{redis_key}:like_count", liked_by.count
+      end
+
       # Used for setup purposes. Creates a set in redis containing users that
       # have liked this object.
       # @private
@@ -135,8 +147,20 @@ module Recommendable
     end
     
     module DislikeableMethods
+      # Retrieve the number of dislikes this object has received. Cached in Redis.
+      # @return [Fixnum] the number of times this object has been disliked
+      def dislike_count
+        Recommendable.redis.get("#{redis_key}:dislike_count").to_i
+      end
+
       private
 
+      # Updates the cache for how many times this object has been disliked.
+      # @private
+      def update_dislike_count
+        Recommendable.redis.set "#{redis_key}:dislike_count", disliked_by.count
+      end
+
       # Used for setup purposes. Creates a set in redis containing users that
       # have disliked this object.
       # @private

data/lib/recommendable/acts_as_recommended_to.rb

@@ -52,7 +52,11 @@ module Recommendable
           end
 
           %w(like unlike dislike undislike).each do |action|
-            send "after_#{action}", lambda { |obj| obj.send(:update_score) and Recommendable.enqueue(self.id) }
+            send "after_#{action}", lambda { |obj|
+              obj.send(:update_score)
+              obj.send "update_#{action.gsub('un', '')}_count"
+              Recommendable.enqueue(self.id)
+            }
           end
           
           before_stash { |obj| unignore(obj) and unpredict(obj) }

data/lib/recommendable/version.rb

@@ -1,7 +1,7 @@
 module Recommendable
   MAJOR = 1
   MINOR = 1
-  PATCH = 3
+  PATCH = 4
 
   VERSION = [MAJOR, MINOR, PATCH].join '.'
 end

data/lib/sidekiq/middleware/client/unique_jobs.rb

@@ -0,0 +1,37 @@
+require 'digest'
+
+if defined?(Sidekiq)
+  module Sidekiq
+    module Middleware
+      module Client
+        class UniqueJobs
+          HASH_KEY_EXPIRATION = 30 * 60
+  
+          def call(worker_class, item, queue)
+            enabled = worker_class.get_sidekiq_options['unique']
+            if enabled
+              payload_hash = Digest::MD5.hexdigest(Sidekiq.dump_json(item))
+              unique = false
+  
+              Sidekiq.redis do |conn|
+                conn.watch(payload_hash)
+  
+                if conn.get(payload_hash)
+                  conn.unwatch
+                else
+                  unique = conn.multi do
+                    conn.setex(payload_hash, HASH_KEY_EXPIRATION, 1)
+                  end
+                end
+              end
+              yield if unique
+            else
+              yield
+            end
+          end
+  
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/middleware/server/unique_jobs.rb

@@ -0,0 +1,17 @@
+if defined?(Sidekiq)
+  module Sidekiq
+    module Middleware
+      module Server
+        class UniqueJobs
+          def call(*args)
+            yield
+          ensure
+            json = Sidekiq.dump_json(args[1])
+            hash = Digest::MD5.hexdigest(json)
+            Sidekiq.redis {|conn| conn.del(hash) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/recommendable_tasks.rake

@@ -1 +1 @@
-require 'resque/tasks'
+require 'resque/tasks' if defined?(Resque)

data/spec/models/dislike_spec.rb

@@ -23,5 +23,19 @@ class DislikeSpec < MiniTest::Spec
       @user.dislike(movie).must_be_nil
       Recommendable::Dislike.count.must_equal 1
     end
+
+    it "should cache the number of dislikes" do
+      movie = Movie.create(:title => "Star Wars: Episode I - The Phantom Menace", :year => 1999)
+      @user2 = User.create(:username => "frank")
+
+      @user.dislike(movie)
+      movie.dislike_count.must_equal 1
+
+      @user2.dislike(movie)
+      movie.dislike_count.must_equal 2
+
+      @user.undislike(movie)
+      movie.dislike_count.must_equal 1
+    end
   end
 end

data/spec/models/like_spec.rb

@@ -24,5 +24,19 @@ class LikeSpec < MiniTest::Spec
       @user.like(movie).must_be_nil
       Recommendable::Like.count.must_equal 1
     end
+
+    it "should cache the number of likes" do
+      movie = Movie.create(:title => "2001: A Space Odyssey", :year => 1968)
+      @user2 = User.create(:username => "frank")
+
+      @user.like(movie)
+      movie.like_count.must_equal 1
+
+      @user2.like(movie)
+      movie.like_count.must_equal 2
+
+      @user.unlike(movie)
+      movie.like_count.must_equal 1
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -195,6 +195,8 @@ files:
 - lib/recommendable/helpers.rb
 - lib/recommendable/railtie.rb
 - lib/recommendable/version.rb
+- lib/sidekiq/middleware/client/unique_jobs.rb
+- lib/sidekiq/middleware/server/unique_jobs.rb
 - lib/tasks/recommendable_tasks.rake
 - recommendable.gemspec
 - script/rails
@@ -276,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Add like-based and/or dislike-based recommendations to your app.