picky 3.4.3 → 3.5.0

data/spec/lib/query/combination_spec.rb

@@ -11,15 +11,15 @@ describe Picky::Query::Combination do
 
     @combination = described_class.new @token, @category
   end
-  
+
   describe "to_s" do
     it "shows the combination's info" do
       @token.stub! :to_result => :token_result
-      
+
       @combination.to_s.should == 'bundle_name some_category_name:token_result'
     end
   end
-  
+
   describe 'hash' do
     it 'should hash the token and the bundle' do
       @combination.hash.should == [@token.to_s, @bundle].hash
@@ -34,7 +34,7 @@ describe Picky::Query::Combination do
         @combination = Picky::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.
+        @combination.to_result.should == [:some_category_name, 'Blä~', 'blä'] # Note: Characters not substituted. That's ok.
       end
     end
     it 'should return a correct result' do
@@ -52,7 +52,7 @@ describe Picky::Query::Combination do
 
   describe 'ids' do
     it 'should call ids with the text on bundle' do
-      @bundle.should_receive(:ids).once.with :some_text
+      @bundle.should_receive(:ids).once.with 'some_text'
 
       @combination.ids
     end
@@ -68,7 +68,7 @@ describe Picky::Query::Combination do
 
   describe 'weight' do
     it 'should call weight with the text on bundle' do
-      @bundle.should_receive(:weight).once.with :some_text
+      @bundle.should_receive(:weight).once.with 'some_text'
 
       @combination.weight
     end

data/spec/lib/query/token_spec.rb

@@ -2,7 +2,7 @@
 require 'spec_helper'
 
 describe Picky::Query::Token do
-  
+
   describe '==' do
     it 'is equal if the originals are equal' do
       described_class.processed('similar~', 'Similar~').should == described_class.processed('similar~', 'Similar~')
@@ -11,12 +11,12 @@ describe Picky::Query::Token do
       described_class.processed('similar~', 'Similar~').should_not == described_class.processed('similar', 'Similar')
     end
   end
-  
+
   describe 'next_similar_token' do
     before(:each) do
       @bundle   = stub :bundle, :similar => [:array, :of, :similar]
       @category = stub :category, :bundle_for => @bundle
-      
+
       @token = described_class.processed 'similar~', 'Similar~'
     end
     it 'returns the right next tokens' do
@@ -30,7 +30,7 @@ describe Picky::Query::Token do
       next_token.should == nil
     end
   end
-  
+
   describe 'next_similar' do
     before(:each) do
       @bundle = stub :bundle
@@ -44,7 +44,7 @@ describe Picky::Query::Token do
         end
         it 'should have a certain original text' do
           @token.next_similar @bundle
-          
+
           @token.original.should == :array
         end
       end
@@ -67,7 +67,7 @@ describe Picky::Query::Token do
           @token.next_similar @bundle
           @token.next_similar @bundle
           @token.next_similar @bundle
-          
+
           @token.text.should == :similar
         end
       end
@@ -84,17 +84,17 @@ describe Picky::Query::Token do
         end
         it 'should have a certain text' do
           @token.next_similar @bundle
-          
-          @token.text.should == :nonsimilar
+
+          @token.text.should == 'nonsimilar'
         end
       end
     end
   end
-  
+
   describe "generate_similarity_for" do
     before(:each) do
       @bundle = stub :bundle
-      
+
       @token = described_class.processed 'flarb~', 'FLARB~'
     end
     context "with similar" do
@@ -114,7 +114,7 @@ describe Picky::Query::Token do
       end
     end
   end
-  
+
   # describe 'to_solr' do
   #   def self.it_should_solr text, expected_result
   #     it "should solrify into #{expected_result} from #{text}" do
@@ -133,7 +133,7 @@ describe Picky::Query::Token do
   #   it_should_solr 'searchengi',   'searchengi~0.89'
   #   it_should_solr 'searchengin',  'searchengin~0.9'
   #   it_should_solr 'searchengine', 'searchengine~0.9'
-  # 
+  #
   #   it_should_solr 'spec:tex',     'specific:tex'
   #   it_should_solr 'with:text',    'text~0.74'
   #   it_should_solr 'name:',        'name~0.74'
@@ -183,7 +183,7 @@ describe Picky::Query::Token do
       described_class.processed('some text', 'SOME TEXT').class.should == described_class
     end
   end
-  
+
   describe 'process' do
     let(:token) { described_class.new 'any_text' }
     it 'returns itself' do
@@ -194,12 +194,25 @@ describe Picky::Query::Token do
       token.should_receive(:partialize).once.ordered
       token.should_receive(:similarize).once.ordered
       token.should_receive(:remove_illegals).once.ordered
-      token.should_receive(:symbolize).once.ordered
 
       token.process
     end
   end
 
+  describe 'symbolize!' do
+    before(:each) do
+      @token = described_class.processed 'string', 'String'
+    end
+    it 'is not symbolized' do
+      @token.text.should == 'string'
+    end
+    it 'can be symbolized' do
+      @token.symbolize!
+
+      @token.text.should == :string
+    end
+  end
+
   describe 'partial?' do
     context 'similar, partial' do
       before(:each) do
@@ -365,7 +378,7 @@ describe Picky::Query::Token do
       end
       it 'should not set partial' do
         @token.instance_variable_set :@partial, false
-        
+
         @token.partial = true
 
         @token.instance_variable_get(:@partial).should be_false
@@ -400,20 +413,20 @@ describe Picky::Query::Token do
     it 'should remove *' do
       token = described_class.processed 'text*'
 
-      token.text.should == :text
+      token.text.should == 'text'
     end
     it 'should remove ~' do
       token = described_class.processed 'text~'
 
-      token.text.should == :text
+      token.text.should == 'text'
     end
     it 'should remove "' do
       token = described_class.processed 'text"'
 
-      token.text.should == :text
+      token.text.should == 'text'
     end
     it "should pass on a processed text" do
-      described_class.processed('text').text.should == :text
+      described_class.processed('text').text.should == 'text'
     end
   end
 

data/spec/lib/query/tokens_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Picky::Query::Tokens do
-  
+
   context 'with ignore_unassigned_tokens true' do
     it 'generates processed tokens from all words' do
       expected = [
@@ -11,12 +11,12 @@ describe Picky::Query::Tokens do
         Picky::Query::Token.processed('sp:solr'),
         Picky::Query::Token.processed('query"')
       ]
-      
+
       described_class.should_receive(:new).once.with expected, true
-      
+
       described_class.processed ['this~', 'is', 'a', 'sp:solr', 'query"'], [], true
     end
-    
+
     describe 'possible_combinations_in' do
       before(:each) do
         @token1 = stub :token1
@@ -48,7 +48,7 @@ describe Picky::Query::Tokens do
       end
     end
   end
-  
+
   describe '.processed' do
     it 'generates processed tokens from all words' do
       expected = [
@@ -58,9 +58,9 @@ describe Picky::Query::Tokens do
         Picky::Query::Token.processed('sp:solr'),
         Picky::Query::Token.processed('query"')
       ]
-      
+
       described_class.should_receive(:new).once.with expected, false
-      
+
       described_class.processed ['this~', 'is', 'a', 'sp:solr', 'query"'], []
     end
     it 'generates processed tokens from all words' do
@@ -71,13 +71,26 @@ describe Picky::Query::Tokens do
         Picky::Query::Token.processed('sp:solr'),
         Picky::Query::Token.processed('query"')
       ]
-      
+
       described_class.should_receive(:new).once.with expected, false
-      
+
       described_class.processed ['this~', 'is', 'a', 'sp:solr', 'query"'], []
     end
   end
 
+  describe 'symbolize' do
+    let(:tokens) { described_class.processed ['a*', 'b'], ['A*', 'B'] }
+
+    it 'has non symbolized tokens' do
+      tokens.map(&:text).should == ['a', 'b']
+    end
+    it 'symbolizes all tokens' do
+      tokens.symbolize
+
+      tokens.map(&:text).should == [:a, :b]
+    end
+  end
+
   describe 'partialize_last' do
     context 'special case' do
       before(:each) do
@@ -140,7 +153,7 @@ describe Picky::Query::Tokens do
       @token1 = stub :token1
       @token2 = stub :token2
       @token3 = stub :token3
-      
+
       @tokens = described_class.new [@token1, @token2, @token3]
     end
     it 'should work correctly' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.4.3
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2011-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70203421661040 !ruby/object:Gem::Requirement
+  requirement: &70136161803160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203421661040
+  version_requirements: *70136161803160
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70203421658600 !ruby/object:Gem::Requirement
+  requirement: &70136161800540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.5.0
   type: :development
   prerelease: false
-  version_requirements: *70203421658600
+  version_requirements: *70136161800540
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70203421656060 !ruby/object:Gem::Requirement
+  requirement: &70136161797800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421656060
+  version_requirements: *70136161797800
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70203421653860 !ruby/object:Gem::Requirement
+  requirement: &70136161795300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421653860
+  version_requirements: *70136161795300
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70203421652480 !ruby/object:Gem::Requirement
+  requirement: &70136161794320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421652480
+  version_requirements: *70136161794320
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70203421649180 !ruby/object:Gem::Requirement
+  requirement: &70136161791120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421649180
+  version_requirements: *70136161791120
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70203421644700 !ruby/object:Gem::Requirement
+  requirement: &70136161786960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421644700
+  version_requirements: *70136161786960
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70203421642920 !ruby/object:Gem::Requirement
+  requirement: &70136161784620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421642920
+  version_requirements: *70136161784620
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70203421640800 !ruby/object:Gem::Requirement
+  requirement: &70136161782840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421640800
+  version_requirements: *70136161782840
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70203421638140 !ruby/object:Gem::Requirement
+  requirement: &70136161780240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421638140
+  version_requirements: *70136161780240
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70203421634220 !ruby/object:Gem::Requirement
+  requirement: &70136161776800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421634220
+  version_requirements: *70136161776800
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &70203421631480 !ruby/object:Gem::Requirement
+  requirement: &70136161773460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203421631480
+  version_requirements: *70136161773460
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -234,7 +234,6 @@ files:
 - lib/picky/interfaces/live_parameters.rb
 - lib/picky/loader.rb
 - lib/picky/migrations/from_30_to_31.rb
-- lib/picky/no_source_specified_exception.rb
 - lib/picky/performant.rb
 - lib/picky/query/allocation.rb
 - lib/picky/query/allocations.rb
@@ -267,8 +266,6 @@ files:
 - lib/picky/wrappers/bundle/wrapper.rb
 - lib/picky/wrappers/category/exact_first.rb
 - lib/picky/wrappers/category/location.rb
-- lib/picky/wrappers/sources/base.rb
-- lib/picky/wrappers/sources/location.rb
 - lib/picky.rb
 - lib/tasks/try.rb
 - lib/tasks/application.rake
@@ -372,8 +369,6 @@ files:
 - spec/lib/sources/db_spec.rb
 - spec/lib/sources/delicious_spec.rb
 - spec/lib/sources/mongo_spec.rb
-- spec/lib/sources/wrappers/base_spec.rb
-- spec/lib/sources/wrappers/location_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb
@@ -497,8 +492,6 @@ test_files:
 - spec/lib/sources/db_spec.rb
 - spec/lib/sources/delicious_spec.rb
 - spec/lib/sources/mongo_spec.rb
-- spec/lib/sources/wrappers/base_spec.rb
-- spec/lib/sources/wrappers/location_spec.rb
 - spec/lib/statistics_spec.rb
 - spec/lib/tasks/try_spec.rb
 - spec/lib/tokenizer_spec.rb

data/lib/picky/no_source_specified_exception.rb

@@ -1,7 +0,0 @@
-module Picky
-
-  # Raised if no source is available on an index.
-  #
-  class NoSourceSpecifiedException < StandardError; end
-
-end

data/lib/picky/wrappers/sources/base.rb

@@ -1,35 +0,0 @@
-module Picky
-
-  module Wrappers
-
-    # Source wrappers can be used to rewrite data before it goes into the index.
-    #
-    # For example if you want to normalize data.
-    #
-    module Sources # :nodoc:all
-
-      class Base
-
-        attr_reader :source
-
-        # Wraps an indexing category.
-        #
-        def initialize source
-          @source = source
-        end
-
-        # Default is delegation for all methods
-        #
-        delegate :harvest,
-                 :connect_backend,
-                 :take_snapshot,
-                 :key_format,
-                 :to => :source
-
-      end
-
-    end
-
-  end
-
-end

data/lib/picky/wrappers/sources/location.rb

@@ -1,56 +0,0 @@
-module Picky
-
-  module Wrappers
-
-    module Sources
-
-      # Should this actually just be a tokenizer?
-      #
-      class Location < Base
-
-        attr_reader :calculation
-
-        def initialize source, grid, precision = 1
-          super source
-          @calculation = Calculations::Location.new grid, precision
-        end
-
-        # Yield the data (id, text for id) for the given category.
-        #
-        def harvest category
-          minimum = 1.0/0
-
-          # Cache.
-          #
-          locations = []
-
-          # Gather min/max.
-          #
-          source.harvest category do |indexed_id, location|
-            location = location.to_f
-            minimum = location if location < minimum
-            locations << [indexed_id, location]
-          end
-
-          calculation.minimum = minimum
-
-          # Recalculate locations.
-          #
-          locations.each do |indexed_id, location|
-            calculation.recalculated_range(location).each do |new_location|
-              yield indexed_id, new_location.to_s
-            end
-          end
-
-          # TODO Move to the right place.
-          #
-          category.exact[:location_minimum] = minimum
-        end
-
-      end
-
-    end
-
-  end
-
-end

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

@@ -1,38 +0,0 @@
-require 'spec_helper'
-
-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
-    end
-    before(:each) do
-      @wrapper = described_class.new @source
-    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
-  context "without backend" do
-    it "fails" do
-      lambda { described_class.new }.should raise_error(ArgumentError)
-    end
-  end
-
-end

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

@@ -1,55 +0,0 @@
-require 'spec_helper'
-
-describe Picky::Wrappers::Sources::Location do
-
-  context "with backend" do
-    before(:each) do
-      @source   = stub :source
-      @category = stub :category
-    end
-    context "without grid option" do
-      it "fails" do
-        lambda { described_class.new(:something) }.should raise_error
-      end
-    end
-    context "with grid option" do
-      before(:each) do
-        @wrapper = described_class.new @source, 10
-      end
-      it "uses a default of 1 on the precision" do
-        @wrapper.calculation.precision.should == 1
-      end
-      it "delegates harvest" do
-        @category.stub! :exact => {}
-
-        @source.should_receive(:harvest).once.with @category
-
-        @wrapper.harvest @category
-      end
-      it "delegates take_snapshot" do
-        @source.should_receive(:take_snapshot).once.with()
-
-        @wrapper.take_snapshot
-      end
-      it "delegates connect_backend" do
-        @source.should_receive(:connect_backend).once.with()
-
-        @wrapper.connect_backend
-      end
-    end
-    context "with grid and precision option" do
-      before(:each) do
-        @wrapper = described_class.new @category, 4, 2
-      end
-      it "uses the given precision" do
-        @wrapper.calculation.precision.should == 2
-      end
-    end
-  end
-  context "without backend" do
-    it "fails" do
-      lambda { described_class.new }.should raise_error(ArgumentError)
-    end
-  end
-
-end