recommendable 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bed9eb66adf5e636014b2f559c0f0c68542c778437bc177dfd4ce107fd7cbead
-  data.tar.gz: e37871a3954bc1032249c6b5920193cddd0897f340d0fc9bda9f9ffd4ca761e3
+  metadata.gz: 47774cd75a72e1b2b326d535fc8dd5899481191dead0b71c0ced41d8f41ad81f
+  data.tar.gz: 117743d3c8bd0b1a5d217f16f35a2e101c2e56da5a6400ad128c2d6b00427d08
 SHA512:
-  metadata.gz: ff226a0223b80b733d4ea0ff04805c343e9d4e6baa9376c1f5fb07ffab69559030ae0fe9a3680f6883c0991aed2073cd296ada67a1446132ba7e5dac9f318df9
-  data.tar.gz: 9c3e92781cb02678ca928bfe66637071c38ddd14fc41936374235f22227b7030d0691232a99fa71e94f529ccbbf4bde73ea8ec79484e8303d3ef6b6e543e5563
+  metadata.gz: be8f704d0b9cc3329573da17d526f0c07bb5a27ee1792ca1446956850eb556b8b0fb9b4f12d964d9a8999157123d4f75c5b771c4184b452169754e1d4f71c20d
+  data.tar.gz: b4665e65e201f8d7f742792be24a92cbc347d296abaa95db07bbc080e468db4e7c53889722c4d034dcc512cd1f41943a28d269cc728e77c26bd90bbec1692e4a

data/lib/recommendable/ratable.rb

@@ -43,11 +43,13 @@ module Recommendable
 
           # Query for the top-N items sorted by score
           #
-          # @param [Fixnum] count the number of items to fetch (defaults to 1)
+          # @param [Hash] options a hash of options to modify which items are returned
+          # @option options [Integer] :count the number of items to fetch (defaults to 1)
+          # @option options [Integer] :offset an offset to allow paging through results
           # @return [Array] the top items belonging to this class, sorted by score
           def self.top(options = {})
             if options.is_a?(Integer)
-              options = { :count => options}
+              options = { :count => options }
               warn "[DEPRECATION] Recommenable::Ratable.top now takes an options hash. Please call `.top(count: #{options[:count]})` instead of just `.top(#{options[:count]})`"
             end
             options.reverse_merge!(:count => 1, :offset => 0)

data/lib/recommendable/rater/recommender.rb

@@ -8,8 +8,9 @@ module Recommendable
       # @return [Array] An array of instances of your user class
       def similar_raters(limit = 10, offset = 0)
         ids = Recommendable.redis.zrevrange(Recommendable::Helpers::RedisKeyMapper.similarity_set_for(id), 0, -1)
+        ids = sanitize_ids(ids, self.class)
 
-        order = ids.map { |id| "#{Recommendable.config.user_class.quoted_table_name}.#{Recommendable.config.user_class.quoted_primary_key} = %d DESC" }.join(', ')
+        order = ids.map { |id| "#{Recommendable.config.user_class.quoted_table_name}.#{Recommendable.config.user_class.quoted_primary_key} = ? DESC" }.join(', ')
         order = self.class.send(:sanitize_sql_for_assignment, [order, *ids])
 
         Recommendable.query(self.class, ids).order(order).limit(limit).offset(offset)
@@ -26,14 +27,21 @@ module Recommendable
 
         ids = Recommendable.redis.zrevrange(recommended_set, 0, -1, :with_scores => true)
         ids = ids.select { |id, score| score > 0 }.map { |pair| pair.first }
+        ids = sanitize_ids(ids, klass)
 
-        order = ids.map { |id| "#{klass.quoted_table_name}.#{klass.quoted_primary_key} = %d DESC" }.join(', ')
+        order = ids.map { |id| "#{klass.quoted_table_name}.#{klass.quoted_primary_key} = ? DESC" }.join(', ')
         order = klass.send(:sanitize_sql_for_assignment, [order, *ids])
         Recommendable.query(klass, ids).order(order).limit(limit).offset(offset)
       end
 
       private
 
+      # Sanitizes ids using klass type mapping
+      # @private
+      def sanitize_ids(ids, klass)
+        ids.map{ |id| klass.new(klass.primary_key => id).send(klass.primary_key) }.compact
+      end
+
       # Removes an item from a user's set of recommendations
       # @private
       def unrecommend(obj)

data/lib/recommendable/version.rb

@@ -2,7 +2,7 @@ module Recommendable
   class Version
     MAJOR = 2
     MINOR = 2
-    PATCH = 1
+    PATCH = 2
 
     def self.to_s
       [MAJOR, MINOR, PATCH].join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: recommendable
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - David Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-15 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport