picky 3.2.0 → 3.3.0

data/spec/lib/indexed/bundle_spec.rb

@@ -1,23 +1,23 @@
 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      = stub :weights
     @partial      = stub :partial
     @similarity   = stub :similarity
     @bundle       = described_class.new :some_name, @category, Picky::Backends::Memory.new, @weights, @partial, @similarity
   end
-  
+
   describe 'to_s' do
     it 'does something' do
-      @bundle.to_s.should == "Picky::Indexed::Bundle(test:some_index:some_category:some_name)"
+      @bundle.to_s.should == "Picky::Bundle(test:some_index:some_category:some_name)"
     end
   end
-  
+
   describe 'clear_index' do
     before(:each) do
       @bundle.instance_variable_set :@inverted, { :a => [] }
@@ -27,7 +27,7 @@ describe Picky::Indexed::Bundle do
     end
     it 'clears the inverted index' do
       @bundle.clear_inverted
-      
+
       @bundle.inverted.should be_empty
     end
   end
@@ -40,7 +40,7 @@ describe Picky::Indexed::Bundle do
     end
     it 'clears the weights' do
       @bundle.clear_weights
-      
+
       @bundle.weights.should be_empty
     end
   end
@@ -53,7 +53,7 @@ describe Picky::Indexed::Bundle do
     end
     it 'clears the similarity index' do
       @bundle.clear_similarity
-      
+
       @bundle.similarity.should be_empty
     end
   end
@@ -66,7 +66,7 @@ describe Picky::Indexed::Bundle do
     end
     it 'clears the similarity index' do
       @bundle.clear_configuration
-      
+
       @bundle.configuration.should be_empty
     end
   end
@@ -100,14 +100,14 @@ describe Picky::Indexed::Bundle do
       @bundle.weight(:existing).should == :specific
     end
   end
-  
+
   describe 'load' do
     it 'should trigger loads' do
       @bundle.should_receive(:load_inverted).once.with
       @bundle.should_receive(:load_weights).once.with
       @bundle.should_receive(:load_similarity).once.with
       @bundle.should_receive(:load_configuration).once.with
-      
+
       @bundle.load
     end
   end
@@ -118,46 +118,46 @@ describe Picky::Indexed::Bundle do
     describe "load_index" do
       it "uses the right file" do
         Yajl::Parser.stub! :parse
-        
+
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_inverted.memory.json', 'r'
-        
+
         @bundle.load_inverted
       end
     end
     describe "load_weights" do
       it "uses the right file" do
         Yajl::Parser.stub! :parse
-        
+
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_weights.memory.json', 'r'
-        
+
         @bundle.load_weights
       end
     end
     describe "load_similarity" do
       it "uses the right file" do
         Marshal.stub! :load
-        
+
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_similarity.memory.dump', 'r:binary'
-        
+
         @bundle.load_similarity
       end
     end
     describe "load_configuration" do
       it "uses the right file" do
         Yajl::Parser.stub! :parse
-        
+
         File.should_receive(:open).once.with 'spec/test_directory/index/test/some_index/some_category_some_name_configuration.memory.json', 'r'
-        
+
         @bundle.load_configuration
       end
     end
   end
-  
+
   describe 'initialization' do
     before(:each) do
       @index    = Picky::Index.new :some_index
       @category = Picky::Category.new :some_category, @index
-      
+
       @bundle = described_class.new :some_name, @category, Picky::Backends::Memory.new, :weights, :partial, :similarity
     end
     it 'should initialize the index correctly' do

data/spec/lib/indexed/wrappers/bundle/calculation_spec.rb

@@ -1,36 +1,36 @@
 require 'spec_helper'
 
-describe Picky::Indexed::Wrappers::Bundle::Calculation do
-  
+describe Picky::Wrappers::Bundle::Calculation do
+
   before(:each) do
     @bundle = stub :bundle
     @calculation = described_class.new @bundle
   end
-  
+
   describe 'ids' do
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:ids).once.with :'0.0'
-      
+
       @calculation.ids :some_sym
     end
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:ids).once.with :'6.28'
-      
+
       @calculation.ids :'6.28'
     end
   end
-  
+
   describe 'weight' do
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:weight).once.with :'0.0'
-      
+
       @calculation.weight :some_sym
     end
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:weight).once.with :'6.28'
-      
+
       @calculation.weight :'6.28'
     end
   end
-  
+
 end

