picky 3.6.14 → 3.6.15

data/lib/picky/query/allocation.rb

@@ -70,7 +70,7 @@ module Picky
       # Transform the allocation into result form.
       #
       def to_result
-        [self.result_identifier, self.score, self.count, @combinations.to_result, self.ids] if self.count > 0
+        [self.result_identifier, self.score, self.count, @combinations.to_result, self.ids] if self.count && self.count > 0
       end
 
       # Json representation of this allocation.

data/lib/picky/query/allocations.rb

@@ -103,12 +103,6 @@ module Picky
         @allocations
       end
 
-      # Simply inspects the internal allocations.
-      #
-      def to_s
-        @allocations.inspect
-      end
-
       # Allocations for results are in the form:
       # [
       #   allocation1.to_result,
@@ -120,6 +114,12 @@ module Picky
         @allocations.map(&:to_result).compact
       end
 
+      # Simply inspects the internal allocations.
+      #
+      def to_s
+        to_result.inspect
+      end
+
     end
 
   end

data/spec/functional/terminate_early_spec.rb

@@ -49,6 +49,17 @@ describe 'Search#terminate_early' do
     try.search('hello', 9, 22).ids.should ==                                                               [2, 1]
     try.search('hello', 9, 25).ids.should ==                                                                     []
 
+    try.search('hello', 9).to_hash[:allocations].size.should == 2
+    try.search('hello', 9, 4).to_hash[:allocations].size.should == 3
+    try.search('hello', 9, 7).to_hash[:allocations].size.should == 3
+    try.search('hello', 9, 10).to_hash[:allocations].size.should == 4
+    try.search('hello', 9, 13).to_hash[:allocations].size.should == 4
+    try.search('hello', 9, 16).to_hash[:allocations].size.should == 4
+    try.search('hello', 9, 19).to_hash[:allocations].size.should == 4
+    try.search('hello', 9, 22).to_hash[:allocations].size.should == 4
+    try.search('hello', 9, 25).to_hash[:allocations].size.should == 4
+
+
     try = Picky::Search.new index do
       terminate_early 0
     end
@@ -68,6 +79,12 @@ 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, 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 = Picky::Search.new index do
       terminate_early with_extra_allocations: 2
     end
@@ -78,6 +95,23 @@ 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]
 
+    try = Picky::Search.new index do
+      terminate_early 1
+    end
+    try.search('hello', 1).ids.should == [6]
+    try.search('hello', 1, 4).ids.should ==          [2]
+    try.search('hello', 1, 8).ids.should ==                      [4]
+    try.search('hello', 1, 12).ids.should ==                                 [6]
+    try.search('hello', 1, 16).ids.should ==                                             [2]
+
+    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, 20).to_hash[:allocations].size.should == 4
+    try.search('hello', 1, 24).to_hash[:allocations].size.should == 4
+
     GC.start
 
     try_slow = Picky::Search.new index

data/spec/lib/query/allocations_spec.rb

@@ -362,12 +362,12 @@ describe Picky::Query::Allocations do
 
   describe "to_s" do
     before(:each) do
-      @internal_allocations = mock :internal_allocations
-      @allocations = described_class.new @internal_allocations
+      @allocation           = stub :allocation, :to_result => :some_result
+      @no_result_allocation = stub :no_results, :to_result => nil
+      @allocations = described_class.new [@allocation, @no_result_allocation, @allocation]
     end
     it "should delegate to the internal allocations array" do
-      @internal_allocations.should_receive(:inspect).once
-      @allocations.to_s
+      @allocations.to_s.should == "[:some_result, :some_result]"
     end
   end
 

metadata

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