picky 2.1.2 → 2.2.0

data/spec/lib/internals/index/redis_spec.rb

@@ -1,74 +1,147 @@
 require 'spec_helper'
 
 describe Internals::Index::Redis do
-  
-  let(:config) do
-    index    = stub :index, :name => :some_index
-    category = stub :category, :name => :some_category
-    Configuration::Index.new index, category
-  end
-  let(:redis) { described_class.new :some_name, config }
-  
-  describe 'setting' do
-    it 'delegates to the configuration' do
-      configuration = stub :configuration
-      redis.stub! :configuration => configuration
-
-      configuration.should_receive(:member).once.with :some_sym
 
-      redis.setting :some_sym
+  context 'indexing' do
+    let(:category) do
+      index    = stub :index, :name => :some_index
+      category = Internals::Indexing::Category.new :some_category, index
     end
-    it 'returns the value' do
-      configuration = stub :configuration
-      redis.stub! :configuration => configuration
+    let(:redis) { described_class.new :some_name, category }
 
-      configuration.should_receive(:member).any_number_of_times.and_return "some config"
+    describe 'setting' do
+      it 'delegates to the configuration' do
+        configuration = stub :configuration
+        redis.stub! :configuration => configuration
 
-      redis.setting(:any).should == "some config"
-    end
-  end
-  describe 'weight' do
-    it 'delegates to the weights' do
-      weights = stub :weights
-      redis.stub! :weights => weights
+        configuration.should_receive(:member).once.with :some_sym
+
+        redis.setting :some_sym
+      end
+      it 'returns the value' do
+        configuration = stub :configuration
+        redis.stub! :configuration => configuration
 
-      weights.should_receive(:member).once.with :some_sym
+        configuration.should_receive(:member).any_number_of_times.and_return "some config"
 
-      redis.weight :some_sym
+        redis.setting(:any).should == "some config"
+      end
     end
-    it 'returns a floated value' do
-      weights = stub :weights
-      redis.stub! :weights => weights
+    describe 'weight' do
+      it 'delegates to the weights' do
+        weights = stub :weights
+        redis.stub! :weights => weights
 
-      weights.should_receive(:member).any_number_of_times.and_return "1.0"
+        weights.should_receive(:member).once.with :some_sym
 
-      redis.weight(:any).should == 1.0
+        redis.weight :some_sym
+      end
+      it 'returns a floated value' do
+        weights = stub :weights
+        redis.stub! :weights => weights
+
+        weights.should_receive(:member).any_number_of_times.and_return "1.0"
+
+        redis.weight(:any).should == 1.0
+      end
+      it 'returns a floated value' do
+        weights = stub :weights
+        redis.stub! :weights => weights
+
+        weights.should_receive(:member).any_number_of_times.and_return 1
+
+        redis.weight(:any).should == 1.0
+      end
     end
-    it 'returns a floated value' do
-      weights = stub :weights
-      redis.stub! :weights => weights
+    describe 'ids' do
+      it 'delegates to the index' do
+        index = stub :index
+        redis.stub! :index => index
 
-      weights.should_receive(:member).any_number_of_times.and_return 1
+        index.should_receive(:collection).once.with :some_sym
 
-      redis.weight(:any).should == 1.0
+        redis.ids :some_sym
+      end
+      it 'returns the value' do
+        index = stub :index
+        redis.stub! :index => index
+
+        index.should_receive(:collection).any_number_of_times.and_return [1,2,3]
+
+        redis.ids(:any).should == [1,2,3]
+      end
     end
   end
-  describe 'ids' do
-    it 'delegates to the index' do
-      index = stub :index
-      redis.stub! :index => index
+  
+  context 'indexed' do
+    let(:category) do
+      index    = stub :index, :name => :some_index
+      category = Internals::Indexed::Category.new :some_category, index
+    end
+    let(:redis) { described_class.new :some_name, category }
+
+    describe 'setting' do
+      it 'delegates to the configuration' do
+        configuration = stub :configuration
+        redis.stub! :configuration => configuration
+
+        configuration.should_receive(:member).once.with :some_sym
+
+        redis.setting :some_sym
+      end
+      it 'returns the value' do
+        configuration = stub :configuration
+        redis.stub! :configuration => configuration
+
+        configuration.should_receive(:member).any_number_of_times.and_return "some config"
+
+        redis.setting(:any).should == "some config"
+      end
+    end
+    describe 'weight' do
+      it 'delegates to the weights' do
+        weights = stub :weights
+        redis.stub! :weights => weights
 
-      index.should_receive(:collection).once.with :some_sym
+        weights.should_receive(:member).once.with :some_sym
 
-      redis.ids :some_sym
+        redis.weight :some_sym
+      end
+      it 'returns a floated value' do
+        weights = stub :weights
+        redis.stub! :weights => weights
+
+        weights.should_receive(:member).any_number_of_times.and_return "1.0"
+
+        redis.weight(:any).should == 1.0
+      end
+      it 'returns a floated value' do
+        weights = stub :weights
+        redis.stub! :weights => weights
+
+        weights.should_receive(:member).any_number_of_times.and_return 1
+
+        redis.weight(:any).should == 1.0
+      end
     end
-    it 'returns the value' do
-      index = stub :index
-      redis.stub! :index => index
+    describe 'ids' do
+      it 'delegates to the index' do
+        index = stub :index
+        redis.stub! :index => index
 
-      index.should_receive(:collection).any_number_of_times.and_return [1,2,3]
+        index.should_receive(:collection).once.with :some_sym
 
-      redis.ids(:any).should == [1,2,3]
+        redis.ids :some_sym
+      end
+      it 'returns the value' do
+        index = stub :index
+        redis.stub! :index => index
+
+        index.should_receive(:collection).any_number_of_times.and_return [1,2,3]
+
+        redis.ids(:any).should == [1,2,3]
+      end
     end
   end
+
 end

data/spec/lib/internals/indexed/bundle/memory_spec.rb

@@ -3,12 +3,11 @@ require 'spec_helper'
 describe Internals::Indexed::Bundle::Memory do
 
   before(:each) do
-    @category     = stub :category, :name => :some_category
     @index        = stub :index, :name => :some_index
-    @configuration = Configuration::Index.new @index, @category
+    @category     = Internals::Indexed::Category.new :some_category, @index
     
     @similarity   = stub :similarity
-    @bundle       = described_class.new :some_name, @configuration, @similarity
+    @bundle       = described_class.new :some_name, @category, @similarity
   end
   
   describe 'to_s' do
@@ -161,11 +160,10 @@ Memory
   
   describe 'initialization' do
     before(:each) do
-      @category = stub :category, :name => :some_category
       @index    = stub :index, :name => :some_index
-      @configuration = Configuration::Index.new @index, @category
+      @category = Internals::Indexed::Category.new :some_category, @index
       
-      @bundle = described_class.new :some_name, @configuration, :similarity
+      @bundle = described_class.new :some_name, @category, :similarity
     end
     it 'should initialize the index correctly' do
       @bundle.index.should == {}

data/spec/lib/internals/indexed/bundle/redis_spec.rb

@@ -7,12 +7,11 @@ describe Internals::Indexed::Bundle::Redis do
     
     Internals::Index::Redis.stub! :new => @backend
     
-    @category     = stub :category, :name => :some_category
     @index        = stub :index, :name => :some_index
-    @configuration = Configuration::Index.new @index, @category
+    @category     = Internals::Indexed::Category.new :some_category, @index
     
     @similarity   = stub :similarity
-    @bundle       = described_class.new :some_name, @configuration, @similarity
+    @bundle       = described_class.new :some_name, @category, @similarity
   end
   
   describe 'ids' do

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Indexed::Wrappers::Bundle::Calculation do
+describe Internals::Indexed::Wrappers::Bundle::Calculation do
   
   before(:each) do
-    @bundle       = stub :bundle
+    @bundle      = stub :bundle
     
-    @calculation = Indexed::Wrappers::Bundle::Calculation.new @bundle
+    @calculation = described_class.new @bundle
   end
   
   describe 'ids' do

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Indexed::Wrappers::Bundle::Wrapper do
+describe Internals::Indexed::Wrappers::Bundle::Wrapper do
   
   before(:each) do
-    @bundle       = stub :bundle
+    @bundle      = stub :bundle
     
-    @calculation = Indexed::Wrappers::Bundle::Wrapper.new @bundle
+    @calculation = described_class.new @bundle
   end
   
   describe 'ids' do

data/spec/lib/internals/indexers/parallel_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+describe Indexers::Parallel do
+
+  before(:each) do
+    @source     = stub :source
+    @tokenizer  = stub :tokenizer
+    @categories = stub :categories
+    @index      = stub :index, :name => :some_index, :categories => @categories
+    
+    @indexer = described_class.new @index
+    @indexer.stub! :timed_exclaim
+  end
+  
+  describe 'flush' do
+    it 'flushes to joined cache to the file and clears it' do
+      cache = stub :cache
+      file  = stub :file
+      
+      cache.should_receive(:join).twice.and_return :joined
+      file.should_receive(:write).twice.with(:joined).and_return :joined
+      cache.should_receive(:clear).twice
+      
+      @indexer.flush [[nil, cache, file], [nil, cache, file]]
+    end
+  end
+  
+  describe "index" do
+    it "should process" do
+      @indexer.should_receive(:process).once.with
+      
+      @indexer.index
+    end
+  end
+  
+end

data/spec/lib/internals/indexers/serial_spec.rb

@@ -3,13 +3,11 @@ require 'spec_helper'
 describe Indexers::Serial do
 
   before(:each) do
-    @index         = stub :index, :name => :some_index
-    @category      = stub :category, :name => :some_category
-    @configuration = Configuration::Index.new @index, @category
-    
-    @source    = stub :source
     @tokenizer = stub :tokenizer
-    @indexer = Indexers::Serial.new @configuration, @source, @tokenizer
+    @source  = stub :source
+    @category  = stub :category, :identifier => :some_identifier, :tokenizer => @tokenizer, :source => @source
+    
+    @indexer = described_class.new @category
     @indexer.stub! :timed_exclaim
   end
   
@@ -40,7 +38,7 @@ describe Indexers::Serial do
   
   describe "indexing_message" do
     it "informs the user about what it is going to index" do
-      @indexer.should_receive(:timed_exclaim).once.with '"some_index:some_category": Starting indexing.'
+      @indexer.should_receive(:timed_exclaim).once.with '"some_identifier": Starting serial indexing.'
       
       @indexer.indexing_message
     end
@@ -55,7 +53,7 @@ describe Indexers::Serial do
   end
   
   describe "index" do
-    it "should execute! the indexer" do
+    it "should process" do
       @indexer.should_receive(:process).once.with
       
       @indexer.index
@@ -68,12 +66,6 @@ describe Indexers::Serial do
     end
   end
   
-  describe "raise_no_source" do
-    it "should raise" do
-      lambda { @indexer.raise_no_source }.should raise_error(Indexers::NoSourceSpecifiedException)
-    end
-  end
-  
   describe "chunked" do
     
   end

data/spec/lib/internals/indexing/bundle/memory_partial_generation_speed_spec.rb

@@ -3,12 +3,11 @@ require 'spec_helper'
 describe Internals::Indexing::Bundle::Memory do
 
   before(:each) do
-    @category         = stub :category, :name => :some_category
     @index            = stub :index, :name => :some_index
-    @configuration    = Configuration::Index.new @index, @category
+    @category         = Internals::Indexing::Category.new :some_category, @index
     
     @partial_strategy = Internals::Generators::Partial::Substring.new :from => 1
-    @exact            = described_class.new :some_name, @configuration, nil, @partial_strategy, nil
+    @exact            = described_class.new :some_name, @category, nil, @partial_strategy, nil
   end
 
   def generate_random_keys amount

data/spec/lib/internals/indexing/bundle/memory_spec.rb

@@ -3,15 +3,14 @@ require 'spec_helper'
 describe Internals::Indexing::Bundle::Memory do
 
   before(:each) do
