picky 3.2.0 → 3.3.0

data/spec/lib/category_indexing_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe Picky::Category do
-  
+
   before(:each) do
     @index  = Picky::Index.new :some_index
     @source = stub :some_given_source, :key_format => nil
   end
   let(:category) { described_class.new(:some_category, @index, :source => @source).tap { |c| c.stub! :timed_exclaim } }
-  
+
   context "unit specs" do
-    let(:exact) { category.indexing_exact }
-    let(:partial) { category.indexing_partial }
-    
+    let(:exact) { category.exact }
+    let(:partial) { category.partial }
+
     describe 'backup' do
       it 'delegates to both bundles' do
         exact.should_receive(:backup).once.with()
         partial.should_receive(:backup).once.with()
-        
+
         category.backup
       end
     end
@@ -24,7 +24,7 @@ describe Picky::Category do
       it 'delegates to both bundles' do
         exact.should_receive(:restore).once.with()
         partial.should_receive(:restore).once.with()
-        
+
         category.restore
       end
     end
@@ -32,7 +32,7 @@ describe Picky::Category do
       it 'delegates to both bundles' do
         exact.should_receive(:raise_unless_cache_exists).once.with()
         partial.should_receive(:raise_unless_cache_exists).once.with()
-        
+
         category.check
       end
     end
@@ -40,12 +40,12 @@ describe Picky::Category do
       it 'delegates to both bundles' do
         exact.should_receive(:delete).once.with()
         partial.should_receive(:delete).once.with()
-        
+
         category.clear
       end
     end
-    
-    describe 'dump_caches' do
+
+    describe 'dump' do
       before(:each) do
         exact.stub! :dump
         partial.stub! :dump
@@ -53,23 +53,23 @@ describe Picky::Category do
       it 'should dump the exact index' do
         exact.should_receive(:dump).once.with
 
-        category.dump_caches
+        category.dump
       end
       it 'should dump the partial index' do
         partial.should_receive(:dump).once.with
 
-        category.dump_caches
+        category.dump
       end
     end
-    
+
     describe 'generate_caches_from_memory' do
       it 'should delegate to partial' do
         partial.should_receive(:generate_caches_from_memory).once.with
-        
+
         category.generate_caches_from_memory
       end
     end
-    
+
     describe 'generate_partial' do
       it 'should return whatever the partial generation returns' do
         exact.stub! :index
@@ -99,13 +99,13 @@ describe Picky::Category do
         category.should_receive(:generate_caches_from_source).once.with().ordered
         category.should_receive(:generate_partial).once.with().ordered
         category.should_receive(:generate_caches_from_memory).once.with().ordered
-        category.should_receive(:dump_caches).once.with().ordered
+        category.should_receive(:dump).once.with().ordered
         category.should_receive(:timed_exclaim).once.ordered
-        
+
         category.cache
       end
     end
-    
+
     describe 'key_format' do
       context 'source has key_format' do
         before(:each) do
@@ -142,7 +142,7 @@ describe Picky::Category do
         end
       end
     end
-    
+
     describe 'source' do
       context 'with explicit source' do
         let(:category) { described_class.new(:some_category, @index, :source => :category_source) }
@@ -157,7 +157,7 @@ describe Picky::Category do
         end
       end
     end
-    
+
     describe "index" do
       before(:each) do
         @indexer = stub :indexer, :index => nil
@@ -165,7 +165,7 @@ describe Picky::Category do
       end
       it "tells the indexer to index" do
         @indexer.should_receive(:index).once.with [category]
-        
+
         category.prepare
       end
     end
@@ -177,5 +177,5 @@ describe Picky::Category do
       end
     end
   end
-  
+
 end

data/spec/lib/category_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe Picky::Category do
-  
+
   let(:index) { Picky::Index.new :some_index }
   let(:category) { described_class.new :some_category, index }
-  
+
   it 'should set defaults correctly' do
-    category.indexing_exact.weights_strategy.should == Picky::Generators::Weights::Default
-    category.indexing_exact.partial_strategy.should be_kind_of(Picky::Generators::Partial::None)
-    category.indexing_exact.similarity_strategy.should == Picky::Generators::Similarity::Default
-    
-    category.indexing_partial.weights_strategy.should be_kind_of(Picky::Generators::Weights::Logarithmic)
-    category.indexing_partial.partial_strategy.should == Picky::Generators::Partial::Default
-    category.indexing_partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
-    
-    category.indexed_exact.similarity_strategy.should == Picky::Generators::Similarity::Default
-    
-    category.indexed_partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
+    category.exact.weights_strategy.should == Picky::Generators::Weights::Default
+    category.exact.partial_strategy.should be_kind_of(Picky::Generators::Partial::None)
+    category.exact.similarity_strategy.should == Picky::Generators::Similarity::Default
+
+    category.partial.weights_strategy.should be_kind_of(Picky::Generators::Weights::Logarithmic)
+    category.partial.partial_strategy.should == Picky::Generators::Partial::Default
+    category.partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
+
+    category.exact.similarity_strategy.should == Picky::Generators::Similarity::Default
+
+    category.partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
   end
-  
+
 end

data/spec/lib/cores_spec.rb

@@ -125,8 +125,8 @@ describe Picky::Cores do
   
   describe 'number_of_cores' do
     before(:each) do
-      @linux  = mock :linux,  :null_object => true
-      @darwin = mock :darwin, :null_object => true
+      @linux  = mock(:linux).as_null_object
+      @darwin = mock(:darwin).as_null_object
       described_class.stub! :os_to_core_mapping => {
         'linux'  => @linux,
         'darwin' => @darwin

data/spec/lib/extensions/object_spec.rb

@@ -33,26 +33,26 @@ describe Object do
   
   describe 'indented_to_s' do
     describe String do
-      let(:object) { described_class.new("Hello\nTest") }
+      let(:string) { String.new("Hello\nTest") }
       
       it 'indents a default amount' do
-        object.indented_to_s.should == "  Hello\n  Test"
+        string.indented_to_s.should == "  Hello\n  Test"
       end
       it 'indents twice' do
-        object.indented_to_s.indented_to_s.should == "    Hello\n    Test"
+        string.indented_to_s.indented_to_s.should == "    Hello\n    Test"
       end
       it 'indents correctly' do
-        object.indented_to_s(3).should == "   Hello\n   Test"
+        string.indented_to_s(3).should == "   Hello\n   Test"
       end
     end
     describe Array do
-      let(:object) { described_class.new(["Hello", "Test"]) }
+      let(:array) { Array.new(["Hello", "Test"]) }
       
       it 'indents a default amount' do
-        object.indented_to_s.should == "  Hello\n  Test"
+        array.indented_to_s.should == "  Hello\n  Test"
       end
       it 'indents twice' do
-        object.indented_to_s.indented_to_s.should == "    Hello\n    Test"
+        array.indented_to_s.indented_to_s.should == "    Hello\n    Test"
       end
     end
   end

data/spec/lib/generators/partial/postfix_spec.rb

@@ -0,0 +1,131 @@
+require 'spec_helper'
+
+describe Picky::Generators::Partial::Postfix do
+
+  context 'default from' do
+    let(:generator) { described_class.new }
+
+    describe 'use_exact_for_partial?' do
+      it 'returns false' do
+        described_class.new.use_exact_for_partial?.should == false
+      end
+    end
+    describe 'from' do
+      it 'should return the right value' do
+        generator.from.should == 1
+      end
+    end
+    describe 'generate_from' do
+      it 'should generate the right index' do
+        generator.generate_from(florian: [1], flavia: [2]).should == {
+          florian: [1],
+          floria:  [1],
+          flori:   [1],
+          flor:    [1],
+          flo:     [1],
+          fl:   [1, 2],
+          f:    [1, 2],
+          flavia:  [2],
+          flavi:   [2],
+          flav:    [2],
+          fla:     [2]
+        }
+      end
+      it "should be fast" do
+        performance_of { generator.generate_from(florian: [1], flavia: [2]) }.should < 0.0001
+      end
+      it "should handle duplicate ids" do
+        generator.generate_from(flo: [1], fla: [1]).should == {
+          flo: [1],
+          fl:  [1],
+          f:   [1],
+          fla: [1]
+        }
+      end
+    end
+  end
+  context 'specific negative from' do
+    describe 'negative from' do
+      before(:each) do
+        @generator = described_class.new from: -2
+      end
+      it 'should generate the right index' do
+        @generator.generate_from(florian: [1], flavia: [2]).should == {
+          florian: [1],
+          floria:  [1],
+          flavia:  [2],
+          flavi:   [2]
+        }
+      end
+    end
+    context "large from" do
+      before(:each) do
+        @generator = described_class.new from: 10
+      end
+      describe 'generate_from' do
+        it 'should generate the right index' do
+          @generator.generate_from(florian: [1], :'01234567890' => [2] ).should == {
+            :florian => [1],
+            :'01234567890' => [2],
+            :'0123456789' => [2]
+          }
+        end
+      end
+    end
+    context 'specific positive from' do
+      before(:each) do
+        @generator = described_class.new from: 4
+      end
+      describe 'to' do
+        it 'should return the right value' do
+          @generator.to.should == -1
+        end
+      end
+      describe 'from' do
+        it 'should return the right value' do
+          @generator.from.should == 4
+        end
+      end
+      describe 'generate_from' do
+        it 'should generate the right index' do
+          @generator.generate_from( :florian => [1], :flavia => [2] ).should == {
+            :florian => [1],
+            :floria => [1],
+            :flori => [1],
+            :flor => [1],
+            :flavia => [2],
+            :flavi => [2],
+            :flav => [2]
+          }
+        end
+      end
+      describe "a bigger example with disjunct symbols" do
+        before(:each) do
+          abc = ('A'..'Z').to_a + ('a'..'z').to_a
+          @index = {}
+          52.times do |i|
+            @index[abc.join.to_sym] = [i]
+            character = abc.shift
+            abc << character
+          end
+        end
+        it "should be fast" do
+          performance_of { @generator.generate_from(@index) }.should < 0.008
+        end
+      end
+      describe "a bigger example with almost identical symbols" do
+        before(:each) do
+          abc = ('A'..'Z').to_a + ('a'..'z').to_a
+          @index = {}
+          52.times do |i|
+            @index[(abc.join + abc[i].to_s).to_sym] = [i]
+          end
+        end
+        it "should be fast" do
+          performance_of { @generator.generate_from(@index) }.should < 0.0045
+        end
+      end
+    end
+  end
+
+end

data/spec/lib/generators/partial/substring_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Picky::Generators::Partial::Substring do
-  
+
   context 'default from' do
     let(:generator) { described_class.new }
-    
+
     describe 'use_exact_for_partial?' do
       it 'returns false' do
         described_class.new.use_exact_for_partial?.should == false
@@ -24,7 +24,7 @@ describe Picky::Generators::Partial::Substring do
           flor:    [1],
           flo:     [1],
           fl:   [1, 2],
-          f:    [1, 2], 
+          f:    [1, 2],
           flavia:  [2],
           flavi:   [2],
           flav:    [2],
@@ -180,6 +180,31 @@ describe Picky::Generators::Partial::Substring do
         end
       end
     end
+    context 'to set, negative from' do
+      before(:each) do
+        @generator = described_class.new from: -3, to: -2
+      end
+      describe 'to' do
+        it 'should return the right value' do
+          @generator.to.should == -2
+        end
+      end
+      describe 'from' do
+        it 'should return the right value' do
+          @generator.from.should == -3
+        end
+      end
+      describe 'generate_from' do
+        it 'should generate the right index' do
+          @generator.generate_from( :florian => [1], :flavia => [2] ).should == {
+            :floria => [1],
+            :flori => [1],
+            :flavi => [2],
+            :flav => [2]
+          }
+        end
+      end
+    end
   end
-  
+
 end

data/spec/lib/generators/weights_generator_spec.rb

@@ -12,9 +12,9 @@ describe Picky::Generators::WeightsGenerator do
 
       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
+      result[:c].should be_within(0.011).of(2.3)
+      result[:d].should be_within(0.011).of(4.6)
+      result[:e].should be_within(0.011).of(6.9)
     end
   end
 

data/spec/lib/index_indexing_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Picky::Index do
-  
+
   describe 'tokenizer' do
     context 'with tokenizer' do
       let(:tokenizer) { stub :tokenizer, :tokenize => '' }
@@ -29,7 +29,7 @@ describe Picky::Index do
       end
     end
   end
-  
+
   context 'after_indexing' do
     context 'with it set' do
       let(:index) do
@@ -51,7 +51,7 @@ describe Picky::Index do
       end
     end
   end
-  
+
   context 'in general' do
     context 'with #each source' do
       let(:index) do
@@ -77,24 +77,20 @@ describe Picky::Index do
       end
 
       it 'does things in order' do
-        category = stub :category        
-        index.stub! :categories => [
-          category,
-          category,
-          category
-        ]
+        categories = stub :categories
+        index.stub! :categories => categories
 
-        category.should_receive(:index).exactly(3).times
+        categories.should_receive(:index).once
 
         index.index
       end
     end
   end
-  
+
   context "with categories" do
     before(:each) do
       the_source = []
-      
+
       @index = described_class.new :some_name do
         source the_source
       end
@@ -109,7 +105,7 @@ describe Picky::Index do
     describe 'define_source' do
       it 'can be set with this method' do
         source = stub :source, :each => [].each
-        
+
         @index.define_source source
 
         @index.source.should == source
@@ -138,7 +134,7 @@ describe Picky::Index do
       end
     end
   end
-  
+
   context "no categories" do
     it "works" do
       described_class.new :some_name do
@@ -146,5 +142,5 @@ describe Picky::Index do
       end
     end
   end
-  
+
 end

data/spec/lib/index_spec.rb

@@ -3,9 +3,9 @@
 require 'spec_helper'
 
 describe Picky::Index do
-  
+
   let(:some_source) { stub :source, :harvest => nil, :inspect => 'some_source' }
-  
+
   context 'initializer' do
     it 'works' do
       the_source = some_source
@@ -22,16 +22,16 @@ describe Picky::Index do
     end
     it 'registers with the indexes' do
       @api = described_class.allocate
-      
+
       Picky::Indexes.should_receive(:register).once.with @api
-      
+
       the_source = some_source
       @api.send :initialize, :some_index_name do
         source the_source
       end
     end
   end
-  
+
   context 'unit' do
     let(:api) do
       the_source = some_source
@@ -39,12 +39,12 @@ describe Picky::Index do
         source the_source
       end
     end
-    
+
     describe 'geo_categories' do
       it 'delegates correctly' do
         api.should_receive(:ranged_category).once.with :some_lat, 0.00898312, from: :some_lat_from
         api.should_receive(:ranged_category).once.with :some_lng, 0.01796624, from: :some_lng_from
-        
+
         api.geo_categories :some_lat, :some_lng, 1, :lat_from => :some_lat_from, :lng_from => :some_lng_from
       end
     end
@@ -82,5 +82,5 @@ describe Picky::Index do
       end
     end
   end
-  
+
 end

data/spec/lib/indexed/bundle_realtime_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
-describe Picky::Indexed::Bundle do
+describe Picky::Bundle do
 
   before(:each) do
     @index        = Picky::Index.new :some_index
     @category     = Picky::Category.new :some_category, @index
-    
+
     @weights      = Picky::Generators::Weights::Default
     @partial      = Picky::Generators::Partial::Default
     @similarity   = Picky::Generators::Similarity::DoubleMetaphone.new 3
     @bundle       = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, @partial, @similarity
   end
-  
+
   it 'is by default empty' do
     @bundle.realtime_mapping.should == {}
   end
@@ -24,12 +24,12 @@ describe Picky::Indexed::Bundle do
   it 'is by default empty' do
     @bundle.similarity.should == {}
   end
-  
+
   describe 'combined' do
     it 'works correctly' do
       @bundle.add 1, :title
       @bundle.add 2, :title
-      
+
       @bundle.realtime_mapping.should == { 1 => [:title], 2 => [:title] }
       @bundle.inverted.should == { :title => [2,1] }
       @bundle.weights.should == { :title => 0.6931471805599453 }
@@ -40,7 +40,7 @@ describe Picky::Indexed::Bundle do
       @bundle.add 2, :title
       @bundle.remove 1
       @bundle.remove 2
-      
+
       @bundle.realtime_mapping.should == {}
       @bundle.weights.should == {}
       @bundle.inverted.should == {}
@@ -51,7 +51,7 @@ describe Picky::Indexed::Bundle do
       @bundle.add 1, :other
       @bundle.add 1, :whatever
       @bundle.remove 1
-      
+
       @bundle.realtime_mapping.should == {}
       @bundle.weights.should == {}
       @bundle.inverted.should == {}
@@ -62,7 +62,7 @@ describe Picky::Indexed::Bundle do
       @bundle.add 2, :thing
       @bundle.add 1, :other
       @bundle.remove 1
-      
+
       @bundle.realtime_mapping.should == { 2 => [:thing] }
       @bundle.weights.should == { :thing => 0.0 }
       @bundle.inverted.should == { :thing => [2] }
@@ -71,7 +71,7 @@ describe Picky::Indexed::Bundle do
     it 'works correctly' do
       @bundle.add 1, :title
       @bundle.add 1, :title
-      
+
       @bundle.realtime_mapping.should == { 1 => [:title] }
       @bundle.weights.should  == { :title => 0.0 }
       @bundle.inverted.should == { :title => [1] }
@@ -81,35 +81,35 @@ describe Picky::Indexed::Bundle do
       @bundle.add 1, :title
       @bundle.remove 1
       @bundle.remove 1
-      
+
       @bundle.realtime_mapping.should == {}
       @bundle.weights.should  == {}
       @bundle.inverted.should == {}
       @bundle.similarity.should == {}
     end
   end
-  
+
   describe 'add' do
     it 'works correctly' do
       @bundle.add 1, :title
-      
+
       @bundle.realtime_mapping.should == { 1 => [:title] }
-      
+
       @bundle.add 2, :other
-      
+
       @bundle.realtime_mapping.should == { 1 => [:title], 2 => [:other] }
-      
+
       @bundle.add 1, :thing
-      
+
       @bundle.realtime_mapping.should == { 1 => [:title, :thing], 2 => [:other] }
     end
     it 'works correctly' do
       @bundle.add 1, :title
-      
+
       @bundle.weights.should == { :title => 0.0 }
       @bundle.inverted.should == { :title => [1] }
       @bundle.similarity.should == { :TTL => [:title] }
     end
   end
-  
+
 end