picky 4.21.2 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 867ccbdac334b762659c0cb099da2545e2ca408f
-  data.tar.gz: 0102830fb69655ebe0e097ad84aff897e9e26068
+  metadata.gz: 954befab3206369e74bfcdda5281da5f9c638f6a
+  data.tar.gz: 7128af9049b1b9ce1f5d29fbc1b37df8ef9eca58
 SHA512:
-  metadata.gz: 3b5efada92088f0e30442f8eb1b9a51dfa551308a9f423e11fa57a326ed22ebff62d36a8fd7ca96257b1474cb1268a9daac2ad7f6f61cfa66277cd0e0740b093
-  data.tar.gz: 2dd2598eecd67120079d2feacda2430ded9ab7c0aeee6c8b239b9c3d19ffdc65fe036a194e8abdd13b3527020cf77fef9d7d35273381f89f9882e3834ab5ac0c
+  metadata.gz: aa52877a9229a585e86fa4e2dd47dfedd093a53e1f7cc802eb6b309ccc49e0ef9c161c2e3b9b6be0ebdec9866365bf940e589dcd83731bdef4c1593fb6c3bce4
+  data.tar.gz: 6f5095a81599f40c006db8cce7bacfa82b58ac8f7043b64d1287ac673dec5b40bb3dd558213dd478d6ee5980f82f1695227a94bc158fe95c3aaa7d93e7dfc172

data/lib/picky/bundle.rb

@@ -128,19 +128,20 @@ module Picky
 
     # Get a list of similar texts.
     #
-    # Note: Does not return itself.
+    # Note: Also checks for itself.
     #
     def similar text
       code = similarity_strategy.encode text
       return [] unless code
-      similar_codes = @similarity[code]
-      if similar_codes.blank?
-        [] # Return a simple array.
-      else
-        similar_codes = similar_codes.dup
-        similar_codes.delete text
-        similar_codes
-      end
+      @similarity[code] || []
+      # similar_codes = @similarity[code]
+      # if similar_codes.blank?
+      #   [] # Return a simple array.
+      # else
+      #   similar_codes = similar_codes.dup
+      #   similar_codes.delete text # Remove itself.
+      #   similar_codes
+      # end
     end
 
     # If a key format is set, use it, else forward to the category.

data/lib/picky/generators/similarity.rb

@@ -1,5 +1,5 @@
 module Picky
-  
+
   module Generators
 
     module Similarity
@@ -12,8 +12,8 @@ module Picky
           thing
         else
           raise <<-ERROR
-similarity options #{identifier_for(index_name, category_name)}should be either
-* for example a Similarity::Phonetic.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
+Similarity options #{identifier_for(index_name, category_name)}should be either
+* for example a Similarity::Soundex.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
 or
 * an object that responds to #encode(text) => encoded_text and #prioritize(array_of_encoded, encoded)
 ERROR
@@ -23,5 +23,5 @@ ERROR
     end
 
   end
-  
+
 end

data/lib/picky/index_indexing.rb

@@ -105,6 +105,8 @@ module Picky
     #
     # Parameter is a method name to use on the key (e.g. :to_i, :to_s, :strip, :split).
     #
+    # TODO Rename to id_format.
+    #
     def key_format key_format = nil
       key_format ? (@key_format = key_format) : @key_format
     end

data/lib/picky/query/allocation.rb

@@ -1,7 +1,7 @@
 module Picky
 
   module Query
-    
+
     # An Allocation contains an ordered list of
     # tuples (Combinations).
     # The Combinations are ordered according to the order
@@ -25,7 +25,13 @@ module Picky
         @index = index
         @combinations = combinations
       end
-      
+
+      # TODO
+      #
+      def each &block
+        @combinations.each &block
+      end
+
       #
       #
       def backend
@@ -48,6 +54,14 @@ module Picky
         end)
       end
 
+      # Ids return by default [].
+      #
+      # TODO Calculate ids here.
+      #
+      def ids
+        @ids ||= []
+      end
+
       # Asks the backend for the (intersected) ids.
       #
       # Note: Combinations can be empty on eg.
@@ -56,18 +70,12 @@ module Picky
       #
       def calculate_ids amount, offset
         return [] if @combinations.empty? # Checked here to avoid checking in each backend.
-        
+
         # TODO Redesign such that ids is only created (and cached) if requested.
         #
         backend.ids @combinations, amount, offset
       end
 
-      # Ids return by default [].
-      #
-      def ids
-        @ids ||= []
-      end
-
       # This starts the searching process.
       #
       # Returns the calculated ids (from the offset).
@@ -112,7 +120,7 @@ module Picky
       def to_result
         [@index.result_identifier, self.score, self.count, @combinations.to_result, self.ids] if self.count && self.count > 0
       end
-      
+
       #
       #
       def to_qualifiers

data/lib/picky/query/allocations.rb

@@ -53,7 +53,7 @@ module Picky
       def remove_categories categories = []
         @allocations.each { |allocation| allocation.remove categories } unless categories.empty?
       end
-      
+
       # Removes allocations.
       #
       # Only those passed in are removed.
@@ -70,7 +70,7 @@ module Picky
           allocation
         end
       end
-      
+
       # Keeps allocations.
       #
       # Only those passed in are kept.
@@ -90,7 +90,7 @@ module Picky
       # Returns the top amount ids.
       #
       def ids amount = 20
-        @allocations.inject([]) do |total, allocation|
+        inject([]) do |total, allocation|
           total.size >= amount ? (return total.shift(amount)) : total + allocation.ids
         end
       end
@@ -128,7 +128,7 @@ module Picky
           end
         end
       end
-      
+
       # Same as #process! but removes duplicate ids from results.
       #
       # Note that in the result later on an allocation won't be

data/lib/picky/query/combinations.rb

@@ -6,7 +6,7 @@ module Picky
     #
     # Combinations contain methods for calculating score (including
     # the boost) and ids for each of its Combination s.
-    #    
+    #
     # They are the core of an Allocation.
     # An Allocation consists of a number of Combinations.
     #
@@ -23,6 +23,12 @@ module Picky
         @combinations = combinations
       end
 
+      # TODO
+      #
+      def each &block
+        @combinations.each &block
+      end
+
       # Sums up the weights of the combinations.
       #
       # Note: Optimized sum(&:weight) away – ~3% improvement.
@@ -39,7 +45,7 @@ module Picky
       # ids that have an associated identifier that is nil.
       #
       def remove categories = []
-        # TODO Do not use the name, but the category. 
+        # TODO Do not use the name, but the category.
         #
         @combinations.reject! { |combination| categories.include?(combination.category.name) }
       end
@@ -49,7 +55,7 @@ module Picky
       def to_result
         @combinations.map &:to_result
       end
-      
+
       def to_qualifiers
         @combinations.map &:category_name
       end

data/lib/picky/results.rb

@@ -5,31 +5,29 @@ module Picky
   #
   class Results
 
+    include Enumerable
+
     # Duration is set externally by the query.
     #
     attr_writer :duration
-    attr_reader :allocations,
-                :offset,
+    attr_reader :offset,
                 :amount,
                 :query
 
     # Takes instances of Query::Allocations as param.
     #
-    def initialize query = nil, amount = 0, offset = 0, allocations = Query::Allocations.new
+    def initialize query = nil, amount = 0, offset = 0, allocations = Query::Allocations.new, extra_allocations = nil, unique = false
       @amount      = amount
       @query       = query
       @offset      = offset
       @allocations = allocations
+      @extra_allocations = extra_allocations
+      @unique      = unique
     end
 
-    # Create new results and calculate the ids.
-    #
-    # TODO Remove and calculate lazily via results.ids (rewrite all references to use Result.new).
-    #
-    def self.from query, amount, offset, allocations, extra_allocations = nil, unique = false
-      results = new query, amount, offset, allocations
-      results.prepare! extra_allocations, unique
-      results
+    def allocations
+      prepare! *(@prepared || [@extra_allocations, @unique])
+      @allocations
     end
 
     # This starts the actual processing.
@@ -38,9 +36,15 @@ module Picky
     # and no ids are calculated.
     #
     def prepare! extra_allocations = nil, unique = false
+      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) :
+        @allocations.process!(amount, offset, extra_allocations)
+    end
+
+    def each &block
+      allocations.each &block
     end
 
     # Forwards to allocations.
@@ -49,6 +53,8 @@ module Picky
     # should not be done repeatedly. Just keep
     # a reference to the result.
     #
+    # TODO Rewrite such that this triggers calculation, not prepare!
+    #
     def ids only = amount
       allocations.ids only
     end

data/lib/picky/search.rb

@@ -138,7 +138,7 @@ module Picky
     def boost boosts
       @boosts = extract_boosts boosts
     end
-    
+
     # Ignore given categories and/or combinations of
     # categories.
     #
@@ -158,7 +158,7 @@ module Picky
         end
       end
     end
-    
+
     # Exclusively keep combinations of
     # categories.
     #
@@ -171,7 +171,7 @@ module Picky
     def only *allocations_and_categories
       indexes.keep_allocations *allocations_and_categories
     end
-    
+
     # Ignore the given token if it cannot be matched to a category.
     # The default behaviour is that if a token does not match to
     # any category, the query will not return anything (since a
@@ -236,12 +236,12 @@ module Picky
     # Note: Internal method, use #search to search.
     #
     def execute tokens, ids, offset, original_text = nil, unique = false
-      Results.from original_text,
-                   ids,
-                   offset,
-                   sorted_allocations(tokens, @max_allocations),
-                   @extra_allocations,
-                   unique
+      Results.new original_text,
+                  ids,
+                  offset,
+                  sorted_allocations(tokens, @max_allocations),
+                  @extra_allocations,
+                  unique
     end
 
     # Forwards the tokenizing to the query tokenizer.

data/spec/functional/arrays_as_ids_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 require 'ostruct'
 
 describe "Array IDs" do
-  
-  let(:index) { Picky::Index.new :arrays } 
+
+  let(:index) { Picky::Index.new :arrays }
   let(:try) { Picky::Search.new index }
 
   # This tests the weights option.

data/spec/functional/results_spec.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+require 'ostruct'
+
+describe "Results" do
+
+  let(:index1) { Picky::Index.new :results1 }
+  let(:index2) { Picky::Index.new :results2 }
+  let(:try) { Picky::Search.new index1, index2 }
+
+  # Test the enumerator abilities.
+  #
+  it 'can enumerate through the allocations' do
+    index1.category :text
+    index2.category :text
+
+    thing = OpenStruct.new id: 1, text: "ohai"
+    other = OpenStruct.new id: 2, text: "ohai kthxbye"
+
+    index1.add thing
+    index1.add other
+    index2.add thing
+
+    # each
+    #
+    expected = [
+      [2, 1],
+      [1]
+    ]
+    try.search("text:ohai").each do |allocation|
+      expected.shift.should == allocation.ids
+    end
+
+    # map
+    #
+    try.search("text:ohai").map(&:ids).should == [
+      [2, 1],
+      [1]
+    ]
+    try.search("text:ohai").map(&:score).should == [0.693, 0.0]
+  end
+
+  it 'can re-prepare with different parameters' do
+    index1.category :text
+    index2.category :text
+
+    thing = OpenStruct.new id: 1, text: "ohai"
+    other = OpenStruct.new id: 2, text: "ohai kthxbye"
+
+    index1.add thing
+    index1.add other
+    index2.add thing
+
+    results = try.search "text:ohai"
+    results.ids.should == [2, 1, 1]
+
+    results.prepare! nil, true
+    results.ids.should == [2, 1]
+    results.ids.object_id.should_not == results.ids.object_id # Not cached.
+  end
+
+end

