picky 3.6.13 → 3.6.14

data/lib/picky/query/allocations.rb

@@ -72,7 +72,6 @@ module Picky
       # Note: It's possible that no ids are returned by an allocation, but a count. (In case of an offset)
       #
       def process! amount, offset = 0, terminate_early = nil
-        current_offset = 0
         each do |allocation|
           ids = allocation.process! amount, offset
           if ids.empty?
@@ -82,7 +81,7 @@ module Picky
             offset = 0                 # we have already passed the offset
           end
           if terminate_early
-            break if terminate_early < 0 && offset <= 0
+            break if terminate_early <= 0 && amount <= 0
             terminate_early -= 1
           end
         end

data/lib/picky/search.rb

@@ -5,8 +5,8 @@ module Picky
   # = Picky Searches
   #
   # A Picky Search is an object which:
-  #  * holds one or more indexes
-  #  * offers an interface to query these indexes.
+  # * holds one or more indexes
+  # * offers an interface to query these indexes.
   #
   # You connect URL paths to indexes via a Query.
   #
@@ -84,14 +84,14 @@ module Picky
     # (So, early)
     #
     # Important note: Do not use this for the live search!
-    #                 (As Picky needs to calculate the total)
+    # (As Picky needs to calculate the total)
     #
     # Note: When using the Picky interface, do not terminate too
-    #       early as this will kill off the allocation selections.
-    #       A value of
-    #         early_terminate 5
-    #       is probably a good idea to show the user 5 extra
-    #       beyond the needed ones.
+    # early as this will kill off the allocation selections.
+    # A value of
+    #    early_terminate 5
+    # is probably a good idea to show the user 5 extra
+    # beyond the needed ones.
     #
     # Examples:
     #   # Terminate if you have enough ids.

data/spec/functional/terminate_early_spec.rb

@@ -23,6 +23,9 @@ describe 'Search#terminate_early' do
     try = Picky::Search.new index
     try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5]
 
+    try = Picky::Search.new index
+    try.search('hello', 30).ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+
     try = Picky::Search.new index do
       terminate_early
     end
@@ -37,21 +40,33 @@ describe 'Search#terminate_early' do
       terminate_early with_extra_allocations: 0
     end
     try.search('hello', 9).ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4]
+    try.search('hello', 9, 4).ids.should ==          [2, 1, 6, 5, 4, 3, 2, 1, 6]
+    try.search('hello', 9, 7).ids.should ==                   [5, 4, 3, 2, 1, 6, 5, 4, 3]
+    try.search('hello', 9, 10).ids.should ==                           [2, 1, 6, 5, 4, 3, 2, 1, 6]
+    try.search('hello', 9, 13).ids.should ==                                    [5, 4, 3, 2, 1, 6, 5, 4, 3]
+    try.search('hello', 9, 16).ids.should ==                                             [2, 1, 6, 5, 4, 3, 2, 1]
+    try.search('hello', 9, 19).ids.should ==                                                      [5, 4, 3, 2, 1]
+    try.search('hello', 9, 22).ids.should ==                                                               [2, 1]
+    try.search('hello', 9, 25).ids.should ==                                                                     []
 
     try = Picky::Search.new index do
       terminate_early 0
     end
-    try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+    try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5]
 
     try = Picky::Search.new index do
       terminate_early with_extra_allocations: 0
     end
-    try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+    try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5]
 
     try = Picky::Search.new index do
       terminate_early 2
     end
     try.search('hello', 13).ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6]
+    try.search('hello', 13, 4).ids.should ==          [2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2]
+    try.search('hello', 13, 8).ids.should ==                      [4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4]
+    try.search('hello', 13, 12).ids.should ==                                 [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1]
+    try.search('hello', 13, 16).ids.should ==                                             [2, 1, 6, 5, 4, 3, 2, 1]
 
     try = Picky::Search.new index do
       terminate_early with_extra_allocations: 2
@@ -63,18 +78,55 @@ describe 'Search#terminate_early' do
     end
     try.search('hello').ids.should == [6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5, 4, 3, 2, 1, 6, 5]
 
+    GC.start
+
+    try_slow = Picky::Search.new index
     slow = performance_of do
-      try.search 'hello'
+      try_slow.search 'hello'
+    end
+    try_fast = Picky::Search.new index do
+      terminate_early
     end
+    fast = performance_of do
+      try_fast.search 'hello'
+    end
+    (slow/fast).should >= 1.1
 
-    try = Picky::Search.new index do
+    try_slow = Picky::Search.new index
+    slow = performance_of do
+      try_slow.search 'hello hello'
+    end
+    try_fast = Picky::Search.new index do
+      terminate_early
+    end
+    fast = performance_of do
+      try_fast.search 'hello hello'
+    end
+    (slow/fast).should >= 1.4
+
+    try_slow = Picky::Search.new index
+    slow = performance_of do
+      try_slow.search 'hello hello hello'
+    end
+    try_fast = Picky::Search.new index do
+      terminate_early
+    end
+    fast = performance_of do
+      try_fast.search 'hello hello hello'
+    end
+    (slow/fast).should >= 1.8
+
+    try_slow = Picky::Search.new index
+    slow = performance_of do
+      try_slow.search 'hello hello hello hello'
+    end
+    try_fast = Picky::Search.new index do
       terminate_early
     end
     fast = performance_of do
-      try.search 'hello'
+      try_fast.search 'hello hello hello hello'
     end
-    
-    (slow/fast).should
+    (slow/fast).should >= 2.0
   end
 
 end

data/spec/lib/query/allocations_spec.rb

@@ -81,20 +81,20 @@ describe Picky::Query::Allocations do
 
   describe 'process!' do
     before(:each) do
-      @allocation1 = stub :allocation1, :process! => [], :count => 4 #, ids: [1, 2, 3, 4]
-      @allocation2 = stub :allocation2, :process! => [], :count => 3 #, ids: [5, 6, 7]
-      @allocation3 = stub :allocation3, :process! => [], :count => 2 #, ids: [8, 9]
+      @allocation1 = stub :allocation1, :count => 4 #, ids: [1, 2, 3, 4]
+      @allocation2 = stub :allocation2, :count => 3 #, ids: [5, 6, 7]
+      @allocation3 = stub :allocation3, :count => 2 #, ids: [8, 9]
       @allocations = described_class.new [@allocation1, @allocation2, @allocation3]
     end
     describe 'lazy evaluation' do
       context 'small amount' do
         before(:each) do
-          @amount = 3
+          @amount = 5
           @offset = 1
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(3,1).and_return [1, 2, 3]
-          @allocation2.should_receive(:process!).once.with(0,0).and_return [] # TODO Actually ok?
+          @allocation1.should_receive(:process!).once.with(5,1).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0).and_return [5, 6]
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
@@ -107,12 +107,103 @@ describe Picky::Query::Allocations do
         end
         it 'should call the process! method right' do
           @allocation1.should_receive(:process!).once.with(1,0).and_return [1]
-          @allocation2.should_receive(:process!).once.with(0,0).and_return [] # TODO Actually ok?
+          @allocation2.should_receive(:process!).never
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
         end
       end
+      context 'small amount and early 1' do
+        before(:each) do
+          @amount = 5
+          @offset = 1
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(5,1).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0).and_return [5, 6]
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 1
+        end
+      end
+      context 'larger amount and early 1' do
+        before(:each) do
+          @amount = 1
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(1,0).and_return [1]
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 1
+        end
+      end
+      context 'larger amount and early 0' do
+        before(:each) do
+          @amount = 4
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(4,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).never
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 0
+        end
+      end
+      context 'larger amount and early 1' do
+        before(:each) do
+          @amount = 4
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(4,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 1
+        end
+      end
+      context 'larger amount and early 0' do
+        before(:each) do
+          @amount = 5
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(5,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0).and_return [5]
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 0
+        end
+      end
+      context 'larger amount and early 1' do
+        before(:each) do
+          @amount = 5
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(5,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0).and_return [5]
+          @allocation3.should_receive(:process!).never
+
+          @allocations.process! @amount, @offset, 1
+        end
+      end
+      context 'larger amount and early 1' do
+        before(:each) do
+          @amount = 8
+          @offset = 0
+        end
+        it 'should call the process! method right' do
+          @allocation1.should_receive(:process!).once.with(8,0).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(4,0).and_return [5, 6, 7]
+          @allocation3.should_receive(:process!).once.with(1,0).and_return [8]
+
+          @allocations.process! @amount, @offset, 1
+        end
+      end
     end
     describe 'amount spanning 3 allocations' do
       before(:each) do
@@ -162,7 +253,8 @@ describe Picky::Query::Allocations do
         end
         it 'should return certain ids' do
           @allocation1.should_receive(:process!).once.with(3,0).and_return [1,2,3]
-          @allocation2.should_receive(:process!).once.with(0,0)
+          @allocation2.should_receive(:process!).once.with(0,0).and_return []
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset
         end
@@ -174,6 +266,7 @@ describe Picky::Query::Allocations do
         it 'should return certain ids' do
           @allocation1.should_receive(:process!).once.with(3,3).and_return [4]
           @allocation2.should_receive(:process!).once.with(2,0).and_return [5,6]
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.6.13
+  version: 3.6.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225485191560 !ruby/object:Gem::Requirement
+  requirement: &70226495445320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70225485191560
+  version_requirements: *70226495445320
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70225485190820 !ruby/object:Gem::Requirement
+  requirement: &70226495444480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.13
+        version: 3.6.14
   type: :development
   prerelease: false
-  version_requirements: *70225485190820
+  version_requirements: *70226495444480
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70225485189940 !ruby/object:Gem::Requirement
+  requirement: &70226495443600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485189940
+  version_requirements: *70226495443600
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70225485189200 !ruby/object:Gem::Requirement
+  requirement: &70226495442880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485189200
+  version_requirements: *70226495442880
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70225485188260 !ruby/object:Gem::Requirement
+  requirement: &70226495442020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485188260
+  version_requirements: *70226495442020
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70225485187840 !ruby/object:Gem::Requirement
+  requirement: &70226495441600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485187840
+  version_requirements: *70226495441600
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70225485187340 !ruby/object:Gem::Requirement
+  requirement: &70226495441100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485187340
+  version_requirements: *70226495441100
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70225485203280 !ruby/object:Gem::Requirement
+  requirement: &70226495457020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485203280
+  version_requirements: *70226495457020
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70225485202700 !ruby/object:Gem::Requirement
+  requirement: &70226495456460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225485202700
+  version_requirements: *70226495456460
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: