picky 4.17.1 → 4.18.0

data/spec/functional/automatic_segmentation_spec.rb

@@ -22,69 +22,72 @@ describe "automatic splitting" do
     index
   end
   
-  it 'can split the text automatically' do
-    automatic_splitter = Picky::Splitters::Automatic.new index[:text]
+  context 'splitting the text automatically' do
+    let(:automatic_splitter) { Picky::Splitters::Automatic.new index[:text] }
     
     # It splits the text correctly.
     #
-    automatic_splitter.split('purplerainbow').should == ['purple', 'rain', 'bow']
-    automatic_splitter.split('purplerain').should == ['purple', 'rain']
-    automatic_splitter.split('purple').should == ['purple']
+    it { automatic_splitter.split('purplerainbow').should == ['purple', 'rain', 'bow'] }
+    it { automatic_splitter.split('purplerain').should == ['purple', 'rain'] }
+    it { automatic_splitter.split('purple').should == ['purple'] }
     
     # When it can't, it splits it using the partial index (correctly).
     #
-    automatic_splitter.split('purplerainbo').should == ['purple', 'rain']
-    automatic_splitter.split('purplerainb').should  == ['purple', 'rain']
+    it { automatic_splitter.split('purplerainbo').should == ['purple', 'rain'] }
+    it { automatic_splitter.split('purplerainb').should  == ['purple', 'rain'] }
     #
-    automatic_splitter.split('purplerai').should == ['purple']
-    automatic_splitter.split('purplera').should  == ['purple']
-    automatic_splitter.split('purpler').should   == ['purple']
+    it { automatic_splitter.split('purplerai').should == ['purple'] }
+    it { automatic_splitter.split('purplera').should  == ['purple'] }
+    it { automatic_splitter.split('purpler').should   == ['purple'] }
     #
-    automatic_splitter.split('purpl').should == []
-    automatic_splitter.split('purp').should  == []
-    automatic_splitter.split('pur').should   == []
-    automatic_splitter.split('pu').should    == []
-    automatic_splitter.split('p').should     == []
+    it { automatic_splitter.split('purpl').should == [] }
+    it { automatic_splitter.split('purp').should  == [] }
+    it { automatic_splitter.split('pur').should   == [] }
+    it { automatic_splitter.split('pu').should    == [] }
+    it { automatic_splitter.split('p').should     == [] }
   end
   
-  it 'can split text automatically (with partial)' do
-    automatic_splitter = Picky::Splitters::Automatic.new index[:text], partial: true
+  context 'splitting text automatically (with partial)' do
+    let(:automatic_splitter) { Picky::Splitters::Automatic.new index[:text], partial: true }
     
     # It splits the text correctly.
     #
-    automatic_splitter.split('purplerainbow').should == ['purple', 'rain', 'bow']
-    automatic_splitter.split('purplerain').should == ['purple', 'rain']
-    automatic_splitter.split('purple').should == ['purple']
+    it { automatic_splitter.split('purplerainbow').should == ['purple', 'rain', 'bow'] }
+    it { automatic_splitter.split('purplerain').should == ['purple', 'rain'] }
+    it { automatic_splitter.split('purple').should == ['purple'] }
     
     # When it can't, it splits it using the partial index (correctly).
     #
-    automatic_splitter.split('purplerainbo').should == ['purple', 'rain', 'bo']
-    automatic_splitter.split('purplerainb').should == ['purple', 'rain', 'b']
+    it { automatic_splitter.split('purplerainbo').should == ['purple', 'rain', 'bo'] }
+    it { automatic_splitter.split('purplerainb').should == ['purple', 'rain', 'b'] }
     #
-    automatic_splitter.split('purplerai').should == ['purple', 'rai']
-    automatic_splitter.split('purplera').should == ['purple', 'ra']
-    automatic_splitter.split('purpler').should == ['purple'] # No 'r' in partial index.
+    it { automatic_splitter.split('purplerai').should == ['purple', 'rai'] }
+    it { automatic_splitter.split('purplera').should == ['purple', 'ra'] }
+    it { automatic_splitter.split('purpler').should == ['purple'] } # No 'r' in partial index.
     #
-    automatic_splitter.split('purpl').should == ['purpl']
-    automatic_splitter.split('purp').should == ['purp']
-    automatic_splitter.split('pur').should == [] # No 'pur' in partial index etc.
-    automatic_splitter.split('pu').should == []
-    automatic_splitter.split('p').should == []
+    it { automatic_splitter.split('purpl').should == ['purpl'] }
+    it { automatic_splitter.split('purp').should == ['purp'] }
+    it { automatic_splitter.split('pur').should == [] } # No 'pur' in partial index etc.
+    it { automatic_splitter.split('pu').should == [] }
+    it { automatic_splitter.split('p').should == [] }
     
-    try = Picky::Search.new index do
-      searching splits_text_on: automatic_splitter
+    let(:try) do
+      splitter = automatic_splitter
+      Picky::Search.new index do
+        searching splits_text_on: splitter
+      end
     end
     
     # Should find the one with all parts.
     #
-    try.search('purplerainbow').ids.should == [1]
-    try.search('sunandrain').ids.should == [5]
+    it { try.search('purplerainbow').ids.should == [1] }
+    it { try.search('sunandrain').ids.should == [5] }
     
     # Common parts are found in multiple examples.
     #
-    try.search('colorpurple').ids.should == [4,1]
-    try.search('bownew').ids.should      == [3,1]
-    try.search('spainisking').ids.should == [6,1]
+    it { try.search('colorpurple').ids.should == [4,1] }
+    it { try.search('bownew').ids.should      == [3,1] }
+    it { try.search('spainisking').ids.should == [6,1] }
   end
   
   it 'is fast enough' do

data/spec/functional/custom_delimiters_spec.rb

@@ -14,26 +14,34 @@ describe 'custom delimiters' do
     Picky::Query::Token.qualifiers_delimiter = ','
   end
 
-  it 'offers custom partial delimiters to be set' do
-    index = Picky::Index.new :custom_delimiters do
-      category :text1
-      category :text2
+  context 'offers custom partial delimiters to be set' do
+    let(:index) do
+      index = Picky::Index.new :custom_delimiters do
+        category :text1
+        category :text2
+      end
+      
+      index.add Struct.new(:id, :text1, :text2).new(1, 'hello', 'world')
+      
+      index
     end
-
-    index.add Struct.new(:id, :text1, :text2).new(1, 'hello', 'world')
-
-    try = Picky::Search.new index
-    try.search("hell world").ids.should == []
-    try.search("hell* world").ids.should == [1]
-    try.search("hello world").ids.should == [1]
+    let(:try) { Picky::Search.new index }
+    
+    it { try.search("hell world").ids.should == [] }
+    it { try.search("hell* world").ids.should == [1] }
+    it { try.search("hello world").ids.should == [1] }
     
-    try.search("hell! world").ids.should == []
-    Picky::Query::Token.partial_character = '!'
-    try.search("hell! world").ids.should == [1]
+    it 'with changed partial character' do
+      try.search("hell! world").ids.should == []
+      Picky::Query::Token.partial_character = '!'
+      try.search("hell! world").ids.should == [1]
+    end
     
-    try.search('hell!" world').ids.should == []
-    Picky::Query::Token.no_partial_character = '\?'
-    try.search('hell!? world').ids.should == []
+    it 'with changed no-partial character' do
+      try.search('hell!" world').ids.should == []
+      Picky::Query::Token.no_partial_character = '\?'
+      try.search('hell!? world').ids.should == []
+    end
   end
   
   it 'offers custom similar delimiters to be set' do
@@ -52,13 +60,15 @@ describe 'custom delimiters' do
     try.search("hell? world").ids.should == []
     Picky::Query::Token.similar_character = '\?'
     try.search("hell? world").ids.should == [1]
+    Picky::Query::Token.no_similar_character = '!'
+    try.search("hello?! world!").ids.should == [1]
     
     try.search('hell?" world').ids.should == []
-    Picky::Query::Token.no_partial_character = '!'
-    try.search('hell?! world').ids.should == []
+    Picky::Query::Token.no_partial_character = '\#'
+    try.search('hello?# world#').ids.should == [1]
   end
   
-  it 'offers custom similar delimiters to be set' do
+  it 'offers custom qualifiers delimiters to be set' do
     index = Picky::Index.new :custom_delimiters do
       category :text1, similarity: Picky::Similarity::Soundex.new
       category :text2

data/spec/functional/no_tokenize_spec.rb

@@ -41,7 +41,7 @@ describe 'Category#tokenize(false)' do
     index.add thing.new(1, ['already', 'tokenized'])
     expect do
       index.add thing.new(2, 'this should fail')
-    end.to raise_error('You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.')
+    end.to raise_error(%Q{undefined method `each' for "this should fail":String. You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.})
     
     try = Picky::Search.new index
     
@@ -56,7 +56,7 @@ describe 'Category#tokenize(false)' do
     index.add thing.new(1, ['already', 'tokenized'])
     expect do
       index.add thing.new(2, 'this should fail')
-    end.to raise_error('You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.')
+    end.to raise_error(%Q{undefined method `each' for "this should fail":String. You probably set tokenize: false on category "text". It will need an Enumerator of previously tokenized tokens.})
     
     try = Picky::Search.new index
     

data/spec/functional/or_spec.rb

@@ -4,101 +4,100 @@ require 'spec_helper'
 require 'ostruct'
 
 describe "OR token" do
+  
+  # We use the same search throughout.
+  #
+  let(:try) { Picky::Search.new index }
+  
+  context 'simple cases' do
+    let(:index) do
+      index = Picky::Index.new :or do
+        category :text
+      end
+      thing = OpenStruct.new id: 1, text: "hello ohai"
+      other = OpenStruct.new id: 2, text: "hello kthxbye"
 
-  it 'handles simple cases' do
-    index = Picky::Index.new :or do
-      category :text
+      index.add thing
+      index.add other
+      
+      index
     end
-
-    thing = OpenStruct.new id: 1, text: "hello ohai"
-    other = OpenStruct.new id: 2, text: "hello kthxbye"
-
-    index.add thing
-    index.add other
-
-    try = Picky::Search.new index
-    
-    # With or, or |.
-    #
-    try.search("hello text:ohai|text:kthxbye").ids.should == [1, 2]
-    try.search("hello text:ohai|kthxbye").ids.should == [1, 2]
-    try.search("hello ohai|text:kthxbye").ids.should == [1, 2]
-    try.search("hello ohai|kthxbye").ids.should == [1, 2]
-    
-    # Still works.
-    #
-    try.search("hello text:ohai").ids.should == [1]
+    it { try.search("hello text:ohai|text:kthxbye").ids.should == [1, 2] }
+    it { try.search("hello text:ohai|kthxbye").ids.should == [1, 2] }
+    it { try.search("hello ohai|text:kthxbye").ids.should == [1, 2] }
+    it { try.search("hello ohai|kthxbye").ids.should == [1, 2] }
+    it('still works') { try.search("hello text:ohai").ids.should == [1] }
   end
   
-  it 'handles more complex cases' do
-    index = Picky::Index.new :or do
-      category :text1
-      category :text2
-    end
+  context 'more complex cases' do
+    let(:index) do
+      index = Picky::Index.new :or do
+        category :text1
+        category :text2
+      end
 
-    thing = OpenStruct.new id: 1, text1: "hello world", text2: "ohai kthxbye"
-    other = OpenStruct.new id: 2, text1: "hello something else", text2: "to be or not to be"
+      thing = OpenStruct.new id: 1, text1: "hello world", text2: "ohai kthxbye"
+      other = OpenStruct.new id: 2, text1: "hello something else", text2: "to be or not to be"
 
-    index.add thing
-    index.add other
-
-    try = Picky::Search.new index
+      index.add thing
+      index.add other
+      
+      index
+    end
     
-    # With or, or |.
-    #
     # Note that the order is changed.
     #
-    try.search("hello ohai|not").ids.should == [1, 2]
-    try.search("hello not|ohai").ids.should == [2, 1]
-    try.search("hello ohai|kthxbye").ids.should == [1]
-    try.search("hello nonexisting|not").ids.should == [2]
-    try.search("hello nonexisting|alsononexisting").ids.should == []
-    try.search("hello text1:world|text2:not|text2:kthxbye").ids.should == [1, 2]
+    it { try.search("hello ohai|not").ids.should == [1, 2] }
+    it { try.search("hello not|ohai").ids.should == [2, 1] }
+    it { try.search("hello ohai|kthxbye").ids.should == [1] }
+    it { try.search("hello nonexisting|not").ids.should == [2] }
+    it { try.search("hello nonexisting|alsononexisting").ids.should == [] }
+    it { try.search("hello text1:world|text2:not|text2:kthxbye").ids.should == [1, 2] }
   end
   
-  it 'handles even more complex cases' do
-    index = Picky::Index.new :or do
-      category :text, similarity: Picky::Similarity::DoubleMetaphone.new(3)
-    end
+  context 'even more complex cases' do
+    let(:index) do
+      index = Picky::Index.new :or do
+        category :text, similarity: Picky::Similarity::DoubleMetaphone.new(3)
+      end
 
-    thing = OpenStruct.new id: 1, text: "hello ohai tester 13"
-    other = OpenStruct.new id: 2, text: "hello kthxbye"
+      thing = OpenStruct.new id: 1, text: "hello ohai tester 13"
+      other = OpenStruct.new id: 2, text: "hello kthxbye"
 
-    index.add thing
-    index.add other
+      index.add thing
+      index.add other
 
-    try = Picky::Search.new index
+      index
+    end
     
-    # With or, or |.
-    #
-    try.search("something,other:ohai").ids.should == []
-    try.search("text:taster~|text:kthxbye hello").ids.should == [2, 1]
-    try.search("text:test*|kthxbye hello").ids.should == [2, 1]
-    try.search("text:11-15|kthxbye hello").ids.should == [2, 1]
-    try.search("hello text,other:ohai|text:kthxbye").ids.should == [1, 2]
-    try.search("hello something,other:ohai|kthxbye").ids.should == [2]
-    try.search("hello text:oh*|text:kthxbya~").ids.should == [1, 2]
+    it { try.search("something,other:ohai").ids.should == [] }
+    it { try.search("text:taster~|text:kthxbye hello").ids.should == [2, 1] }
+    it { try.search("text:test*|kthxbye hello").ids.should == [2, 1] }
+    it { try.search("text:11-15|kthxbye hello").ids.should == [2, 1] }
+    it { try.search("hello text,other:ohai|text:kthxbye").ids.should == [1, 2] }
+    it { try.search("hello something,other:ohai|kthxbye").ids.should == [2] }
+    it { try.search("hello text:oh*|text:kthxbya~").ids.should == [1, 2] }
   end
   
-  it 'handles multi-ORs' do
-    index = Picky::Index.new :or do
-      category :text, similarity: Picky::Similarity::DoubleMetaphone.new(3)
-    end
-
-    thing     = OpenStruct.new id: 1, text: "that thing"
-    something = OpenStruct.new id: 2, text: "and something"
-    other     = OpenStruct.new id: 3, text: "or other"
+  context 'multi-ORs' do
+    let(:index) do
+      index = Picky::Index.new :or do
+        category :text, similarity: Picky::Similarity::DoubleMetaphone.new(3)
+      end
 
-    index.add thing
-    index.add something
-    index.add other
+      thing     = OpenStruct.new id: 1, text: "that thing"
+      something = OpenStruct.new id: 2, text: "and something"
+      other     = OpenStruct.new id: 3, text: "or other"
 
-    try = Picky::Search.new index
+      index.add thing
+      index.add something
+      index.add other
+      
+      index
+    end
     
-    # With or, or |.
-    #
-    try.search("thing|something|other").ids.should == [1, 2, 3]
-    try.search("something|other").ids.should == [2, 3]
+    it { try.search("thing|something|other").ids.should == [1, 2, 3] }
+    it { try.search("something|other").ids.should == [2, 3] }
   end
 
 end

data/spec/functional/pool_spec.rb

@@ -30,58 +30,59 @@ describe 'GC stats: searching' do
 
   # TODO Why are both versions almost equally fast?
   #
-  context 'without pool' do
-    # TODO Reinstate after checking assumption about Ruby 2.
-    #
-    # it 'runs the GC more' do
-    #   # Quickly check if the pool is removed.
-    #   #
-    #   fail 'object pool still installed' if Picky::Query::Token.respond_to? :release_all
-    #   
-    #   try = search
-    #   query = 'abracadabra mirgel'
-    #   gc_runs_of do
-    #     amount.times { try.search query }
-    #   end.should >= 10
-    # end
-    it 'is less (?) performant' do
-      try = search
-      query = 'abracadabra mirgel'
-      performance_of do
-        amount.times { try.search query }
-      end.should >= 0.15
-    end
-  end
-  context 'with pool' do
-    before(:each) do
-      Picky::Pool.install
-    end
-    after(:each) do
-      # Reload since installing the Pool taints the classes.
-      #
-      Picky::Loader.load_framework
-    end
-    it 'runs the GC less' do
-      # Quickly check that the pool is added.
-      #
-      fail 'object pool not installed' unless Picky::Query::Token.respond_to? :release_all
-      
-      try = search
-      query = 'abracadabra mirgel'
-      gc_runs_of do
-        amount.times do
-          try.search query
-          Picky::Pool.release_all
-        end
-      end.should <= 1 # Definitely less GC runs.
-    end
-    it 'is more (?) performant' do
-      try = search
-      query = 'abracadabra mirgel'
-      performance_of do
-        amount.times { try.search query }
-      end.should <= 0.2
-    end
-  end
+  # context 'without pool' do
+  #   it 'runs the GC more' do
+  #     # Quickly check if the pool is removed.
+  #     #
+  #     fail 'object pool still installed' if Picky::Query::Token.respond_to? :release_all
+  #     
+  #     try = search
+  #     query = 'abracadabra mirgel'
+  #     gc_runs_of do
+  #       amount.times { try.search query }
+  #     end.should >= 10
+  #   end
+  #   it 'is less (?) performant' do
+  #     try = search
+  #     query = 'abracadabra mirgel'
+  #     performance_of do
+  #       amount.times { try.search query }
+  #     end.should <= 0.15
+  #   end
+  # end
+  # context 'with pool' do
+  #   before(:each) do
+  #     Picky::Pool.install
+  #   end
+  #   after(:each) do
+  #     # Reload since installing the Pool taints the classes.
+  #     #
+  #     Picky::Loader.load_framework
+  #   end
+  #   it 'runs the GC less' do
+  #     # Quickly check that the pool is added.
+  #     #
+  #     fail 'object pool not installed' unless Picky::Query::Token.respond_to? :release_all
+  #     
+  #     try = search
+  #     query = 'abracadabra mirgel'
+  #     gc_runs_of do
+  #       amount.times do |i|
+  #         try.search query
+  #         Picky::Pool.release_all if i % 5 == 0
+  #       end
+  #     end.should <= 1 # Definitely less GC runs.
+  #   end
+  #   it 'is more (?) performant' do
+  #     try = search
+  #     query = 'abracadabra it whatever mirgel'
+  #     performance_of do
+  #       amount.times do |i|
+  #         try.search query
+  #         Picky::Pool.release_all if i % 5 == 0
+  #       end
+  #     end.should <= 0.2
+  #   end
+  # end
   
 end

data/spec/functional/realtime_spec.rb

@@ -478,7 +478,7 @@ describe "Realtime Indexing" do
     let(:index) do
       Picky::Index.new(:books) do
         backend Picky::Backends::Redis.new(realtime: true)
-        key_format :to_s # TODO Make key format dependent on backend?
+        key_format :to_s
         category :title
         category :author, similarity: Picky::Generators::Similarity::DoubleMetaphone.new(3)
       end

data/spec/lib/backends/backend_spec.rb

@@ -4,15 +4,15 @@ describe Picky::Backends::Backend do
 
   let(:backend) { described_class.new }
 
-  describe 'weight' do
-    it 'forwards to the parameter' do
-      combinations = stub :combinations
-
-      combinations.should_receive(:score).once.with()
-
-      backend.weight combinations
-    end
-  end
+  # describe 'score' do
+  #   it 'forwards to the parameter' do
+  #     combinations = stub :combinations
+  # 
+  #     combinations.should_receive(:score).once.with()
+  # 
+  #     backend.score combinations
+  #   end
+  # end
 
   describe 'to_s' do
     it 'is correct' do

data/spec/lib/backends/sqlite/array_spec.rb

@@ -25,19 +25,16 @@ describe Picky::Backends::SQLite::Array do
       it 'initializes the client' do
         client.stub! :execute
 
-        db.should_receive(:lazily_initialize_client).once.with
+        db.should_receive(:db).exactly(4).times.with
 
         db.dump_sqlite Hash.new
       end
       it 'executes something' do
-        db.stub! :lazily_initialize_client
-
         client.should_receive(:execute).at_least(1).times
 
         db.dump_sqlite Hash.new
       end
       it 'inserts keys and values' do
-        db.stub! :lazily_initialize_client
         client.stub! :execute # We only want to test the insert statements.
 
         client.should_receive(:execute).once.with 'insert into key_value values (?,?)', 'a', '[1,2,3]'
@@ -93,19 +90,16 @@ describe Picky::Backends::SQLite::Array do
       it 'initializes the client' do
         client.stub! :execute
 
-        db.should_receive(:lazily_initialize_client).once.with
+        db.should_receive(:db).exactly(4).times.with
 
         db.dump_sqlite Hash.new
       end
       it 'executes something' do
-        db.stub! :lazily_initialize_client
-
         client.should_receive(:execute).at_least(1).times
 
         db.dump_sqlite Hash.new
       end
       it 'inserts keys and values' do
-        db.stub! :lazily_initialize_client
         client.stub! :execute # We only want to test the insert statements.
 
         client.should_receive(:execute).once.with 'insert into key_value values (?,?)', 'a', '[1,2,3]'

data/spec/lib/backends/sqlite/value_spec.rb

@@ -25,7 +25,7 @@ describe Picky::Backends::SQLite::Value do
       it 'initializes the client' do
         client.stub! :execute
 
-        db.should_receive(:lazily_initialize_client).once.with
+        db.should_receive(:db).exactly(4).times.with
 
         db.dump_sqlite Hash.new
       end
@@ -37,7 +37,7 @@ describe Picky::Backends::SQLite::Value do
         db.dump_sqlite Hash.new
       end
       it 'inserts keys and values' do
-        db.stub! :lazily_initialize_client
+        # db.stub! :db
         client.stub! :execute # We only want to test the insert statements.
 
         client.should_receive(:execute).once.with 'insert into key_value values (?,?)', 'a', '[1,2,3]'

data/spec/lib/category_indexed_spec.rb

@@ -212,18 +212,6 @@ describe Picky::Category do
       @category.stub! :exact => (@exact = stub :exact)
       @category.stub! :partial => (@partial = stub :partial)
     end
-    describe 'bundle_for' do
-      it 'should return the right bundle' do
-        token = stub :token, :partial? => false
-
-        @category.bundle_for(token).should == @exact
-      end
-      it 'should return the right bundle' do
-        token = stub :token, :partial? => true
-
-        @category.bundle_for(token).should == @partial
-      end
-    end
 
     describe 'load' do
       it 'should call two methods' do

data/spec/lib/query/allocation_spec.rb

@@ -184,10 +184,10 @@ describe Picky::Query::Allocation do
   describe "calculate_score" do
     context 'non-empty combinations' do
       it 'should forward to backend and combinations' do
-        @backend.should_receive(:weight).once.with(@combinations).and_return 1
-        @combinations.should_receive(:boost_for).once.with(:some_boosts).and_return 2
+        @combinations.should_receive(:score).once.and_return 1
+        weights = stub :weights, :boost_for => 2
 
-        @allocation.calculate_score(:some_boosts).should == 3
+        @allocation.calculate_score(weights).should == 3
       end
     end
   end