picky 4.0.0pre6 → 4.0.0

data/spec/lib/query/combinations_spec.rb

@@ -26,10 +26,10 @@ describe Picky::Query::Combinations do
 
   describe "weighted_score" do
     it "uses the weights' score method" do
-      weights = stub :weights
-      weights.should_receive(:score_for).once.with @combinations_ary
+      boosts = stub :boosts
+      boosts.should_receive(:boost_for).once.with @combinations_ary
 
-      @combinations.weighted_score weights
+      @combinations.boost_for boosts
     end
   end
 

data/spec/lib/search_spec.rb

@@ -32,7 +32,7 @@ describe Picky::Search do
       end
     end
     it 'works' do
-      search.weights.should == Picky::Query::Weights.new([:a, :b] => 3, [:c, :d] => -1)
+      search.boosts.should == Picky::Query::Boosts.new([:a, :b] => 3, [:c, :d] => -1)
     end
   end
 
@@ -66,21 +66,21 @@ describe Picky::Search do
 
   end
 
-  describe "weights handling" do
+  describe "boosts handling" do
     it "creates a default weight when no weights are given" do
       search = described_class.new
 
-      search.weights.should be_kind_of(Picky::Query::Weights)
+      search.boosts.should be_kind_of(Picky::Query::Boosts)
     end
     it "handles :weights options when not yet wrapped" do
       search = described_class.new do boost [:a, :b] => +3 end
 
-      search.weights.should be_kind_of(Picky::Query::Weights)
+      search.boosts.should be_kind_of(Picky::Query::Boosts)
     end
     it "handles :weights options when already wrapped" do
-      search = described_class.new do boost Picky::Query::Weights.new([:a, :b] => +3) end
+      search = described_class.new do boost Picky::Query::Boosts.new([:a, :b] => +3) end
 
-      search.weights.should be_kind_of(Picky::Query::Weights)
+      search.boosts.should be_kind_of(Picky::Query::Boosts)
     end
   end
 
@@ -134,7 +134,7 @@ describe Picky::Search do
         @search = described_class.new
       end
       it 'works correctly' do
-        @search.to_s.should == 'Picky::Search(weights: Picky::Query::Weights({}))'
+        @search.to_s.should == 'Picky::Search(boosts: Picky::Query::Boosts({}))'
       end
     end
     context 'with weights' do
@@ -142,23 +142,23 @@ describe Picky::Search do
         @search = described_class.new @index do boost [:a, :b] => +3 end
       end
       it 'works correctly' do
-        @search.to_s.should == 'Picky::Search(some_index, weights: Picky::Query::Weights({[:a, :b]=>3}))'
+        @search.to_s.should == 'Picky::Search(some_index, boosts: Picky::Query::Boosts({[:a, :b]=>3}))'
       end
     end
     context 'with special weights' do
       before(:each) do
-        class RandomWeights
-          def score_for combinations
+        class RandomBoosts
+          def boost_for combinations
             rand
           end
           def to_s
             "#{self.class}(rand)"
           end
         end
-        @search = described_class.new @index do boost RandomWeights.new end
+        @search = described_class.new @index do boost RandomBoosts.new end
       end
       it 'works correctly' do
-        @search.to_s.should == 'Picky::Search(some_index, weights: RandomWeights(rand))'
+        @search.to_s.should == 'Picky::Search(some_index, boosts: RandomBoosts(rand))'
       end
     end
     context 'without weights' do
@@ -166,7 +166,7 @@ describe Picky::Search do
         @search = described_class.new @index
       end
       it 'works correctly' do
-        @search.to_s.should == 'Picky::Search(some_index, weights: Picky::Query::Weights({}))'
+        @search.to_s.should == 'Picky::Search(some_index, boosts: Picky::Query::Boosts({}))'
       end
     end
   end

data/spec/lib/tokenizer_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe Picky::Tokenizer do
-  
+
   context 'with special instance' do
     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
@@ -26,10 +26,10 @@ EXPECTED
       end
     end
   end
-  
+
   context 'with normal instance' do
     let(:tokenizer) { described_class.new }
-    
+
         describe 'to_s' do
           it 'spits out the right text' do
             tokenizer.to_s.should == <<-EXPECTED
@@ -43,7 +43,7 @@ Case sensitive?     -
 EXPECTED
           end
         end
-    
+
     describe 'rejects_token_if' do
       it 'rejects empty tokens by default' do
         tokenizer.reject(['a', nil, '', 'b']).should == ['a', 'b']
@@ -60,7 +60,11 @@ EXPECTED
         tokenizer.substitute_characters('abcdefghijklmnopqrstuvwxyzäöü').should == 'abcdefghijklmnopqrstuvwxyzäöü'
       end
       it 'raises if nothing with #substitute is given' do
-        expect { tokenizer.substitutes_characters_with Object.new }.to raise_error("The substitutes_characters_with option needs a character substituter, which responds to #substitute.")
+        expect { tokenizer.substitutes_characters_with Object.new }.
+          to raise_error(<<-ERROR)
+The substitutes_characters_with option needs a character substituter,
+which responds to #substitute(text) and returns substituted_text."
+ERROR
       end
       it "uses the substituter to replace characters" do
         tokenizer.substitutes_characters_with Picky::CharacterSubstituters::WestEuropean.new
@@ -84,7 +88,7 @@ EXPECTED
         end
         it 'should define a method normalize_with_patterns does nothing' do
           unchanging = stub :unchanging
-          
+
           tokenizer.normalize_with_patterns(unchanging).should == unchanging
         end
       end
@@ -145,7 +149,7 @@ EXPECTED
         end
         it 'should define a method remove_illegals that does nothing' do
           unchanging = stub :unchanging
-          
+
           tokenizer.remove_illegals unchanging
         end
       end
@@ -210,5 +214,5 @@ EXPECTED
       end
     end
   end
-  
+
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.0.0pre6
-  prerelease: 5
+  version: 4.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2011-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149986589980 !ruby/object:Gem::Requirement
+  requirement: &70136859666820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149986589980
+  version_requirements: *70136859666820
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70149986589080 !ruby/object:Gem::Requirement
+  requirement: &70136859665980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0pre6
+        version: 4.0.0
   type: :development
   prerelease: false
-  version_requirements: *70149986589080
+  version_requirements: *70136859665980
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70149986588600 !ruby/object:Gem::Requirement
+  requirement: &70136859663880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149986588600
+  version_requirements: *70136859663880
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70149986588080 !ruby/object:Gem::Requirement
+  requirement: &70136859663340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149986588080
+  version_requirements: *70136859663340
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70149986587440 !ruby/object:Gem::Requirement
+  requirement: &70136859662720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149986587440
+  version_requirements: *70136859662720
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70149986602940 !ruby/object:Gem::Requirement
+  requirement: &70136859661300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70149986602940
+  version_requirements: *70136859661300
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70149986602420 !ruby/object:Gem::Requirement
+  requirement: &70136859660460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70149986602420
+  version_requirements: *70136859660460
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -99,6 +99,13 @@ files:
 - aux/picky/cli.rb
 - lib/picky/analytics.rb
 - lib/picky/analyzer.rb
+- lib/picky/api/category/partial.rb
+- lib/picky/api/category/similarity.rb
+- lib/picky/api/category/weight.rb
+- lib/picky/api/search/boost.rb
+- lib/picky/api/source.rb
+- lib/picky/api/tokenizer/character_substituter.rb
+- lib/picky/api/tokenizer.rb
 - lib/picky/backends/backend.rb
 - lib/picky/backends/file/basic.rb
 - lib/picky/backends/file/json.rb
@@ -194,6 +201,7 @@ files:
 - lib/picky/performant.rb
 - lib/picky/query/allocation.rb
 - lib/picky/query/allocations.rb
+- lib/picky/query/boosts.rb
 - lib/picky/query/combination.rb
 - lib/picky/query/combinations.rb
 - lib/picky/query/indexes.rb
@@ -201,7 +209,6 @@ files:
 - lib/picky/query/qualifier_category_mapper.rb
 - lib/picky/query/token.rb
 - lib/picky/query/tokens.rb
-- lib/picky/query/weights.rb
 - lib/picky/rack/harakiri.rb
 - lib/picky/results/exact_first.rb
 - lib/picky/results.rb
@@ -246,6 +253,13 @@ files:
 - spec/functional/terminate_early_spec.rb
 - spec/lib/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
+- spec/lib/api/category/partial_spec.rb
+- spec/lib/api/category/similarity_spec.rb
+- spec/lib/api/category/weight_spec.rb
+- spec/lib/api/search/boost_spec.rb
+- spec/lib/api/source_spec.rb
+- spec/lib/api/tokenizer/character_substituter_spec.rb
+- spec/lib/api/tokenizer_spec.rb
 - spec/lib/backends/backend_spec.rb
 - spec/lib/backends/file/basic_spec.rb
 - spec/lib/backends/file_spec.rb
@@ -317,6 +331,7 @@ files:
 - spec/lib/loader_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
+- spec/lib/query/boosts_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations_spec.rb
 - spec/lib/query/indexes_check_spec.rb
@@ -325,7 +340,6 @@ files:
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
-- spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results/exact_first_spec.rb
 - spec/lib/results_spec.rb
@@ -352,9 +366,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: http://rubyforge.org/projects/picky
 rubygems_version: 1.8.11
@@ -382,6 +396,13 @@ test_files:
 - spec/functional/terminate_early_spec.rb
 - spec/lib/analytics_spec.rb
 - spec/lib/analyzer_spec.rb