-    @internal_index = stub :index, :name => :some_index
-    @category       = stub :category, :name => :some_category
-    @configuration  = Configuration::Index.new @internal_index, @category
+    @index = stub :index, :name => :some_index
+    @category       = Internals::Indexing::Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights
     @similarity  = stub :similarity
   end
-  let(:index) { described_class.new :some_name, @configuration, @similarity, @partial, @weights }
+  let(:index) { described_class.new :some_name, @category, @similarity, @partial, @weights }
   
   describe 'raise_cache_missing' do
     it 'does something' do
@@ -65,8 +64,8 @@ describe Internals::Indexing::Bundle::Memory do
       index.stub! :files => files
       
       @ary = stub :ary
-      @internal_index.should_receive(:[]).any_number_of_times.and_return @ary
-      index.stub! :index => @internal_index
+      @index.should_receive(:[]).any_number_of_times.and_return @ary
+      index.stub! :index => @index
     end
     context 'id key format' do
       before(:each) do

data/spec/lib/internals/indexing/bundle/redis_spec.rb

@@ -3,15 +3,14 @@ require 'spec_helper'
 describe Internals::Indexing::Bundle::Redis do
 
   before(:each) do
-    @internal_index = stub :index, :name => :some_index
-    @category       = stub :category, :name => :some_category
-    @configuration  = Configuration::Index.new @internal_index, @category
+    @index       = stub :index, :name => :some_index
+    @category    = Internals::Indexing::Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights
     @similarity  = stub :similarity
   end
-  let(:index) { described_class.new :some_name, @configuration, @similarity, @partial, @weights }
+  let(:index) { described_class.new :some_name, @category, @similarity, @partial, @weights }
 
   describe 'raise_cache_missing' do
     it 'does something' do
@@ -65,8 +64,8 @@ describe Internals::Indexing::Bundle::Redis do
       index.stub! :files => files
       
       @ary = stub :ary
-      @internal_index.should_receive(:[]).any_number_of_times.and_return @ary
-      index.stub! :index => @internal_index
+      @index.should_receive(:[]).any_number_of_times.and_return @ary
+      index.stub! :index => @index
     end
     context 'id key format' do
       before(:each) do

data/spec/lib/internals/indexing/category_spec.rb

@@ -106,6 +106,21 @@ describe Internals::Indexing::Category do
       end
     end
     
+    describe 'source' do
+      context 'with explicit source' do
+        let(:category) { described_class.new(:some_category, @index, :source => :category_source) }
+        it 'returns the right source' do
+          category.source.should == :category_source
+        end
+      end
+      context 'without explicit source' do
+        let(:category) { described_class.new(:some_category, @index.tap{ |index| index.stub! :source => :index_source }) }
+        it 'returns the right source' do
+          category.source.should == :index_source
+        end
+      end
+    end
+    
     describe "cache" do
       before(:each) do
         category.stub! :generate_caches
@@ -113,12 +128,12 @@ describe Internals::Indexing::Category do
       it "prepares the cache directory" do
         category.should_receive(:prepare_index_directory).once.with
         
-        category.cache
+        category.cache!
       end
       it "tells the indexer to index" do
         category.should_receive(:generate_caches).once.with
         
-        category.cache
+        category.cache!
       end
     end
     describe "index" do
@@ -129,18 +144,18 @@ describe Internals::Indexing::Category do
       it "prepares the cache directory" do
         category.should_receive(:prepare_index_directory).once.with
         
-        category.index
+        category.index!
       end
       it "tells the indexer to index" do
         @indexer.should_receive(:index).once.with
         
-        category.index
+        category.index!
       end
     end
     describe "source" do
       context "without source" do
-        it "raises" do
-          lambda { described_class.new :some_name, @index }.should raise_error(Indexers::NoSourceSpecifiedException)
+        it "has no problem with that" do
+          lambda { described_class.new :some_name, @index }.should_not raise_error
         end
       end
     end

data/spec/lib/internals/indexing/index_spec.rb

@@ -6,26 +6,62 @@ describe Internals::Indexing::Index do
     before(:each) do
       @source = stub :some_source
       
