recommendable 0.1.8 → 0.2.1.1

data/CHANGELOG.markdown

@@ -1,8 +1,34 @@
 Changelog
 =========
 
-0.1.6 (current version)
+0.2.0 (current version)
 -----------------------
+* NOTE: This release is NOT backwards compatible. Please migrate your databases:
+
+```
+rename_column :recommendable_ignores, :ignoreable_id, :ignorable_id
+rename_column :recommendable_ignores, :ignoreable_type, :ignorable_type
+rename_table  :recommendable_stashed_items, :recommendable_stashes
+```
+
+* Fix an issue with recommendable models implemented via STI 
+* Fix a library-wide typo of "ignoreable" to "ignorable"
+
+0.1.9
+-----
+* Yanked due to breaking bug
+
+0.1.8
+-----
+* Revert changes made in 0.1.7 due to licensing
+
+0.1.7
+-----
+* Yanked and no longer available.
+* Attempted switch from Resque to Sidekiq
+
+0.1.6
+-----
 * Dynamic finders for your User class:
 
 `current_user.liked_movies`

data/Gemfile.lock

@@ -30,8 +30,6 @@ 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)
@@ -50,6 +48,8 @@ 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,15 +73,20 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redis (2.2.2)
-    redis-namespace (1.1.0)
+    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)
-    sidekiq (1.0.0)
-      celluloid (~> 0.10.0)
-      connection_pool (~> 0.9.0)
-      multi_json
-      redis
-      redis-namespace
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
@@ -93,6 +98,8 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
+    vegas (0.1.11)
+      rack (>= 1.0.0)
     yard (0.6.8)
 
 PLATFORMS
@@ -104,7 +111,8 @@ 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/app/models/recommendable/dislike.rb

@@ -8,5 +8,9 @@ module Recommendable
     
     validates :user_id, :uniqueness => { :scope => [:dislikeable_id, :dislikeable_type],
                                          :message => "has already disliked this item" }
+
+    def dislikeable_type=(sType)
+      super sType.to_s.classify.constantize.base_class.to_s
+    end
   end
 end

data/app/models/recommendable/ignore.rb

@@ -1,12 +1,15 @@
 module Recommendable
   class Ignore < ActiveRecord::Base
     self.table_name = 'recommendable_ignores'
-    attr_accessible :user_id, :ignoreable_id, :ignoreable_type
+    attr_accessible :user_id, :ignorable_id, :ignorable_type
 
     belongs_to :user, :class_name => Recommendable.user_class.to_s, :foreign_key => :user_id
-    belongs_to :ignoreable, :polymorphic => true
+    belongs_to :ignorable, :polymorphic => true
     
-    validates :user_id, :uniqueness => { :scope => [:ignoreable_id, :ignoreable_type],
+    validates :user_id, :uniqueness => { :scope => [:ignorable_id, :ignorable_type],
                                          :message => "has already ignored this item" }
+    def ignorable_type=(sType)
+      super sType.to_s.classify.constantize.base_class.to_s
+    end
   end
 end

data/app/models/recommendable/like.rb

@@ -8,5 +8,9 @@ module Recommendable
     
     validates :user_id, :uniqueness => { :scope => [:likeable_id, :likeable_type],
                                          :message => "has already liked this item" }
+
+    def likeable_type=(sType)
+      super sType.to_s.classify.constantize.base_class.to_s
+    end
   end
 end

data/app/models/recommendable/{stashed_item.rb → stash.rb}

@@ -1,6 +1,6 @@
 module Recommendable
-  class StashedItem < ActiveRecord::Base
-    self.table_name = 'recommendable_stashed_items'
+  class Stash < ActiveRecord::Base
+    self.table_name = 'recommendable_stashes'
     attr_accessible :user_id, :stashable_id, :stashable_type
 
     belongs_to :user, :class_name => Recommendable.user_class.to_s, :foreign_key => :user_id
@@ -8,5 +8,8 @@ module Recommendable
     
     validates :user_id, :uniqueness => { :scope => [:stashable_id, :stashable_type],
                                          :message => "has already stashed this item" }
+    def stashable_type=(sType)
+      super sType.to_s.classify.constantize.base_class.to_s
+    end
   end
 end

data/db/migrate/20120127092558_create_ignores.rb

@@ -2,13 +2,13 @@ class CreateIgnores < ActiveRecord::Migration
   def up
     create_table :recommendable_ignores do |t|
       t.references :user
-      t.references :ignoreable, :polymorphic => true
+      t.references :ignorable, :polymorphic => true
       t.timestamps
     end
     
-    add_index :recommendable_ignores, :ignoreable_id
-    add_index :recommendable_ignores, :ignoreable_type
-    add_index :recommendable_ignores, [:user_id, :ignoreable_id, :ignoreable_type], :unique => true, :name => "user_ignore_constraint"
+    add_index :recommendable_ignores, :ignorable_id
+    add_index :recommendable_ignores, :ignorable_type
+    add_index :recommendable_ignores, [:user_id, :ignorable_id, :ignorable_type], :unique => true, :name => "user_ignore_constraint"
   end
   
   def down

data/db/migrate/20120131173909_create_stashes.rb

@@ -0,0 +1,17 @@
+class CreateStashes < ActiveRecord::Migration
+  def up
+    create_table :recommendable_stashes do |t|
+      t.references :user
+      t.references :stashable, :polymorphic => true
+      t.timestamps
+    end
+    
+    add_index :recommendable_stashes, :stashable_id
+    add_index :recommendable_stashes, :stashable_type
+    add_index :recommendable_stashes, [:user_id, :stashable_id, :stashable_type], :unique => true, :name => "user_stashed_constraint"
+  end
+  
+  def down
+    drop_table :recommendable_stashes
+  end
+end

data/lib/recommendable.rb

@@ -1,4 +1,5 @@
 require 'recommendable/engine'
+require 'recommendable/helpers'
 require 'recommendable/acts_as_recommended_to'
 require 'recommendable/acts_as_recommendable'
 require 'recommendable/exceptions'
@@ -12,4 +13,8 @@ module Recommendable
   def self.recommendable_classes
     @@recommendable_classes ||= []
   end
+
+  def self.enqueue(user_id)
+    Resque.enqueue RecommendationRefresher, user_id
+  end
 end

data/lib/recommendable/acts_as_recommendable.rb

@@ -7,12 +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 => :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, :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 :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
           
           include LikeableMethods
           include DislikeableMethods
@@ -72,8 +79,8 @@ module Recommendable
           # {#create_recommendable_sets}
           # @private
           def destroy_recommendable_sets
-            Recommendable.redis.del "#{self.class}:#{id}:liked_by"
-            Recommendable.redis.del "#{self.class}:#{id}:disliked_by"
+            Recommendable.redis.del "#{self.class.base_class}:#{id}:liked_by"
+            Recommendable.redis.del "#{self.class.base_class}:#{id}:disliked_by"
           end
 
           # Returns an array of IDs of users that have liked or disliked this item.
@@ -92,12 +99,16 @@ module Recommendable
       end
 
       def acts_as_recommendable?() false end
+
+      def sti?() self.base_class != self end
+
+      private
     end
 
     # Instance methods.
     def recommendable?() self.class.acts_as_recommendable? end
 
-    def redis_key() "#{self.class}:#{id}" end
+    def redis_key() "#{self.class.base_class}:#{id}" end
 
     protected :redis_key
     

data/lib/recommendable/acts_as_recommended_to.rb

@@ -2,6 +2,7 @@ require 'active_support/concern'
 
 module Recommendable
   module ActsAsRecommendedTo
+    include Recommendable::Helpers
     extend ActiveSupport::Concern
     
     module ClassMethods
@@ -17,7 +18,7 @@ module Recommendable
           has_many :likes, :class_name => "Recommendable::Like", :dependent => :destroy, :foreign_key => :user_id
           has_many :dislikes, :class_name => "Recommendable::Dislike", :dependent => :destroy, :foreign_key => :user_id
           has_many :ignores, :class_name => "Recommendable::Ignore", :dependent => :destroy, :foreign_key => :user_id
-          has_many :stashed_items, :class_name => "Recommendable::StashedItem", :dependent => :destroy, :foreign_key => :user_id
+          has_many :stashed_items, :class_name => "Recommendable::Stash", :dependent => :destroy, :foreign_key => :user_id
           
           include LikeMethods
           include DislikeMethods
@@ -81,9 +82,9 @@ module Recommendable
         raise RecordNotRecommendableError unless object.recommendable?
         return if likes? object
         completely_unrecommend object
-        likes.create! :likeable_id => object.id, :likeable_type => object.class.to_s
+        likes.create! :likeable_id => object.id, :likeable_type => object.class
         object.send :update_score
-        Resque.enqueue RecommendationRefresher, self.id
+        Recommendable.enqueue self.id
         true
       end
       
@@ -92,7 +93,7 @@ module Recommendable
       # @param [Object] object the object you want to check
       # @return true if self likes object, false if not
       def likes? object
-        likes.exists? :likeable_id => object.id, :likeable_type => object.class.to_s
+        likes.exists? :likeable_id => object.id, :likeable_type => object.class.base_class.to_s
       end
       
       # Destroys a Recommendable::Like currently associating self with object
@@ -100,9 +101,9 @@ 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.to_s).first.try(:destroy)
+        if likes.where(:likeable_id => object.id, :likeable_type => object.class.base_class.to_s).first.try(:destroy)
           object.send :update_score
-          Resque.enqueue RecommendationRefresher, self.id
+          Recommendable.enqueue self.id
           true
         end
       end
@@ -122,7 +123,13 @@ 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
-        likes.where(:likeable_type => klass).includes(:likeable).map(&:likeable)
+        liked = if klass.sti?
+          likes.joins manual_join(klass, 'like')
+        else
+          likes.where(:likeable_type => klass.to_s).includes(:likeable)
+        end
+
+        liked.map(&:likeable)
       end
 
       # Get a list of Recommendable::Likes with a `#likeable_type` of the passed
@@ -132,7 +139,11 @@ module Recommendable
       # @note You should not need to use this method. (see {#liked_for})
       # @private
       def likes_for klass
-        likes.where :likeable_type => klass.to_s.classify
+        if klass.sti?
+          likes.joins manual_join(klass, 'like')
+        else
+          likes.where(:likeable_type => klass.to_s)
+        end
       end
     end
     
@@ -149,9 +160,9 @@ module Recommendable
         raise RecordNotRecommendableError unless object.recommendable?
         return if dislikes? object
         completely_unrecommend object
-        dislikes.create! :dislikeable_id => object.id, :dislikeable_type => object.class.to_s
+        dislikes.create! :dislikeable_id => object.id, :dislikeable_type => object.class
         object.send :update_score
-        Resque.enqueue RecommendationRefresher, self.id
+        Recommendable.enqueue self.id
         true
       end
       
@@ -160,7 +171,7 @@ 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
+        dislikes.exists? :dislikeable_id => object.id, :dislikeable_type => object.class.base_class.to_s
       end
       
       # Destroys a Recommendable::Dislike currently associating self with object
@@ -168,9 +179,9 @@ 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.to_s).first.try(:destroy)
+        if dislikes.where(:dislikeable_id => object.id, :dislikeable_type => object.class.base_class.to_s).first.try(:destroy)
           object.send :update_score
-          Resque.enqueue RecommendationRefresher, self.id
+          Recommendable.enqueue self.id
           true
         end
       end
@@ -190,7 +201,13 @@ 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
-        dislikes.where(:dislikeable_type => klass).includes(:dislikeable).map(&:dislikeable)
+        disliked = if klass.sti?
+          dislikes.joins manual_join(klass, 'dislike')
+        else
+          dislikes.where(:dislikeable_type => klass.to_s).includes(:dislikeable)
+        end
+
+        disliked.map(&:dislikeable)
       end
       
       # Get a list of Recommendable::Dislikes with a `#dislikeable_type` of the
@@ -200,12 +217,16 @@ module Recommendable
       # @note You should not need to use this method. (see {#disliked_for})
       # @private
       def dislikes_for klass
-        dislikes.where :dislikeable_type => klass.to_s.classify
+        if klass.sti?
+          dislikes.joins manual_join(klass, 'dislike')
+        else
+          dislikes.where(:dislikeable_type => klass.to_s)
+        end
       end
     end
 
     module StashMethods
-      # Creates a Recommendable::StashedItem to associate self to a passed object.
+      # Creates a Recommendable::Stash to associate self to a passed object.
       # This will remove the item from this user's recommendations.
       # If self is currently found to have liked or disliked the object, nothing
       # will happen. It will, however, be unignored.
@@ -218,7 +239,7 @@ module Recommendable
         return if rated?(object) || stashed?(object)
         unignore object
         unpredict object
-        stashed_items.create! :stashable_id => object.id, :stashable_type => object.class.to_s
+        stashed_items.create! :stashable_id => object.id, :stashable_type => object.class
         true
       end
       
@@ -227,15 +248,15 @@ module Recommendable
       # @param [Object] object the object you want to check
       # @return true if self has stashed object, false if not
       def stashed? object
-        stashed_items.exists? :stashable_id => object.id, :stashable_type => object.class.to_s
+        stashed_items.exists? :stashable_id => object.id, :stashable_type => object.class.base_class.to_s
       end
       
-      # Destroys a Recommendable::StashedItem currently associating self with object
+      # Destroys a Recommendable::Stash currently associating self with object
       #
       # @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.to_s).first.try(:destroy)
+        true if stashed_items.where(:stashable_id => object.id, :stashable_type => object.class.base_class.to_s).first.try(:destroy)
       end
       
       # Get a list of records that self has currently stashed for later
@@ -253,7 +274,13 @@ 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
-        stashed_items.where(:stashable_type => klass).includes(:stashable).map(&:stashable)
+        stashed = if klass.sti?
+          stashed_items.joins manual_join(klass, 'stash')
+        else
+          stashed_items.where(:stashable_type => klass.to_s).includes(:stashable)
+        end
+
+        stashed.map(&:stashable)
       end
     end
     
@@ -270,7 +297,7 @@ module Recommendable
         raise RecordNotRecommendableError unless object.recommendable?
         return if ignored? object
         completely_unrecommend object
-        ignores.create! :ignoreable_id => object.id, :ignoreable_type => object.class.to_s
+        ignores.create! :ignorable_id => object.id, :ignorable_type => object.class
         true
       end
       
@@ -279,7 +306,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
-        ignores.exists? :ignoreable_id => object.id, :ignoreable_type => object.class.to_s
+        ignores.exists? :ignorable_id => object.id, :ignorable_type => object.class.base_class.to_s
       end
       
       # Destroys a Recommendable::Ignore currently associating self with object
@@ -287,7 +314,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
-        true if ignores.where(:ignoreable_id => object.id, :ignoreable_type => object.class.to_s).first.try(:destroy)
+        true if ignores.where(:ignorable_id => object.id, :ignorable_type => object.class.base_class.to_s).first.try(:destroy)
       end
       
       # Get a list of records that self is currently ignoring
@@ -305,7 +332,13 @@ 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
-        ignores.where(:ignoreable_type => klass).includes(:ignoreable).map(&:ignoreable)
+        ignored = if klass.sti?
+          ignores.joins manual_join(klass, 'ignore')
+        else
+          ignores.where(:ignorable_type => klass.to_s).includes(:ignorable)
+        end
+
+        ignored.map(&:ignorable)
       end
     end
     
@@ -397,7 +430,8 @@ 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
-        return [] if likes_for(klass).count + dislikes_for(klass).count == 0 || Recommendable.redis.zcard(predictions_set_for(klass)) == 0
+        return [] if likes_for(klass.base_class).count + dislikes_for(klass.base_class).count == 0 || \
+                     Recommendable.redis.zcard(predictions_set_for(klass)) == 0
       
         recommendations = []
         i = 0

data/lib/recommendable/helpers.rb

@@ -0,0 +1,8 @@
+module Recommendable
+  module Helpers
+    def manual_join(klass, action)
+      table = klass.base_class.table_name
+      "JOIN #{table} ON recommendable_#{action.pluralize}.#{action}able_id = #{table}.id AND #{table}.type = '#{klass}'"
+    end
+  end
+end

data/lib/recommendable/version.rb

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

data/spec/dummy/db/migrate/20120128005555_create_ignores.recommendable.rb

@@ -3,13 +3,13 @@ class CreateIgnores < ActiveRecord::Migration
   def up
     create_table :recommendable_ignores, :force => true do |t|
       t.references :user
-      t.references :ignoreable, :polymorphic => true
+      t.references :ignorable, :polymorphic => true
       t.timestamps
     end
     
-    add_index :recommendable_ignores, :ignoreable_id
-    add_index :recommendable_ignores, :ignoreable_type
-    add_index :recommendable_ignores, [:user_id, :ignoreable_id, :ignoreable_type], :unique => true, :name => "user_ignore_constraint"
+    add_index :recommendable_ignores, :ignorable_id
+    add_index :recommendable_ignores, :ignorable_type
+    add_index :recommendable_ignores, [:user_id, :ignorable_id, :ignorable_type], :unique => true, :name => "user_ignore_constraint"
   end
   
   def down

data/spec/dummy/db/migrate/20120131195416_create_stashes.recommendable.rb

@@ -0,0 +1,19 @@
+# This migration comes from recommendable (originally 20120131173909)
+class CreateStashes < ActiveRecord::Migration
+  def up
+    create_table :recommendable_stashes do |t|
+      t.references :user
+      t.references :stashable, :polymorphic => true
+      t.timestamps
+    end
+    
+    add_index :recommendable_stashes, :stashable_id
+    add_index :recommendable_stashes, :stashable_type
+    add_index :recommendable_stashes, [:user_id, :stashable_id, :stashable_type], :unique => true, :name => "user_stashed_constraint"
+  end
+  
+  def down
+    drop_table :recommendable_stashes
+  end
+end
+

data/spec/dummy/db/schema.rb

@@ -46,15 +46,15 @@ ActiveRecord::Schema.define(:version => 20120131195416) do
 
   create_table "recommendable_ignores", :force => true do |t|
     t.integer  "user_id"
-    t.integer  "ignoreable_id"
-    t.string   "ignoreable_type"
-    t.datetime "created_at",      :null => false
-    t.datetime "updated_at",      :null => false
+    t.integer  "ignorable_id"
+    t.string   "ignorable_type"
+    t.datetime "created_at",     :null => false
+    t.datetime "updated_at",     :null => false
   end
 
-  add_index "recommendable_ignores", ["ignoreable_id"], :name => "index_recommendable_ignores_on_ignoreable_id"
-  add_index "recommendable_ignores", ["ignoreable_type"], :name => "index_recommendable_ignores_on_ignoreable_type"
-  add_index "recommendable_ignores", ["user_id", "ignoreable_id", "ignoreable_type"], :name => "user_ignore_constraint", :unique => true
+  add_index "recommendable_ignores", ["ignorable_id"], :name => "index_recommendable_ignores_on_ignorable_id"
+  add_index "recommendable_ignores", ["ignorable_type"], :name => "index_recommendable_ignores_on_ignorable_type"
+  add_index "recommendable_ignores", ["user_id", "ignorable_id", "ignorable_type"], :name => "user_ignore_constraint", :unique => true
 
   create_table "recommendable_likes", :force => true do |t|
     t.integer  "user_id"
@@ -68,7 +68,7 @@ ActiveRecord::Schema.define(:version => 20120131195416) do
   add_index "recommendable_likes", ["likeable_type"], :name => "index_recommendable_likes_on_likeable_type"
   add_index "recommendable_likes", ["user_id", "likeable_id", "likeable_type"], :name => "user_like_constraint", :unique => true
 
-  create_table "recommendable_stashed_items", :force => true do |t|
+  create_table "recommendable_stashes", :force => true do |t|
     t.integer  "user_id"
     t.integer  "stashable_id"
     t.string   "stashable_type"
@@ -76,9 +76,9 @@ ActiveRecord::Schema.define(:version => 20120131195416) do
     t.datetime "updated_at",     :null => false
   end
 
-  add_index "recommendable_stashed_items", ["stashable_id"], :name => "index_recommendable_stashed_items_on_stashable_id"
-  add_index "recommendable_stashed_items", ["stashable_type"], :name => "index_recommendable_stashed_items_on_stashable_type"
-  add_index "recommendable_stashed_items", ["user_id", "stashable_id", "stashable_type"], :name => "user_stashed_constraint", :unique => true
+  add_index "recommendable_stashes", ["stashable_id"], :name => "index_recommendable_stashes_on_stashable_id"
+  add_index "recommendable_stashes", ["stashable_type"], :name => "index_recommendable_stashes_on_stashable_type"
+  add_index "recommendable_stashes", ["user_id", "stashable_id", "stashable_type"], :name => "user_stashed_constraint", :unique => true
 
   create_table "users", :force => true do |t|
     t.string   "username"

data/spec/models/{stashed_item_spec.rb → stash_spec.rb}

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-class StashedItemSpec < MiniTest::Spec
-  describe Recommendable::StashedItem do
+class StashSpec < MiniTest::Spec
+  describe Recommendable::Stash do
     before :each do
       @user = User.create(:username => "dave")
     end
