commendo 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fb3a3f98e3846e5f75d884630c3735ed57f62b1
-  data.tar.gz: 3944a25fc941e55a343b5201bf40ef77fbef08fb
+  metadata.gz: d5d32053e7810788416b8a9d1c42937bff79462b
+  data.tar.gz: aa65282bdfbe68311fdc140fcbbe59dabc029c92
 SHA512:
-  metadata.gz: fe3b6ea17ed10adc4ae2ffa12e7179d305970b4c8bf0d100671df8b6f800b7ffa042291c57a8d1c4d62550490654c245134f3f18c2f1733cfa0ca829018defcb
-  data.tar.gz: 7d01cc0c741ca514992e57b44c3defdc1a8d3de5db26f486eae3ef9bd1de62f8823974c6350178ae725bc0b61698f7cc9fdd4f1705f085a1b4799db3654c3276
+  metadata.gz: 316b145f9abc4370d0e621e2e374ae9105fe61f9f647b150a1acca82b4818be46bd994eac011cba57d6560bf8c8e5430d0b6a7e09634c313ea09723cd2f35662
+  data.tar.gz: f9d134bf294c9abd189af50400948d4dc2fed55e5fb925e3f39cc714fa6090cc4c67bac3dd896e0c40bcde730549deebe4b3525d9ec520c6432882beec0e7afa

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.0.5 / 2014-03-31
+* [FEATURE] Can now accept array of resources and return combined similarity scores
+
 # 0.0.4 / 2014-03-31
 * [FEATURE] Similarity score pushed down into redis using two different approaches depending on size of set
 

data/lib/commendo/content_set.rb

@@ -68,8 +68,17 @@ module Commendo
     end
 
     def similar_to(resource)
-      similar_resources = redis.zrevrange(similarity_key(resource), 0, -1, with_scores: true)
-
+      if resource.kind_of? Array
+        keys = resource.map do |res|
+          similarity_key(res)
+        end
+        tmp_key = "#{key_base}:tmp:#{SecureRandom.uuid}"
+        redis.zunionstore(tmp_key, keys)
+        similar_resources = redis.zrevrange(tmp_key, 0, -1, with_scores: true)
+        redis.del(tmp_key)
+      else
+        similar_resources = redis.zrevrange(similarity_key(resource), 0, -1, with_scores: true)
+      end
       similar_resources.map do |resource|
         {resource: resource[0], similarity: resource[1].to_f}
       end

data/lib/commendo/version.rb

@@ -1,3 +1,3 @@
 module Commendo
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/test/content_set_test.rb

@@ -95,7 +95,21 @@ module Commendo
     end
 
     def test_calculate_yields_after_each
-      skip
+      redis = Redis.new(db: 15)
+      redis.flushdb
+      key_base = 'CommendoTests'
+      cs = ContentSet.new(redis, key_base)
+      (3..23).each do |group|
+        (3..23).each do |res|
+          cs.add_by_group(group, res) if res % group == 0
+        end
+      end
+      expected_keys = ['CommendoTests:resources:3', 'CommendoTests:resources:4', 'CommendoTests:resources:5', 'CommendoTests:resources:6', 'CommendoTests:resources:7', 'CommendoTests:resources:8', 'CommendoTests:resources:9', 'CommendoTests:resources:10', 'CommendoTests:resources:11', 'CommendoTests:resources:12', 'CommendoTests:resources:13', 'CommendoTests:resources:14', 'CommendoTests:resources:15', 'CommendoTests:resources:16', 'CommendoTests:resources:17', 'CommendoTests:resources:18', 'CommendoTests:resources:19', 'CommendoTests:resources:20', 'CommendoTests:resources:21', 'CommendoTests:resources:22', 'CommendoTests:resources:23']
+      actual_keys = []
+      cs.calculate_similarity { |key, index, total|
+        actual_keys << key
+      }
+      assert_equal expected_keys.sort, actual_keys.sort
     end
 
     def test_calculate_deletes_old_values_first
@@ -221,6 +235,65 @@ module Commendo
 
     end
 
+    def test_recommends_for_many
+      redis = Redis.new(db: 15)
+      redis.flushdb
+      ts = TagSet.new(redis, 'CommendoTests:tags')
+      cs = ContentSet.new(redis, 'CommendoTests', ts)
+      (3..23).each do |group|
+        (3..23).each do |res|
+          cs.add(res, group) if res % group == 0
+          ts.add(res, 'mod3') if res.modulo(3).zero?
+          ts.add(res, 'mod4') if res.modulo(4).zero?
+          ts.add(res, 'mod5') if res.modulo(5).zero?
+        end
+      end
+      cs.calculate_similarity
+      expected = [
+        {resource: '18', similarity: 1.333},
+        {resource: '3', similarity: 1.25},
+        {resource: '6', similarity: 0.833},
+        {resource: '12', similarity: 0.7},
+        {resource: '21', similarity: 0.667},
+        {resource: '15', similarity: 0.667},
+        {resource: '9', similarity: 0.533},
+        {resource: '4', similarity: 0.25},
+        {resource: '8', similarity: 0.2},
+        {resource: '16', similarity: 0.167},
+        {resource: '20', similarity: 0.143}
+      ]
+      actual = cs.similar_to([12, 6, 9])
+      assert_equal expected, actual
+      #, include: ['mod4'], exclude: ['mod3', 'mod5']
+    end
+
+    def test_recommends_for_many_applies_filters
+      redis = Redis.new(db: 15)
+      redis.flushdb
+      ts = TagSet.new(redis, 'CommendoTests:tags')
+      cs = ContentSet.new(redis, 'CommendoTests', ts)
+      (3..23).each do |group|
+        (3..23).each do |res|
+          cs.add(res, group) if res % group == 0
+          ts.add(res, 'mod3') if res.modulo(3).zero?
+          ts.add(res, 'mod4') if res.modulo(4).zero?
+          ts.add(res, 'mod5') if res.modulo(5).zero?
+        end
+      end
+      cs.calculate_similarity
+      actual = cs.filtered_similar_to([12, 6, 9], include: ['mod4'], exclude: ['mod3', 'mod5'])
+      refute contains_resource('6', actual)
+      refute contains_resource('18', actual)
+      assert contains_resource('4', actual)
+      refute contains_resource('3', actual)
+      refute contains_resource('9', actual)
+      assert contains_resource('8', actual)
+      refute contains_resource('21', actual)
+      assert contains_resource('16', actual)
+      refute contains_resource('15', actual)
+      refute contains_resource('20', actual)
+    end
+
     def similar_to(cs, resource, similar)
       contains_resource(similar, cs.similar_to(resource))
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commendo
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Rob Styles