-      @categories = stub :categories
-      
-      @index = described_class.new :some_name, @source
+      @index = described_class.new :some_name, source: @source
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
-      
-      @index.stub! :categories => @categories
+    end
+    describe "raise_no_source" do
+      it "should raise" do
+        lambda { @index.raise_no_source }.should raise_error(NoSourceSpecifiedException)
+      end
+    end
+    describe 'define_source' do
+      it 'can be set with this method' do
+        @index.define_source :some_other_source
+
+        @index.source.should == :some_other_source
+      end
     end
     describe "generate_caches" do
       it "delegates to each category" do
-        @categories.should_receive(:generate_caches).once.with
+        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
+          end.to raise_error(%Q{Index category "some_non_existent_name" not found. Possible categories: "some_category_name1", "some_category_name2".})
+        end
+      end
+      context 'with categories' do
+        before(:each) do
+          @index.define_category :some_name, :source => stub(:source)
+        end
+        it 'returns it if found' do
+          @index.find(:some_name).should_not == nil
+        end
+        it 'raises on none existent category' do
+          expect do
+            @index.find :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
+    end
   end
   
   context "no categories" do
     it "works" do
-      described_class.new :some_name, @source
+      described_class.new :some_name, source: @source
     end
   end
   

data/spec/lib/query/indexes_spec.rb

@@ -6,7 +6,7 @@ describe Internals::Query::Indexes do
     n       = i + 1
     name    = :"index#{n}"
     indexed = :"indexed#{n}"
-    let(name) { stub name, :indexed => stub(indexed) }
+    let(name) { stub name, :internal_indexed => stub(indexed) }
   end
 
   let(:indexes) { described_class.new index1, index2, index3 }

data/spec/lib/search_spec.rb

@@ -6,14 +6,63 @@ describe Search do
   
   before(:each) do
     @type      = stub :type
-    @index     = stub :some_index, :indexed => @type
+    @index     = stub :some_index, :internal_indexed => @type
+  end
+  
+  describe 'tokenized' do
+    let(:search) { described_class.new }
+    it 'delegates to the tokenizer' do
+      tokenizer = stub :tokenizer
+      search.stub! :tokenizer => tokenizer
+      
+      tokenizer.should_receive(:tokenize).once.with :some_text
+      
+      search.tokenized :some_text
+    end
+  end
+  
+  describe 'boost' do
+    let(:search) do
+      described_class.new do
+        boost [:a, :b] => +3,
+              [:c, :d] => -1
+      end
+    end
+    it 'works' do
+      search.weights.should == Query::Weights.new([:a, :b] => 3, [:c, :d] => -1)
+    end
+  end
+  
+  describe 'tokenizer' do
+    context 'no tokenizer predefined' do
+      let(:search) { described_class.new }
+      it 'returns the default tokenizer' do
+        search.tokenizer.should == Internals::Tokenizers::Query.default
+      end
+    end
+    context 'tokenizer predefined' do
+      let(:predefined) { stub(:tokenizer, :tokenize => nil) }
+      context 'by way of hash' do
+        let(:search) { described_class.new(tokenizer: predefined) }
+        it 'returns the predefined tokenizer' do
+          search.tokenizer.should == predefined
+        end
+      end
+      context 'by way of DSL' do
+        let(:search) { pre = predefined; described_class.new { searching pre } }
+        it 'returns the predefined tokenizer' do
+          search.tokenizer.should == predefined
+        end
+      end
+    end
+    
   end
   
   describe 'combinations_type_for' do
     let(:search) { described_class.new }
     it 'returns a specific Combination for a specific input' do
       some_source = stub(:source, :harvest => nil)
-      search.combinations_type_for([Index::Memory.new(:gu, some_source)]).should == Internals::Query::Combinations::Memory
+      search.combinations_type_for([Index::Memory.new(:gu, source: some_source)]).should == Internals::Query::Combinations::Memory
     end
     it 'just works on the same types' do
       search.combinations_type_for([:blorf, :blarf]).should == Internals::Query::Combinations::Memory