data/spec/functional/similarity_spec.rb

@@ -0,0 +1,72 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe 'similarity' do
+  it 'does Soundex' do
+    index = Picky::Index.new :phonetic do
+      indexing removes_characters: /[^a-z\s]/i
+      category :text, similarity: Picky::Similarity::Soundex.new(1)
+    end
+
+    index.replace_from id: 1, text: "Peter"
+
+    try = Picky::Search.new index
+
+    # No ~, no similarity.
+    #
+    try.search("text:petor").ids.should == []
+
+    # Finds soundex-similar text.
+    #
+    try.search("text:petor~").ids.should == [1]
+
+    # Finds the identity.
+    #
+    try.search("text:peter~").ids.should == [1]
+  end
+  it 'does Metaphone' do
+    index = Picky::Index.new :phonetic do
+      indexing removes_characters: /[^a-z\s]/i
+      category :text, similarity: Picky::Similarity::Metaphone.new(1)
+    end
+
+    index.replace_from id: 1, text: "Peter"
+
+    try = Picky::Search.new index
+
+    # No ~, no similarity.
+    #
+    try.search("text:pdr").ids.should == []
+
+    # Finds soundex-similar text.
+    #
+    try.search("text:pdr~").ids.should == [1]
+
+    # Finds the identity.
+    #
+    try.search("text:peter~").ids.should == [1]
+  end
+  it 'does DoubleMetaphone' do
+    index = Picky::Index.new :phonetic do
+      indexing removes_characters: /[^a-z\s]/i
+      category :text, similarity: Picky::Similarity::DoubleMetaphone.new(1)
+    end
+
+    index.replace_from id: 1, text: "Peter"
+
+    try = Picky::Search.new index
+
+    # No ~, no similarity.
+    #
+    try.search("text:pdr").ids.should == []
+
+    # Finds soundex-similar text.
+    #
+    try.search("text:pdr~").ids.should == [1]
+
+    # Finds the identity.
+    #
+    try.search("text:peter~").ids.should == [1]
+  end
+end

data/spec/functional/terminate_early_spec.rb

@@ -156,43 +156,51 @@ describe 'Search#terminate_early' do
     fast = performance_of do
       try_fast.search 'hello'
     end
-    (slow/fast).should >= 1.1
+    slow.should < 0.00009
+    fast.should < 0.00005
+    (slow/fast).should >= 1.5
 
     try_slow = Picky::Search.new index
     slow = performance_of do
-      try_slow.search 'hello hello'
+      try_slow.search('hello hello').ids
     end
     try_fast = Picky::Search.new index do
       terminate_early
     end
     fast = performance_of do
-      try_fast.search 'hello hello'
+      try_fast.search('hello hello').ids
     end
-    (slow/fast).should >= 1.2
+    slow.should < 0.00015
+    fast.should < 0.00009
+    (slow/fast).should >= 1.5
 
     try_slow = Picky::Search.new index
     slow = performance_of do
-      try_slow.search 'hello hello hello'
+      try_slow.search('hello hello hello').ids
     end
     try_fast = Picky::Search.new index do
       terminate_early
     end
     fast = performance_of do
-      try_fast.search 'hello hello hello'
+      try_fast.search('hello hello hello').ids
     end
-    (slow/fast).should >= 1.4
+    slow.should < 0.0005
+    fast.should < 0.00025
+    (slow/fast).should >= 2
 
     try_slow = Picky::Search.new index
     slow = performance_of do
-      try_slow.search 'hello hello hello hello'
+      try_slow.search('hello hello hello hello').ids
     end
     try_fast = Picky::Search.new index do
       terminate_early
     end
     fast = performance_of do
-      try_fast.search 'hello hello hello hello'
+      try_fast.search('hello hello hello hello').ids
     end
-    (slow/fast).should >= 1.7
+    slow.should < 0.002
+    fast.should < 0.0008
+    (slow/fast).should >= 2.3
   end
 
 end

