predictor 1.0.0 → 2.0.0.rc1

data/spec/input_matrix_spec.rb

@@ -14,22 +14,6 @@ describe Predictor::InputMatrix do
     @matrix.redis_key.should == "predictor-test:mymatrix"
   end
 
-  it "should respond to add_set" do
-    @matrix.respond_to?(:add_set).should == true
-  end
-
-  it "should respond to add_single" do
-    @matrix.respond_to?(:add_single).should == true
-  end
-
-  it "should respond to similarities_for" do
-    @matrix.respond_to?(:similarities_for).should == true
-  end
-
-  it "should respond to all_items" do
-    @matrix.respond_to?(:all_items).should == true
-  end
-
   describe "weight" do
     it "returns the weight configured or a default of 1" do
       @matrix.weight.should == 1.0  # default weight
@@ -38,16 +22,10 @@ describe Predictor::InputMatrix do
     end
   end
 
-  describe "add_set" do
-    it "adds each member of the set to the 'all_items' set" do
-      @matrix.all_items.should_not include("foo", "bar", "fnord", "blubb")
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-      @matrix.all_items.should include("foo", "bar", "fnord", "blubb")
-    end
-
+  describe "add_to_set" do
     it "adds each member of the set to the key's 'sets' set" do
       @matrix.items_for("item1").should_not include("foo", "bar", "fnord", "blubb")
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
+      @matrix.add_to_set "item1", "foo", "bar", "fnord", "blubb"
       @matrix.items_for("item1").should include("foo", "bar", "fnord", "blubb")
     end
 
@@ -56,7 +34,7 @@ describe Predictor::InputMatrix do
       @matrix.sets_for("bar").should_not include("item1")
       @matrix.sets_for("fnord").should_not include("item1")
       @matrix.sets_for("blubb").should_not include("item1")
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
+      @matrix.add_to_set "item1", "foo", "bar", "fnord", "blubb"
       @matrix.sets_for("foo").should include("item1")
       @matrix.sets_for("bar").should include("item1")
       @matrix.sets_for("fnord").should include("item1")
@@ -64,58 +42,11 @@ describe Predictor::InputMatrix do
     end
   end
 
-  describe "add_set!" do
-    it "calls add_set and process_item! for each item" do
-      @matrix.should_receive(:add_set).with("item1", ["foo", "bar"])
-      @matrix.should_receive(:process_item!).with("foo")
-      @matrix.should_receive(:process_item!).with("bar")
-      @matrix.add_set! "item1", ["foo", "bar"]
-    end
-  end
-
-  describe "add_single" do
-    it "adds the item to the 'all_items' set" do
-      @matrix.all_items.should_not include("foo")
-      @matrix.add_single "item1", "foo"
-      @matrix.all_items.should include("foo")
-    end
-
-    it "adds the item to the key's 'sets' set" do
-      @matrix.items_for("item1").should_not include("foo")
-      @matrix.add_single "item1", "foo"
-      @matrix.items_for("item1").should include("foo")
-    end
-
-    it "adds the key to the item's 'items' set" do
-      @matrix.sets_for("foo").should_not include("item1")
-      @matrix.add_single "item1", "foo"
-      @matrix.sets_for("foo").should include("item1")
-    end
-  end
-
-  describe "add_single!" do
-    it "calls add_single and process_item! for the item" do
-      @matrix.should_receive(:add_single).with("item1", "foo")
-      @matrix.should_receive(:process_item!).with("foo")
-      @matrix.add_single! "item1", "foo"
-    end
-  end
-
-  describe "all_items" do
-    it "returns all items across all sets in the input matrix" do
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-      @matrix.add_set "item2", ["foo", "bar", "snafu", "nada"]
-      @matrix.add_set "item3", ["nada"]
-      @matrix.all_items.should include("foo", "bar", "fnord", "blubb", "snafu", "nada")
-      @matrix.all_items.length.should == 6
-    end
-  end
-
   describe "items_for" do
     it "returns the items in the given set ID" do
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
+      @matrix.add_to_set "item1", ["foo", "bar", "fnord", "blubb"]
       @matrix.items_for("item1").should include("foo", "bar", "fnord", "blubb")
-      @matrix.add_set "item2", ["foo", "bar", "snafu", "nada"]
+      @matrix.add_to_set "item2", ["foo", "bar", "snafu", "nada"]
       @matrix.items_for("item2").should include("foo", "bar", "snafu", "nada")
       @matrix.items_for("item1").should_not include("snafu", "nada")
     end
@@ -123,8 +54,8 @@ describe Predictor::InputMatrix do
 
   describe "sets_for" do
     it "returns the set IDs the given item is in" do
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-      @matrix.add_set "item2", ["foo", "bar", "snafu", "nada"]
+      @matrix.add_to_set "item1", ["foo", "bar", "fnord", "blubb"]
+      @matrix.add_to_set "item2", ["foo", "bar", "snafu", "nada"]
       @matrix.sets_for("foo").should include("item1", "item2")
       @matrix.sets_for("snafu").should == ["item2"]
     end
@@ -132,9 +63,9 @@ describe Predictor::InputMatrix do
 
   describe "related_items" do
     it "returns the items in sets the given item is also in" do
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-      @matrix.add_set "item2", ["foo", "bar", "snafu", "nada"]
-      @matrix.add_set "item3", ["nada", "other"]
+      @matrix.add_to_set "item1", ["foo", "bar", "fnord", "blubb"]
+      @matrix.add_to_set "item2", ["foo", "bar", "snafu", "nada"]
+      @matrix.add_to_set "item3", ["nada", "other"]
       @matrix.related_items("bar").should include("foo", "fnord", "blubb", "snafu", "nada")
       @matrix.related_items("bar").length.should == 5
       @matrix.related_items("other").should == ["nada"]
@@ -143,109 +74,48 @@ describe Predictor::InputMatrix do
     end
   end
 
-  describe "similarity" do
-    it "should calculate the correct similarity between two items" do
-      add_two_item_test_data!(@matrix)
-      @matrix.process!
-      @matrix.similarity("fnord", "blubb").should == 0.4
-      @matrix.similarity("blubb", "fnord").should == 0.4
-    end
-  end
-
-  describe "similarities_for" do
-    it "should calculate all similarities for an item (1/3)" do
-      add_three_item_test_data!(@matrix)
-      @matrix.process!
-      res = @matrix.similarities_for("fnord", with_scores: true)
-      res.length.should == 2
-      res[0].should == ["shmoo", 0.75]
-      res[1].should == ["blubb", 0.4]
-    end
-
-    it "should calculate all similarities for an item (2/3)" do
-      add_three_item_test_data!(@matrix)
-      @matrix.process!
-      res = @matrix.similarities_for("shmoo", with_scores: true)
-      res.length.should == 2
-      res[0].should == ["fnord", 0.75]
-      res[1].should == ["blubb", 0.2]
-    end
-
-
-    it "should calculate all similarities for an item (3/3)" do
-      add_three_item_test_data!(@matrix)
-      @matrix.process!
-      res = @matrix.similarities_for("blubb", with_scores: true)
-      res.length.should == 2
-      res[0].should == ["fnord", 0.4]
-      res[1].should == ["shmoo", 0.2]
-    end
-  end
-
-  describe "delete_item!" do
+  describe "delete_item" do
     before do
-      @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-      @matrix.add_set "item2", ["foo", "bar", "snafu", "nada"]
-      @matrix.add_set "item3", ["nada", "other"]
-      @matrix.process!
+      @matrix.add_to_set "item1", "foo", "bar", "fnord", "blubb"
+      @matrix.add_to_set "item2", "foo", "bar", "snafu", "nada"
+      @matrix.add_to_set "item3", "nada", "other"
     end
 
     it "should delete the item from sets it is in" do
       @matrix.items_for("item1").should include("bar")
       @matrix.items_for("item2").should include("bar")
       @matrix.sets_for("bar").should include("item1", "item2")
