inferx 0.2.3 → 0.2.4

data/spec/inferx/category/complementary_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+require 'inferx/category/complementary'
+
+describe Inferx::Category::Complementary, '#ready_to_inject' do
+  it 'calls #inject with the words to inject block' do
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
+    category.should_receive(:inject).with(%w(word1 word2 word3))
+
+    category.ready_to_inject do |inject|
+      inject[%w(word1)]
+      inject[%w(word2)]
+      inject[%w(word3)]
+    end
+  end
+end
+
+describe Inferx::Category::Complementary, '#ready_to_eject' do
+  it 'calls #eject with the words to eject block' do
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
+    category.should_receive(:eject).with(%w(word1 word2 word3))
+
+    category.ready_to_eject do |eject|
+      eject[%w(word1)]
+      eject[%w(word2)]
+      eject[%w(word3)]
+    end
+  end
+end
+
+describe Inferx::Category::Complementary, '#train' do
+  before do
+    @filtered_categories = categories_stub do |s|
+      s.stub!(:inject => {'red' => 5})
+    end
+
+    @categories = categories_stub do |s|
+      s.stub!(:except => @filtered_categories)
+    end
+
+    @category = described_class.new(redis_stub, @categories, 'red', 2)
+  end
+
+  it 'calls Inferx::Categories#except with the category name' do
+    @categories.should_receive(:except).with('red').and_return(@filtered_categories)
+    @category.train(%w(apple strawberry apple strawberry strawberry))
+  end
+
+  it 'calls Inferx::Categories#inject with the words' do
+    @filtered_categories.should_receive(:inject).with(%w(apple strawberry apple strawberry strawberry)).and_return('red' => 5)
+    @category.train(%w(apple strawberry apple strawberry strawberry))
+  end
+end
+
+describe Inferx::Category::Complementary, '#untrain' do
+  before do
+    @filtered_categories = categories_stub do |s|
+      s.stub!(:eject => {'red' => 5})
+    end
+
+    @categories = categories_stub do |s|
+      s.stub!(:except => @filtered_categories)
+    end
+
+    @category = described_class.new(redis_stub, @categories, 'red', 7)
+  end
+
+  it 'calls Inferx::Categories#except with the category name' do
+    @categories.should_receive(:except).with('red').and_return(@filtered_categories)
+    @category.untrain(%w(apple strawberry apple strawberry strawberry))
+  end
+
+  it 'calls Inferx::Categories#eject with the words' do
+    @filtered_categories.should_receive(:eject).with(%w(apple strawberry apple strawberry strawberry)).and_return('red' => 5)
+    @category.untrain(%w(apple strawberry apple strawberry strawberry))
+  end
+end

data/spec/inferx/category_spec.rb

@@ -2,21 +2,18 @@ require 'spec_helper'
 require 'inferx/category'
 
 describe Inferx::Category, '#initialize' do
-  it 'calls Inferx::Adapter#initialize' do
-    redis = redis_stub
-    category = described_class.new(redis, 'red', 2, :namespace => 'example', :manual => true)
-    category.instance_eval { @redis }.should == redis
-    category.instance_eval { @namespace }.should == 'example'
-    category.should be_manual
+  it 'sets key for access to training data of the category to key attribute' do
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
+    category.key.should == 'inferx:categories:red'
   end
 
-  it 'sets the category name to the name attribute' do
-    category = described_class.new(redis_stub, 'red', 2)
+  it 'sets the category name to name attribute' do
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
     category.name.should == 'red'
   end
 
-  it 'sets the size to the size attribute' do
-    category = described_class.new(redis_stub, 'red', 2)
+  it 'sets the size to size attribute' do
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
     category.size.should == 2
   end
 end
@@ -27,18 +24,29 @@ describe Inferx::Category, '#all' do
       s.should_receive(:zrevrange).with('inferx:categories:red', 0, -1, :withscores => true).and_return([])
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     category.all
   end
 
   it 'returns the words with the score' do
     redis = redis_stub do |s|
-      s.stub!(:zrevrange).with('inferx:categories:red', 0, -1, :withscores => true).and_return(%w(apple 2 strawberry 3))
+      s.stub!(:zrevrange).with('inferx:categories:red', 0, -1, :withscores => true).and_return([['apple', 2.0], ['strawberry', 3.0]])
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     category.all.should == {'apple' => 2, 'strawberry' => 3}
   end
+
+  context 'when return old format' do
+    it 'returns the words with the score' do
+      redis = redis_stub do |s|
+        s.stub!(:zrevrange).with('inferx:categories:red', 0, -1, :withscores => true).and_return(%w(apple 2 strawberry 3))
+      end
+
+      category = described_class.new(redis, categories_stub, 'red', 2)
+      category.all.should == {'apple' => 2, 'strawberry' => 3}
+    end
+  end
 end
 
 describe Inferx::Category, '#get' do
@@ -47,7 +55,7 @@ describe Inferx::Category, '#get' do
       s.should_receive(:zscore).with('inferx:categories:red', 'apple')
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     category.get('apple')
   end
 
@@ -56,7 +64,7 @@ describe Inferx::Category, '#get' do
       s.stub!(:zscore).with('inferx:categories:red', 'apple').and_return('1')
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     category.get('apple').should == 1
   end
 
@@ -66,65 +74,44 @@ describe Inferx::Category, '#get' do
         s.stub!(:zscore).with('inferx:categories:red', 'strawberry').and_return(nil)
       end
 
-      category = described_class.new(redis, 'red', 2)
+      category = described_class.new(redis, categories_stub, 'red', 2)
       category.get('strawberry').should be_nil
     end
   end
 end
 
 describe Inferx::Category, '#train' do
-  it 'calls Redis#zincrby and Redis#hincrby' do
-    redis = redis_stub do |s|
-      s.should_receive(:zincrby).with('inferx:categories:red', 2, 'apple')
-      s.should_receive(:zincrby).with('inferx:categories:red', 3, 'strawberry')
-      s.should_receive(:hincrby).with('inferx:categories', 'red', 5)
-      s.should_receive(:save)
+  before do
+    @filtered_categories = categories_stub do |s|
+      s.stub!(:inject => {'red' => 5})
     end
 
-    category = described_class.new(redis, 'red', 2)
-    category.train(%w(apple strawberry apple strawberry strawberry))
-  end
-
-  it 'increases the size attribute' do
-    redis = redis_stub do |s|
-      s.stub!(:zincrby)
-      s.stub!(:hincrby)
+    @categories = categories_stub do |s|
+      s.stub!(:filter => @filtered_categories)
     end
 
-    category = described_class.new(redis, 'red', 2)
-    category.train(%w(apple strawberry apple strawberry strawberry))
-    category.size.should == 7
+    @category = described_class.new(redis_stub, @categories, 'red', 2)
   end
 
-  context 'with no update' do
-    it 'does not call Redis#hincrby' do
-      redis = redis_stub do |s|
-        s.should_not_receive(:hincrby)
-        s.should_not_receive(:save)
-      end
-
-      category = described_class.new(redis, 'red', 2)
-      category.train([])
-    end
+  it 'calls Inferx::Categories#filter with the category name' do
+    @categories.should_receive(:filter).with('red').and_return(@filtered_categories)
+    @category.train(%w(apple strawberry apple strawberry strawberry))
   end
 
-  context 'with manual save' do
-    it 'does not call Redis#save' do
-      redis = redis_stub do |s|
-        s.stub!(:zincrby)
-        s.stub!(:hincrby)
-        s.should_not_receive(:save)
-      end
+  it 'calls Inferx::Categories#inject with the words' do
+    @filtered_categories.should_receive(:inject).with(%w(apple strawberry apple strawberry strawberry)).and_return('red' => 5)
+    @category.train(%w(apple strawberry apple strawberry strawberry))
+  end
 
-      category = described_class.new(redis, 'red', 2, :manual => true)
-      category.train(%w(apple strawberry apple strawberry strawberry))
-    end
+  it 'increases size attribute' do
+    @category.train(%w(apple strawberry apple strawberry strawberry))
+    @category.size.should == 7
   end
 end
 
 describe Inferx::Category, '#ready_to_train' do
   it 'calls #train with the words to train block' do
-    category = described_class.new(redis_stub, 'red', 2)
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
     category.should_receive(:train).with(%w(word1 word2 word3))
 
     category.ready_to_train do |train|
@@ -136,83 +123,37 @@ describe Inferx::Category, '#ready_to_train' do
 end
 
 describe Inferx::Category, '#untrain' do
-  it 'calls Redis#zincrby, Redis#zremrangebyscore and Redis#hincrby' do
-    redis = redis_stub do |s|
-      s.stub!(:pipelined).and_return do |&block|
-        block.call
-        %w(3 -2 1)
-      end
-
-      s.should_receive(:zincrby).with('inferx:categories:red', -2, 'apple')
-      s.should_receive(:zincrby).with('inferx:categories:red', -3, 'strawberry')
-      s.should_receive(:zremrangebyscore).with('inferx:categories:red', '-inf', 0)
-      s.should_receive(:hincrby).with('inferx:categories', 'red', -3)
-      s.should_receive(:save)
+  before do
+    @filtered_categories = categories_stub do |s|
+      s.stub!(:eject => {'red' => 5})
     end
 
-    category = described_class.new(redis, 'red', 7)
-    category.untrain(%w(apple strawberry apple strawberry strawberry))
-  end
-
-  it 'decreases the size attribute' do
-    redis = redis_stub do |s|
-      s.stub!(:pipelined).and_return do |&block|
-        block.call
-        %w(3 -2 1)
-      end
-
-      s.stub!(:zincrby)
-      s.stub!(:zremrangebyscore)
-      s.stub!(:hincrby)
+    @categories = categories_stub do |s|
+      s.stub!(:filter => @filtered_categories)
     end
 
-    category = described_class.new(redis, 'red', 7)
-    category.untrain(%w(apple strawberry apple strawberry strawberry))
-    category.size.should == 4
+    @category = described_class.new(redis_stub, @categories, 'red', 7)
   end
 
-  context 'with no update' do
-    it 'does not call Redis#zremrangebyscore and Redis#hincrby' do
-      redis = redis_stub do |s|
-        s.stub!(:pipelined).and_return do |&block|
-          block.call
-          %w(-2 -3 2)
-        end
-
-        s.stub!(:zincrby)
-        s.stub!(:zremrangebyscore)
-        s.should_not_receive(:hincrby)
-        s.should_not_receive(:save)
-      end
-
-      category = described_class.new(redis, 'red', 7)
-      category.untrain(%w(apple strawberry apple strawberry strawberry))
-    end
+  it 'calls Inferx::Categories#filter with the category name' do
+    @categories.should_receive(:filter).with('red').and_return(@filtered_categories)
+    @category.untrain(%w(apple strawberry apple strawberry strawberry))
   end
 
-  context 'with manual save' do
-    it 'does not call Redis#save' do
-      redis = redis_stub do |s|
-        s.stub!(:pipelined).and_return do |&block|
-          block.call
-          %w(3 -2 1)
-        end
-
-        s.stub!(:zincrby)
-        s.stub!(:zremrangebyscore)
-        s.stub!(:hincrby)
-        s.should_not_receive(:save)
-      end
+  it 'calls Inferx::Categories#eject with the words' do
+    @filtered_categories.should_receive(:eject).with(%w(apple strawberry apple strawberry strawberry)).and_return('red' => 5)
+    @category.untrain(%w(apple strawberry apple strawberry strawberry))
+  end
 
-      category = described_class.new(redis, 'red', 7, :manual => true)
-      category.untrain(%w(apple strawberry apple strawberry strawberry))
-    end
+  it 'decreases size attribute' do
+    @category.untrain(%w(apple strawberry apple strawberry strawberry))
+    @category.size.should == 2
   end
 end
 
 describe Inferx::Category, '#ready_to_untrain' do
   it 'calls #untrain with the words to untrain block' do
-    category = described_class.new(redis_stub, 'red', 2)
+    category = described_class.new(redis_stub, categories_stub, 'red', 2)
     category.should_receive(:untrain).with(%w(word1 word2 word3))
 
     category.ready_to_untrain do |untrain|
@@ -230,7 +171,7 @@ describe Inferx::Category, '#scores' do
       s.should_receive(:zscore).with('inferx:categories:red', 'strawberry')
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     category.scores(%w(apple strawberry))
   end
 
@@ -239,7 +180,7 @@ describe Inferx::Category, '#scores' do
       s.stub!(:pipelined => %w(2 3))
     end
 
-    category = described_class.new(redis, 'red', 2)
+    category = described_class.new(redis, categories_stub, 'red', 2)
     scores = category.scores(%w(apple strawberry))
     scores.should == [2, 3]
   end

data/spec/inferx_spec.rb

@@ -18,19 +18,11 @@ describe Inferx, '#initialize' do
     described_class.new(:namespace => 'example', :manual => true)
   end
 
-  it "sets an instance of #{described_class}::Categories to the categories attribute" do
+  it "sets an instance of #{described_class}::Categories to categories attribute" do
     redis_stub
     inferx = described_class.new
     inferx.categories.should be_an(Inferx::Categories)
   end
-
-  context 'with :complementary option' do
-    it "sets an instance of #{described_class}::Complementary::Categories to the categories attribute" do
-      redis_stub
-      inferx = described_class.new(:complementary => true)
-      inferx.categories.should be_an(Inferx::Complementary::Categories)
-    end
-  end
 end
 
 describe Inferx, '#score' do

data/spec/spec_helper.rb

@@ -6,3 +6,10 @@ def redis_stub
     Redis.stub!(:new => s) if defined? Redis
   end
 end
+
+def categories_stub
+  stub.tap do |s|
+    s.stub!(:key => 'inferx:categories')
+    yield s if block_given?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inferx
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -58,17 +58,13 @@ files:
 - Rakefile
 - inferx.gemspec
 - lib/inferx.rb
-- lib/inferx/adapter.rb
 - lib/inferx/categories.rb
 - lib/inferx/category.rb
-- lib/inferx/complementary/categories.rb
-- lib/inferx/complementary/category.rb
+- lib/inferx/category/complementary.rb
 - lib/inferx/version.rb
-- spec/inferx/adapter_spec.rb
 - spec/inferx/categories_spec.rb
+- spec/inferx/category/complementary_spec.rb
 - spec/inferx/category_spec.rb
-- spec/inferx/complementary/categories_spec.rb
-- spec/inferx/complementary/category_spec.rb
 - spec/inferx_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -96,11 +92,9 @@ signing_key:
 specification_version: 3
 summary: Naive Bayes classifier, the training data on Redis
 test_files:
-- spec/inferx/adapter_spec.rb
 - spec/inferx/categories_spec.rb
+- spec/inferx/category/complementary_spec.rb
 - spec/inferx/category_spec.rb
-- spec/inferx/complementary/categories_spec.rb
-- spec/inferx/complementary/category_spec.rb
 - spec/inferx_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/lib/inferx/adapter.rb

@@ -1,64 +0,0 @@
-class Inferx
-  class Adapter
-
-    # @param [Redis] redis an instance of Redis
-    # @param [Hash] options
-    # @option options [String] :namespace namespace of keys to be used to Redis
-    # @option options [Boolean] :manual whether manual save, defaults to false
-    def initialize(redis, options = {})
-      @redis = redis
-      @options = options
-      @namespace = options[:namespace]
-      @manual = !!options[:manual]
-    end
-
-    # Determine if manual save.
-    #
-    # @return [Boolean] whether or not manual save
-    def manual?
-      @manual
-    end
-
-    # Get the key for access to categories.
-    #
-    # @return [String] the key
-    def categories_key
-      @categories_key ||= make_categories_key
-    end
-
-    # Make the key for access to categories.
-    #
-    # @return [String] the key
-    def make_categories_key
-      parts = %w(inferx categories)
-      parts.insert(1, @namespace) if @namespace
-      parts.join(':')
-    end
-
-    # Make the key for access to scores stored each by word.
-    #
-    # @param [String] category_name a category name
-    # @return [String] the key
-    def make_category_key(category_name)
-      "#{categories_key}:#{category_name}"
-    end
-
-    # Spawn an instance of any class.
-    #
-    # @param [Class] klass any class, constructor takes the instance of Redis to
-    #   first argument, and takes the options to last argument
-    # @param [Array] args any arguments
-    # @return [Object] a instance of the class
-    def spawn(klass, *args)
-      klass.new(@redis, *args, @options)
-    end
-
-    protected
-
-    %w(hdel hexists hget hgetall hincrby hkeys hsetnx).each do |command|
-      define_method(command) do |*args|
-        @redis.__send__(command, categories_key, *args)
-      end
-    end
-  end
-end