picky 4.22.0 → 4.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 954befab3206369e74bfcdda5281da5f9c638f6a
-  data.tar.gz: 7128af9049b1b9ce1f5d29fbc1b37df8ef9eca58
+  metadata.gz: e15709ee827c97bd8f7fa31bb40fea1b75e9dafc
+  data.tar.gz: 017a417c0c3b37fbf61950b12542cbd76b4127f8
 SHA512:
-  metadata.gz: aa52877a9229a585e86fa4e2dd47dfedd093a53e1f7cc802eb6b309ccc49e0ef9c161c2e3b9b6be0ebdec9866365bf940e589dcd83731bdef4c1593fb6c3bce4
-  data.tar.gz: 6f5095a81599f40c006db8cce7bacfa82b58ac8f7043b64d1287ac673dec5b40bb3dd558213dd478d6ee5980f82f1695227a94bc158fe95c3aaa7d93e7dfc172
+  metadata.gz: 12c089ea8f406347266fe790b383e6e5e00ffb582ebfe852bea83bacb8be7cb1e4a807a04a84c7489aa6857f9456fc8c7639dbb21ab3e265880c2f0c68e234fe
+  data.tar.gz: ccc498547476f2e420a9dfa4a8ee13fba61c16a11b002d71990883f39ade4d5b77c3ab396c5f12420ce0582873d5d0530a7bdeedf9aee0bc1daa14e44cf776d0

data/lib/picky/query/allocation.rb

@@ -84,21 +84,23 @@ module Picky
       #  * amount: The amount of ids to calculate.
       #  * offset: The offset to calculate them from.
       #
-      def process! amount, offset
+      def process! amount, offset, sorting = nil
         calculated_ids = calculate_ids amount, offset
+        calculated_ids.sort_by! &sorting if sorting
         @count = calculated_ids.size                         # cache the count before throwing away the ids
         @ids   = calculated_ids.slice!(offset, amount) || [] # slice out the relevant part
       end
       # Same as the above, but with illegal ids. Parameter added:
       #  * illegal_ids: ids to ignore.
       #
-      def process_with_illegals! amount, offset, illegal_ids
+      def process_with_illegals! amount, offset, illegal_ids, sorting = nil
         # Note: Fairly inefficient calculation since it
         # assumes the worst case that the ids contain
         # all illegal ids.
         #
         calculated_ids = calculate_ids amount + illegal_ids.size, offset
         calculated_ids = calculated_ids - illegal_ids
+        calculated_ids.sort_by! &sorting if sorting
         @count = calculated_ids.size                         # cache the count before throwing away the ids
         @ids   = calculated_ids.slice!(offset, amount) || [] # slice out the relevant part
       end

data/lib/picky/query/allocations.rb

@@ -113,9 +113,9 @@ 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
+      def process! amount, offset = 0, terminate_early = nil, sorting = nil
         each do |allocation|
-          calculated_ids = allocation.process! amount, offset
+          calculated_ids = allocation.process! amount, offset, sorting
           if calculated_ids.empty?
             offset = offset - allocation.count unless offset.zero?
           else
@@ -137,10 +137,10 @@ module Picky
       #
       # Note: Slower than #process! especially with large offsets.
       #
-      def process_unique! amount, offset = 0, terminate_early = nil
+      def process_unique! amount, offset = 0, terminate_early = nil, sorting = nil
         unique_ids = []
         each do |allocation|
-          calculated_ids = allocation.process_with_illegals! amount, 0, unique_ids
+          calculated_ids = allocation.process_with_illegals! amount, 0, unique_ids, sorting
           projected_offset = offset - allocation.count
           unique_ids += calculated_ids # uniq this? <- No, slower than just leaving duplicates.
           if projected_offset <= 0

data/lib/picky/results.rb

@@ -12,7 +12,8 @@ module Picky
     attr_writer :duration
     attr_reader :offset,
                 :amount,
-                :query
+                :query,
+                :sorting
 
     # Takes instances of Query::Allocations as param.
     #
@@ -24,6 +25,13 @@ module Picky
       @extra_allocations = extra_allocations
       @unique      = unique
     end
+    
+    # Provide a block which
+    # accepts a result id.
+    #
+    def sort_by &sorting
+      @sorting = sorting
+    end
 
     def allocations
       prepare! *(@prepared || [@extra_allocations, @unique])
@@ -39,8 +47,8 @@ module Picky
       return if @prepared == [extra_allocations, unique] # cached?
       @prepared = [extra_allocations, unique] # cache!
       unique ?
-        @allocations.process_unique!(amount, offset, extra_allocations) :
-        @allocations.process!(amount, offset, extra_allocations)
+        @allocations.process_unique!(amount, offset, extra_allocations, sorting) :
+        @allocations.process!(amount, offset, extra_allocations, sorting)
     end
 
     def each &block