data/spec/lib/bundle_indexing_spec.rb

@@ -21,8 +21,8 @@ describe Picky::Bundle do
       bundle.add_similarity :dragon
       bundle.add_similarity :dargon
     end
-    it 'returns the right similars (not itself)' do
-      bundle.similar(:dragon).should == [:dargon]
+    it 'returns the right similars (including itself)' do
+      bundle.similar(:dragon).should == [:dargon, :dragon]
     end
     it 'returns the right similars' do
       bundle.similar(:trkn).should == [:dargon, :dragon]

data/spec/lib/generators/similarity/double_metaphone_spec.rb

@@ -19,48 +19,9 @@ describe Picky::Generators::Similarity::DoubleMetaphone do
       @similarity.encode(text).should == expected
     end
   end
-  # def self.it_should_generate_from index, expected
-  #   it "should generate #{expected.inspect} correctly from #{index.inspect}" do
-  #     @similarity.generate_from(index).should == expected
-  #   end
-  # end
 
   it_should_encode :meier,       :MR
   it_should_encode :grossberger, :KRSP
   it_should_encode :hadelbla,    :HTLP
 
-  # it_should_generate_from({}, {})
-  # it_should_generate_from({ :maier => nil, :meier => nil }, :MR => [:maier, :meier]) # should be correctly ordered
-  # it_should_generate_from({ :maier => nil, :meier => nil, :hallaballa => nil }, :MR => [:maier, :meier], :HLPL => [:hallaballa])
-  # it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :SSN => [:susan, :susanne], :PRTR => [:bruderer])
-
-  # describe 'with reduced amount' do
-  #   before(:each) do
-  #     @similarity = described_class.new(1)
-  #   end
-  #   it_should_generate_from({ :maier => nil, :meier => nil }, :MR => [:maier])
-  #   it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :SSN => [:susan], :PRTR => [:bruderer])
-  # end
-
-  # describe 'hashify' do
-  #   it 'should turn an empty list into an empty hash' do
-  #     @similarity.send(:hashify, []).should == {}
-  #   end
-  #   it 'should turn the list into an unordered similarity' do
-  #     @similarity.send(:hashify, [:meier, :maier]).should == { :MR => [:meier, :maier] }
-  #   end
-  #   it 'should turn the list into a encoded hash' do
-  #     @similarity.send(:hashify, [:meier, :maier, :peter]).should == { :MR => [:meier, :maier], :PTR => [:peter] }
-  #   end
-  # end
-  #
-  # context 'integration' do
-  #   it 'should return the right ordered array' do
-  #     index = @similarity.generate_from :meier => nil, :maier => nil, :mairai => nil, :mair => nil, :meira => nil
-  #     code  = @similarity.encoded :maier
-  #
-  #     index[code].should == [:mair, :maier, :meier, :meira, :mairai]
-  #   end
-  # end
-
 end

data/spec/lib/generators/similarity/metaphone_spec.rb

@@ -20,48 +20,8 @@ describe Picky::Generators::Similarity::Metaphone do
     end
   end
 
-  # def self.it_should_generate_from index, expected
-  #   it "should generate #{expected.inspect} correctly from #{index.inspect}" do
-  #     @similarity.generate_from(index).should == expected
-  #   end
-  # end
-
   it_should_encode :meier,       :MR
   it_should_encode :grossberger, :KRSBRJR
   it_should_encode :hadelbla,    :HTLBL
 
-  # it_should_generate_from({}, {})
-  # it_should_generate_from({ :maier => nil, :meier => nil }, :MR => [:maier, :meier]) # should be correctly ordered
-  # it_should_generate_from({ :maier => nil, :meier => nil, :hallaballa => nil }, :MR => [:maier, :meier], :HLBL => [:hallaballa])
-  # it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :SSN => [:susan, :susanne], :BRTRR => [:bruderer])
-
-  # describe 'with reduced amount' do
-  #   before(:each) do
-  #     @similarity = described_class.new(1)
-  #   end
-  #   it_should_generate_from({ :maier => nil, :meier => nil }, :MR => [:maier])
-  #   it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :SSN => [:susan], :BRTRR => [:bruderer])
-  # end
-  #
-  # describe 'hashify' do
-  #   it 'should turn an empty list into an empty hash' do
-  #     @similarity.send(:hashify, []).should == {}
-  #   end
-  #   it 'should turn the list into an unordered similarity' do
-  #     @similarity.send(:hashify, [:meier, :maier]).should == { :MR => [:meier, :maier] }
-  #   end
-  #   it 'should turn the list into a encoded hash' do
-  #     @similarity.send(:hashify, [:meier, :maier, :peter]).should == { :MR => [:meier, :maier], :PTR => [:peter] }
-  #   end
-  # end
-  #
-  # context 'integration' do
-  #   it 'should return the right ordered array' do
-  #     index = @similarity.generate_from :meier => nil, :maier => nil, :mairai => nil, :mair => nil, :meira => nil
-  #     code  = @similarity.encoded :maier
-  #
-  #     index[code].should == [:mair, :maier, :meier, :meira, :mairai]
-  #   end
-  # end
-
 end

data/spec/lib/generators/similarity/soundex_spec.rb

@@ -20,48 +20,8 @@ describe Picky::Generators::Similarity::Soundex do
     end
   end
 
-  # def self.it_should_generate_from index, expected
-  #   it "should generate #{expected.inspect} correctly from #{index.inspect}" do
-  #     @similarity.generate_from(index).should == expected
-  #   end
-  # end
-
   it_should_encode :meier,       :M600
   it_should_encode :grossberger, :G621
   it_should_encode :hadelbla,    :H341
 
-  # it_should_generate_from({}, {})
-  # it_should_generate_from({ :maier => nil, :meier => nil }, :M600 => [:maier, :meier]) # should be correctly ordered
-  # it_should_generate_from({ :maier => nil, :meier => nil, :hallaballa => nil }, :M600 => [:maier, :meier], :H414 => [:hallaballa])
-  # it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :S250 => [:susan, :susanne], :B636 => [:bruderer])
-
-  # describe 'with reduced amount' do
-  #   before(:each) do
-  #     @similarity = described_class.new(1)
-  #   end
-  #   it_should_generate_from({ :maier => nil, :meier => nil }, :M600 => [:maier])
-  #   it_should_generate_from({ :susan => nil, :susanne => nil, :bruderer => nil }, :S250 => [:susan], :B636 => [:bruderer])
-  # end
-
-  # describe 'hashify' do
-  #   it 'should turn an empty list into an empty hash' do
-  #     @similarity.send(:hashify, []).should == {}
-  #   end
-  #   it 'should turn the list into an unordered similarity' do
-  #     @similarity.send(:hashify, [:meier, :maier]).should == { :M600 => [:meier, :maier] }
-  #   end
-  #   it 'should turn the list into a encoded hash' do
-  #     @similarity.send(:hashify, [:meier, :maier, :peter]).should == { :M600 => [:meier, :maier], :P360 => [:peter] }
-  #   end
-  # end
-
-  # context 'integration' do
-  #   it 'should return the right ordered array' do
-  #     index = @similarity.generate_from :meier => nil, :maier => nil, :mairai => nil, :mair => nil, :meira => nil
-  #     code  = @similarity.encoded :maier
-  #
-  #     index[code].should == [:mair, :maier, :meier, :meira, :mairai]
-  #   end
-  # end
-
 end

data/spec/lib/generators/similarity_spec.rb

@@ -28,8 +28,8 @@ describe Picky::Generators::Similarity do
         expect {
           similarity.from Object.new
         }.to raise_error(<<-ERROR)
-similarity options should be either
-* for example a Similarity::Phonetic.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
+Similarity options should be either
+* for example a Similarity::Soundex.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
 or
 * an object that responds to #encode(text) => encoded_text and #prioritize(array_of_encoded, encoded)
 ERROR
@@ -38,8 +38,8 @@ ERROR
         expect {
           similarity.from Object.new, 'some_index'
         }.to raise_error(<<-ERROR)
-similarity options for some_index should be either
-* for example a Similarity::Phonetic.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
+Similarity options for some_index should be either
+* for example a Similarity::Soundex.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
 or
 * an object that responds to #encode(text) => encoded_text and #prioritize(array_of_encoded, encoded)
 ERROR
@@ -48,8 +48,8 @@ ERROR
         expect {
           similarity.from Object.new, 'some_index', 'some_category'
         }.to raise_error(<<-ERROR)
-similarity options for some_index:some_category should be either
-* for example a Similarity::Phonetic.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
+Similarity options for some_index:some_category should be either
+* for example a Similarity::Soundex.new(n), Similarity::Metaphone.new(n), Similarity::DoubleMetaphone.new(n) etc.
 or
 * an object that responds to #encode(text) => encoded_text and #prioritize(array_of_encoded, encoded)
 ERROR

data/spec/lib/results_spec.rb

@@ -2,34 +2,23 @@ require 'spec_helper'
 
 describe Picky::Results do
 
-  describe "from" do
-    before(:each) do
-      @results = double :results
-      described_class.stub :new => @results
-
-      @results.stub :prepare!
-    end
-    it "should generate a result" do
-      described_class.from("some query", 20, 0, @allocations).should == @results
-    end
-  end
-
   describe "ids" do
     before(:each) do
       @allocations = double :allocations
-      @results = described_class.new :unimportant, :amount, :unimportant, @allocations
+      @results = described_class.new :unimportant, :amount, :offset, @allocations
     end
     it "forwards" do
+      @allocations.should_receive(:process!).once.with :amount, :offset, 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(:ids).once.with :amount
 
       @results.ids
     end
-    
   end
 
   describe 'to_s time format' do
@@ -54,12 +43,12 @@ describe Picky::Results do
     context 'with results' do
       before(:each) do
         @allocations = double :allocations,
-                            :process! => nil,
-                            :size => 12
+                              :process! => nil,
+                              :size => 12
 
         @results = described_class.new "some_query", 20, 1234, @allocations
         @results.stub :duration => 0.1234567890,
-                       :total    => 12345678
+                      :total    => 12345678
       end
       it 'should output a specific log' do
         @results.to_s.should == '>|2011-08-16 10:07:33|0.123457|some_query                                        |12345678|1234|12|'
@@ -94,7 +83,8 @@ describe Picky::Results do
 
   describe "accessors" do
     before(:each) do
-      @results = described_class.new :query, :amount, :offset, :allocations
+      @allocations = double :allocations, :process! => :allocations
+      @results = described_class.new :query, :amount, :offset, @allocations
     end
     it "should have accessors for query" do
       @results.query.should == :query
@@ -106,7 +96,7 @@ describe Picky::Results do
       @results.offset.should == :offset
     end
     it "should have accessors for allocations" do
-      @results.allocations.should == :allocations
+      @results.allocations.should == @allocations
     end
     it "should have accessors for duration" do
       @results.duration = :some_duration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.21.2
+  version: 4.22.0
 platform: ruby
 authors:
 - Florian Hanke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -259,6 +259,8 @@ files:
 - spec/functional/regression_spec.rb
 - spec/functional/reloading_spec.rb
 - spec/functional/remap_qualifiers_spec.rb
+- spec/functional/results_spec.rb
+- spec/functional/similarity_spec.rb
 - spec/functional/sorting_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb
@@ -438,6 +440,8 @@ test_files:
 - spec/functional/regression_spec.rb
 - spec/functional/reloading_spec.rb
 - spec/functional/remap_qualifiers_spec.rb
+- spec/functional/results_spec.rb
+- spec/functional/similarity_spec.rb
 - spec/functional/sorting_spec.rb
 - spec/functional/speed_spec.rb
 - spec/functional/static_spec.rb