picky 3.0.0.pre1 → 3.0.0.pre2

data/spec/lib/application_spec.rb

@@ -8,11 +8,12 @@ describe Picky::Application do
     it "should run ok" do
       lambda {
         class MinimalTestApplication < described_class
-          books = Picky::Indexes::Memory.new :books,
-                                             source: Picky::Sources::DB.new(
-                                               'SELECT id, title FROM books',
-                                               :file => 'app/db.yml'
-                                             )
+          books = Picky::Indexes::Memory.new :books do
+                  source Picky::Sources::DB.new(
+                    'SELECT id, title FROM books',
+                    :file => 'app/db.yml'
+                  )
+                  end
           books.define_category :title
           
           rack_adapter.stub! :exclaim # Stopping it from exclaiming.
@@ -43,11 +44,13 @@ describe Picky::Application do
                     substitutes_characters_with: Picky::CharacterSubstituters::WestEuropean.new,
                     maximum_tokens: 5
           
-          books_index = Picky::Indexes::Memory.new :books,
-                                                   source: Picky::Sources::DB.new(
-                                                     'SELECT id, title, author, isbn13 as isbn FROM books',
-                                                     :file => 'app/db.yml'
-                                                   )
+          books_index = Picky::Indexes::Memory.new :books do
+            source Picky::Sources::DB.new(
+              'SELECT id, title, author, isbn13 as isbn FROM books',
+              :file => 'app/db.yml'
+            )
+          end
+          
           books_index.define_category :title,
                                       similarity: Picky::Similarity::DoubleMetaphone.new(3) # Up to three similar title word indexed.
           books_index.define_category :author,
@@ -67,9 +70,11 @@ describe Picky::Application do
           rack_adapter.stub! :exclaim # Stopping it from exclaiming.
           
           route %r{^/books} => Picky::Search.new(books_index)
-          route %r{^/buks}  => Picky::Search.new(books_index) do
+          
+          buks_search = Picky::Search.new(books_index) do
             searching removes_characters: /[buks]/
           end
+          route %r{^/buks} => buks_search
         end
       }.should_not raise_error
     end
@@ -119,6 +124,21 @@ describe Picky::Application do
     end
   end
   
+  describe 'route' do
+    it 'is delegated' do
+      described_class.rack_adapter.should_receive(:route).once.with :some_options
+      
+      described_class.route(:some_options)
+    end
+    it 'raises on block' do
+      expect {
+        described_class.route :quack => Hash.new do # Anything with a block.
+          # do something
+        end
+      }.to raise_error("Warning: block passed into #route method, not into Search.new!")
+    end
+  end
+  
   describe 'call' do
     before(:each) do
       @routes = stub :routes

data/spec/lib/backend/files_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Backend::Files do
 
   before(:each) do
-    index         = Picky::Indexes::Memory.new :some_index, source: []
+    index         = Picky::Indexes::Memory.new :some_index
     category      = Picky::Category.new :some_category, index
     bundle        = Picky::Indexing::Bundle::Base.new :some_bundle, category, nil, nil, nil
     

data/spec/lib/categories_indexed_spec.rb

@@ -22,7 +22,7 @@ describe Picky::Categories do
   
   context "with real categories" do
     before(:each) do
-      @index1 = Picky::Indexes::Memory.new :name, source: []
+      @index1 = Picky::Indexes::Memory.new :name
       
       @categories = described_class.new
       @categories << Picky::Category.new(:category1, @index1)
@@ -65,7 +65,7 @@ describe Picky::Categories do
   
   context 'without options' do
     before(:each) do
-      @index1 = Picky::Indexes::Memory.new :some_index, source: []
+      @index1 = Picky::Indexes::Memory.new :some_index
       
       @category1 = Picky::Category.new :category1, @index1
       @category2 = Picky::Category.new :category2, @index1

data/spec/lib/category_indexed_spec.rb

@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Picky::Category do
 
   before(:each) do
-    @index               = Picky::Indexes::Index.new :some_index, source: []
+    @index = Picky::Indexes::Index.new :some_index do
+      source []
+    end
     @partial_strategy    = stub :partial, :use_exact_for_partial? => false
     @weights_strategy    = stub :weights
     @similarity_strategy = stub :similarity
@@ -40,7 +42,10 @@ describe Picky::Category do
     end
     context 'indexed_bundle_class defined differently' do
       before(:each) do
-        @category = described_class.new :some_name, Picky::Indexes::Redis.new(:some_index_name, source: [])
+        index = Picky::Indexes::Redis.new(:some_index_name) do
+          source []
+        end
+        @category = described_class.new :some_name, index
       end
       context 'with a partial strategy that uses the exact index' do
         before(:each) do

data/spec/lib/category_indexing_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Category do
   
   before(:each) do
-    @index  = Picky::Indexes::Memory.new :some_index, source: []
+    @index  = Picky::Indexes::Memory.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 } }

data/spec/lib/category_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Picky::Category do
   
-  let(:index) { Picky::Indexes::Memory.new :some_index, source: [] }
+  let(:index) { Picky::Indexes::Memory.new :some_index }
   let(:category) { described_class.new :some_category, index }
   
   it 'should set defaults correctly' do

data/spec/lib/frontend_adapters/rack_spec.rb

@@ -63,7 +63,7 @@ describe Picky::FrontendAdapters::Rack do
   context 'real routes' do
     before(:each) do
       @rack_adapter.reset_routes
-      PickyLog.stub! :log
+      Picky.logger.stub! :log
     end
     it 'should route correctly' do
       env = {}
@@ -107,7 +107,7 @@ describe Picky::FrontendAdapters::Rack do
       env = rack_defaults_for '/searches/some_route?query=some_query'
       
       search = stub :search
-      search.should_receive(:search_with_text).once.with(anything, 20, 0).and_return(Picky::Results.new)
+      search.should_receive(:search).once.with(anything, 20, 0).and_return(Picky::Results.new)
       Picky::Search.stub! :new => search
       
       @rack_adapter.route '/searches/some_route' => Picky::Search.new(:some_index, :some_other_index)
@@ -119,7 +119,7 @@ describe Picky::FrontendAdapters::Rack do
       env = rack_defaults_for '/searches/some_route?query=some_query&type=some_type'
       
       search = stub :search
-      search.should_receive(:search_with_text).once.with(anything, 20, 0).and_return(Picky::Results.new)
+      search.should_receive(:search).once.with(anything, 20, 0).and_return(Picky::Results.new)
       Picky::Search.stub! :new => search
       
       @rack_adapter.route '/searches/some_route' => Picky::Search.new(:some_index, :some_other_index), :query => { :type => :some_type }
@@ -131,7 +131,7 @@ describe Picky::FrontendAdapters::Rack do
       env = rack_defaults_for '/searches/some_wrong_route?query=some_query'
       
       search = stub :search
-      search.should_receive(:search_with_text).never
+      search.should_receive(:search).never
       Picky::Search.stub! :new => search
       
       @rack_adapter.route '/searches/some_route' => Picky::Search.new(:some_index, :some_other_index)

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Indexed::Bundle::Memory do
 
   before(:each) do
-    @index        = Picky::Indexes::Memory.new :some_index, source: []
+    @index        = Picky::Indexes::Memory.new :some_index
     @category     = Picky::Category.new :some_category, @index
     
     @similarity   = stub :similarity
@@ -153,7 +153,7 @@ describe Picky::Indexed::Bundle::Memory do
   
   describe 'initialization' do
     before(:each) do
-      @index    = Picky::Indexes::Memory.new :some_index, source: []
+      @index    = Picky::Indexes::Memory.new :some_index
       @category = Picky::Category.new :some_category, @index
       
       @bundle = described_class.new :some_name, @category, :similarity

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

@@ -7,7 +7,7 @@ describe Picky::Indexed::Bundle::Redis do
     
     Picky::Backend::Redis.stub! :new => @backend
     
-    @index        = Picky::Indexes::Memory.new :some_index, source: []
+    @index        = Picky::Indexes::Memory.new :some_index
     @category     = Picky::Category.new :some_category, @index
     
     @similarity   = stub :similarity

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

@@ -13,7 +13,7 @@ describe Picky::Indexed::Wrappers::ExactFirst do
   describe "self.wrap" do
     context "index" do
       it "wraps each category" do
-        index = Picky::Indexes::Memory.new :some_index, source: []
+        index = Picky::Indexes::Memory.new :some_index
         index.define_category :some_category
         
         Picky::Indexed::Wrappers::ExactFirst.wrap index
@@ -23,7 +23,7 @@ describe Picky::Indexed::Wrappers::ExactFirst do
         end
       end
       it "returns the index" do
-        index = Picky::Indexes::Memory.new :some_index, source: []
+        index = Picky::Indexes::Memory.new :some_index
         index.define_category :some_category
         
         described_class.wrap(index).should == index

data/spec/lib/indexes/index_indexed_spec.rb

@@ -4,7 +4,7 @@ describe Picky::Indexes::Index do
   
   context 'without stubbed categories' do
     before(:each) do
-      @index = described_class.new :some_index_name, source: []
+      @index = described_class.new :some_index_name
     end
     
     describe 'define_category' do
@@ -23,7 +23,7 @@ describe Picky::Indexes::Index do
     before(:each) do
       @categories = stub :categories
       
-      @index = described_class.new :some_name, source: []
+      @index = described_class.new :some_name
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
       
@@ -46,9 +46,31 @@ describe Picky::Indexes::Index do
     end
   end
   
+  context 'result_identifier' do
+    context 'with it set' do
+      let(:index) do
+        described_class.new :some_name do
+          result_identifier :some_identifier
+        end
+      end
+      it 'has an after_indexing set' do
+        index.result_identifier.should == :some_identifier
+      end
+    end
+    context 'with it not set' do
+      let(:index) do
+        described_class.new :some_name do
+        end
+      end
+      it 'returns the name' do
+        index.result_identifier.should == :some_name
+      end
+    end
+  end
+  
   context "no categories" do
     it "works" do
-      described_class.new :some_name, source: []
+      described_class.new :some_name
     end
   end
   

data/spec/lib/indexes/index_indexing_spec.rb

@@ -4,14 +4,25 @@ describe Picky::Indexes::Index do
   
   describe 'tokenizer' do
     context 'with tokenizer' do
-      let(:index) { described_class.new :some_name, source: [], tokenizer: 'some tokenizer' }
+      let(:tokenizer) { stub :tokenizer, :tokenize => '' }
+      let(:index) do
+        the_tokenizer = tokenizer
+        described_class.new :some_name do
+          source []
+          indexing the_tokenizer
+        end
+      end
 
       it 'does things in order' do
-        index.tokenizer.should == 'some tokenizer'
+        index.tokenizer.should == tokenizer
       end
     end
     context 'without tokenizer' do
-      let(:index) { described_class.new :some_name, source: [] }
+      let(:index) do
+        described_class.new :some_name do
+          source []
+        end
+      end
 
       it 'does things in order' do
         index.tokenizer.should == Picky::Indexes.tokenizer
@@ -19,9 +30,35 @@ describe Picky::Indexes::Index do
     end
   end
   
+  context 'after_indexing' do
+    context 'with it set' do
+      let(:index) do
+        described_class.new :some_name do
+          after_indexing "some after indexing going on"
+        end
+      end
+      it 'has an after_indexing set' do
+        index.after_indexing.should == "some after indexing going on"
+      end
+    end
+    context 'with it not set' do
+      let(:index) do
+        described_class.new :some_name do
+        end
+      end
+      it 'does not have an after_indexing set' do
+        index.after_indexing.should == nil
+      end
+    end
+  end
+  
   context 'in general' do
     context 'with #each source' do
-      let(:index) { described_class.new :some_name, source: [] }
+      let(:index) do
+        described_class.new :some_name do
+          source []
+        end
+      end
 
       it 'does things in order' do
         index.should_receive(:check_source_empty).once.with.ordered
@@ -32,7 +69,12 @@ describe Picky::Indexes::Index do
     end
     context 'with non#each source' do
       let(:source) { stub :source, :harvest => nil }
-      let(:index) { described_class.new :some_name, source: source }
+      let(:index) do
+        the_source = source
+        described_class.new :some_name do
+          source the_source
+        end
+      end
 
       it 'does things in order' do
         category = stub :category        
@@ -51,9 +93,11 @@ describe Picky::Indexes::Index do
   
   context "with categories" do
     before(:each) do
-      @source = []
+      the_source = []
       
-      @index = described_class.new :some_name, source: @source
+      @index = described_class.new :some_name do
+        source the_source
+      end
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
     end
@@ -64,9 +108,11 @@ describe Picky::Indexes::Index do
     end
     describe 'define_source' do
       it 'can be set with this method' do
-        @index.define_source :some_other_source
+        source = stub :source, :each => [].each
+        
+        @index.define_source source
 
-        @index.source.should == :some_other_source
+        @index.source.should == source
       end
     end
     describe 'find' do
@@ -95,7 +141,9 @@ describe Picky::Indexes::Index do
   
   context "no categories" do
     it "works" do
-      described_class.new :some_name, source: []
+      described_class.new :some_name do
+        source []
+      end
     end
   end
   

data/spec/lib/indexes/index_spec.rb

@@ -8,31 +8,37 @@ describe Picky::Indexes::Index do
   
   context 'initializer' do
     it 'works' do
-      expect { described_class.new :some_index_name, source: some_source }.to_not raise_error
+      the_source = some_source
+      expect { described_class.new :some_index_name do source the_source end }.to_not raise_error
     end
     it 'fails correctly' do
       expect { described_class.new 0, some_source }.to raise_error
     end
-    it 'fails correctly' do
-      expect { described_class.new :some_index_name, source: :some_source }.to raise_error
-    end
     it 'fails correctly' do
       expect { described_class.new :some_index_name, some_source }.to raise_error
     end
     it 'does not fail' do
-      expect { described_class.new :some_index_name, source: [] }.to_not raise_error
+      expect { described_class.new :some_index_name do source [] end }.to_not raise_error
     end
     it 'registers with the indexes' do
       @api = described_class.allocate
       
       Picky::Indexes.should_receive(:register).once.with @api
       
-      @api.send :initialize, :some_index_name, source: some_source
+      the_source = some_source
+      @api.send :initialize, :some_index_name do
+        source the_source
+      end
     end
   end
   
   context 'unit' do
-    let(:api) { described_class.new :some_index_name, source: some_source }
+    let(:api) do
+      the_source = some_source
+      described_class.new :some_index_name do
+        source the_source
+      end
+    end
     
     describe 'geo_categories' do
       it 'delegates correctly' do

data/spec/lib/indexes/redis_spec.rb

@@ -8,7 +8,7 @@ describe Picky::Indexes::Redis do
   
   describe 'initialize' do
     it 'works' do
-      described_class.new :some_name, source: some_source
+      described_class.new :some_name
     end
   end
   

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Indexing::Bundle::Memory do
 
   before(:each) do
-    @index            = Picky::Indexes::Memory.new :some_index, source: []
+    @index            = Picky::Indexes::Memory.new :some_index
     @category         = Picky::Category.new :some_category, @index
     
     @partial_strategy = Picky::Generators::Partial::Substring.new :from => 1

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Indexing::Bundle::Memory do
 
   before(:each) do
-    @index    = Picky::Indexes::Memory.new :some_index, source: []
+    @index    = Picky::Indexes::Memory.new :some_index
     @category = Picky::Category.new :some_category, @index
     
     @partial     = stub :partial

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

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Picky::Indexing::Bundle::Redis do
 
   before(:each) do
-    @index       = Picky::Indexes::Memory.new :some_index, source: []
+    @index       = Picky::Indexes::Memory.new :some_index
     @category    = Picky::Category.new :some_category, @index
     
     @partial     = stub :partial

data/spec/lib/search_spec.rb

@@ -42,12 +42,6 @@ describe Picky::Search do
     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
@@ -62,7 +56,11 @@ describe Picky::Search 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([Picky::Indexes::Memory.new(:gu, source: some_source)]).should == Picky::Query::Combinations::Memory
+      search.combinations_type_for([
+        Picky::Indexes::Memory.new(:gu) do
+          source some_source
+        end]
+      ).should == Picky::Query::Combinations::Memory
     end
     it 'just works on the same types' do
       search.combinations_type_for([:blorf, :blarf]).should == Picky::Query::Combinations::Memory
@@ -89,42 +87,44 @@ describe Picky::Search do
       search.weights.should be_kind_of(Picky::Query::Weights)
     end
     it "handles :weights options when not yet wrapped" do
-      search = described_class.new :weights => { [:a, :b] => +3 }
+      search = described_class.new do boost [:a, :b] => +3 end
       
       search.weights.should be_kind_of(Picky::Query::Weights)
     end
     it "handles :weights options when already wrapped" do
-      search = described_class.new :weights => Picky::Query::Weights.new([:a, :b] => +3)
+      search = described_class.new do boost Picky::Query::Weights.new([:a, :b] => +3) end
       
       search.weights.should be_kind_of(Picky::Query::Weights)
     end
   end
   
-  describe "search_with_text" do
+  describe "search" do
     before(:each) do
       @search = described_class.new
     end
-    it "delegates to search" do
+    it "delegates to search_with" do
       @search.stub! :tokenized => :tokens
       
-      @search.should_receive(:search).once.with :tokens, 20, 0
+      @search.should_receive(:search_with).once.with :tokens, 20, 0
       
-      @search.search_with_text :text, 20, 0
+      @search.search :text, 20, 0
     end
     it "uses the tokenizer" do
-      @search.stub! :search
+      @search.stub! :search_with
       
       @search.should_receive(:tokenized).once.with :text
       
-      @search.search_with_text :text, 20 # (unimportant)
+      @search.search :text, 20 # (unimportant)
     end
   end
   
   describe 'initializer' do
     context 'with tokenizer' do
       before(:each) do
-        @tokenizer = stub :tokenizer, :tokenize => :some_tokenized_text
-        @search    = described_class.new @index, tokenizer: @tokenizer
+        tokenizer = stub :tokenizer, :tokenize => :some_tokenized_text
+        @search = described_class.new @index do
+          searching tokenizer
+        end
       end
       it 'should tokenize using the tokenizer' do
         @search.tokenized('some text').should == :some_tokenized_text
@@ -138,7 +138,7 @@ describe Picky::Search do
     end
     context 'with weights' do
       before(:each) do
-        @search = described_class.new @index, weights: :some_weights
+        @search = described_class.new @index do boost :some_weights end
       end
       it 'works correctly' do
         @search.to_s.should == 'Picky::Search(some_index, weights: some_weights)'

data/spec/lib/tokenizers/base_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe Picky::Tokenizers::Base do
   
   context 'with special instance' do
-    let (:tokenizer) { described_class.new reject_token_if: lambda { |token| token.to_s.length < 2 || token == :hello }, case_sensitive: true }
+    let (:tokenizer) { described_class.new rejects_token_if: lambda { |token| token.to_s.length < 2 || token == :hello }, case_sensitive: true }
     it 'rejects tokens with length < 2' do
       tokenizer.reject([:'', :a, :ab, :abc]).should == [:ab, :abc]
     end
@@ -46,12 +46,12 @@ EXPECTED
           end
         end
     
-    describe 'reject_token_if' do
+    describe 'rejects_token_if' do
       it 'rejects empty tokens by default' do
         tokenizer.reject(['a', nil, '', 'b']).should == ['a', 'b']
       end
       it 'rejects tokens based on the given rejection criteria if set' do
-        tokenizer.reject_token_if &:nil?
+        tokenizer.rejects_token_if &:nil?
 
         tokenizer.reject(['a', nil, '', 'b']).should == ['a', '', 'b']
       end

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 3.0.0.pre1
+  version: 3.0.0.pre2
 platform: ruby
 authors: 
 - Florian Hanke
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-07 00:00:00 +10:00
+date: 2011-08-11 00:00:00 +10:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.0.pre1
+        version: 3.0.0.pre2
   type: :development
   version_requirements: *id002
 description: Fast Ruby semantic text search engine with comfortable single field interface.
@@ -129,7 +129,6 @@ files:
 - lib/picky/indexing/wrappers/category/location.rb
 - lib/picky/interfaces/live_parameters.rb
 - lib/picky/loader.rb
-- lib/picky/loggers/search.rb
 - lib/picky/no_source_specified_exception.rb
 - lib/picky/performant.rb
 - lib/picky/query/allocation.rb
@@ -240,7 +239,6 @@ files:
 - spec/lib/indexing/bundle/redis_spec.rb
 - spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
-- spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/combination_spec.rb
@@ -368,7 +366,6 @@ test_files:
 - spec/lib/indexing/bundle/redis_spec.rb
 - spec/lib/interfaces/live_parameters_spec.rb
 - spec/lib/loader_spec.rb
-- spec/lib/loggers/search_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
 - spec/lib/query/combination_spec.rb

data/lib/picky/loggers/search.rb

@@ -1,26 +0,0 @@
-# encoding: utf-8
-#
-module Picky
-
-  # TODO Remove?
-  #
-  module Loggers # :nodoc:all
-
-    # Log Proxy
-    #
-    class Search
-
-      attr_reader :logger
-
-      def initialize logger
-        @logger = logger
-      end
-
-      def log message
-        logger.info message
-      end
-
-    end
-  end
-
-end