-      @matrix.delete_item!("bar")
+      @matrix.delete_item("bar")
       @matrix.items_for("item1").should_not include("bar")
       @matrix.items_for("item2").should_not include("bar")
       @matrix.sets_for("bar").should be_empty
     end
-
-    it "should delete the cached similarities for the item" do
-      @matrix.similarities_for("bar").should_not be_empty
-      @matrix.delete_item!("bar")
-      @matrix.similarities_for("bar").should be_empty
-    end
-
-    it "should delete the item from other cached similarities" do
-      @matrix.similarities_for("foo").should include("bar")
-      @matrix.delete_item!("bar")
-      @matrix.similarities_for("foo").should_not include("bar")
-    end
-
-    it "should delete the item from the all_items set" do
-      @matrix.all_items.should include("bar")
-      @matrix.delete_item!("bar")
-      @matrix.all_items.should_not include("bar")
-    end
   end
 
   it "should calculate the correct jaccard index" do
-    @matrix.add_set "item1", ["foo", "bar", "fnord", "blubb"]
-    @matrix.add_set "item2", ["bar", "fnord", "shmoo", "snafu"]
-    @matrix.add_set "item3", ["bar", "nada", "snafu"]
-
-    @matrix.send(:calculate_jaccard,
-      "bar",
-      "snafu"
-    ).should == 2.0/3.0
+    @matrix.add_to_set "item1", "foo", "bar", "fnord", "blubb"
+    @matrix.add_to_set "item2", "bar", "fnord", "shmoo", "snafu"
+    @matrix.add_to_set "item3", "bar", "nada", "snafu"
+
+    @matrix.calculate_jaccard("bar", "snafu").should == 2.0/3.0
   end
 
 private
 
   def add_two_item_test_data!(matrix)
-    matrix.add_set("user42", ["fnord", "blubb"])
-    matrix.add_set("user44", ["blubb"])
-    matrix.add_set("user46", ["fnord"])
-    matrix.add_set("user48", ["fnord", "blubb"])
-    matrix.add_set("user50", ["fnord"])
+    matrix.add_to_set("user42", "fnord", "blubb")
+    matrix.add_to_set("user44", "blubb")
+    matrix.add_to_set("user46", "fnord")
+    matrix.add_to_set("user48", "fnord", "blubb")
+    matrix.add_to_set("user50", "fnord")
   end
 
   def add_three_item_test_data!(matrix)
-    matrix.add_set("user42", ["fnord", "blubb", "shmoo"])
-    matrix.add_set("user44", ["blubb"])
-    matrix.add_set("user46", ["fnord", "shmoo"])
-    matrix.add_set("user48", ["fnord", "blubb"])
-    matrix.add_set("user50", ["fnord", "shmoo"])
+    matrix.add_to_set("user42", "fnord", "blubb", "shmoo")
+    matrix.add_to_set("user44", "blubb")
+    matrix.add_to_set("user46", "fnord", "shmoo")
+    matrix.add_to_set("user48", "fnord", "blubb")
+    matrix.add_to_set("user50", "fnord", "shmoo")
   end
 
 end

data/spec/predictor_spec.rb

@@ -9,7 +9,7 @@ describe Predictor do
 
   it "should raise an exception if unconfigured redis connection is accessed" do
     Predictor.redis = nil
-    lambda{ ecommendify.redis }.should raise_error
+    lambda{ Predictor.redis }.should raise_error(/not configured/i)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predictor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Pathgather
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -45,10 +45,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Changelog.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
+- docs/READMEv1.md
 - lib/predictor.rb
 - lib/predictor/base.rb
 - lib/predictor/input_matrix.rb
@@ -74,9 +76,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.1.11