recommendable 2.0.0 → 2.0.0.20121011

data/lib/recommendable/helpers/calculations.rb

@@ -45,6 +45,7 @@ module Recommendable
           relevant_user_ids = Recommendable.config.ratable_classes.inject([]) do |memo, klass|
             liked_set = Recommendable::Helpers::RedisKeyMapper.liked_set_for(klass, user_id)
             disliked_set = Recommendable::Helpers::RedisKeyMapper.disliked_set_for(klass, user_id)
+
             item_ids = Recommendable.redis.sunion(liked_set, disliked_set)
 
             unless item_ids.empty?
@@ -76,18 +77,37 @@ module Recommendable
         def update_recommendations_for(user_id)
           nearest_neighbors = Recommendable.config.nearest_neighbors || Recommendable.config.user_class.count
           Recommendable.config.ratable_classes.each do |klass|
-            similarity_set = Recommendable::Helpers::RedisKeyMapper.similarity_set_for(user_id)
+            rated_sets = [
+              Recommendable::Helpers::RedisKeyMapper.liked_set_for(klass, user_id),
+              Recommendable::Helpers::RedisKeyMapper.disliked_set_for(klass, user_id),
+              Recommendable::Helpers::RedisKeyMapper.hidden_set_for(klass, user_id),
+              Recommendable::Helpers::RedisKeyMapper.bookmarked_set_for(klass, user_id)
+            ]
+            temp_set = Recommendable::Helpers::RedisKeyMapper.temp_set_for(Recommendable.config.user_class, user_id)
+            similarity_set  = Recommendable::Helpers::RedisKeyMapper.similarity_set_for(user_id)
             recommended_set = Recommendable::Helpers::RedisKeyMapper.recommended_set_for(klass, user_id)
-            similar_user_ids = Recommendable.redis.zrevrange(similarity_set, 0, nearest_neighbors - 1)
+            most_similar_user_ids = Recommendable.redis.zrevrange(similarity_set, 0, nearest_neighbors - 1)
+            least_similar_user_ids = Recommendable.redis.zrange(similarity_set, 0, nearest_neighbors - 1)
 
-            sets_to_union = similar_user_ids.inject([]) do |sets, id|
+            # Get likes from the most similar users
+            sets_to_union = most_similar_user_ids.inject([]) do |sets, id|
               sets << Recommendable::Helpers::RedisKeyMapper.liked_set_for(klass, id)
             end
 
-            next if sets_to_union.empty?
-            scores = Recommendable.redis.sunion(sets_to_union).map { |id| [predict_for(user_id, klass, id), id] }
-            next if scores.empty?
-            Recommendable.redis.zadd(recommended_set, scores)
+            # Get dislikes from the least similar users
+            least_similar_user_ids.inject(sets_to_union) do |sets, id|
+              sets << Recommendable::Helpers::RedisKeyMapper.disliked_set_for(klass, id)
+            end
+
+            return if sets_to_union.empty?
+
+            # SDIFF rated items so they aren't recommended
+            Recommendable.redis.sunionstore(temp_set, sets_to_union)
+            item_ids = Recommendable.redis.sdiff(temp_set, rated_sets)
+            scores = item_ids.map { |id| [predict_for(user_id, klass, id), id] }
+            scores.each do |s|
+              Recommendable.redis.zadd(recommended_set, s[0], s[1])
+            end
           end
 
           true

data/lib/recommendable/helpers/redis_key_mapper.rb

@@ -13,16 +13,20 @@ module Recommendable
         end
 
         def liked_by_set_for(klass, id)
-          [Recommendable.config.redis_namespace, klass.to_s.tableize, id, "liked_by"].compact.join(':')
+          [Recommendable.config.redis_namespace, klass.to_s.tableize, id, 'liked_by'].compact.join(':')
         end
 
         def disliked_by_set_for(klass, id)
-          [Recommendable.config.redis_namespace, klass.to_s.tableize, id, "disliked_by"].compact.join(':')
+          [Recommendable.config.redis_namespace, klass.to_s.tableize, id, 'disliked_by'].compact.join(':')
         end
 
         def score_set_for(klass)
           [Recommendable.config.redis_namespace, klass.to_s.tableize, 'scores'].join(':')
         end
+
+        def temp_set_for(klass, id)
+          [Recommendable.config.redis_namespace, klass.to_s.tableize, id, 'temp'].compact.join(':')
+        end
       end
     end
   end

data/lib/recommendable/version.rb

@@ -2,7 +2,7 @@ module Recommendable
   MAJOR = 2
   MINOR = 0
   PATCH = 0
-  PRE   = nil
+  PRE   = 20121011
 
   VERSION = [MAJOR, MINOR, PATCH, PRE].compact.join '.'
 end

data/lib/recommendable/workers/sidekiq.rb

@@ -1,8 +1,10 @@
 module Recommendable
   module Workers
     class Sidekiq
-      include ::Sidekiq::Worker
-      sidekiq_options :unique => true, :queue => :recommendable
+      if defined?(::Sidekiq)
+        include ::Sidekiq::Worker
+        sidekiq_options :unique => true, :queue => :recommendable
+      end
 
       def perform(user_id)
         Recommendable::Helpers::Calculations.update_similarities_for(user_id)

data/lib/recommendable.rb

@@ -7,6 +7,11 @@ require 'recommendable/helpers'
 require 'recommendable/rater'
 require 'recommendable/ratable'
 
+require 'recommendable/workers/sidekiq'
+require 'recommendable/workers/resque'
+require 'recommendable/workers/delayed_job'
+require 'recommendable/workers/rails'
+
 module Recommendable
   class << self
     def redis() config.redis end
@@ -21,18 +26,14 @@ module Recommendable
       user_id = user_id.id if user_id.is_a?(Recommendable.config.user_class)
 
       if defined?(::Sidekiq)
-        require 'recommendable/workers/sidekiq'
         Recommendable::Workers::Sidekiq.perform_async(user_id)
       elsif defined?(::Resque)
-        require 'recommendable/workers/resque'
         Resque.enqueue(Recommendable::Workers::Resque, user_id)
       elsif defined?(::Delayed::Job)
-        require 'recommendable/workers/delayed_job'
         Delayed::Job.enqueue(Recommendable::Workers::DelayedJob.new(user_id))
       elsif defined?(::Rails::Queueing)
-        require 'recommendable/workers/rails'
         unless Rails.queue.any? { |w| w.user_id == user_id }
-          Rails.queue.push(Recommendable::Workers::Rails.new(user_idid))
+          Rails.queue.push(Recommendable::Workers::Rails.new(user_id))
           Rails.application.queue_consumer.start
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.0.20121011
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2012-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -213,4 +213,3 @@ signing_key:
 specification_version: 3
 summary: A Like/Dislike recommendation engine for Ruby apps using Redis
 test_files: []
-has_rdoc: yard