picky 1.4.1 → 1.4.2

data/spec/lib/{cacher → internals/generators}/partial/substring_spec.rb

@@ -1,24 +1,23 @@
 require 'spec_helper'
 
-describe Cacher::Partial::Substring do
+describe Internals::Generators::Partial::Substring do
   
   context 'default from' do
-    before(:each) do
-      @cacher = Cacher::Partial::Substring.new
-    end
+    let(:generator) { described_class.new }
+    
     describe 'use_exact_for_partial?' do
       it 'returns false' do
-        Cacher::Partial::Substring.new.use_exact_for_partial?.should == false
+        described_class.new.use_exact_for_partial?.should == false
       end
     end
     describe 'from' do
       it 'should return the right value' do
-        @cacher.from.should == 1
+        generator.from.should == 1
       end
     end
     describe 'generate_from' do
       it 'should generate the right index' do
-        @cacher.generate_from(florian: [1], flavia: [2]).should == {
+        generator.generate_from(florian: [1], flavia: [2]).should == {
           florian: [1],
           floria:  [1],
           flori:   [1],
@@ -33,10 +32,10 @@ describe Cacher::Partial::Substring do
         }
       end
       it "should be fast" do
-        performance_of { @cacher.generate_from(florian: [1], flavia: [2]) }.should < 0.0001
+        performance_of { generator.generate_from(florian: [1], flavia: [2]) }.should < 0.0001
       end
       it "should handle duplicate ids" do
-        @cacher.generate_from(flo: [1], fla: [1]).should == {
+        generator.generate_from(flo: [1], fla: [1]).should == {
           flo: [1],
           fl:  [1],
           f:   [1],
@@ -48,10 +47,10 @@ describe Cacher::Partial::Substring do
   context 'from set' do
     describe 'negative from' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new from: -2
+        @generator = described_class.new from: -2
       end
       it 'should generate the right index' do
-        @cacher.generate_from(florian: [1], flavia: [2]).should == {
+        @generator.generate_from(florian: [1], flavia: [2]).should == {
           florian: [1],
           floria:  [1],
           flavia:  [2],
@@ -61,11 +60,11 @@ describe Cacher::Partial::Substring do
     end
     context "large from" do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new from: 10
+        @generator = described_class.new from: 10
       end
       describe 'generate_from' do
         it 'should generate the right index' do
-          @cacher.generate_from(florian: [1], :'01234567890' => [2] ).should == {
+          @generator.generate_from(florian: [1], :'01234567890' => [2] ).should == {
             :florian => [1],
             :'01234567890' => [2],
             :'0123456789' => [2]
@@ -75,21 +74,21 @@ describe Cacher::Partial::Substring do
     end
     context 'default to' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new from: 4
+        @generator = described_class.new from: 4
       end
       describe 'to' do
         it 'should return the right value' do
-          @cacher.to.should == -1
+          @generator.to.should == -1
         end
       end
       describe 'from' do
         it 'should return the right value' do
-          @cacher.from.should == 4
+          @generator.from.should == 4
         end
       end
       describe 'generate_from' do
         it 'should generate the right index' do
-          @cacher.generate_from( :florian => [1], :flavia => [2] ).should == {
+          @generator.generate_from( :florian => [1], :flavia => [2] ).should == {
             :florian => [1],
             :floria => [1],
             :flori => [1],
@@ -111,7 +110,7 @@ describe Cacher::Partial::Substring do
           end
         end
         it "should be fast" do
-          performance_of { @cacher.generate_from(@index) }.should < 0.008
+          performance_of { @generator.generate_from(@index) }.should < 0.008
         end
       end
       describe "a bigger example with almost identical symbols" do
@@ -123,27 +122,27 @@ describe Cacher::Partial::Substring do
           end
         end
         it "should be fast" do
-          performance_of { @cacher.generate_from(@index) }.should < 0.0045
+          performance_of { @generator.generate_from(@index) }.should < 0.0045
         end
       end
     end
     context 'to set' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new from: 4, to: -2
+        @generator = described_class.new from: 4, to: -2
       end
       describe 'to' do
         it 'should return the right value' do
-          @cacher.to.should == -2
+          @generator.to.should == -2
         end
       end
       describe 'from' do
         it 'should return the right value' do
-          @cacher.from.should == 4
+          @generator.from.should == 4
         end
       end
       describe 'generate_from' do
         it 'should generate the right index' do
-          @cacher.generate_from( :florian => [1], :flavia => [2] ).should == {
+          @generator.generate_from( :florian => [1], :flavia => [2] ).should == {
             :floria => [1],
             :flori => [1],
             :flor => [1],
@@ -155,21 +154,21 @@ describe Cacher::Partial::Substring do
     end
     context 'to set' do
       before(:each) do
-        @cacher = Cacher::Partial::Substring.new from: 4, to: 0
+        @generator = described_class.new from: 4, to: 0
       end
       describe 'to' do
         it 'should return the right value' do
-          @cacher.to.should == 0
+          @generator.to.should == 0
         end
       end
       describe 'from' do
         it 'should return the right value' do
-          @cacher.from.should == 4
+          @generator.from.should == 4
         end
       end
       describe 'generate_from' do
         it 'should generate the right index' do
-          @cacher.generate_from( :florian => [1], :flavia => [2] ).should == {
+          @generator.generate_from( :florian => [1], :flavia => [2] ).should == {
             :florian => [1],
             :floria => [1],
             :flori => [1],

data/spec/lib/{cacher → internals/generators}/partial_generator_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Cacher::PartialGenerator do
+describe Internals::Generators::PartialGenerator do
 
   context 'integration' do
     it 'should generate the correct values with a given strategy' do
-      generator = Cacher::PartialGenerator.new :meier => [1], :maier => [2]
+      generator = described_class.new :meier => [1], :maier => [2]
       
-      generator.generate(Cacher::Partial::Substring.new).should == {
+      generator.generate(Internals::Generators::Partial::Substring.new).should == {
         :meier => [1],
         :meie => [1],
         :mei => [1],
@@ -19,9 +19,9 @@ describe Cacher::PartialGenerator do
       }
     end
     it 'should generate the correct values with a given specific strategy' do
-      generator = Cacher::PartialGenerator.new :meier => [1], :maier => [2]
+      generator = described_class.new :meier => [1], :maier => [2]
       
-      generator.generate(Cacher::Partial::Substring.new(:from => 3)).should == {
+      generator.generate(Internals::Generators::Partial::Substring.new(:from => 3)).should == {
         :meier => [1],
         :meie => [1],
         :mei => [1],

data/spec/lib/{cacher → internals/generators}/similarity/double_levenshtone_spec.rb

@@ -2,10 +2,10 @@
 #
 require 'spec_helper'
 
-describe Cacher::Similarity::DoubleLevenshtone do
+describe Internals::Generators::Similarity::DoubleLevenshtone do
 
   before(:each) do
-    @similarity = Cacher::Similarity::DoubleLevenshtone.new
+    @similarity = described_class.new
   end
 
   def self.it_should_encode text, expected
@@ -30,7 +30,7 @@ describe Cacher::Similarity::DoubleLevenshtone do
 
   describe 'with reduced amount' do
     before(:each) do
-      @similarity = Cacher::Similarity::DoubleLevenshtone.new(1)
+      @similarity = described_class.new(1)
     end
     it_should_generate_from({ :maier => nil, :meier => nil }, :MR => [:maier])
     it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :SSN => [:susan], :PRTR => [:bruderer])
@@ -59,7 +59,7 @@ describe Cacher::Similarity::DoubleLevenshtone do
   
   context "alias" do
     it "works also with Phonetic" do
-      lambda { Cacher::Similarity::Phonetic.new(1) }.should_not raise_error
+      lambda { Internals::Generators::Similarity::Phonetic.new(1) }.should_not raise_error
     end
   end
 

data/spec/lib/{cacher → internals/generators}/similarity/none_spec.rb

@@ -2,10 +2,10 @@
 #
 require 'spec_helper'
 
-describe Cacher::Similarity::None do
+describe Internals::Generators::Similarity::None do
 
   before(:each) do
-    @similarity = Cacher::Similarity::None.new
+    @similarity = described_class.new
   end
   
   describe "saved?" do

data/spec/lib/{cacher → internals/generators}/similarity_generator_spec.rb

@@ -1,21 +1,21 @@
 require 'spec_helper'
 
-describe Cacher::SimilarityGenerator do
+describe Internals::Generators::SimilarityGenerator do
 
   context 'integration' do
     it 'should generate the correct values' do
-      generator = Cacher::SimilarityGenerator.new :anything_really
+      generator = described_class.new :anything_really
 
       generator.generate.should == {}
     end
     it 'should generate the correct values with a given strategy' do
-      generator = Cacher::SimilarityGenerator.new :meier => nil,
+      generator = described_class.new :meier => nil,
                                                   :maier => nil,
                                                   :mayer => nil,
                                                   :meyer => nil,
                                                   :peter => nil
 
-      generator.generate(Cacher::Similarity::DoubleLevenshtone.new).should == { :MR => [:meier, :maier, :mayer, :meyer], :PTR => [:peter] }
+      generator.generate(Internals::Generators::Similarity::DoubleLevenshtone.new).should == { :MR => [:meier, :maier, :mayer, :meyer], :PTR => [:peter] }
     end
   end
 

data/spec/lib/{cacher → internals/generators}/weights/logarithmic_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Cacher::Weights::Logarithmic do
+describe Internals::Generators::Weights::Logarithmic do
 
   before(:each) do
-    @cacher = Cacher::Weights::Logarithmic.new
+    @cacher = described_class.new
   end
 
   describe 'generate_from' do

data/spec/lib/internals/generators/weights_generator_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Internals::Generators::WeightsGenerator do
+
+  context 'integration' do
+    it 'should generate the correct values' do
+      generator = described_class.new :a => Array.new(0),
+                                        :b => Array.new(1),
+                                        :c => Array.new(10),
+                                        :d => Array.new(100),
+                                        :e => Array.new(1000)
+
+      result = generator.generate
+
+      result[:c].should be_close 2.3, 0.011
+      result[:d].should be_close 4.6, 0.011
+      result[:e].should be_close 6.9, 0.011
+    end
+  end
+
+end

data/spec/lib/{index → internals/index}/file/basic_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Index::File::Basic do
+describe Internals::Index::File::Basic do
   
   before(:each) do
-    @file = Index::File::Basic.new "some/cache/path/to/file"
+    @file = described_class.new "some/cache/path/to/file"
   end
   
   describe "backup_file_path_of" do

data/spec/lib/{index → internals/index}/file/json_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Index::File::JSON do
+describe Internals::Index::File::JSON do
   
   before(:each) do
-    @file = Index::File::JSON.new "some_cache_path"
+    @file = described_class.new "some_cache_path"
   end
   
   describe "dump" do

data/spec/lib/{index → internals/index}/file/marshal_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Index::File::Marshal do
+describe Internals::Index::File::Marshal do
   
   before(:each) do
-    @file = Index::File::Marshal.new "some_cache_path"
+    @file = described_class.new "some_cache_path"
   end
   
   describe "dump" do

data/spec/lib/{index → internals/index}/file/text_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Index::File::Text do
+describe Internals::Index::File::Text do
   
   before(:each) do
-    @file = Index::File::Text.new "some_cache_path"
+    @file = described_class.new "some_cache_path"
   end
   
   describe "load" do

data/spec/lib/{index → internals/index}/files_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
-describe Index::Files do
+describe Internals::Index::Files do
 
   before(:each) do
     index         = stub :index, :name => :some_index
     category      = stub :category, :name => :some_category
     configuration = Configuration::Index.new index, category
     
-    @files         = Index::Files.new :some_name, configuration
+    @files         = described_class.new :some_name, configuration
     
     @prepared      = @files.prepared
     

data/spec/lib/{indexed/bundle_spec.rb → internals/indexed/bundle/memory_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Indexed::Bundle do
+describe Internals::Indexed::Bundle::Memory do
 
   before(:each) do
     @category     = stub :category, :name => :some_category
@@ -8,13 +8,12 @@ describe Indexed::Bundle do
     @configuration = Configuration::Index.new @index, @category
     
     @similarity   = stub :similarity
-    @bundle_class = Indexed::Bundle
-    @bundle       = @bundle_class.new :some_name, @configuration, @similarity
+    @bundle       = described_class.new :some_name, @configuration, @similarity
   end
 
   describe 'identifier' do
     it 'should return a specific identifier' do
-      @bundle.identifier.should == 'some_index some_category (some_name)'
+      @bundle.identifier.should == 'some_index:some_category:some_name'
     end
   end
 
@@ -100,7 +99,7 @@ describe Indexed::Bundle do
       @index    = stub :index, :name => :some_index
       @configuration = Configuration::Index.new @index, @category
       
-      @bundle = @bundle_class.new :some_name, @configuration, :similarity
+      @bundle = described_class.new :some_name, @configuration, :similarity
     end
     it 'should initialize the index correctly' do
       @bundle.index.should == {}

data/spec/lib/{indexed → internals/indexed}/categories_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Indexed::Categories do
+describe Internals::Indexed::Categories do
   context 'with option ignore_unassigned_tokens' do
     context 'ignore_unassigned_tokens true' do
       before(:each) do
-        @categories = Indexed::Categories.new ignore_unassigned_tokens: true
+        @categories = described_class.new ignore_unassigned_tokens: true
       end
       it 'should return the right value' do
         @categories.ignore_unassigned_tokens.should == true
@@ -12,7 +12,7 @@ describe Indexed::Categories do
     end
     context 'ignore_unassigned_tokens false' do
       before(:each) do
-        @categories = Indexed::Categories.new ignore_unassigned_tokens: false
+        @categories = described_class.new ignore_unassigned_tokens: false
       end
       it 'should return the right value' do
         @categories.ignore_unassigned_tokens.should == false
@@ -24,14 +24,14 @@ describe Indexed::Categories do
     before(:each) do
       @index1 = stub :index1, :name => :some_index
       
-      @categories = Indexed::Categories.new
-      @categories << Indexed::Category.new(:category1, @index1)
-      @categories << Indexed::Category.new(:category2, @index1)
-      @categories << Indexed::Category.new(:category3, @index1)
+      @categories = described_class.new
+      @categories << Internals::Indexed::Category.new(:category1, @index1)
+      @categories << Internals::Indexed::Category.new(:category2, @index1)
+      @categories << Internals::Indexed::Category.new(:category3, @index1)
     end
     describe "similar_possible_for" do
       before(:each) do
-        @token = Query::Token.processed 'similar~'
+        @token = Internals::Query::Token.processed 'similar~'
       end
       it "returns possible categories" do
         @categories.similar_possible_for(@token).should == []
@@ -41,7 +41,7 @@ describe Indexed::Categories do
   
   describe 'clear' do
     before(:each) do
-      @categories = Indexed::Categories.new
+      @categories = described_class.new
     end
     it 'is clear right at the beginning' do
       @categories.categories.should be_empty
@@ -67,11 +67,11 @@ describe Indexed::Categories do
     before(:each) do
       @index1 = stub :index1, :name => :some_index
       
-      @category1 = Indexed::Category.new :category1, @index1
-      @category2 = Indexed::Category.new :category2, @index1
-      @category3 = Indexed::Category.new :category3, @index1
+      @category1 = Internals::Indexed::Category.new :category1, @index1
+      @category2 = Internals::Indexed::Category.new :category2, @index1
+      @category3 = Internals::Indexed::Category.new :category3, @index1
       
-      @categories = Indexed::Categories.new
+      @categories = described_class.new
       @categories << @category1
       @categories << @category2
       @categories << @category3

data/spec/lib/{indexed → internals/indexed}/category_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Indexed::Category do
+describe Internals::Indexed::Category do
 
   before(:each) do
     @index               = stub :index, :name => :some_index
@@ -11,28 +11,49 @@ describe Indexed::Category do
     @exact   = stub :exact, :dump => nil
     @partial = stub :partial, :dump => nil
     
-    @category = Indexed::Category.new :some_name, @index, :partial    => @partial_strategy,
-                                                          :weights    => @weights_strategy,
-                                                          :similarity => @similarity_strategy,
-                                                          :qualifiers => [:q, :qualifier],
-                                                          :exact_index_bundle => @exact,
-                                                          :partial_index_bundle => @partial
+    @category = described_class.new :some_name, @index, :partial    => @partial_strategy,
+                                                        :weights    => @weights_strategy,
+                                                        :similarity => @similarity_strategy,
+                                                        :qualifiers => [:q, :qualifier]
     
     @category.stub! :exclaim
   end
   
   describe 'partial' do
-    context 'with a partial strategy that uses the exact index' do
+    context 'default' do
       before(:each) do
-        @partial_strategy.stub! :use_exact_for_partial? => true
+        @category = described_class.new :some_name, @index
       end
-      it 'returns the partial index' do
-        @category.partial.should == @exact
+      context 'with a partial strategy that uses the exact index' do
+        before(:each) do
+          @partial_strategy.stub! :use_exact_for_partial? => true
+        end
+        it 'returns the partial index' do
+          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Memory)
+        end
+      end
+      context 'with a partial strategy that uses the partial index (default)' do
+        it 'returns the partial index' do
+          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Memory)
+        end
       end
     end
-    context 'with a partial strategy that uses the partial index (default)' do
-      it 'returns the partial index' do
-        @category.partial.should == @partial
+    context 'indexed_bundle_class defined' do
+      before(:each) do
+        @category = described_class.new :some_name, @index, :indexed_bundle_class => Internals::Indexed::Bundle::Redis
+      end
+      context 'with a partial strategy that uses the exact index' do
+        before(:each) do
+          @partial_strategy.stub! :use_exact_for_partial? => true
+        end
+        it 'returns the partial index' do
+          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Redis)
+        end
+      end
+      context 'with a partial strategy that uses the partial index (default)' do
+        it 'returns the partial index' do
+          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Redis)
+        end
       end
     end
   end
@@ -122,35 +143,41 @@ describe Indexed::Category do
         @category.stub! :weight => :some_weight, :bundle_for => :bundle
       end
       it 'should return a new combination' do
-        @category.combination_for(@token).should be_kind_of(::Query::Combination)
+        @category.combination_for(@token).should be_kind_of(Internals::Query::Combination)
       end
       it 'should create the combination correctly' do
-        ::Query::Combination.should_receive(:new).once.with @token, @category
+        Internals::Query::Combination.should_receive(:new).once.with @token, @category
 
         @category.combination_for @token
       end
     end
   end
+  
+  context 'stubbed exact/partial' do
+    before(:each) do
+      @category.stub! :exact => (@exact = stub :exact)
+      @category.stub! :partial => (@partial = stub :partial)
+    end
+    describe 'bundle_for' do
+      it 'should return the right bundle' do
+        token = stub :token, :partial? => false
 
-  describe 'bundle_for' do
-    it 'should return the right bundle' do
-      token = stub :token, :partial? => false
+        @category.bundle_for(token).should == @exact
+      end
+      it 'should return the right bundle' do
+        token = stub :token, :partial? => true
 
-      @category.bundle_for(token).should == @exact
+        @category.bundle_for(token).should == @partial
+      end
     end
-    it 'should return the right bundle' do
-      token = stub :token, :partial? => true
 
-      @category.bundle_for(token).should == @partial
-    end
-  end
-  
-  describe 'load_from_cache' do
-    it 'should call two methods' do
-      @exact.should_receive(:load).once
-      @partial.should_receive(:load).once
-      
-      @category.load_from_cache
+    describe 'load_from_cache' do
+      it 'should call two methods' do
+        @exact.should_receive(:load).once
+        @partial.should_receive(:load).once
+
+        @category.load_from_cache
+      end
     end
   end
 

data/spec/lib/{indexed → internals/indexed}/index_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Indexed::Index do
+describe Internals::Indexed::Index do
   
   context 'without stubbed categories' do
     before(:each) do
-      @index = Indexed::Index.new :some_index_name
+      @index = described_class.new :some_index_name
     end
     
     describe 'define_category' do
@@ -14,7 +14,7 @@ describe Indexed::Index do
         @index.categories.categories.size.should == 1 
       end
       it 'returns the new category' do
-        @index.define_category(:some_category_name).should be_kind_of(Indexed::Category)
+        @index.define_category(:some_category_name).should be_kind_of(Internals::Indexed::Category)
       end
     end
   end
@@ -23,7 +23,7 @@ describe Indexed::Index do
     before(:each) do
       @categories = stub :categories
       
-      @index = Indexed::Index.new :some_name
+      @index = described_class.new :some_name
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
       
@@ -48,7 +48,7 @@ describe Indexed::Index do
   
   context "no categories" do
     it "works" do
-      Indexed::Index.new :some_name
+      described_class.new :some_name
     end
   end