picky 3.4.3 → 3.5.0

data/lib/picky/wrappers/category/location.rb

@@ -6,23 +6,28 @@ module Picky
 
         # THINK Is this the best way to do this?
         #
-        def self.wrap category, grid, precision = 1
-          wrapped_exact = Wrappers::Bundle::Location.new category.exact, grid: grid, precision: precision
-          new_source    = Wrappers::Sources::Location.new category.source, grid, precision
+        def self.wrap category, grid, precision = 1, anchor = 0.0
+          wrapped_exact = Wrappers::Bundle::Location.new category.exact, grid: grid, precision: precision, anchor: anchor
 
           category.class_eval do
+
+            # Uses a basic tokenizer.
+            #
+            def tokenizer
+              @tokenizer ||= Tokenizer.new
+            end
+
+            # Both use the exact index.
+            #
+            # TODO Necessary to wrap?
+            #
             define_method :exact do
               wrapped_exact
             end
             define_method :partial do
               wrapped_exact
             end
-            def tokenizer
-              @tokenizer ||= Tokenizer.new
-            end
-            define_method :source do
-              new_source
-            end
+
           end
         end
 

data/lib/tasks/try.rb

@@ -7,8 +7,8 @@ module Picky
     def initialize text, index = nil, category = nil
       @text = text
       @specific = Picky::Indexes
-      @specific = @specific[index.to_sym]    if index
-      @specific = @specific[category.to_sym] if category
+      @specific = @specific[index.intern]    if index
+      @specific = @specific[category.intern] if category
     end
 
     def saved

data/spec/lib/backends/memory/text_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe Picky::Backends::Memory::Text do
-  
+
   let(:text) { described_class.new "some_cache_path" }
-  
+
   describe 'extension' do
     it 'is correct' do
       text.extension.should == :txt
@@ -17,7 +17,7 @@ describe Picky::Backends::Memory::Text do
       }.to raise_error("Can't have an initial content from text file. Use JSON or Marshal.")
     end
   end
-  
+
   describe "load" do
     it "raises" do
       lambda do
@@ -41,12 +41,12 @@ describe Picky::Backends::Memory::Text do
     it "yields split lines and returns the id and token text" do
       text.retrieve do |id, token|
         id.should    == '123456'
-        token.should == :some_nice_token
+        token.should == 'some_nice_token'
       end
     end
     it "is fast" do
-      performance_of { text.retrieve { |id, token| } }.should < 0.00005
+      performance_of { text.retrieve { |id, token| } }.should < 0.00006
     end
   end
-  
+
 end

data/spec/lib/bundle_spec.rb

@@ -14,13 +14,13 @@ describe Picky::Bundle do
                         Picky::Generators::Partial::Default,
                         Picky::Generators::Similarity::DoubleMetaphone.new(3)
   end
-  
+
   describe 'identifier' do
     it 'is correct' do
-      bundle.identifier.should == 'test:some_index:some_category:some_name'
+      bundle.identifier.should == 'some_index:some_category:some_name'
     end
   end
-  
+
   describe 'index_path' do
     it 'is correct' do
       bundle.index_path(:some_type).should == 'spec/test_directory/index/test/some_index/some_category_some_name_some_type'
@@ -29,5 +29,5 @@ describe Picky::Bundle do
       bundle.index_path.should == 'spec/test_directory/index/test/some_index/some_category_some_name'
     end
   end
-  
+
 end

data/spec/lib/calculations/location_spec.rb

@@ -1,58 +1,56 @@
 require 'spec_helper'
 
 describe Picky::Calculations::Location do
-  
+
   context 'with precision 1' do
     before(:each) do
-      @calculation = described_class.new 1.5, 1
-      @calculation.minimum = 42.7
+      @calculation = described_class.new 1.5, 42.7, 1
     end
-    describe 'recalculated_range' do
+    describe 'calculated_range' do
       it 'returns the right range' do
-        @calculation.recalculated_range(40.0).should == (-2..0)
+        @calculation.calculated_range(40.0).should == (-2..0)
       end
       it 'returns the right range' do
-        @calculation.recalculated_range(41.0).should == (-1..1)
+        @calculation.calculated_range(41.0).should == (-1..1)
       end
       it 'returns the right range' do
-        @calculation.recalculated_range(0).should == (-42..-40)
+        @calculation.calculated_range(0).should == (-42..-40)
       end
     end
-    describe 'recalculate' do
-      it 'sets the minimum close value to the minimum minus user grid' do
-        @calculation.recalculate(41.2).should == 1
+    describe 'calculate' do
+      it 'sets the anchor close value to the minimum minus user grid' do
+        @calculation.calculate(41.2).should == 1
       end
-      it 'sets the minimum value to 1 plus precision' do
-        @calculation.recalculate(42.7).should == 2
+      it 'sets the anchor value to 1 plus precision' do
+        @calculation.calculate(42.7).should == 2
       end
-      it 'sets the minimum value plus 2/3 of the grid size to 2 plus 1 grid length' do
-        @calculation.recalculate(43.7).should == 3
+      it 'sets the anchor value plus 2/3 of the grid size to 2 plus 1 grid length' do
+        @calculation.calculate(43.7).should == 3
       end
-      it 'sets the minimum value plus 20/3 of the grid size to 2 plus 10 grid length' do
-        @calculation.recalculate(52.7).should == 12
+      it 'sets the anchor value plus 20/3 of the grid size to 2 plus 10 grid length' do
+        @calculation.calculate(52.7).should == 12
       end
     end
   end
-  
+
   context 'with precision 3' do
     before(:each) do
-      @calculation = described_class.new 1.5, 3
-      @calculation.minimum = 42.7
+      @calculation = described_class.new 1.5, 42.7, 3
     end
-    describe 'recalculate' do
-      it 'sets the minimum close value to the minimum minus user grid' do
-        @calculation.recalculate(41.2).should == 1
+    describe 'calculate' do
+      it 'sets the anchor close value to the minimum minus user grid' do
+        @calculation.calculate(41.2).should == 1
       end
-      it 'sets the minimum value to 1 plus precision' do
-        @calculation.recalculate(42.7).should == 4
+      it 'sets the anchor value to 1 plus precision' do
+        @calculation.calculate(42.7).should == 4
       end
-      it 'sets the minimum value plus 2/3 of the grid size plus 1 plus precision plus 1 grid length' do
-        @calculation.recalculate(43.7).should == 6
+      it 'sets the anchor value plus 2/3 of the grid size plus 1 plus precision plus 1 grid length' do
+        @calculation.calculate(43.7).should == 6
       end
-      it 'sets the minimum value plus 20/3 of the grid size to 2 plus 10 grid length' do
-        @calculation.recalculate(52.7).should == 27
+      it 'sets the anchor value plus 20/3 of the grid size to 2 plus 10 grid length' do
+        @calculation.calculate(52.7).should == 27
       end
     end
   end
-  
+
 end

data/spec/lib/category_indexed_spec.rb

@@ -160,6 +160,7 @@ describe Picky::Category do
 
     describe 'load_from_cache' do
       it 'should call two methods' do
+        @category.should_receive(:clear_realtime_mapping).once
         @exact.should_receive(:load).once
         @partial.should_receive(:load).once
 

data/spec/lib/category_indexing_spec.rb

@@ -62,50 +62,37 @@ describe Picky::Category do
       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
-        partial.stub! :generate_partial_from => :generation_returns
-
-        category.generate_partial
-      end
-      it 'should use the exact index to generate the partial index' do
-        exact_index = stub :exact_index
-        exact.stub! :inverted => exact_index
-        partial.should_receive(:generate_partial_from).once.with(exact_index)
-
-        category.generate_partial
-      end
-    end
-
-    describe 'generate_caches_from_source' do
-      it 'should delegate to exact' do
-        exact.should_receive(:generate_caches_from_source).once.with
-
-        category.generate_caches_from_source
-      end
-    end
-
     describe 'cache' do
       it 'should call multiple methods in order' 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(:empty).once.with().ordered
+        category.should_receive(:retrieve).once.with().ordered
         category.should_receive(:dump).once.with().ordered
-        category.should_receive(:timed_exclaim).once.ordered
 
         category.cache
       end
     end
 
+    describe 'retrieve' do
+      it 'call the right thing' do
+        prepared = stub :prepared
+        prepared.should_receive(:retrieve).any_number_of_times
+                                          .and_yield(1, :some_token)
+                                          .and_yield(2, :some_token)
+                                          .and_yield(3, :some_token)
+                                          .and_yield(4, :some_token)
+                                          .and_yield(5, :some_token)
+        category.stub! :prepared => prepared
+
+        category.should_receive(:add_tokenized_token).once.with(1, :some_token, :<<)
+        category.should_receive(:add_tokenized_token).once.with(2, :some_token, :<<)
+        category.should_receive(:add_tokenized_token).once.with(3, :some_token, :<<)
+        category.should_receive(:add_tokenized_token).once.with(4, :some_token, :<<)
+        category.should_receive(:add_tokenized_token).once.with(5, :some_token, :<<)
+
+        category.retrieve
+      end
+    end
+
     describe 'key_format' do
       context 'source has key_format' do
         before(:each) do

data/spec/lib/category_spec.rb

@@ -17,6 +17,8 @@ describe Picky::Category do
     category.exact.similarity_strategy.should == Picky::Generators::Similarity::Default
 
     category.partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
+
+    category.instance_variable_get(:@symbols).should == nil
   end
 
 end

data/spec/lib/extensions/string_spec.rb

@@ -7,7 +7,7 @@ describe String do
   context 'performance' do
     include Picky::Helpers::Measuring
     before(:each) do
-      @token = (((0..9).to_a)*10).to_s.to_sym
+      @token = (((0..9).to_a)*10).to_s
     end
     it "is fast" do
       performance_of { @token.each_subtoken { |subtoken| } }.should < 0.00065

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

@@ -157,7 +157,7 @@ describe Picky::Generators::Partial::Infix do
           end
         end
         it "should be fast" do
-          performance_of { @generator.generate_from(@index) }.should < 0.06
+          performance_of { @generator.generate_from(@index) }.should < 0.07
         end
       end
       describe "a bigger example with almost identical symbols" do
@@ -169,7 +169,7 @@ describe Picky::Generators::Partial::Infix do
           end
         end
         it "should be fast" do
-          performance_of { @generator.generate_from(@index) }.should < 0.06
+          performance_of { @generator.generate_from(@index) }.should < 0.07
         end
       end
     end

data/spec/lib/index_indexing_spec.rb

@@ -97,9 +97,11 @@ describe Picky::Index do
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
     end
-    describe "raise_no_source" do
-      it "should raise" do
-        lambda { @index.raise_no_source }.should raise_error(Picky::NoSourceSpecifiedException)
+    describe "warn_no_source" do
+      it "should warn" do
+        @index.should_receive(:warn).once.with "No source given for index some_name."
+
+        @index.warn_no_source
       end
     end
     describe 'define_source' do

data/spec/lib/indexed/bundle_spec.rb

@@ -14,7 +14,7 @@ describe Picky::Bundle do
 
   describe 'to_s' do
     it 'does something' do
-      @bundle.to_s.should == "Picky::Bundle(test:some_index:some_category:some_name)"
+      @bundle.to_s.should == "Picky::Bundle(some_index:some_category:some_name)"
     end
   end
 
@@ -73,7 +73,7 @@ describe Picky::Bundle do
 
   describe 'identifier' do
     it 'should return a specific identifier' do
-      @bundle.identifier.should == 'test:some_index:some_category:some_name'
+      @bundle.identifier.should == 'some_index:some_category:some_name'
     end
   end
 

data/spec/lib/indexers/base_spec.rb

@@ -20,10 +20,8 @@ describe Picky::Indexers::Base do
   end
 
   describe 'index' do
-    it 'messages, then processed' do
-      indexer.should_receive(:start_indexing_message).once.with.ordered
-      indexer.should_receive(:process).once.with(:categories).ordered
-      indexer.should_receive(:finish_indexing_message).once.with.ordered
+    it 'processes' do
+      indexer.should_receive(:process).once.with :categories
 
       indexer.index :categories
     end

data/spec/lib/indexers/serial_spec.rb

@@ -9,31 +9,15 @@ describe Picky::Indexers::Serial do
                       :identifier => :some_identifier,
                       :tokenizer => @tokenizer,
                       :source => @source
-    
+
     @indexer = described_class.new @category
     @indexer.stub! :timed_exclaim
   end
-  
-  describe "start_indexing_message" do
-    it "informs the user about what it is going to index" do
-      @indexer.should_receive(:timed_exclaim).once.with '"some_identifier": Starting serial data preparation.'
-      
-      @indexer.start_indexing_message
-    end
-  end
-  
-  describe "finish_indexing_message" do
-    it "informs the user about what it is going to index" do
-      @indexer.should_receive(:timed_exclaim).once.with '"some_identifier": Finished serial data preparation.'
-      
-      @indexer.finish_indexing_message
-    end
-  end
-  
+
   describe "source" do
     it "returns the one given to is" do
       @indexer.source.should == @source
     end
   end
-  
+
 end

data/spec/lib/indexing/bundle_partial_generation_speed_spec.rb

@@ -1,42 +1,42 @@
-require 'spec_helper'
-
-describe Picky::Bundle do
-
-  before(:each) do
-    @index            = Picky::Index.new :some_index
-    @category         = Picky::Category.new :some_category, @index
-
-    @partial_strategy = Picky::Generators::Partial::Substring.new :from => 1
-    @exact            = described_class.new :some_name, @category, Picky::Backends::Memory.new, nil, @partial_strategy, nil
-  end
-
-  def generate_random_keys amount
-    alphabet = ('a'..'z').to_a
-    (1..amount).to_a.collect! do |n|
-      Array.new(20).collect! { alphabet[rand(26)] }.join.to_sym
-    end
-  end
-  def generate_random_ids amount
-    (1..amount).to_a.collect! do |_|
-      Array.new(rand(100)+5).collect! do |_|
-        rand(5_000_000)
-      end
-    end
-  end
-
-  describe 'speed' do
-    context 'medium arrays' do
-      before(:each) do
-        random_keys     = generate_random_keys 300
-        random_ids      = generate_random_ids  300
-        @exact.inverted = Hash[random_keys.zip(random_ids)]
-      end
-      it 'should be fast' do
-        performance_of do
-          @exact.generate_partial
-        end.should < 0.1
-      end
-    end
-  end
-
-end
+# require 'spec_helper'
+#
+# describe Picky::Bundle do
+#
+#   before(:each) do
+#     @index            = Picky::Index.new :some_index
+#     @category         = Picky::Category.new :some_category, @index
+#
+#     @partial_strategy = Picky::Generators::Partial::Substring.new :from => 1
+#     @exact            = described_class.new :some_name, @category, Picky::Backends::Memory.new, nil, @partial_strategy, nil
+#   end
+#
+#   def generate_random_keys amount
+#     alphabet = ('a'..'z').to_a
+#     (1..amount).to_a.collect! do |n|
+#       Array.new(20).collect! { alphabet[rand(26)] }.join.to_sym
+#     end
+#   end
+#   def generate_random_ids amount
+#     (1..amount).to_a.collect! do |_|
+#       Array.new(rand(100)+5).collect! do |_|
+#         rand(5_000_000)
+#       end
+#     end
+#   end
+#
+#   describe 'speed' do
+#     context 'medium arrays' do
+#       before(:each) do
+#         random_keys     = generate_random_keys 300
+#         random_ids      = generate_random_ids  300
+#         @exact.inverted = Hash[random_keys.zip(random_ids)]
+#       end
+#       it 'should be fast' do
+#         performance_of do
+#           @exact.generate_partial
+#         end.should < 0.1
+#       end
+#     end
+#   end
+#
+# end

data/spec/lib/indexing/bundle_spec.rb

@@ -11,7 +11,7 @@ describe Picky::Bundle do
 
   describe 'identifier' do
     it 'is correct' do
-      bundle.identifier.should == 'test:some_index:some_category:some_name'
+      bundle.identifier.should == 'some_index:some_category:some_name'
     end
   end
 
@@ -37,13 +37,13 @@ describe Picky::Bundle do
     it 'does something' do
       expect {
         bundle.raise_cache_missing :similarity
-      }.to raise_error("Error: The similarity cache for test:some_index:some_category:some_name is missing.")
+      }.to raise_error("Error: The similarity cache for some_index:some_category:some_name is missing.")
     end
   end
 
   describe 'warn_cache_small' do
     it 'warns the user' do
-      bundle.should_receive(:warn).once.with "Warning: similarity cache for test:some_index:some_category:some_name smaller than 16 bytes."
+      bundle.should_receive(:warn).once.with "Warning: similarity cache for some_index:some_category:some_name smaller than 16 bytes."
 
       bundle.warn_cache_small :similarity
     end
@@ -51,136 +51,7 @@ describe Picky::Bundle do
 
   describe 'identifier' do
     it 'should return a specific identifier' do
-      bundle.identifier.should == 'test:some_index:some_category:some_name'
-    end
-  end
-
-  describe 'initialize_index_for' do
-    context 'token not yet assigned' do
-      before(:each) do
-        bundle.stub! :index => {}
-      end
-      it 'should assign it an empty array' do
-        bundle.initialize_inverted_index_for :some_token
-
-        bundle.inverted[:some_token].should == []
-      end
-    end
-    context 'token already assigned' do
-      before(:each) do
-        bundle.stub! :index => { :some_token => :already_assigned }
-      end
-      it 'should not assign it anymore' do
-        bundle.initialize_inverted_index_for :some_token
-
-        bundle.index[:some_token].should == :already_assigned
-      end
-    end
-  end
-
-  describe 'retrieve' do
-    before(:each) do
-      @ary = []
-
-      prepared = stub :prepared
-      prepared.should_receive(:retrieve).once.and_yield(' 1',     :some_token)
-                                             .and_yield('1 ',     :some_token)
-                                             .and_yield('1',      :some_token)
-                                             .and_yield('    2',  :some_token)
-                                             .and_yield('3',      :some_token)
-                                             .and_yield('  3  ',  :some_token)
-                                             .and_yield('  1234', :some_token)
-
-      bundle.stub! :prepared => prepared
-
-      @inverted = stub :inverted, :[] => @ary
-      bundle.stub! :inverted => @inverted
-    end
-    context 'uniqueness' do
-      before(:each) do
-        @category.stub! :key_format => :to_i
-        @inverted = { :test => @ary }
-      end
-      it 'is correct' do
-        bundle.retrieve
-
-        bundle.inverted[:test].should == [1,2,3,1234]
-      end
-    end
-    context 'id key format' do
-      before(:each) do
-        @category.stub! :key_format => :to_i
-      end
-      it 'should call the other methods correctly' do
-        @ary.should_receive(:<<).once.ordered.with 1
-        @ary.should_receive(:<<).once.ordered.with 2
-        @ary.should_receive(:<<).once.ordered.with 3
-        @ary.should_receive(:<<).once.ordered.with 1234
-
-        bundle.retrieve
-      end
-    end
-    context 'other key format' do
-      before(:each) do
-        @category.stub! :key_format => :strip
-      end
-      it 'should call the other methods correctly' do
-        @ary.should_receive(:<<).once.ordered.with '1'
-        @ary.should_receive(:<<).once.ordered.with '2'
-        @ary.should_receive(:<<).once.ordered.with '3'
-        @ary.should_receive(:<<).once.ordered.with '1234'
-
-        bundle.retrieve
-      end
-    end
-    context 'no key format - default' do
-      before(:each) do
-        @category.stub! :key_format => nil
-      end
-      it 'should call the other methods correctly' do
-        @ary.should_receive(:<<).once.ordered.with 1
-        @ary.should_receive(:<<).once.ordered.with 2
-        @ary.should_receive(:<<).once.ordered.with 3
-        @ary.should_receive(:<<).once.ordered.with 1234
-
-        bundle.retrieve
-      end
-    end
-  end
-
-  describe 'load_from_index_file' do
-    it 'should call two methods in order' do
-      bundle.should_receive(:load_from_prepared_index_generation_message).once.ordered
-      bundle.should_receive(:retrieve).once.ordered
-
-      bundle.load_from_prepared_index_file
-    end
-  end
-
-  describe 'generate_derived' do
-    it 'should call two methods in order' do
-      bundle.should_receive(:generate_weights).once.ordered
-      bundle.should_receive(:generate_similarity).once.ordered
-
-      bundle.generate_derived
-    end
-  end
-
-  describe 'generate_caches_from_memory' do
-    it 'should call two methods in order' do
-      bundle.should_receive(:cache_from_memory_generation_message).once.ordered
-      bundle.should_receive(:generate_derived).once.ordered
-
-      bundle.generate_caches_from_memory
-    end
-  end
-
-  describe 'generate_caches_from_source' do
-    it 'should call two methods in order' do
-      bundle.should_receive(:load_from_prepared_index_file).once.ordered
-      bundle.should_receive(:generate_caches_from_memory).once.ordered
-
-      bundle.generate_caches_from_source
+      bundle.identifier.should == 'some_index:some_category:some_name'
     end
   end