picky 4.12.5 → 4.12.6

data/lib/picky/query/combinations.rb

@@ -41,7 +41,9 @@ module Picky
       # ids that have an associated identifier that is nil.
       #
       def remove categories = []
-        @combinations.reject! { |combination| categories.include?(combination.category) }
+        # TODO Do not use the name, but the category. 
+        #
+        @combinations.reject! { |combination| categories.include?(combination.category.name) }
       end
 
       #

data/spec/functional/ignore_spec.rb

@@ -6,6 +6,38 @@ require 'spec_helper'
 #
 describe 'ignoring allocations/categories' do
 
+  it 'ignores categories/allocations correctly' do
+    index = Picky::Index.new :books do
+      category :author
+      category :title
+      category :text
+    end
+
+    thing = Struct.new :id, :author, :title, :text
+    index.add thing.new(1, 'peter', 'some title', 'some text')
+    index.add thing.new(2, 'some name', 'some title', 'some text')
+    
+    try = Picky::Search.new index do
+      ignore [:author, :text],
+             :text,
+             [:text, :text]
+    end
+    
+    # These categories/allocations are now removed.
+    #
+    try.search('some some').allocations.to_result.should == [
+      # [:books, 1.386, 2, [[:text, "some", "some"],   [:text, "some", "some"]],   [2, 1]],
+      [:books, 1.386, 2, [[:title, "some", "some"]],                             [2, 1]],
+      [:books, 1.386, 2, [                           [:title, "some", "some"]],  [2, 1]],
+      [:books, 1.386, 2, [[:title, "some", "some"],  [:title, "some", "some"]],  [2, 1]],
+      [:books, 0.693, 1, [[:title, "some", "some"],  [:author, "some", "some"]], [2]],
+      # [:books, 0.693, 1, [[:author, "some", "some"], [:text, "some", "some"]],   [2]],
+      [:books, 0.693, 1, [[:author, "some", "some"], [:title, "some", "some"]],  [2]],
+      [:books, 0.693, 1, [                           [:author, "some", "some"]], [2]],
+      [:books, 0.0,   1, [[:author, "some", "some"], [:author, "some", "some"]], [2]]
+    ]
+  end
+  
   it 'ignores allocations correctly' do
     index = Picky::Index.new :books do
       category :author
@@ -67,4 +99,35 @@ describe 'ignoring allocations/categories' do
       # [:books, 0.0,   1, [[:author, "some", "some"], [:author, "some", "some"]], [2]]
     ]
   end
+  
+  it 'performs far better' do
+    index = Picky::Index.new :books do
+      category :author
+      category :title
+      category :text
+    end
+
+    thing = Struct.new :id, :author, :title, :text
+    index.add thing.new(1, 'peter', 'some title', 'some text')
+    index.add thing.new(2, 'some name', 'some title', 'some text')
+    index.add thing.new(3, 'peter', 'some title', 'some text')
+    index.add thing.new(4, 'some name', 'some title', 'some text')
+    index.add thing.new(5, 'peter', 'some title', 'some text')
+    index.add thing.new(6, 'some name', 'some title', 'some text')
+    index.add thing.new(7, 'peter', 'some title', 'some text')
+    index.add thing.new(8, 'some name', 'some title', 'some text')
+    
+    try = Picky::Search.new index
+    
+    # Reasonably fast.
+    #
+    performance_of { try.search('some some') }.should < 0.0005
+    
+    try.only [:author, :text],
+             [:text, :text]
+    
+    # Much faster.
+    #
+    performance_of { try.search('some some') }.should < 0.000175
+  end
 end

data/spec/lib/query/combinations_spec.rb

@@ -57,9 +57,9 @@ describe Picky::Query::Combinations do
 
   describe 'remove' do
     before(:each) do
-      @combination1 = stub :combination1, :category => :other
-      @combination2 = stub :combination2, :category => :to_remove
-      @combination3 = stub :combination3, :category => :to_remove
+      @combination1 = stub :combination1, :category => stub(:other, :name => :other)
+      @combination2 = stub :combination2, :category => stub(:to_remove, :name => :to_remove)
+      @combination3 = stub :combination3, :category => stub(:to_remove, :name => :to_remove)
 
       @combinations = described_class.new [@combination1, @combination2, @combination3]
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.12.5
+  version: 4.12.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.5
+        version: 4.12.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.12.5
+        version: 4.12.6
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement