picky 3.6.15 → 3.6.16

data/lib/picky/query/allocations.rb

@@ -11,6 +11,7 @@ module Picky
                :first,
                :inject,
                :size,
+               :map,
                :to => :@allocations
 
       def initialize allocations = []
@@ -80,8 +81,8 @@ module Picky
             amount = amount - ids.size # we need less results from the following allocation
             offset = 0                 # we have already passed the offset
           end
-          if terminate_early
-            break if terminate_early <= 0 && amount <= 0
+          if terminate_early && amount <= 0
+            break if terminate_early <= 0
             terminate_early -= 1
           end
         end
@@ -90,8 +91,11 @@ module Picky
       # The total is simply the sum of the counts of all allocations.
       #
       def total
-        @total ||= inject(0) do |total, allocation|
-          total + (allocation.count || break)
+        @total ||= calculate_total
+      end
+      def calculate_total
+        inject(0) do |total, allocation|
+          total + (allocation.count or return total)
         end
       end
 

data/spec/functional/terminate_early_spec.rb

@@ -79,12 +79,18 @@ describe 'Search#terminate_early' do
     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.search('hello', 13).to_hash[:allocations].size.should == 3
-    try.search('hello', 13, 4).to_hash[:allocations].size.should == 3
+    try.search('hello', 13).to_hash[:allocations].size.should == 4
+    try.search('hello', 13, 4).to_hash[:allocations].size.should == 4
     try.search('hello', 13, 8).to_hash[:allocations].size.should == 4
     try.search('hello', 13, 12).to_hash[:allocations].size.should == 4
     try.search('hello', 13, 16).to_hash[:allocations].size.should == 4
 
+    try.search('hello', 13).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 13, 4).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 13, 8).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 13, 12).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 13, 16).allocations.map(&:count).should == [6, 6, 6, 6]
+
     try = Picky::Search.new index do
       terminate_early with_extra_allocations: 2
     end
@@ -106,12 +112,42 @@ describe 'Search#terminate_early' do
 
     try.search('hello', 1).to_hash[:allocations].size.should == 2
     try.search('hello', 1, 4).to_hash[:allocations].size.should == 2
-    try.search('hello', 1, 8).to_hash[:allocations].size.should == 2
-    try.search('hello', 1, 12).to_hash[:allocations].size.should == 3
-    try.search('hello', 1, 16).to_hash[:allocations].size.should == 3
+    try.search('hello', 1, 8).to_hash[:allocations].size.should == 3
+    try.search('hello', 1, 12).to_hash[:allocations].size.should == 4
+    try.search('hello', 1, 16).to_hash[:allocations].size.should == 4
     try.search('hello', 1, 20).to_hash[:allocations].size.should == 4
     try.search('hello', 1, 24).to_hash[:allocations].size.should == 4
 
+    try.search('hello', 1).allocations.map(&:count).should == [6, 6, nil, nil]
+    try.search('hello', 1, 4).allocations.map(&:count).should == [6, 6, nil, nil]
+    try.search('hello', 1, 8).allocations.map(&:count).should == [6, 6, 6, nil]
+    try.search('hello', 1, 12).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 1, 16).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 1, 20).allocations.map(&:count).should == [6, 6, 6, 6]
+    try.search('hello', 1, 24).allocations.map(&:count).should == [6, 6, 6, 6]
+
+    try.search('hello', 1, 0).to_hash.should == {
+      :allocations => [
+        [:terminate_early, 1.792, 6, [[:text1, "hello", "hello"]], [6]],
+        [:terminate_early, 1.792, 6, [[:text2, "hello", "hello"]], []]
+      ],
+      :offset => 0,
+      :duration => anything,
+      :total => 12
+    }
+
+    try.search('hello', 1, 12).to_hash.should == {
+      :allocations => [
+        [:terminate_early, 1.792, 6, [[:text1, "hello", "hello"]], []],
+        [:terminate_early, 1.792, 6, [[:text2, "hello", "hello"]], []],
+        [:terminate_early, 1.792, 6, [[:text3, "hello", "hello"]], [6]],
+        [:terminate_early, 1.792, 6, [[:text4, "hello", "hello"]], []]
+      ],
+      :offset => 12,
+      :duration => anything,
+      :total => 24
+    }
+
     GC.start
 
     try_slow = Picky::Search.new index
@@ -148,7 +184,7 @@ describe 'Search#terminate_early' do
     fast = performance_of do
       try_fast.search 'hello hello hello'
     end
-    (slow/fast).should >= 1.8
+    (slow/fast).should >= 1.7
 
     try_slow = Picky::Search.new index
     slow = performance_of do

data/spec/lib/query/allocations_spec.rb

@@ -121,7 +121,7 @@ describe Picky::Query::Allocations do
         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
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset, 1
         end
@@ -186,7 +186,7 @@ describe Picky::Query::Allocations do
         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
+          @allocation3.should_receive(:process!).once.with(0,0).and_return []
 
           @allocations.process! @amount, @offset, 1
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 3.6.15
+  version: 3.6.16
   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: &70213132195120 !ruby/object:Gem::Requirement
+  requirement: &70259516646360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213132195120
+  version_requirements: *70259516646360
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70213132210660 !ruby/object:Gem::Requirement
+  requirement: &70259516645760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.6.15
+        version: 3.6.16
   type: :development
   prerelease: false
-  version_requirements: *70213132210660
+  version_requirements: *70259516645760
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70213132210060 !ruby/object:Gem::Requirement
+  requirement: &70259516645320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132210060
+  version_requirements: *70259516645320
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70213132209440 !ruby/object:Gem::Requirement
+  requirement: &70259516644860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132209440
+  version_requirements: *70259516644860
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70213132208820 !ruby/object:Gem::Requirement
+  requirement: &70259516644400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132208820
+  version_requirements: *70259516644400
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70213132208100 !ruby/object:Gem::Requirement
+  requirement: &70259516643960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132208100
+  version_requirements: *70259516643960
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70213132207500 !ruby/object:Gem::Requirement
+  requirement: &70259516659780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132207500
+  version_requirements: *70259516659780
 - !ruby/object:Gem::Dependency
   name: unicorn
-  requirement: &70213132207060 !ruby/object:Gem::Requirement
+  requirement: &70259516659260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132207060
+  version_requirements: *70259516659260
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70213132206580 !ruby/object:Gem::Requirement
+  requirement: &70259516658620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70213132206580
+  version_requirements: *70259516658620
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables: