picky 2.5.2 → 2.6.0

data/spec/lib/{internals/indexing/index_spec.rb → index/base_indexing_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Index do
+describe Index::Base do
   
   context "with categories" do
     before(:each) do
-      @source = stub :some_source
+      @source = []
       
       @index = described_class.new :some_name, source: @source
       @index.define_category :some_category_name1
@@ -22,24 +22,11 @@ describe Internals::Indexing::Index do
         @index.source.should == :some_other_source
       end
     end
-    describe "generate_caches" do
-      it "delegates to each category" do
-        category1 = stub :category1
-        category2 = stub :category2
-        
-        @index.stub! :categories => [category1, category2]
-        
-        category1.should_receive(:generate_caches).once.ordered.with
-        category2.should_receive(:generate_caches).once.ordered.with
-        
-        @index.generate_caches
-      end
-    end
     describe 'find' do
       context 'no categories' do
         it 'raises on none existent category' do
           expect do
-            @index.find :some_non_existent_name
+            @index[:some_non_existent_name]
           end.to raise_error(%Q{Index category "some_non_existent_name" not found. Possible categories: "some_category_name1", "some_category_name2".})
         end
       end
@@ -48,11 +35,11 @@ describe Internals::Indexing::Index do
           @index.define_category :some_name, :source => stub(:source)
         end
         it 'returns it if found' do
-          @index.find(:some_name).should_not == nil
+          @index[:some_name].should_not == nil
         end
         it 'raises on none existent category' do
           expect do
-            @index.find :some_non_existent_name
+            @index[:some_non_existent_name]
           end.to raise_error(%Q{Index category "some_non_existent_name" not found. Possible categories: "some_category_name1", "some_category_name2", "some_name".})
         end
       end
@@ -61,7 +48,7 @@ describe Internals::Indexing::Index do
   
   context "no categories" do
     it "works" do
-      described_class.new :some_name, source: @source
+      described_class.new :some_name, source: []
     end
   end
   

data/spec/lib/index/base_spec.rb

@@ -61,67 +61,24 @@ ERROR
         api.geo_categories :some_lat, :some_lng, 1, :lat_from => :some_lat_from, :lng_from => :some_lng_from
       end
     end
-    
-    describe 'define_source' do
-      it 'delegates to the internal indexing' do
-        indexing = stub :indexing
-        api.stub! :internal_indexing => indexing
-        
-        indexing.should_receive(:define_source).once.with :some_source
-        
-        api.define_source :some_source
-      end
-      it 'has an alias' do
-        indexing = stub :indexing
-        api.stub! :internal_indexing => indexing
-        
-        indexing.should_receive(:define_source).once.with :some_source
-        
-        api.source :some_source
-      end
-    end
-    
-    describe 'define_indexing' do
-      it 'delegates to the internal indexing' do
-        indexing = stub :indexing
-        api.stub! :internal_indexing => indexing
-        
-        indexing.should_receive(:define_indexing).once.with :some_options
-        
-        api.define_indexing :some_options
-      end
-      it 'has an alias' do
-        indexing = stub :indexing
-        api.stub! :internal_indexing => indexing
-        
-        indexing.should_receive(:define_indexing).once.with :some_options
-        
-        api.indexing :some_options
-      end
-    end
 
     describe 'define_category' do
       context 'with block' do
-        it 'returns itself' do
-          api.define_category(:some_name){ |indexing, indexed| }.should == api
+        it 'returns the category' do
+          expected = nil
+          api.define_category(:some_name){ |category| expected = category }.should == expected
         end
         it 'takes a string' do
           lambda { api.define_category('some_name'){ |indexing, indexed| } }.should_not raise_error
         end
         it 'yields both the indexing category and the indexed category' do
-          api.define_category(:some_name) do |indexing, indexed|
-            indexing.should be_kind_of(Internals::Indexing::Category)
-            indexed.should be_kind_of(Internals::Indexed::Category)
-          end
-        end
-        it 'yields the indexing category which has the given name' do
-          api.define_category(:some_name) do |indexing, indexed|
-            indexing.name.should == :some_name
+          api.define_category(:some_name) do |category|
+            category.should be_kind_of(Category)
           end
         end
-        it 'yields the indexed category which has the given name' do
-          api.define_category(:some_name) do |indexing, indexed|
-            indexed.name.should == :some_name
+        it 'yields the category which has the given name' do
+          api.define_category(:some_name) do |category|
+            category.name.should == :some_name
           end
         end
       end
@@ -130,10 +87,10 @@ ERROR
           lambda { api.define_category(:some_name) }.should_not raise_error
         end
         it 'takes a string' do
-          lambda { api.define_category('some_name').should == api }.should_not raise_error
+          lambda { api.define_category('some_name') }.should_not raise_error
         end
         it 'returns itself' do
-          api.define_category(:some_name).should == api
+          api.define_category(:some_name).should be_kind_of(Category)
         end
       end
     end

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Bundle::Memory do
+describe Indexed::Bundle::Memory do
 
   before(:each) do
-    @index        = stub :index, :name => :some_index
-    @category     = Internals::Indexed::Category.new :some_category, @index
+    @index        = Index::Memory.new :some_index, source: []
+    @category     = Category.new :some_category, @index
     
     @similarity   = stub :similarity
     @bundle       = described_class.new :some_name, @category, @similarity
@@ -160,8 +160,8 @@ Memory
   
   describe 'initialization' do
     before(:each) do
-      @index    = stub :index, :name => :some_index
-      @category = Internals::Indexed::Category.new :some_category, @index
+      @index    = Index::Memory.new :some_index, source: []
+      @category = Category.new :some_category, @index
       
       @bundle = described_class.new :some_name, @category, :similarity
     end

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

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Bundle::Redis do
+describe Indexed::Bundle::Redis do
 
   before(:each) do
     @backend = stub :backend
     
-    Internals::Index::Redis.stub! :new => @backend
+    Backend::Redis.stub! :new => @backend
     
-    @index        = stub :index, :name => :some_index
-    @category     = Internals::Indexed::Category.new :some_category, @index
+    @index        = Index::Memory.new :some_index, source: []
+    @category     = Category.new :some_category, @index
     
     @similarity   = stub :similarity
     @bundle       = described_class.new :some_name, @category, @similarity

data/spec/lib/{internals/indexed → indexed}/wrappers/bundle/calculation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Wrappers::Bundle::Calculation do
+describe Indexed::Wrappers::Bundle::Calculation do
   
   before(:each) do
     @bundle      = stub :bundle

data/spec/lib/{internals/indexed → indexed}/wrappers/bundle/wrapper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Wrappers::Bundle::Wrapper do
+describe Indexed::Wrappers::Bundle::Wrapper do
   
   before(:each) do
     @bundle      = stub :bundle

data/spec/lib/{internals/indexed → indexed}/wrappers/exact_first_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Wrappers::ExactFirst do
+describe Indexed::Wrappers::ExactFirst do
   
   before(:each) do
     @exact    = stub :exact
     @partial  = stub :partial
-    @category = stub :category, :exact => @exact, :partial => @partial
+    @category = stub :category, :indexed_exact => @exact, :indexed_partial => @partial
     
     @wrapper  = described_class.new @category
   end
@@ -13,17 +13,17 @@ describe Internals::Indexed::Wrappers::ExactFirst do
   describe "self.wrap" do
     context "index" do
       it "wraps each category" do
-        index = Internals::Indexed::Index.new :index_name
+        index = Index::Memory.new :some_index, source: []
         index.define_category :some_category
         
-        Internals::Indexed::Wrappers::ExactFirst.wrap index
+        Indexed::Wrappers::ExactFirst.wrap index
         
         index.categories.categories.each do |category|
-          category.should be_kind_of(Internals::Indexed::Wrappers::ExactFirst)
+          category.should be_kind_of(Indexed::Wrappers::ExactFirst)
         end
       end
       it "returns the index" do
-        index = Internals::Indexed::Index.new :index_name
+        index = Index::Memory.new :some_index, source: []
         index.define_category :some_category
         
         described_class.wrap(index).should == index
@@ -31,7 +31,7 @@ describe Internals::Indexed::Wrappers::ExactFirst do
     end
     context "category" do
       it "wraps each category" do
-        category = stub :category, :exact => :exact, :partial => :partial
+        category = stub :category, :indexed_exact => :exact, :indexed_partial => :partial
         
         described_class.wrap(category).should be_kind_of(described_class)
       end

data/spec/lib/indexes_class_spec.rb

@@ -0,0 +1,30 @@
+require 'spec_helper'
+
+describe Indexes do
+
+  before(:each) do
+    @index   = stub :some_index, :name => :some_index
+    @indexes = described_class.instance
+  end
+
+  describe 'clear' do
+    it 'clears the indexes' do
+      Indexes.register @index
+
+      Indexes.clear
+
+      @indexes.indexes.should == []
+    end
+  end
+
+  describe 'register' do
+    it 'adds the given index to the indexes' do
+      Indexes.clear
+      
+      Indexes.register @index
+
+      @indexes.indexes.should == [@index]
+    end
+  end
+
+end

data/spec/lib/{indexed/indexes_spec.rb → indexes_indexed_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Indexed::Indexes do
+describe Indexes do
 
   context 'after initialize' do
     let(:indexes) { described_class.new }

data/spec/lib/{indexing/indexes_spec.rb → indexes_indexing_spec.rb}

@@ -1,6 +1,8 @@
+# encoding: utf-8
+#
 require 'spec_helper'
 
-describe Indexing::Indexes do
+describe Indexes do
 
   context 'after initialize' do
     let(:indexes) { described_class.new }
@@ -8,7 +10,7 @@ describe Indexing::Indexes do
       indexes.indexes.should == []
     end
   end
-  
+
   describe 'methods' do
     let(:indexes) { described_class.new }
     before(:each) do
@@ -20,11 +22,9 @@ describe Indexing::Indexes do
     describe 'index_for_tests' do
       it 'takes a snapshot, then indexes and caches each' do
         indexes.should_receive(:take_snapshot).once.with.ordered
-        @index1.should_receive(:index!).once.with.ordered
-        @index1.should_receive(:cache!).once.with.ordered
-        @index2.should_receive(:index!).once.with.ordered
-        @index2.should_receive(:cache!).once.with.ordered
-        
+        @index1.should_receive(:index).once.with.ordered
+        @index2.should_receive(:index).once.with.ordered
+      
         indexes.index_for_tests
       end
     end
@@ -36,7 +36,7 @@ describe Indexing::Indexes do
     describe 'clear' do
       it 'clears the indexes' do
         indexes.clear
-        
+      
         indexes.indexes.should == []
       end
     end

data/spec/lib/{internals/indexing/indexes_spec.rb → indexes_spec.rb}

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
-describe Indexing::Indexes do
-  
+describe Indexes do
+
   before(:each) do
-    @indexes = Indexing::Indexes.new
+    @index   = stub :some_index, :name => :some_index
+    @indexes = described_class.instance
   end
-  
+
   describe 'indexes' do
     it 'exists' do
       lambda { @indexes.indexes }.should_not raise_error
@@ -14,23 +15,25 @@ describe Indexing::Indexes do
       @indexes.indexes.should be_empty
     end
   end
-  
+
   describe 'clear' do
     it 'clears the indexes' do
-      @indexes.register :some_index
-      
+      @indexes.register @index
+
       @indexes.clear
-      
+
       @indexes.indexes.should == []
     end
   end
-  
+
   describe 'register' do
     it 'adds the given index to the indexes' do
-      @indexes.register :some_index
+      @indexes.clear
       
-      @indexes.indexes.should == [:some_index]
+      @indexes.register @index
+
+      @indexes.indexes.should == [@index]
     end
   end
-  
+
 end

data/spec/lib/{internals/indexing → indexing}/bundle/memory_partial_generation_speed_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Bundle::Memory do
+describe Indexing::Bundle::Memory do
 
   before(:each) do
-    @index            = stub :index, :name => :some_index, :bundle_class => nil
-    @category         = Internals::Indexing::Category.new :some_category, @index
+    @index            = Index::Memory.new :some_index, source: []
+    @category         = Category.new :some_category, @index
     
-    @partial_strategy = Internals::Generators::Partial::Substring.new :from => 1
+    @partial_strategy = Generators::Partial::Substring.new :from => 1
     @exact            = described_class.new :some_name, @category, nil, @partial_strategy, nil
   end
 

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Bundle::Memory do
+describe Indexing::Bundle::Memory do
 
   before(:each) do
-    @index = stub :index, :name => :some_index, :bundle_class => nil
-    @category       = Internals::Indexing::Category.new :some_category, @index
+    @index    = Index::Memory.new :some_index, source: []
+    @category = Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights

data/spec/lib/{internals/indexing → indexing}/bundle/redis_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Bundle::Redis do
+describe Indexing::Bundle::Redis do
 
   before(:each) do
-    @index       = stub :index, :name => :some_index, :bundle_class => nil
-    @category    = Internals::Indexing::Category.new :some_category, @index
+    @index       = Index::Memory.new :some_index, source: []
+    @category    = Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights

data/spec/lib/{internals/indexing → indexing}/bundle/super_base_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Bundle::SuperBase do
+describe Indexing::Bundle::SuperBase do
 
   before(:each) do
     @configuration = stub :configuration, :identifier => 'some_identifier'
-    Internals::Index::Files.stub! :new
+    Backend::Files.stub! :new
     @similarity = Similarity::DoubleMetaphone.new 3
     @bundle = described_class.new :some_name, @configuration, @similarity
   end

data/spec/lib/query/allocation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Query::Allocation do
+describe Query::Allocation do
   
   before(:each) do
     @combinations = stub :combinations

data/spec/lib/query/allocations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Query::Allocations do
+describe Query::Allocations do
 
   describe 'reduce_to' do
     before(:each) do

data/spec/lib/query/combination_spec.rb

@@ -2,14 +2,14 @@
 #
 require 'spec_helper'
 
-describe 'Query::Combination' do
+describe Query::Combination do
 
   before(:each) do
     @bundle      = stub :bundle, :identifier => :bundle_name
-    @token       = Internals::Query::Token.processed('some_text~')
+    @token       = Query::Token.processed('some_text~')
     @category    = stub :category, :bundle_for => @bundle, :name => :some_category_name
 
-    @combination = Internals::Query::Combination.new @token, @category
+    @combination = described_class.new @token, @category
   end
   
   describe "to_s" do
@@ -41,9 +41,9 @@ describe 'Query::Combination' do
   describe 'to_result' do
     context 'functional with qualifier' do
       before(:each) do
-        token = Internals::Tokenizers::Query.new.tokenize('name:Blä~').first
+        token = Tokenizers::Query.new.tokenize('name:Blä~').first
 
-        @combination = Internals::Query::Combination.new token, @category
+        @combination = Query::Combination.new token, @category
       end
       it 'should return a correct result' do
         @combination.to_result.should == [:some_category_name, 'Blä~', :blä] # Note: Characters not substituted. That's ok.

data/spec/lib/query/combinations/base_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Query::Combinations::Base do
+describe Query::Combinations::Base do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/combinations/memory_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Query::Combinations::Memory do
+describe Query::Combinations::Memory do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/combinations/redis_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Query::Combinations::Redis do
+describe Query::Combinations::Redis do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/indexes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Query::Indexes do
+describe Query::Indexes do
 
   3.times do |i|
     n       = i + 1

data/spec/lib/query/qualifiers_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Internals::Query::Qualifiers do
+describe Query::Qualifiers do
   
   before(:each) do
-    described_class.instance << Internals::Query::Qualifier.new(:test1, ['t1', 'tt1', 'ttt1'])
-    described_class.instance << Internals::Query::Qualifier.new(:test2, [:t2, :tt2, :ttt2])
-    described_class.instance << Internals::Query::Qualifier.new(:test3, [:t3, :tt3, :ttt3])
+    described_class.instance << Query::Qualifier.new(:test1, ['t1', 'tt1', 'ttt1'])
+    described_class.instance << Query::Qualifier.new(:test2, [:t2, :tt2, :ttt2])
+    described_class.instance << Query::Qualifier.new(:test3, [:t3, :tt3, :ttt3])
     described_class.instance.prepare
   end
   

data/spec/lib/query/token_spec.rb

@@ -1,11 +1,11 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe Internals::Query::Token do
+describe Query::Token do
   
   before(:all) do
-    Internals::Query::Qualifiers.instance << Internals::Query::Qualifier.new(:specific, [:sp, :spec])
-    Internals::Query::Qualifiers.instance.prepare
+    Query::Qualifiers.instance << Query::Qualifier.new(:specific, [:sp, :spec])
+    Query::Qualifiers.instance.prepare
   end
   
   describe '==' do