recommendable 1.1.4 → 1.1.5

data/CHANGELOG.markdown

@@ -1,8 +1,22 @@
 Changelog
 =========
 
-1.1.2 (Current version)
+1.1.5 (Current version)
 -----------------------
+* Fix #47, a problem where models could not recommend themselves
+
+1.1.4
+-----
+* Fix #41, a problem where Resque rake tasks were required regardless of whether or not it was bundled
+* Fix #46 by adding UniqueJob middleware for Sidekiq.
+* Added caches for an item's number of likes and dislikes received
+
+1.1.3
+-----
+* Update Redis.
+
+1.1.2
+-----
 * Fix #38, a problem with enqueueing users based on updating the score of a recommendable record
 
 1.1.1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    recommendable (1.1.3)
+    recommendable (1.1.5)
       hooks
       rails (>= 3.0.0)
       redis (>= 2.2.0)
@@ -43,7 +43,7 @@ GEM
     hooks (0.2.0)
     i18n (0.6.0)
     journey (1.0.4)
-    json (1.7.3)
+    json (1.7.4)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)

data/app/models/recommendable/dislike.rb

@@ -7,7 +7,10 @@ module Recommendable
     belongs_to :dislikeable, :polymorphic => true
     
     validates :user_id, :uniqueness => { :scope => [:dislikeable_id, :dislikeable_type],
-                                         :message => "has already disliked this item" }
+                                         :message => "has already disliked this item" },
+                        :presence => true
+    validates_presence_of :dislikeable_id
+    validates_presence_of :dislikeable_type
 
     def dislikeable_type=(sType)
       super sType.to_s.classify.constantize.base_class.to_s

data/app/models/recommendable/ignore.rb

@@ -7,7 +7,10 @@ module Recommendable
     belongs_to :ignorable, :polymorphic => true
     
     validates :user_id, :uniqueness => { :scope => [:ignorable_id, :ignorable_type],
-                                         :message => "has already ignored this item" }
+                                         :message => "has already ignored this item" },
+                        :presence => true
+    validates_presence_of :ignorable_id
+    validates_presence_of :ignorable_type
     
     def ignorable_type=(sType)
       super sType.to_s.classify.constantize.base_class.to_s

data/app/models/recommendable/like.rb

@@ -4,10 +4,13 @@ module Recommendable
     attr_accessible :user_id, :likeable_id, :likeable_type
 
     belongs_to :user, :class_name => Recommendable.user_class.to_s, :foreign_key => :user_id
-    belongs_to :likeable, :polymorphic => true
+    belongs_to :likeable, :polymorphic => true, :foreign_key => :likeable_id
     
     validates :user_id, :uniqueness => { :scope => [:likeable_id, :likeable_type],
-                                         :message => "has already liked this item" }
+                                         :message => "has already liked this item" },
+                        :presence => true
+    validates_presence_of :likeable_id
+    validates_presence_of :likeable_type
 
     def likeable_type=(sType)
       super sType.to_s.classify.constantize.base_class.to_s

data/app/models/recommendable/stash.rb

@@ -7,7 +7,10 @@ module Recommendable
     belongs_to :stashable, :polymorphic => :true
     
     validates :user_id, :uniqueness => { :scope => [:stashable_id, :stashable_type],
-                                         :message => "has already stashed this item" }
+                                         :message => "has already stashed this item" },
+                        :presence => true
+    validates_presence_of :stashable_id
+    validates_presence_of :stashable_type
     
     def stashable_type=(sType)
       super sType.to_s.classify.constantize.base_class.to_s

data/lib/recommendable/acts_as_recommendable.rb

@@ -7,19 +7,19 @@ module Recommendable
         class_eval do
           Recommendable.recommendable_classes << self
           
-          has_many :likes,    :as => :likeable, :dependent => :destroy,
-                              :class_name => "Recommendable::Like"
-          has_many :dislikes, :as => :dislikeable, :dependent => :destroy,
-                              :class_name => "Recommendable::Dislike"
-          has_many :ignores,  :as => :ignorable, :dependent => :destroy,
-                              :class_name => "Recommendable::Ignore"
-          has_many :stashes,  :as => :stashable, :dependent => :destroy,
-                              :class_name => "Recommendable::Stash"
-
-          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
+          has_many :recommendable_likes, :as => :likeable, :dependent => :destroy,
+                                         :class_name => "Recommendable::Like"
+          has_many :recommendable_dislikes, :as => :dislikeable, :dependent => :destroy,
+                                            :class_name => "Recommendable::Dislike"
+          has_many :recommendable_ignores, :as => :ignorable, :dependent => :destroy,
+                                           :class_name => "Recommendable::Ignore"
+          has_many :recommendable_stashes, :as => :stashable, :dependent => :destroy,
+                                           :class_name => "Recommendable::Stash"
+
+          has_many :liked_by, :through => :recommendable_likes, :source => :user,
+                              :foreign_key => :user_id, :class_name => Recommendable.user_class.to_s
+          has_many :disliked_by, :through => :recommendable_dislikes, :source => :user,
+                                 :foreign_key => :user_id, :class_name => Recommendable.user_class.to_s
           
           include LikeableMethods
           include DislikeableMethods
@@ -29,7 +29,7 @@ module Recommendable
           def self.acts_as_recommendable?() true end
 
           def been_rated?
-            likes.count + dislikes.count > 0
+            recommendable_likes.count + recommendable_dislikes.count > 0
           end
 
           # Returns an array of users that have liked or disliked this item.
@@ -53,9 +53,9 @@ module Recommendable
             return 0 unless been_rated?
 
             z = 1.96
-            n = likes.count + dislikes.count
+            n = recommendable_likes.count + recommendable_dislikes.count
 
-            phat = likes.count / n.to_f
+            phat = recommendable_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
@@ -93,14 +93,15 @@ module Recommendable
           # @return [Array] an array of user IDs
           # @private
           def rates_by
-            likes.map(&:user_id) + dislikes.map(&:user_id)
+            recommendable_likes.map(&:user_id) + recommendable_dislikes.map(&:user_id)
           end
 
           def self.score_set
             "#{self}:sorted"
           end
 
-          private :likes, :dislikes, :ignores, :stashes
+          private :recommendable_likes, :recommendable_dislikes,
+                  :recommendable_ignores, :recommendable_stashes
         end
       end
 

data/lib/recommendable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3