picky 4.11.2 → 4.11.3

data/lib/picky/category.rb

@@ -48,6 +48,7 @@ module Picky
       #
       @source    = Source.from options[:source], true, @index.name
       @tokenizer = Tokenizer.from options[:indexing], @index.name, name
+      @ranger    = options[:ranging] || Range
 
       @key_format = options.delete :key_format
       @backend    = options.delete :backend
@@ -175,4 +176,4 @@ module Picky
 
   end
 
-end
+end

data/lib/picky/category_indexed.rb

@@ -18,12 +18,9 @@ module Picky
     def weight token
       bundle = bundle_for token
       if range = token.range
-        # The math is not perfectly correct, but you
-        # get my idea. Also, we could return early.
+        # TODO We might be able to return early?
         #
-        # TODO Possible to speed up more?
-        #
-        range.inject(nil) do |sum, text|
+        @ranger.new(*range).inject(nil) do |sum, text|
           weight = bundle.weight(text)
           weight && (weight + (sum || 0)) || sum
         end
@@ -40,7 +37,7 @@ module Picky
         # Adding all to an array, then flattening
         # is faster than using ary + ary.
         #
-        range.inject([]) do |result, text|
+        @ranger.new(*range).inject([]) do |result, text|
           # It is 30% faster using the empty check
           # than just << [].
           #
@@ -69,4 +66,4 @@ module Picky
 
   end
 
-end
+end

data/lib/picky/query/token.rb

@@ -201,7 +201,7 @@ module Picky
       end
       def rangify
         if @text.include? @@range_character
-          @range = Range.new *@text.split(@@range_character, 2)
+          @range = @text.split(@@range_character, 2)
         end
       end
       def range
@@ -331,4 +331,4 @@ module Picky
 
   end
 
-end
+end

data/spec/functional/range_queries_spec.rb

@@ -85,5 +85,53 @@ describe 'range queries' do
   #   #
   #   try.search('198-200*').ids.should == [8,3,1,4,5,7,6,2]
   # end
+
+  describe 'custom ranges' do
+    class Wrap12Hours
+      include Enumerable
+        
+      def initialize(min, max)
+        @hours = 12
+        @min   = min.to_i
+        @top   = max.to_i
+        @top   += @hours if @top < @min
+      end
+
+      def each
+        @min.upto(@top).each do |i|
+          yield (i % @hours).to_s
+        end
+      end
+    end
+    
+    let(:index) do
+      index = Picky::Index.new :range_queries do
+        category :hour,
+                 ranging: Wrap12Hours,
+                 partial: Picky::Partial::None.new
+      end
+    
+      rangy = Struct.new :id, :hour
+      
+      index.add rangy.new(1, 0)
+      index.add rangy.new(2, 1)
+      index.add rangy.new(3, 4)
+      index.add rangy.new(4, 5)
+      index.add rangy.new(5, 11)
+      index.add rangy.new(6, 10)
+      index.add rangy.new(7, 2)
+      index.add rangy.new(8, 3)
+      
+      index
+    end
+
+    it 'allows injection of custom range classes' do
+      try.search('hour:10-2').ids.should == [6, 5, 1, 2, 7]
+    end
+    
+    it 'allows injection of custom range classes' do
+      try.search('hour:0-11').ids.should == [1, 2, 7, 8, 3, 4, 6, 5]
+    end
+  end
   
-end
+end

data/spec/lib/category_indexed_spec.rb

@@ -92,7 +92,7 @@ describe Picky::Category do
     end
     context 'with range' do
       before :each do
-        token.stub! :range => (1..3)
+        token.stub! :range => [1, 3]
       end
       context 'partial bundle' do
         before(:each) do
@@ -154,7 +154,7 @@ describe Picky::Category do
       end
     end
     context 'with range' do
-      before(:each) { token.stub! :range => (1..3) }
+      before(:each) { token.stub! :range => [1, 3] }
       context 'partial bundle' do
         before(:each) do
           @category.stub! :bundle_for => @partial

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.11.2
+  version: 4.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.11.2
+        version: 4.11.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.11.2
+        version: 4.11.3
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement