commendo 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9504182a72226de650736e2b987eda2734a5f3bf
-  data.tar.gz: ff9fb6d451b160f8f2ac4da2d4cb2688621ad7ff
+  metadata.gz: c9c9e5e5c280d0f1ec32c258aa01875eadb369a4
+  data.tar.gz: 370760fc75db86566eaa79684f345aef76176fd7
 SHA512:
-  metadata.gz: 7669f08e1c313865623360a14f72d7686da669c36c7a096485f9da9d9552f904b7cf808bbdaf2379af32d681939a6ab5d587759cbead1fb8037d6869ef91e048
-  data.tar.gz: e8a729ece664f9167e0f2efd8212f5d1ac87ab5edd5dc443ff561ae047d81a97ab6d1d5dafccf7b2c8aac209bc38bc34cdd456e01816bba050ad03cd32a8c8b8
+  metadata.gz: feb82aed9f709bb50357bfa0de939bb6c941a5d7e2b593dd9b1cbf46a0dfd1190e1d703df54ba8e234872d032c452e54b7a9b2ce648722d5b4883711badf69ab
+  data.tar.gz: c040aa4d208403f52f3bf54d63ab0d5bc5868e4a621175642f539872ce5d444bd8e73f39492ec521bb1cb6b3cd640dc14a83666db5e3aa3a9208c9c219fb7b6d

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 1.2.0 / 2015-04-01
+* [FEATURE] Add ability to remove select tags for a resource
+
 # 1.1.0 / 2015-04-01
 * [FEATURE] Add ability to remove a resource from a group and recalculate similarity
 

data/bin/commendo-load-tags-tsv

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'redis'
+require 'commendo'
+require 'progressbar'
+
+filename = ARGV[0]
+redis_db = ARGV[1].to_i
+base_key = ARGV[2]
+
+redis = Redis.new(db: redis_db, timeout: 60)
+ts = Commendo::TagSet.new(redis, base_key)
+
+puts "Loading."
+file_length = `wc -l #{filename}`.to_i
+pbar = ProgressBar.new('Loading TSV file', file_length)
+File.open(filename) do |f|
+  f.each_line.with_index do |line, i|
+    pbar.inc
+    tags = line.split("\t")
+    resource = tags.shift
+    ts.add(resource, *tags)
+  end
+end
+puts "\nFinished loading"

data/bin/commendo-load-tsv

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+
+require 'redis'
+require 'commendo'
+require 'progressbar'
+
+filename = ARGV[0]
+redis_db = ARGV[1].to_i
+base_key = ARGV[2]
+
+redis = Redis.new(db: redis_db, timeout: 60)
+cs = Commendo::ContentSet.new(redis, base_key)
+
+puts "Loading."
+file_length = `wc -l #{filename}`.to_i
+pbar = ProgressBar.new('Loading TSV file', file_length)
+File.open(filename) do |f|
+  f.each_line.with_index do |line, i|
+    pbar.inc
+    ids = line.split("\t")
+    resource = ids.shift
+    cs.add(resource, *ids)
+  end
+end
+puts "\nFinished loading"
+
+puts 'Calculating similarities'
+pbar = nil
+cs.calculate_similarity do |key, i, total|
+  pbar ||= ProgressBar.new('Calculating similarity', total)
+  pbar.inc
+end

data/lib/commendo/tag_set.rb

@@ -33,8 +33,12 @@ module Commendo
       return can_include && !should_exclude
     end
 
-    def delete(resource)
+    def delete(resource, *tags)
+      if tags.empty?
       redis.del(resource_key(resource))
+      else
+        redis.srem(resource_key(resource), tags)
+      end
     end
 
     private

data/lib/commendo/version.rb

@@ -1,3 +1,3 @@
 module Commendo
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/test/tag_set_test.rb

@@ -50,7 +50,7 @@ module Commendo
       assert_equal ['qip', 'qux'], @ts.get(2)
     end
 
-    def test_deletes_tags_for_resource
+    def test_deletes_all_tags_for_resource
       @ts.set(1, 'foo', 'bar', 'baz')
       @ts.set(2, 'qux', 'qip')
       assert_equal ['bar', 'baz', 'foo'], @ts.get(1)
@@ -60,6 +60,13 @@ module Commendo
       assert_equal ['qip', 'qux'], @ts.get(2)
     end
 
+    def test_deletes_given_tags_for_resource
+      assert_equal [], @ts.get(1)
+      @ts.set(1, 'foo', 'bar', 'baz', 'qux', 'qip')
+      @ts.delete(1, 'qux', 'qip')
+      assert_equal ['bar', 'baz', 'foo'], @ts.get(1)
+    end
+
     def test_matches_tags
       @ts.set(1, 'foo', 'bar', 'baz')
       @ts.set(2, 'qux', 'qip')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commendo
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Rob Styles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -114,6 +114,8 @@ email:
 executables:
 - commendo-find-identical-pairs
 - commendo-load
+- commendo-load-tags-tsv
+- commendo-load-tsv
 - commendo-recommendations-distribution
 - commendo-similarity-distribution
 extensions: []
@@ -127,6 +129,8 @@ files:
 - Rakefile
 - bin/commendo-find-identical-pairs
 - bin/commendo-load
+- bin/commendo-load-tags-tsv
+- bin/commendo-load-tsv
 - bin/commendo-recommendations-distribution
 - bin/commendo-similarity-distribution
 - commendo.gemspec