+- spec/lib/api/category/partial_spec.rb
+- spec/lib/api/category/similarity_spec.rb
+- spec/lib/api/category/weight_spec.rb
+- spec/lib/api/search/boost_spec.rb
+- spec/lib/api/source_spec.rb
+- spec/lib/api/tokenizer/character_substituter_spec.rb
+- spec/lib/api/tokenizer_spec.rb
 - spec/lib/backends/backend_spec.rb
 - spec/lib/backends/file/basic_spec.rb
 - spec/lib/backends/file_spec.rb
@@ -453,6 +474,7 @@ test_files:
 - spec/lib/loader_spec.rb
 - spec/lib/query/allocation_spec.rb
 - spec/lib/query/allocations_spec.rb
+- spec/lib/query/boosts_spec.rb
 - spec/lib/query/combination_spec.rb
 - spec/lib/query/combinations_spec.rb
 - spec/lib/query/indexes_check_spec.rb
@@ -461,7 +483,6 @@ test_files:
 - spec/lib/query/solr_spec.rb
 - spec/lib/query/token_spec.rb
 - spec/lib/query/tokens_spec.rb
-- spec/lib/query/weights_spec.rb
 - spec/lib/rack/harakiri_spec.rb
 - spec/lib/results/exact_first_spec.rb
 - spec/lib/results_spec.rb

data/spec/lib/query/weights_spec.rb

@@ -1,81 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Query::Weights do
-  
-  context 'with weights' do
-    before(:each) do
-      @weights = described_class.new [:test1, :test2]         => 6,
-                                     [:test1]                 => 5,
-                                     [:test3]                 => 3,
-                                     [:test3, :test2]         => 4,
-                                     [:test1, :test4]         => 5,
-                                     [:test4, :test1]         => 5,
-                                     [:test4, :test1, :test2] => 4,
-                                     [:test1, :test4, :test2] => 4,
-                                     [:test4, :test5]         => 3,
-                                     [:test5, :test1]         => 2,
-                                     [:test1, :test5]         => 2,
-                                     [:test3, :test1]         => 2,
-                                     [:test1, :test3]         => 2
-    end
-    
-    describe 'score_for' do
-      it 'gets the category names from the combinations' do
-        combinations = [
-          stub(:combination1, :category_name => :test1),
-          stub(:combination1, :category_name => :test2)
-        ]
-        
-        @weights.score_for(combinations).should == +6
-      end
-    end
-    
-    describe "weight_for" do
-      it "should return zero if there is no specific weight" do
-        @weights.weight_for([:not_a_specific_allocation]).should be_zero
-      end
-    end
-  
-    def self.it_should_return_a_specific_weight_for(allocation, weight)
-      it "should return weight #{weight} for #{allocation.inspect}" do
-        @weights.weight_for(allocation).should == weight
-      end
-    end
-  
-    it_should_return_a_specific_weight_for [:test1, :test2],         6
-    it_should_return_a_specific_weight_for [:test1],                 5
-    it_should_return_a_specific_weight_for [:test1, :test3],         2
-    it_should_return_a_specific_weight_for [:test3],                 3
-    it_should_return_a_specific_weight_for [:test3, :test2],         4
-    it_should_return_a_specific_weight_for [:test1, :test4],         5
-    it_should_return_a_specific_weight_for [:test4, :test1],         5
-    it_should_return_a_specific_weight_for [:test4, :test1, :test2], 4
-    it_should_return_a_specific_weight_for [:test1, :test4, :test2], 4
-    it_should_return_a_specific_weight_for [:test4, :test5],         3
-    it_should_return_a_specific_weight_for [:test5, :test1],         2
-    it_should_return_a_specific_weight_for [:test1, :test5],         2
-    it_should_return_a_specific_weight_for [:test3, :test1],         2
-  
-    describe 'to_s' do
-      it 'is correct' do
-        @weights.to_s.should == "Picky::Query::Weights({[:test1, :test2]=>6, [:test1]=>5, [:test3]=>3, [:test3, :test2]=>4, [:test1, :test4]=>5, [:test4, :test1]=>5, [:test4, :test1, :test2]=>4, [:test1, :test4, :test2]=>4, [:test4, :test5]=>3, [:test5, :test1]=>2, [:test1, :test5]=>2, [:test3, :test1]=>2, [:test1, :test3]=>2})"
-      end
-    end
-    describe 'empty?' do
-      it 'is correct' do
-        @weights.empty?.should == false
-      end
-    end
-  end
-  context 'without weights' do
-    before(:each) do
-      @weights = described_class.new
-    end
-    describe 'empty?' do
-      it 'is correct' do
-        @weights.empty?.should == true
-      end
-    end
-  end
-  
-end