data/spec/lib/indexed/wrappers/bundle/wrapper_spec.rb

@@ -1,27 +1,27 @@
 require 'spec_helper'
 
-describe Picky::Indexed::Wrappers::Bundle::Wrapper do
-  
+describe Picky::Wrappers::Bundle::Wrapper do
+
   before(:each) do
     @bundle = stub :bundle
-    
+
     @calculation = described_class.new @bundle
   end
-  
+
   describe 'ids' do
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:ids).once.with :some_sym
-      
+
       @calculation.ids :some_sym
     end
   end
-  
+
   describe 'weight' do
     it 'calls bundle#ids correctly' do
       @bundle.should_receive(:weight).once.with :some_sym
-      
+
       @calculation.weight :some_sym
     end
   end
-  
+
 end

data/spec/lib/indexed/wrappers/exact_first_spec.rb

@@ -1,52 +1,52 @@
 require 'spec_helper'
 
-describe Picky::Indexed::Wrappers::ExactFirst do
-  
+describe Picky::Wrappers::ExactFirst do
+
   before(:each) do
     @exact    = stub :exact
     @partial  = stub :partial
-    @category = stub :category, :indexed_exact => @exact, :indexed_partial => @partial
-    
+    @category = stub :category, :exact => @exact, :partial => @partial
+
     @wrapper  = described_class.new @category
   end
-  
+
   describe "self.wrap" do
     context "index" do
       it "wraps each category" do
         index = Picky::Index.new :some_index
         index.define_category :some_category
-        
-        Picky::Indexed::Wrappers::ExactFirst.wrap index
-        
+
+        Picky::Wrappers::ExactFirst.wrap index
+
         index.categories.categories.each do |category|
-          category.should be_kind_of(Picky::Indexed::Wrappers::ExactFirst)
+          category.should be_kind_of(Picky::Wrappers::ExactFirst)
         end
       end
       it "returns the index" do
         index = Picky::Index.new :some_index
         index.define_category :some_category
-        
+
         described_class.wrap(index).should == index
       end
     end
     context "category" do
       it "wraps each category" do
-        category = stub :category, :indexed_exact => :exact, :indexed_partial => :partial
-        
+        category = stub :category, :exact => :exact, :partial => :partial
+
         described_class.wrap(category).should be_kind_of(described_class)
       end
     end
   end
-  
+
   describe 'ids' do
     it "uses first the exact, then the partial ids" do
       @exact.stub!   :ids => [1,4,5,6]
       @partial.stub! :ids => [2,3,7]
-      
+
       @wrapper.ids(:anything).should == [1,4,5,6,2,3,7]
     end
   end
-  
+
   describe 'weight' do
     context "exact with weight" do
       before(:each) do
@@ -91,5 +91,5 @@ describe Picky::Indexed::Wrappers::ExactFirst do
       end
     end
   end
-  
+
 end

data/spec/lib/indexers/base_spec.rb

@@ -4,48 +4,29 @@ describe Picky::Indexers::Base do
 
   let(:some_index_or_category) { stub :some_index_or_category, :name => 'some index or category' }
   let(:indexer) { described_class.new some_index_or_category }
-  
+
   describe 'index_or_category' do
     it 'returns the right thing' do
       indexer.index_or_category.should == some_index_or_category
     end
   end
-  
+
   describe 'source' do
     it 'delegates it to the index or category' do
       some_index_or_category.should_receive(:source).once.with
-      
+
       indexer.source
     end
   end
-  
+
   describe 'index' do
     it 'messages, then processed' do
       indexer.should_receive(:start_indexing_message).once.with.ordered
-      indexer.should_receive(:prepare).once.with(:categories).ordered
       indexer.should_receive(:process).once.with(:categories).ordered
       indexer.should_receive(:finish_indexing_message).once.with.ordered
-      
+
       indexer.index :categories
     end
   end
-  
-  describe 'prepare' do
-    it 'calls a certain method on each category' do
-      some_index_or_category.stub! :source
-      
-      category1 = stub :category1
-      category2 = stub :category2
-      category3 = stub :category3
-      
-      categories = [category1, category2, category3]
-      
-      categories.each do |category|
-        category.should_receive(:prepare_index_directory).once.with
-      end
-      
-      indexer.prepare categories
-    end
-  end
-  
+
 end

data/spec/lib/indexes_spec.rb