@@ -21,7 +21,7 @@ class StashedItemSpec < MiniTest::Spec
       
       @user.stash(movie).must_equal true
       @user.stash(movie).must_be_nil
-      Recommendable::StashedItem.count.must_equal 1
+      Recommendable::Stash.count.must_equal 1
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70124007208240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124007208240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70124007206840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124007206840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70124007205260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124007205260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70124007203840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70124007203840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70124007201400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70124007201400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70124007200440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +101,15 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70124007200440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70124007199640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70124007199640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70124007198320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124007198320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70124007196840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +149,15 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124007196840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &70124007195680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +165,15 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124007195680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.19.0
 - !ruby/object:Gem::Dependency
   name: resque-loner
-  requirement: &70124007194380 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +181,12 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70124007194380
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.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
@@ -151,13 +206,13 @@ files:
 - app/models/recommendable/dislike.rb
 - app/models/recommendable/ignore.rb
 - app/models/recommendable/like.rb
-- app/models/recommendable/stashed_item.rb
+- app/models/recommendable/stash.rb
 - app/workers/recommendable/recommendation_refresher.rb
 - config/routes.rb
 - db/migrate/20120124193723_create_likes.rb
 - db/migrate/20120124193728_create_dislikes.rb
 - db/migrate/20120127092558_create_ignores.rb
-- db/migrate/20120131173909_create_stashed_items.rb
+- db/migrate/20120131173909_create_stashes.rb
 - lib/generators/recommendable/USAGE
 - lib/generators/recommendable/install_generator.rb
 - lib/generators/recommendable/templates/initializer.rb
@@ -166,6 +221,7 @@ files:
 - lib/recommendable/acts_as_recommended_to.rb
 - lib/recommendable/engine.rb
 - lib/recommendable/exceptions.rb
+- lib/recommendable/helpers.rb
 - lib/recommendable/railtie.rb
 - lib/recommendable/version.rb
 - lib/tasks/recommendable_tasks.rake
@@ -209,7 +265,7 @@ files:
 - spec/dummy/db/migrate/20120128020413_create_movies.rb
 - spec/dummy/db/migrate/20120128024632_create_php_frameworks.rb
 - spec/dummy/db/migrate/20120128024804_create_bullies.rb
-- spec/dummy/db/migrate/20120131195416_create_stashed_items.recommendable.rb
+- spec/dummy/db/migrate/20120131195416_create_stashes.recommendable.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/log/.gitkeep
@@ -225,7 +281,7 @@ files:
 - spec/models/ignore_spec.rb
 - spec/models/like_spec.rb
 - spec/models/movie_spec.rb
-- spec/models/stashed_item_spec.rb
+- spec/models/stash_spec.rb
 - spec/models/user_benchmark_spec.rb
 - spec/models/user_spec.rb
 - spec/spec_helper.rb
@@ -249,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: Add like-based and/or dislike-based recommendations to your app.

data/db/migrate/20120131173909_create_stashed_items.rb

@@ -1,17 +0,0 @@
-class CreateStashedItems < ActiveRecord::Migration
-  def up
-    create_table :recommendable_stashed_items do |t|
-      t.references :user
-      t.references :stashable, :polymorphic => true
-      t.timestamps
-    end
-    
-    add_index :recommendable_stashed_items, :stashable_id
-    add_index :recommendable_stashed_items, :stashable_type
-    add_index :recommendable_stashed_items, [:user_id, :stashable_id, :stashable_type], :unique => true, :name => "user_stashed_constraint"
-  end
-  
-  def down
-    drop_table :recommendable_stashed_items
-  end
-end

data/spec/dummy/db/migrate/20120131195416_create_stashed_items.recommendable.rb

@@ -1,18 +0,0 @@
-# This migration comes from recommendable (originally 20120131173909)
-class CreateStashedItems < ActiveRecord::Migration
-  def up
-    create_table :recommendable_stashed_items do |t|
-      t.references :user
-      t.references :stashable, :polymorphic => true
-      t.timestamps
-    end
-    
-    add_index :recommendable_stashed_items, :stashable_id
-    add_index :recommendable_stashed_items, :stashable_type
-    add_index :recommendable_stashed_items, [:user_id, :stashable_id, :stashable_type], :unique => true, :name => "user_stashed_constraint"
-  end
-  
-  def down
-    drop_table :recommendable_stashed_items
-  end
-end