data/spec/functional/sort_by_spec.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe "id option" do
+
+  it 'can be given a different id (in-ruby based)' do
+    data = Picky::Index.new :id do
+      id :id
+      category :text, partial: Picky::Partial::Postfix.new(from: 1)
+      category :number
+    end
+
+    require 'ostruct'
+
+    thing = OpenStruct.new id: 1, number: 2, text: "aabcdef bcdef"
+    other = OpenStruct.new id: 2, number: 1, text: "abcdef bbcdef"
+
+    data.add thing
+    data.add other
+
+    sorting_order = {
+      thing.id => thing,
+      other.id => other
+    }
+
+    try = Picky::Search.new data
+
+    # Sort by number.
+    #
+    results = try.search("a")
+    
+    results.sort_by { |id| sorting_order[id].number }
+    
+    results.ids.should == [2,1]
+    
+    # Sort by text.
+    #
+    results = try.search("a")
+    
+    results.sort_by { |id| sorting_order[id].text }
+    
+    results.ids.should == [1,2]
+    
+    # Sort by number.
+    #
+    results = try.search("a* b")
+    
+    results.sort_by { |id| sorting_order[id].number }
+    
+    results.ids.should == [2,1]
+    
+    # Sort by text.
+    #
+    results = try.search("a* b")
+    
+    results.sort_by { |id| sorting_order[id].text }
+    
+    results.ids.should == [1,2]
+  end
+
+end

data/spec/functional/terminate_early_spec.rb

@@ -157,7 +157,7 @@ describe 'Search#terminate_early' do
       try_fast.search 'hello'
     end
     slow.should < 0.00009
-    fast.should < 0.00005
+    fast.should < 0.00006
     (slow/fast).should >= 1.5
 
     try_slow = Picky::Search.new index

data/spec/lib/picky_spec.rb

@@ -19,7 +19,7 @@ describe Picky do
     simple_load = <<-COMMAND
       #{ruby} -I #{load_path} -r picky -e "puts 'OK'"
     COMMAND
-    
+    p IO.popen(simple_load, err: [:child, :out]).readline
     IO.popen(simple_load, err: [:child, :out]).readline.strip.should == 'OK'
   end
   

data/spec/lib/query/allocations_spec.rb

@@ -93,15 +93,15 @@ describe Picky::Query::Allocations do
           @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]
+          @allocation1.should_receive(:process!).once.with(5,1,nil).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5, 6]
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
         end
         it 'should call the process! method right including unique' do
-          @allocation1.should_receive(:process_with_illegals!).once.with(5,0,[]).and_return [2, 3, 4]
-          @allocation2.should_receive(:process_with_illegals!).once.with(2,0,[2,3,4]).and_return [5, 6]
+          @allocation1.should_receive(:process_with_illegals!).once.with(5,0,[],nil).and_return [2, 3, 4]
+          @allocation2.should_receive(:process_with_illegals!).once.with(2,0,[2,3,4],nil).and_return [5, 6]
           @allocation3.should_receive(:process_with_illegals!).never
 
           @allocations.process_unique! @amount, @offset, 0
@@ -113,7 +113,7 @@ describe Picky::Query::Allocations do
           @offset = 0
         end
         it 'should call the process! method right' do
-          @allocation1.should_receive(:process!).once.with(1,0).and_return [1]
+          @allocation1.should_receive(:process!).once.with(1,0,nil).and_return [1]
           @allocation2.should_receive(:process!).never
           @allocation3.should_receive(:process!).never
 
@@ -126,9 +126,9 @@ describe Picky::Query::Allocations do
           @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!).once.with(0,0).and_return []
+          @allocation1.should_receive(:process!).once.with(5,1,nil).and_return [2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5, 6]
+          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
 
           @allocations.process! @amount, @offset, 1
         end
@@ -139,8 +139,8 @@ describe Picky::Query::Allocations do
           @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 []
+          @allocation1.should_receive(:process!).once.with(1,0,nil).and_return [1]
+          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 1
@@ -152,7 +152,7 @@ describe Picky::Query::Allocations do
           @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]
+          @allocation1.should_receive(:process!).once.with(4,0,nil).and_return [1, 2, 3, 4]
           @allocation2.should_receive(:process!).never
           @allocation3.should_receive(:process!).never
 
@@ -165,8 +165,8 @@ describe Picky::Query::Allocations do
           @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 []
+          @allocation1.should_receive(:process!).once.with(4,0,nil).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 1
@@ -178,8 +178,8 @@ describe Picky::Query::Allocations do
           @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]
+          @allocation1.should_receive(:process!).once.with(5,0,nil).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0,nil).and_return [5]
           @allocation3.should_receive(:process!).never
 
           @allocations.process! @amount, @offset, 0
@@ -191,9 +191,9 @@ describe Picky::Query::Allocations do
           @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!).once.with(0,0).and_return []
+          @allocation1.should_receive(:process!).once.with(5,0,nil).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(1,0,nil).and_return [5]
+          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
 
           @allocations.process! @amount, @offset, 1
         end
@@ -204,9 +204,9 @@ describe Picky::Query::Allocations do
           @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]
+          @allocation1.should_receive(:process!).once.with(8,0,nil).and_return [1, 2, 3, 4]
+          @allocation2.should_receive(:process!).once.with(4,0,nil).and_return [5, 6, 7]
+          @allocation3.should_receive(:process!).once.with(1,0,nil).and_return [8]
 
           @allocations.process! @amount, @offset, 1
         end
@@ -218,9 +218,9 @@ describe Picky::Query::Allocations do
         @offset = 2
       end
       it 'should call the process! method right' do
-        @allocation1.should_receive(:process!).once.with(6,2).and_return [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]
+        @allocation1.should_receive(:process!).once.with(6,2,nil).and_return [3,4]
+        @allocation2.should_receive(:process!).once.with(4,0,nil).and_return [5,6,7]
+        @allocation3.should_receive(:process!).once.with(1,0,nil).and_return [8]
 
         @allocations.process! @amount, @offset
       end
@@ -231,9 +231,9 @@ describe Picky::Query::Allocations do
         @offset = 8
       end
       it 'should call the process! method right' do
-        @allocation1.should_receive(:process!).once.with(10,8).and_return []
-        @allocation2.should_receive(:process!).once.with(10,4).and_return []
-        @allocation3.should_receive(:process!).once.with(10,1).and_return [9]
+        @allocation1.should_receive(:process!).once.with(10,8,nil).and_return []
+        @allocation2.should_receive(:process!).once.with(10,4,nil).and_return []
+        @allocation3.should_receive(:process!).once.with(10,1,nil).and_return [9]
 
         @allocations.process! @amount, @offset
       end
@@ -243,9 +243,9 @@ describe Picky::Query::Allocations do
         @amount = 0
       end
       it 'should return an empty array always' do
-        @allocation1.should_receive(:process!).once.with(0,0).and_return []
-        @allocation2.should_receive(:process!).once.with(0,0).and_return []
-        @allocation3.should_receive(:process!).once.with(0,0).and_return []
+        @allocation1.should_receive(:process!).once.with(0,0,nil).and_return []
+        @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
+        @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
 
         @allocations.process! @amount
       end
@@ -259,9 +259,9 @@ describe Picky::Query::Allocations do
           @offset = 0
         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).and_return []
-          @allocation3.should_receive(:process!).once.with(0,0).and_return []
+          @allocation1.should_receive(:process!).once.with(3,0,nil).and_return [1,2,3]
+          @allocation2.should_receive(:process!).once.with(0,0,nil).and_return []
+          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
 
           @allocations.process! @amount, @offset
         end
@@ -271,9 +271,9 @@ describe Picky::Query::Allocations do
           @offset = 3
         end
         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 []
+          @allocation1.should_receive(:process!).once.with(3,3,nil).and_return [4]
+          @allocation2.should_receive(:process!).once.with(2,0,nil).and_return [5,6]
+          @allocation3.should_receive(:process!).once.with(0,0,nil).and_return []
 
           @allocations.process! @amount, @offset
         end

data/spec/lib/results_spec.rb

@@ -8,13 +8,13 @@ describe Picky::Results do
       @results = described_class.new :unimportant, :amount, :offset, @allocations
     end
     it "forwards" do
-      @allocations.should_receive(:process!).once.with :amount, :offset, nil
+      @allocations.should_receive(:process!).once.with :amount, :offset, nil, nil
       @allocations.should_receive(:ids).once.with :anything
 
       @results.ids :anything
     end
     it "forwards and uses amount if nothing given" do
-      @allocations.should_receive(:process!).once.with :amount, :offset, nil
+      @allocations.should_receive(:process!).once.with :amount, :offset, nil, nil
       @allocations.should_receive(:ids).once.with :amount
 
       @results.ids

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.22.0
+  version: 4.23.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -261,6 +261,7 @@ files:
 - spec/functional/remap_qualifiers_spec.rb
 - spec/functional/results_spec.rb
 - spec/functional/similarity_spec.rb
+- spec/functional/sort_by_spec.rb
 - spec/functional/sorting_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb
@@ -442,6 +443,7 @@ test_files:
 - spec/functional/remap_qualifiers_spec.rb
 - spec/functional/results_spec.rb
 - spec/functional/similarity_spec.rb
+- spec/functional/sort_by_spec.rb
 - spec/functional/sorting_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb