recommendable 0.1.6 → 0.1.8

data/Gemfile.lock

@@ -30,6 +30,8 @@ GEM
       multi_json (~> 1.0)
     arel (3.0.0)
     builder (3.0.0)
+    celluloid (0.10.0)
+    connection_pool (0.9.1)
     erubis (2.7.0)
     hike (1.2.1)
     i18n (0.6.0)
@@ -48,8 +50,6 @@ GEM
     rack (1.4.0)
     rack-cache (1.1)
       rack (>= 0.4)
-    rack-protection (1.2.0)
-      rack
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
@@ -73,20 +73,15 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redis (2.2.2)
-    redis-namespace (1.0.3)
+    redis-namespace (1.1.0)
       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)
+    sidekiq (1.0.0)
+      celluloid (~> 0.10.0)
+      connection_pool (~> 0.9.0)
+      multi_json
+      redis
+      redis-namespace
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -98,8 +93,6 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
     yard (0.6.8)
 
 PLATFORMS
@@ -111,8 +104,7 @@ DEPENDENCIES
   minitest
   rails (>= 3.1.0)
   redis (~> 2.2.0)
-  resque (~> 1.19.0)
-  resque-loner (~> 1.2.0)
   shoulda
+  sidekiq
   sqlite3
   yard (~> 0.6.0)

data/README.markdown

@@ -72,8 +72,6 @@ Redis will now be running on localhost:6379. After a second, you can hit `ctrl-\
 
 Contributing to recommendable
 -----------------------------
- 
-Read the [Contributing][contributing] wiki page first. 
 
 Once you've made your great commits:
 
@@ -100,7 +98,6 @@ further details.
 
 [stars]: http://davidcelis.com/blog/2012/02/01/why-i-hate-five-star-ratings/
 [resque]: https://github.com/defunkt/resque
-[contributing]: http://wiki.github.com/defunkt/resque/contributing
 [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/lib/generators/recommendable/templates/initializer.rb

@@ -13,7 +13,7 @@ require "resque-loner"
 # 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.
+# 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

data/lib/recommendable/acts_as_recommendable.rb

@@ -11,8 +11,8 @@ module Recommendable
           has_many :dislikes, :as => :dislikeable, :dependent => :destroy, :class_name => "Recommendable::Dislike"
           has_many :ignores, :as => :ignoreable, :dependent => :destroy, :class_name => "Recommendable::Ignore"
           has_many :stashes, :as => :stashable, :dependent => :destroy, :class_name => "Recommendable::StashedItem"
-          has_many :liked_by, :through => :likes, :source => :user, :foreign_key => :user_id
-          has_many :disliked_by, :through => :dislikes, :source => :user, :foreign_key => :user_id
+          has_many :liked_by, :through => :likes, :source => :user, :foreign_key => :user_id, :class_name => Recommendable.user_class.to_s
+          has_many :disliked_by, :through => :dislikes, :source => :user, :foreign_key => :user_id, :class_name => Recommendable.user_class.to_s
           
           include LikeableMethods
           include DislikeableMethods
@@ -31,10 +31,10 @@ module Recommendable
             liked_by + disliked_by
           end
 
-          def self.top(count=1)
+          def self.top count = 1
             ids = Recommendable.redis.zrevrange(self.score_set, 0, count - 1).map(&:to_i)
 
-            items = self.find(ids)
+            items = self.find ids
 
             return items.sort do |x, y|
               ids.index(x.id) <=> ids.index(y.id)
@@ -49,7 +49,7 @@ module Recommendable
             z = 1.96
             n = likes.count + dislikes.count
 
-            phat = 1.0 * likes.count / n.to_f
+            phat = likes.count / n.to_f
             score = (phat + z*z/(2*n) - z * Math.sqrt((phat*(1-phat)+z*z/(4*n))/n))/(1+z*z/n)
 
             Recommendable.redis.zadd self.class.score_set, score, self.id

data/lib/recommendable/acts_as_recommended_to.rb

@@ -5,7 +5,7 @@ module Recommendable
     extend ActiveSupport::Concern
     
     module ClassMethods
-      def recommends(*things)
+      def recommends *things
         acts_as_recommended_to
         things.each { |thing| thing.to_s.classify.constantize.acts_as_recommendable }
       end
@@ -28,8 +28,16 @@ module Recommendable
           before_destroy :remove_from_similarities
           before_destroy :remove_recommendations
 
-          def method_missing(method, *args, &block)
-            if method.to_s =~ /(liked|disliked|ignored|stashed|recommended)_(.+)/
+          def method_missing method, *args, &block
+            if method.to_s =~ /^(liked|disliked)_(.+)_in_common_with$/
+              begin
+                super unless $2.classify.constantize.acts_as_recommendable?
+                
+                self.send "#{$1}_in_common_with", *args, { :class => $2.classify.constantize }
+              rescue NameError
+                super
+              end
+            elsif method.to_s =~ /^(liked|disliked|ignored|stashed|recommended)_(.+)$/
               begin
                 super unless $2.classify.constantize.acts_as_recommendable?
 
@@ -42,8 +50,9 @@ module Recommendable
             end
           end
 
-          def respond_to?(method)
-            if method.to_s =~ /(liked|disliked|ignored|stashed|recommended)_(.+)/
+          def respond_to? method, include_private = false
+            if method.to_s =~ /^(liked|disliked|ignored|stashed|recommended)_(.+)$/ || \
+               method.to_s =~ /^common_(liked|disliked)_(.+)_with$/
               begin
                 $2.classify.constantize.acts_as_recommendable?
               rescue NameError
@@ -68,7 +77,7 @@ 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`
-      def like(object)
+      def like object
         raise RecordNotRecommendableError unless object.recommendable?
         return if likes? object
         completely_unrecommend object
@@ -82,7 +91,7 @@ module Recommendable
       # 
       # @param [Object] object the object you want to check
       # @return true if self likes object, false if not
-      def likes?(object)
+      def likes? object
         likes.exists? :likeable_id => object.id, :likeable_type => object.class.to_s
       end
       
@@ -90,7 +99,7 @@ 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)
+      def unlike object
         if likes.where(:likeable_id => object.id, :likeable_type => object.class.to_s).first.try(:destroy)
           object.send :update_score
           Resque.enqueue RecommendationRefresher, self.id
@@ -112,7 +121,7 @@ module Recommendable
       #
       # @param [Class, String, Symbol] klass the class of records. Can be the class constant, or a String/Symbol representation of the class name.
       # @return [Array] an array of ActiveRecord objects that self has liked belonging to klass
-      def liked_for(klass)
+      def liked_for klass
         likes.where(:likeable_type => klass).includes(:likeable).map(&:likeable)
       end
 
@@ -122,7 +131,7 @@ module Recommendable
       # @param [Class, String, Symbol] klass the class for which you would like to return self's likes. Can be the class constant, or a String/Symbol representation of the class name.
       # @note You should not need to use this method. (see {#liked_for})
       # @private
-      def likes_for(klass)
+      def likes_for klass
         likes.where :likeable_type => klass.to_s.classify
       end
     end
@@ -136,7 +145,7 @@ 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`
-      def dislike(object)
+      def dislike object
         raise RecordNotRecommendableError unless object.recommendable?
         return if dislikes? object
         completely_unrecommend object
@@ -150,15 +159,15 @@ module Recommendable
       # 
       # @param [Object] object the object you want to check
       # @return true if self dislikes object, false if not
-      def dislikes?(object)
-        dislikes.exists?(:dislikeable_id => object.id, :dislikeable_type => object.class.to_s)
+      def dislikes? object
+        dislikes.exists? :dislikeable_id => object.id, :dislikeable_type => object.class.to_s
       end
       
       # Destroys a Recommendable::Dislike currently associating self with object
       #
       # @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)
+      def undislike object
         if dislikes.where(:dislikeable_id => object.id, :dislikeable_type => object.class.to_s).first.try(:destroy)
           object.send :update_score
           Resque.enqueue RecommendationRefresher, self.id
@@ -170,7 +179,7 @@ module Recommendable
       
       # @return [Array] an array of ActiveRecord objects that self has disliked
       def disliked
-        Recommendable.recommendable_classes.flat_map { |klass| disliked_for(klass) }
+        Recommendable.recommendable_classes.flat_map { |klass| disliked_for klass }
       end
 
       private
@@ -180,7 +189,7 @@ module Recommendable
       #
       # @param [Class, String, Symbol] klass the class of records. Can be the class constant, or a String/Symbol representation of the class name.
       # @return [Array] an array of ActiveRecord objects that self has disliked belonging to klass
-      def disliked_for(klass)
+      def disliked_for klass
         dislikes.where(:dislikeable_type => klass).includes(:dislikeable).map(&:dislikeable)
       end
       
@@ -190,7 +199,7 @@ module Recommendable
       # @param [Class, String, Symbol] klass the class for which you would like to return self's dislikes. Can be the class constant, or a String/Symbol representation of the class name.
       # @note You should not need to use this method. (see {#disliked_for})
       # @private
-      def dislikes_for(klass)
+      def dislikes_for klass
         dislikes.where :dislikeable_type => klass.to_s.classify
       end
     end
@@ -204,7 +213,7 @@ 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`
-      def stash(object)
+      def stash object
         raise RecordNotRecommendableError unless object.recommendable?
         return if rated?(object) || stashed?(object)
         unignore object
@@ -217,7 +226,7 @@ module Recommendable
       # 
       # @param [Object] object the object you want to check
       # @return true if self has stashed object, false if not
-      def stashed?(object)
+      def stashed? object
         stashed_items.exists? :stashable_id => object.id, :stashable_type => object.class.to_s
       end
       
@@ -225,7 +234,7 @@ 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)
+      def unstash object
         true if stashed_items.where(:stashable_id => object.id, :stashable_type => object.class.to_s).first.try(:destroy)
       end
       
@@ -243,7 +252,7 @@ module Recommendable
       #
       # @param [Class, String, Symbol] klass the class of records. Can be the class constant, or a String/Symbol representation of the class name.
       # @return [Array] an array of ActiveRecord objects that self has stashed belonging to klass
-      def stashed_for(klass)
+      def stashed_for klass
         stashed_items.where(:stashable_type => klass).includes(:stashable).map(&:stashable)
       end
     end
@@ -257,7 +266,7 @@ 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`
-      def ignore(object)
+      def ignore object
         raise RecordNotRecommendableError unless object.recommendable?
         return if ignored? object
         completely_unrecommend object
@@ -269,7 +278,7 @@ module Recommendable
       # 
       # @param [Object] object the object you want to check
       # @return true if self has ignored object, false if not
-      def ignored?(object)
+      def ignored? object
         ignores.exists? :ignoreable_id => object.id, :ignoreable_type => object.class.to_s
       end
       
@@ -277,7 +286,7 @@ 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)
+      def unignore object
         true if ignores.where(:ignoreable_id => object.id, :ignoreable_type => object.class.to_s).first.try(:destroy)
       end
       
@@ -295,7 +304,7 @@ module Recommendable
       #
       # @param [Class, String, Symbol] klass the class of records. Can be the class constant, or a String/Symbol representation of the class name.
       # @return [Array] an array of ActiveRecord objects that self has ignored belonging to klass
-      def ignored_for(klass)
+      def ignored_for klass
         ignores.where(:ignoreable_type => klass).includes(:ignoreable).map(&:ignoreable)
       end
     end
@@ -305,7 +314,7 @@ module Recommendable
       # 
       # @param [Object] object the object you want to check
       # @return true if self has liked or disliked object, false if not
-      def rated?(object)
+      def rated? object
         likes?(object) || dislikes?(object)
       end
       
@@ -323,7 +332,7 @@ module Recommendable
       # @param [Hash] options the options for this query
       # @option options [Fixnum] :count (10) The number of raters to return
       # @return [Array] An array of instances of your user class
-      def similar_raters(options = {})
+      def similar_raters options = {}
         defaults = { :count => 10 }
         options = defaults.merge options
         
@@ -335,6 +344,30 @@ module Recommendable
           rater_ids.index(x.id) <=> rater_ids.index(y.id)
         end
       end
+
+      def liked_in_common_with rater, options = {}
+        options.merge!({ :return_records => true })
+        create_recommended_to_sets and rater.create_recommended_to_sets
+        liked = common_likes_with rater, options
+        destroy_recommended_to_sets and rater.destroy_recommended_to_sets
+        return liked
+      end
+
+      def disliked_in_common_with rater, options = {}
+        options.merge!({ :return_records => true })
+        create_recommended_to_sets and rater.create_recommended_to_sets
+        disliked = common_dislikes_with rater, options
+        destroy_recommended_to_sets and rater.destroy_recommended_to_sets
+        return disliked
+      end
+
+      def disagreed_on_with rater, options = {}
+        options.merge!({ :return_records => true })
+        create_recommended_to_sets and rater.create_recommended_to_sets
+        disagreements = disagreements_with rater, options
+        destroy_recommended_to_sets and rater.destroy_recommended_to_sets
+        return disagreements
+      end
       
       # Get a list of recommendations for self. The whole point of this gem!
       # Recommendations are returned in a descending order with the first index
@@ -343,11 +376,11 @@ module Recommendable
       # @param [Hash] options the options for returning this list
       # @option options [Fixnum] :count (10) the number of recommendations to get
       # @return [Array] an array of ActiveRecord objects that are recommendable
-      def recommendations(options = {})
+      def recommendations options = {}
         return [] if likes.count + dislikes.count == 0
 
         unioned_predictions = "#{self.class}:#{id}:predictions"
-        Recommendable.redis.zunionstore unioned_predictions, Recommendable.recommendable_classes.map { |klass| predictions_set_for(klass) }
+        Recommendable.redis.zunionstore unioned_predictions, Recommendable.recommendable_classes.map { |klass| predictions_set_for klass }
         
         recommendations = Recommendable.redis.zrevrange(unioned_predictions, 0, 10).map do |object|
           klass, id = object.split(":")
@@ -363,7 +396,7 @@ module Recommendable
       #
       # @param [Class, String, Symbol] klass the class to receive recommendations for. Can be the class constant, or a String/Symbol representation of the class name.
       # @return [Array] an array of ActiveRecord objects that are recommendable
-      def recommended_for(klass)
+      def recommended_for klass
         return [] if likes_for(klass).count + dislikes_for(klass).count == 0 || Recommendable.redis.zcard(predictions_set_for(klass)) == 0
       
         recommendations = []
@@ -384,7 +417,7 @@ module Recommendable
       #
       # @param [Object] object the object to fetch the probability for
       # @return [Float] the likelihood of self liking the passed object
-      def probability_of_liking(object)
+      def probability_of_liking object
         Recommendable.redis.zscore predictions_set_for(object.class), object.redis_key
       end
       
@@ -394,10 +427,12 @@ module Recommendable
       # @param [Object] object the object to fetch the probability for
       # @return [Float] the likelihood of self disliking the passed object
       # @see {#probability_of_liking}
-      def probability_of_disliking(object)
+      def probability_of_disliking object
         -probability_of_liking(object)
       end
       
+      protected
+
       # Makes a call to Redis and intersects the sets of likes belonging to self
       # and rater.
       #
@@ -406,11 +441,9 @@ module Recommendable
       # @option options [Class, String, Symbol] :class ('nil') Restrict the intersection to a single recommendable type. By default, all recomendable types are considered
       # @option options [true, false] :return_records (true) Return the actual Model instances
       # @return [Array] Typically, an array of ActiveRecord objects (unless :return_records is false)
-      def common_likes_with(rater, options = {})
-        defaults = { :class => nil,
-                     :return_records => true }
-        options = defaults.merge(options)
-        create_recommended_to_sets and rater.create_recommended_to_sets if options[:return_records]
+      def common_likes_with rater, options = {}
+        defaults = { :class => nil, :return_records => false }
+        options = defaults.merge options
 
         if options[:class]
           in_common = Recommendable.redis.sinter likes_set_for(options[:class]), rater.likes_set_for(options[:class])
@@ -420,14 +453,13 @@ module Recommendable
             things = Recommendable.redis.sinter(likes_set_for(klass), rater.likes_set_for(klass))
 
             if options[:return_records]
-              klass.to_s.classify.constantize.find(things)
+              klass.to_s.classify.constantize.find things
             else
-              things.map {|id| "#{klass.to_s.classify}:#{id}"}
+              things.map { |id| "#{klass.to_s.classify}:#{id}" }
             end
           end
         end
 
-        destroy_recommended_to_sets and rater.destroy_recommended_to_sets if options[:return_records]
         in_common
       end
       
@@ -439,11 +471,9 @@ module Recommendable
       # @option options [Class, String, Symbol] :class ('nil') Restrict the intersection to a single recommendable type. By default, all recomendable types are considered
       # @option options [true, false] :return_records (true) Return the actual Model instances
       # @return [Array] Typically, an array of ActiveRecord objects (unless :return_records is false)
-      def common_dislikes_with(rater, options = {})
-        defaults = { :class => nil,
-                     :return_records => true }
-        options = defaults.merge(options)
-        create_recommended_to_sets and rater.create_recommended_to_sets if options[:return_records]
+      def common_dislikes_with rater, options = {}
+        defaults = { :class => nil, :return_records => false }
+        options = defaults.merge options
 
         if options[:class]
           in_common = Recommendable.redis.sinter dislikes_set_for(options[:class]), rater.dislikes_set_for(options[:class])
@@ -455,12 +485,11 @@ module Recommendable
             if options[:return_records]
               klass.to_s.classify.constantize.find(things)
             else
-              things.map {|id| "#{klass.to_s.classify}:#{id}"}
+              things.map { |id| "#{klass.to_s.classify}:#{id}" }
             end
           end
         end
 
-        destroy_recommended_to_sets and rater.destroy_recommended_to_sets if options[:return_records]
         in_common
       end
       
@@ -474,11 +503,9 @@ module Recommendable
       # @option options [Class, String, Symbol] :class ('nil') Restrict the intersections to a single recommendable type. By default, all recomendable types are considered
       # @option options [true, false] :return_records (true) Return the actual Model instances
       # @return [Array] Typically, an array of ActiveRecord objects (unless :return_records is false)
-      def disagreements_with(rater, options = {})
-        defaults = { :class => nil,
-                     :return_records => true }
-        options = defaults.merge(options)
-        create_recommended_to_sets and rater.create_recommended_to_sets if options[:return_records]
+      def disagreements_with rater, options = {}
+        defaults = { :class => nil, :return_records => false }
+        options = defaults.merge options
         
         if options[:class]
           disagreements =  Recommendable.redis.sinter(likes_set_for(options[:class]), rater.dislikes_set_for(options[:class]))
@@ -492,12 +519,11 @@ module Recommendable
             if options[:return_records]
               klass.to_s.classify.constantize.find(things)
             else
-              things.map {|id| "#{options[:class].to_s.classify}:#{id}"}
+              things.map { |id| "#{options[:class].to_s.classify}:#{id}" }
             end
           end
         end
 
-        destroy_recommended_to_sets and rater.destroy_recommended_to_sets if options[:return_records]
         disagreements
       end
 
@@ -508,23 +534,21 @@ module Recommendable
       #
       # param [Object] object the object to destroy Recommendable models for
       # @private
-      def completely_unrecommend(object)
-        unlike(object)
-        undislike(object)
-        unstash(object)
-        unignore(object)
-        unpredict(object)
+      def completely_unrecommend object
+        unlike object
+        undislike object
+        unstash object
+        unignore object
+        unpredict object
       end
 
-      protected
-
       # @private
-      def likes_set_for(klass)
+      def likes_set_for klass
         "#{self.class}:#{id}:likes:#{klass}"
       end
       
       # @private
-      def dislikes_set_for(klass)
+      def dislikes_set_for klass
         "#{self.class}:#{id}:dislikes:#{klass}"
       end
 
@@ -533,8 +557,8 @@ module Recommendable
       # @private
       def create_recommended_to_sets
         Recommendable.recommendable_classes.each do |klass|
-          likes_for(klass).each {|like| Recommendable.redis.sadd likes_set_for(klass), like.likeable_id }
-          dislikes_for(klass).each {|dislike| Recommendable.redis.sadd dislikes_set_for(klass), dislike.dislikeable_id }
+          likes_for(klass).each { |like| Recommendable.redis.sadd likes_set_for(klass), like.likeable_id }
+          dislikes_for(klass).each { |dislike| Recommendable.redis.sadd dislikes_set_for(klass), dislike.dislikeable_id }
         end
       end
       
@@ -580,7 +604,7 @@ module Recommendable
       #
       # @private
       def update_recommendations
-        Recommendable.recommendable_classes.each {|klass| update_recommendations_for klass}
+        Recommendable.recommendable_classes.each { |klass| update_recommendations_for klass }
       end
       
       # Used internally to update self's prediction values across a single
@@ -588,10 +612,10 @@ module Recommendable
       #
       # @param [Class] klass the recommendable type to update predictions for
       # @private
-      def update_recommendations_for(klass)
+      def update_recommendations_for klass
         klass.find_each do |object|
           next if rated?(object) || !object.been_rated? || ignored?(object) || stashed?(object)
-          prediction = predict(object)
+          prediction = predict object
           Recommendable.redis.zadd(predictions_set_for(object.class), prediction, object.redis_key) if prediction
         end
       end
@@ -606,14 +630,14 @@ module Recommendable
       # @param [Object] object the object to check the likeliness of liking
       # @return [Float] the probability that self will like object
       # @private
-      def predict(object)
+      def predict object
         liked_by, disliked_by = object.send :create_recommendable_sets
         rated_by = Recommendable.redis.scard(liked_by) + Recommendable.redis.scard(disliked_by)
         similarity_sum = 0.0
         prediction = 0.0
       
-        Recommendable.redis.smembers(liked_by).inject(similarity_sum) {|sum, r| sum += Recommendable.redis.zscore(similarity_set, r).to_f }
-        Recommendable.redis.smembers(disliked_by).inject(similarity_sum) {|sum, r| sum -= Recommendable.redis.zscore(similarity_set, r).to_f }
+        Recommendable.redis.smembers(liked_by).inject(similarity_sum) { |sum, r| sum += Recommendable.redis.zscore(similarity_set, r).to_f }
+        Recommendable.redis.smembers(disliked_by).inject(similarity_sum) { |sum, r| sum -= Recommendable.redis.zscore(similarity_set, r).to_f }
       
         prediction = similarity_sum / rated_by.to_f
         
@@ -657,7 +681,7 @@ module Recommendable
       end
       
       # @private
-      def unpredict(object)
+      def unpredict object
         Recommendable.redis.zrem predictions_set_for(object.class), object.redis_key
       end
 
@@ -667,7 +691,7 @@ module Recommendable
       end
       
       # @private
-      def predictions_set_for(klass)
+      def predictions_set_for klass
         "#{self.class}:#{id}:predictions:#{klass}"
       end
     end

data/lib/recommendable/engine.rb

@@ -7,7 +7,7 @@ module Recommendable
       attr_accessor :root
       
       def root
-        @root ||= Pathname.new(File.expand_path('../../', __FILE__))
+        @root ||= Pathname.new File.expand_path('../../', __FILE__)
       end
     end
   end

data/lib/recommendable/version.rb

@@ -1,3 +1,3 @@
 module Recommendable
-  VERSION = '0.1.6'
+  VERSION = '0.1.8'
 end

data/spec/models/user_spec.rb

@@ -254,6 +254,36 @@ class UserSpec < MiniTest::Spec
         Recommendable.redis.del "User:#{@frank.id}:similarities"
         Recommendable.redis.del "User:#{@frank.id}:predictions:Movie"
       end
+
+      it "should have common likes with a friend" do
+        @dave.like @movie1
+        @dave.like @movie2
+        @dave.like @movie4
+
+        @frank.like @movie2
+        @frank.like @movie3
+        @frank.like @movie4
+
+        @dave.liked_movies_in_common_with(@frank).must_include @movie2
+        @dave.liked_movies_in_common_with(@frank).must_include @movie4
+        @dave.liked_movies_in_common_with(@frank).wont_include @movie1
+        @dave.liked_movies_in_common_with(@frank).wont_include @movie3
+      end
+
+      it "should have common dislikes with a friend" do
+        @dave.dislike @movie1
+        @dave.dislike @movie3
+        @dave.like    @movie4
+
+        @frank.dislike @movie2
+        @frank.dislike @movie3
+        @frank.dislike @movie4
+
+        @dave.disliked_movies_in_common_with(@frank).wont_include @movie2
+        @dave.disliked_movies_in_common_with(@frank).wont_include @movie4
+        @dave.disliked_movies_in_common_with(@frank).wont_include @movie1
+        @dave.disliked_movies_in_common_with(@frank).must_include @movie3
+      end
       
       it "should get populated sorted sets for similarities and recommendations" do
         @dave.like(@movie1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70234153626020 !ruby/object:Gem::Requirement
+  requirement: &70124007208240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234153626020
+  version_requirements: *70124007208240
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70234153623920 !ruby/object:Gem::Requirement
+  requirement: &70124007206840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234153623920
+  version_requirements: *70124007206840
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70234153622740 !ruby/object:Gem::Requirement
+  requirement: &70124007205260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234153622740
+  version_requirements: *70124007205260
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70234153621620 !ruby/object:Gem::Requirement
+  requirement: &70124007203840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70234153621620
+  version_requirements: *70124007203840
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70234153619880 !ruby/object:Gem::Requirement
+  requirement: &70124007201400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70234153619880
+  version_requirements: *70124007201400
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70234153618120 !ruby/object:Gem::Requirement
+  requirement: &70124007200440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70234153618120
+  version_requirements: *70124007200440
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70234153616840 !ruby/object:Gem::Requirement
+  requirement: &70124007199640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70234153616840
+  version_requirements: *70124007199640
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70234153616140 !ruby/object:Gem::Requirement
+  requirement: &70124007198320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234153616140
+  version_requirements: *70124007198320
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70234153615260 !ruby/object:Gem::Requirement
+  requirement: &70124007196840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234153615260
+  version_requirements: *70124007196840
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70234153613760 !ruby/object:Gem::Requirement
+  requirement: &70124007195680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234153613760
+  version_requirements: *70124007195680
 - !ruby/object:Gem::Dependency
   name: resque-loner
-  requirement: &70234153611760 !ruby/object:Gem::Requirement
+  requirement: &70124007194380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70234153611760
+  version_requirements: *70124007194380
 description: Allow a model (typically User) to Like and/or Dislike models in your
   app. Generate recommendations quickly using redis.
 email: david@davidcelis.com