picky 4.5.3 → 4.5.4

data/lib/picky/query/allocation.rb

@@ -23,23 +23,16 @@ module Picky
       def initialize index, combinations
         @combinations = combinations
 
-        # Could this be rewritten?
+        # TODO Could this be rewritten?
         #
         @result_identifier = index.result_identifier
         @backend           = index.backend
       end
 
-      def hash
-        @combinations.hash
-      end
-      # def eql? other
-      #   self.class == other.class && combinations.eql?(other.combinations)
-      # end
-
       # Asks the backend for the total score and
       # adds the boosts to it.
       #
-      # THINK Can the combinations be empty?
+      # TODO THINK Can the combinations be empty?
       #
       def calculate_score weights
         @score ||= if @combinations.empty?
@@ -52,7 +45,7 @@ module Picky
 
       # Asks the backend for the (intersected) ids.
       #
-      # THINK Can the combinations be empty?
+      # TODO THINK Can the combinations be empty?
       #
       def calculate_ids amount, offset
         return [] if @combinations.empty?

data/lib/picky/query/allocations.rb

@@ -138,7 +138,7 @@ module Picky
         end
       end
 
-      def uniq
+      def uniq!
         @allocations.uniq!
       end
 
@@ -154,7 +154,7 @@ module Picky
       # ]
       #
       def to_result
-        @allocations.map(&:to_result).compact
+        @allocations.map { |allocation| allocation.to_result }.compact
       end
 
       # Simply inspects the internal allocations.

data/lib/picky/query/boosts.rb

@@ -61,7 +61,7 @@ module Picky
       # Note: Maybe make combinations comparable to Symbols?
       #
       def boost_for combinations
-        boost_for_categories combinations.map(&:category_name)
+        boost_for_categories combinations.map { |combination| combination.category_name }
       end
 
       # A Weights instance is == to another if

data/lib/picky/query/combination.rb

@@ -51,14 +51,6 @@ module Picky
         @identifier ||= "#{bundle.identifier}:inverted:#{token.text}"
       end
 
-      # Note: Required for uniq!
-      #
-      # THINK Ok with category or is the bundle needed?
-      #
-      def hash
-        [token, category].hash
-      end
-
       # Combines the category names with the original names.
       # [
       #  [:title,    'Flarbl', :flarbl],

data/lib/picky/query/combinations.rb

@@ -22,12 +22,12 @@ module Picky
         @combinations = combinations
       end
 
-      def hash
-        @combinations.hash
-      end
-
+      # Sums up the weights of the combinations.
+      #
+      # Note: Optimized sum(&:weight) away – ~3% improvement.
+      #
       def score
-        @combinations.sum &:weight
+        @combinations.inject(0) { |total, combination| total + combination.weight }
       end
       def boost_for weights
         weights.boost_for @combinations

data/lib/picky/query/indexes.rb

@@ -62,9 +62,11 @@ module Picky
       def prepared_allocations_for tokens, weights = {}, amount = nil
         allocations = allocations_for tokens
 
-        # Remove double allocations.
+        # Removed: Remove potential double allocations.
         #
-        allocations.uniq
+        # Note: allocations are unique by definition.
+        #
+        # allocations.uniq! unless tokens.uniq?
 
         # Score the allocations using weights as bias.
         #

data/lib/picky/query/token.rb

@@ -15,6 +15,8 @@ module Picky
       attr_writer :similar
       attr_accessor :user_defined_categories
 
+      # TODO Do not check on blank, but empty?
+      #
       delegate :blank?,
                :to => :text
 

data/spec/functional/allocations_uniq_by_definition_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+# This spec exists to prove that it is unnecessary
+# to call allocations.uniq! when putting together results.
+#
+describe 'uniqueness of allocations' do
+
+  it 'is already uniq' do
+    index = Picky::Index.new :already_uniq do
+      category :category1
+      category :category2
+      category :category3
+    end
+
+    thing = Struct.new(:id, :category1, :category2, :category3)
+    index.add thing.new(1, 'text1', 'text2', 'text3')
+    
+    try = Picky::Search.new index do
+      max_allocations 100
+    end
+    
+    # Picky finds three categories.
+    #
+    try.search('text*').ids.should == [1,1,1]
+    
+    # Picky finds 9 possible allocations.
+    #
+    try.search('text* text*').ids.should == [1,1,1]*3
+    
+    # Picky finds 27 possible allocations.
+    #
+    try.search('text* text* text*', 100).ids.should == [1,1,1]*3*3
+  end
+end

data/spec/lib/query/allocation_spec.rb

@@ -9,13 +9,13 @@ describe Picky::Query::Allocation do
     @allocation   = described_class.new @index, @combinations
   end
 
-  describe "hash" do
-    it "delegates to the combinations" do
-      @combinations.should_receive(:hash).once.with
-
-      @allocation.hash
-    end
-  end
+  # describe "hash" do
+  #   it "delegates to the combinations" do
+  #     @combinations.should_receive(:hash).once.with
+  # 
+  #     @allocation.hash
+  #   end
+  # end
 
   describe "to_s" do
     before(:each) do

data/spec/lib/query/combination_spec.rb

@@ -23,23 +23,23 @@ describe Picky::Query::Combination do
     end
   end
 
-  describe 'hash' do
-    it 'should hash the token and the bundle' do
-      @combination.hash.should == [@token, @category].hash
-    end
-    it 'should distinguish two combinations sufficiently' do
-      category1 = stub :category,
-                       :identifier => 'some_category_identifier1'
-
-      category2 = stub :category,
-                       :identifier => 'some_category_identifier2'
-
-      combination1 = described_class.new @token, category1
-      combination2 = described_class.new @token, category2
-
-      combination1.hash.should_not == combination2.hash
-    end
-  end
+  # describe 'hash' do
+  #   it 'should hash the token and the bundle' do
+  #     @combination.hash.should == [@token, @category].hash
+  #   end
+  #   it 'should distinguish two combinations sufficiently' do
+  #     category1 = stub :category,
+  #                      :identifier => 'some_category_identifier1'
+  # 
+  #     category2 = stub :category,
+  #                      :identifier => 'some_category_identifier2'
+  # 
+  #     combination1 = described_class.new @token, category1
+  #     combination2 = described_class.new @token, category2
+  # 
+  #     combination1.hash.should_not == combination2.hash
+  #   end
+  # end
 
   describe 'to_result' do
     context 'functional with qualifier' do

data/spec/lib/query/combinations_spec.rb

@@ -47,13 +47,13 @@ describe Picky::Query::Combinations do
     end
   end
 
-  describe 'hash' do
-    it "delegates to the combinations array" do
-      @combinations_ary.should_receive(:hash).once.with
-
-      @combinations.hash
-    end
-  end
+  # describe 'hash' do
+  #   it "delegates to the combinations array" do
+  #     @combinations_ary.should_receive(:hash).once.with
+  # 
+  #     @combinations.hash
+  #   end
+  # end
 
   describe 'remove' do
     before(:each) do

data/spec/lib/query/indexes_spec.rb

@@ -91,14 +91,14 @@ describe Picky::Query::Indexes do
       indexes.stub! :allocations_for => @allocations
     end
     it 'calls the right method in order' do
-      @allocations.should_receive(:uniq).once.ordered.with()
+      # @allocations.should_receive(:uniq!).once.ordered.with()
       @allocations.should_receive(:calculate_score).once.ordered.with(:some_weights)
       @allocations.should_receive(:sort!).once.ordered.with()
 
       indexes.prepared_allocations_for :some_tokens, :some_weights
     end
     it 'calls the right method in order' do
-      @allocations.should_receive(:uniq).once.ordered.with()
+      # @allocations.should_receive(:uniq!).once.ordered.with()
       @allocations.should_receive(:calculate_score).once.ordered.with({})
       @allocations.should_receive(:sort!).once.ordered.with()
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.5.3
+  version: 4.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70121139908960 !ruby/object:Gem::Requirement
+  requirement: &70333809340140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70121139908960
+  version_requirements: *70333809340140
 - !ruby/object:Gem::Dependency
   name: picky-client
-  requirement: &70121139908300 !ruby/object:Gem::Requirement
+  requirement: &70333809339480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.3
+        version: 4.5.4
   type: :development
   prerelease: false
-  version_requirements: *70121139908300
+  version_requirements: *70333809339480
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70121139907780 !ruby/object:Gem::Requirement
+  requirement: &70333809338840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121139907780
+  version_requirements: *70333809338840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70121139907100 !ruby/object:Gem::Requirement
+  requirement: &70333809338380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121139907100
+  version_requirements: *70333809338380
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70121139906400 !ruby/object:Gem::Requirement
+  requirement: &70333809337880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121139906400
+  version_requirements: *70333809337880
 - !ruby/object:Gem::Dependency
   name: procrastinate
-  requirement: &70121139905880 !ruby/object:Gem::Requirement
+  requirement: &70333809353740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70121139905880
+  version_requirements: *70333809353740
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
-  requirement: &70121139905360 !ruby/object:Gem::Requirement
+  requirement: &70333809353360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70121139905360
+  version_requirements: *70333809353360
 description: Fast Ruby semantic text search engine with comfortable single field interface.
 email: florian.hanke+picky@gmail.com
 executables:
@@ -242,6 +242,7 @@ files:
 - spec/aux/picky/cli_spec.rb
 - spec/category_realtime_spec.rb
 - spec/ext/performant_spec.rb
+- spec/functional/allocations_uniq_by_definition_spec.rb
 - spec/functional/backends/file_spec.rb
 - spec/functional/backends/memory_bundle_realtime_spec.rb
 - spec/functional/backends/memory_json_utf8_spec.rb
@@ -396,6 +397,7 @@ test_files:
 - spec/aux/picky/cli_spec.rb
 - spec/category_realtime_spec.rb
 - spec/ext/performant_spec.rb
+- spec/functional/allocations_uniq_by_definition_spec.rb
 - spec/functional/backends/file_spec.rb
 - spec/functional/backends/memory_bundle_realtime_spec.rb
 - spec/functional/backends/memory_json_utf8_spec.rb