@@ -2,37 +2,48 @@ require 'spec_helper'
 
 describe Picky::Indexes do
 
-  before(:each) do
-    @index   = stub :some_index, :name => :some_index
-    @indexes = described_class.instance
+  let(:index) { stub :some_index, :name => :some_index }
+
+  context 'with instance' do
+    let(:indexes) { Picky::Indexes.new }
+
+    describe 'indexes' do
+      it 'exists' do
+        lambda { indexes.indexes }.should_not raise_error
+      end
+      it 'is empty by default' do
+        indexes.indexes.should be_empty
+      end
+    end
   end
 
-  describe 'indexes' do
-    it 'exists' do
-      lambda { @indexes.indexes }.should_not raise_error
-    end
-    it 'is empty by default' do
-      @indexes.indexes.should be_empty
+  context 'with singleton' do
+    let(:indexes) { Picky::Indexes.instance }
+
+    describe 'indexes' do
+      it 'exists' do
+        lambda { indexes.indexes }.should_not raise_error
+      end
     end
-  end
 
-  describe 'clear_indexes' do
-    it 'clears the indexes' do
-      @indexes.register @index
+    describe 'clear_indexes' do
+      it 'clears the indexes' do
+        indexes.register index
 
-      @indexes.clear_indexes
+        indexes.clear_indexes
 
-      @indexes.indexes.should == []
+        indexes.indexes.should == []
+      end
     end
-  end
 
-  describe 'register' do
-    it 'adds the given index to the indexes' do
-      @indexes.clear_indexes
-      
-      @indexes.register @index
+    describe 'register' do
+      it 'adds the given index to the indexes' do
+        indexes.clear_indexes
+
+        indexes.register index
 
-      @indexes.indexes.should == [@index]
+        indexes.indexes.should == [index]
+      end
     end
   end
 

data/spec/lib/indexing/bundle_partial_generation_speed_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Picky::Indexing::Bundle do
+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

data/spec/lib/indexing/bundle_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Picky::Indexing::Bundle do
+describe Picky::Bundle do
 
   before(:each) do
     @index    = Picky::Index.new :some_index
@@ -8,13 +8,13 @@ describe Picky::Indexing::Bundle do
     @similarity = Picky::Similarity::DoubleMetaphone.new 3
   end
   let(:bundle) { described_class.new :some_name, @category, Picky::Backends::Memory.new, :some_weights, :some_partial, @similarity }
-  
+
   describe 'identifier' do
     it 'is correct' do
       bundle.identifier.should == 'test:some_index:some_category:some_name'
     end
   end
-  
+
   describe 'similar' do
     before(:each) do
       bundle.similarity = @similarity.generate_from( :dragon => [1,2,3], :dargon => [4,5,6] )
@@ -32,7 +32,7 @@ describe Picky::Indexing::Bundle do
       performance_of { bundle.similar(:trkn) }.should < 0.00006
     end
   end
-  
+
   describe 'raise_cache_missing' do
     it 'does something' do
       expect {
@@ -40,21 +40,21 @@ describe Picky::Indexing::Bundle do
       }.to raise_error("Error: The similarity cache for test: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.warn_cache_small :similarity
     end
   end
-  
+
   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
@@ -77,13 +77,13 @@ describe Picky::Indexing::Bundle do
       end
     end
   end
-  
+
   describe 'retrieve' do
     before(:each) do
       prepared = stub :prepared
       prepared.should_receive(:retrieve).once.and_yield '  1234', :some_token
       bundle.stub! :prepared => prepared
-      
+
       @ary = stub :ary
       inverted = stub :inverted, :[] => @ary
       bundle.stub! :inverted => inverted
@@ -94,7 +94,7 @@ describe Picky::Indexing::Bundle do
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234
-        
+
         bundle.retrieve
       end
     end
@@ -104,7 +104,7 @@ describe Picky::Indexing::Bundle do
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with '1234'
-        
+
         bundle.retrieve
       end
     end
@@ -114,7 +114,7 @@ describe Picky::Indexing::Bundle do
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234
-        
+
         bundle.retrieve
       end
     end
@@ -123,7 +123,6 @@ describe Picky::Indexing::Bundle do
   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(:clear).once.ordered
       bundle.should_receive(:retrieve).once.ordered
 
       bundle.load_from_prepared_index_file
@@ -156,16 +155,16 @@ describe Picky::Indexing::Bundle do
       bundle.generate_caches_from_source
     end
   end
-  
+
   describe 'dump' do
     it 'should trigger dumps' do
       bundle.stub! :timed_exclaim
-      
+
       bundle.should_receive(:dump_inverted).once.with
       bundle.should_receive(:dump_weights).once.with
       bundle.should_receive(:dump_similarity).once.with
       bundle.should_receive(:dump_configuration).once.with
-      
+
       bundle.dump
     end
   end
@@ -174,7 +173,7 @@ describe Picky::Indexing::Bundle do
     it "calls methods in order" do
       bundle.should_receive(:raise_unless_index_exists).once.ordered
       bundle.should_receive(:raise_unless_similarity_exists).once.ordered
-      
+
       bundle.raise_unless_cache_exists
     end
   end
@@ -187,7 +186,7 @@ describe Picky::Indexing::Bundle do
       it "calls the methods in order" do
         bundle.should_receive(:warn_if_index_small).once.ordered
         bundle.should_receive(:raise_unless_index_ok).once.ordered
-        
+
         bundle.raise_unless_index_exists
       end
     end
@@ -199,7 +198,7 @@ describe Picky::Indexing::Bundle do
       it "calls nothing" do
         bundle.should_receive(:warn_if_index_small).never
         bundle.should_receive(:raise_unless_index_ok).never
-        
+
         bundle.raise_unless_index_exists
       end
     end
@@ -213,7 +212,7 @@ describe Picky::Indexing::Bundle do
       it "calls the methods in order" do
         bundle.should_receive(:warn_if_similarity_small).once.ordered
         bundle.should_receive(:raise_unless_similarity_ok).once.ordered
-        
+
         bundle.raise_unless_similarity_exists
       end
     end
@@ -225,7 +224,7 @@ describe Picky::Indexing::Bundle do
       it "calls nothing" do
         bundle.should_receive(:warn_if_similarity_small).never
         bundle.should_receive(:raise_unless_similarity_ok).never
-        
+
         bundle.raise_unless_similarity_exists
       end
     end
@@ -237,7 +236,7 @@ describe Picky::Indexing::Bundle do
       end
       it "warns" do
         bundle.should_receive(:warn_cache_small).once.with :similarity
-        
+
         bundle.warn_if_similarity_small
       end
     end
@@ -247,7 +246,7 @@ describe Picky::Indexing::Bundle do
       end
       it "does not warn" do
         bundle.should_receive(:warn_cache_small).never
-        
+
         bundle.warn_if_similarity_small
       end
     end
@@ -259,7 +258,7 @@ describe Picky::Indexing::Bundle do
       end
       it "warns" do
         bundle.should_receive(:raise_cache_missing).never
-        
+
         bundle.raise_unless_similarity_ok
       end
     end
@@ -269,12 +268,12 @@ describe Picky::Indexing::Bundle do
       end
       it "does not warn" do
         bundle.should_receive(:raise_cache_missing).once.with :similarity
-        
+
         bundle.raise_unless_similarity_ok
       end
     end
   end
-  
+
   describe 'initialization' do
     it 'should initialize the index correctly' do
       bundle.inverted.should == {}
@@ -298,5 +297,5 @@ describe Picky::Indexing::Bundle do
       bundle.similarity_strategy.should == @similarity
     end
   end
-  
+
 end

data/spec/lib/sources/wrappers/base_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Picky::Sources::Wrappers::Base do
-  
+describe Picky::Wrappers::Sources::Base do
+
   before(:each) do
     @source = stub :source
   end
-  
+
   context "with backend" do
     it "doesn't fail" do
       lambda { described_class.new(@source) }.should_not raise_error
@@ -15,17 +15,17 @@ describe Picky::Sources::Wrappers::Base do
     end
     it "delegates harvest" do
       @source.should_receive(:harvest).once.with :some_category
-      
+
       @wrapper.harvest :some_category
     end
     it "delegates take_snapshot" do
       @source.should_receive(:take_snapshot).once.with :some_index
-      
+
       @wrapper.take_snapshot :some_index
     end
     it "delegates connect_backend" do
       @source.should_receive(:connect_backend).once.with # nothing
-      
+
       @wrapper.connect_backend
     end
   end
@@ -34,5 +34,5 @@ describe Picky::Sources::Wrappers::Base do
       lambda { described_class.new }.should raise_error(ArgumentError)
     end
   end
-  
+
 end