picky 4.10.0 → 4.11.0

data/spec/functional/facets_spec.rb

@@ -89,7 +89,7 @@ describe 'facets' do
       index = Picky::Index.new :facets do
         category :name
         category :surname
-        category :age_category
+        category :age_category, :qualifier => :age
       end
 
       thing = Struct.new :id, :name, :surname, :age_category
@@ -139,29 +139,27 @@ describe 'facets' do
       it 'is fast enough' do
         performance_of {
           10.times { finder.facets(:age_category, filter: 'surname:meier name:peter') }
-        }.should < 0.004
+        }.should < 0.0032
       end
       it 'has one filtered facet' do
-        # TODO Fix problems with alternative qualifiers (like :age).
-        #
         finder.facets(:age_category, filter: 'surname:meier name:peter').should == {
           '45' => 1
         }
       end
       it 'has two filtered facets' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter').should == {
+        finder.facets(:surname, filter: 'age:40 name:peter').should == {
           'kunz' => 1,
           'hanke' => 1 # Not 2 since it is filtered.
         }
       end
       it 'has 2 facets >= count 1' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter', at_least: 1).should == {
+        finder.facets(:surname, filter: 'age:40 name:peter', at_least: 1).should == {
           'kunz' => 1,
           'hanke' => 1
         }
       end
       it 'has 0 facets >= counts 2' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter', at_least: 2).should == {}
+        finder.facets(:surname, filter: 'age:40 name:peter', at_least: 2).should == {}
       end
     end
     
@@ -169,27 +167,25 @@ describe 'facets' do
       it 'is fast enough' do
         performance_of {
           10.times { finder.facets(:age_category, filter: 'surname:meier name:peter', counts: false) }
-        }.should < 0.004
+        }.should < 0.003
       end
       it 'has one filtered facet' do
-        # TODO Fix problems with alternative qualifiers (like :age).
-        #
         finder.facets(:age_category, filter: 'surname:meier name:peter', counts: false).should == ['45']
       end
       it 'has two filtered facets' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter', counts: false).should == [
+        finder.facets(:surname, filter: 'age:40 name:peter', counts: false).should == [
           'kunz',
           'hanke'
         ]
       end
       it 'has 2 facets >= count 1' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter', at_least: 1, counts: false).should == [
+        finder.facets(:surname, filter: 'age:40 name:peter', at_least: 1, counts: false).should == [
           'kunz',
           'hanke'
         ]
       end
       it 'has 0 facets >= counts 2' do
-        finder.facets(:surname, filter: 'age_category:40 name:peter', at_least: 2, counts: false).should == []
+        finder.facets(:surname, filter: 'age:40 name:peter', at_least: 2, counts: false).should == []
       end
     end
     

data/spec/functional/multi_index_qualifier_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe 'Multi Index Qualifiers' do
+  
+  it 'resolves the same qualifier to different categories on each index' do
+    people = Picky::Index.new :people do
+      category :title
+      category :name, qualifiers: [:name, :last_name]
+    end
+    books = Picky::Index.new :books do
+      category :title, qualifiers: [:title, :name]
+      category :subtitle
+    end
+
+    person = Struct.new :id, :title, :name
+    book   = Struct.new :id, :title, :subtitle
+
+    people.add person.new(1, 'mister', 'pedro maria alhambra madrugada')
+    
+    books.add book.new(2, 'the mister madrugada affair', 'the story of seventeen madrugada family members')
+
+    try = Picky::Search.new people, books
+    
+    try.search('title:mister').ids.should == [1, 2]
+    try.search('name:madrugada').ids.should == [1, 2]
+  end
+  
+end

data/spec/functional/only_spec.rb

@@ -17,46 +17,48 @@ describe 'Search#only' do
     try.search('text1').ids.should == [1]
     try.search('text2').ids.should == [1]
     try.search('text3').ids.should == [1]
+    
+    expect do
+      try_again = Picky::Search.new index do
+        only :category1
+      end
+      try_again.search('text1').ids.should == [1]
+      try_again.search('text2').ids.should == []
+      try_again.search('text3').ids.should == []
 
-    try_again = Picky::Search.new index do
-      only :category1
-    end
-    try_again.search('text1').ids.should == [1]
-    try_again.search('text2').ids.should == []
-    try_again.search('text3').ids.should == []
-
-    try_again.only :category2, :category3
+      try_again.only :category2, :category3
     
-    try_again.search('text1').ids.should == []
-    try_again.search('text2').ids.should == [1]
-    try_again.search('text3').ids.should == [1]
+      try_again.search('text1').ids.should == []
+      try_again.search('text2').ids.should == [1]
+      try_again.search('text3').ids.should == [1]
     
-    try_again.search('category1:text1').ids.should == []
-    try_again.search('category1:text2').ids.should == []
-    try_again.search('category1:text3').ids.should == []
+      try_again.search('category1:text1').ids.should == []
+      try_again.search('category1:text2').ids.should == []
+      try_again.search('category1:text3').ids.should == []
     
-    try_again.search('category2:text1').ids.should == []
-    try_again.search('category2:text2').ids.should == [1]
-    try_again.search('category2:text3').ids.should == []
+      try_again.search('category2:text1').ids.should == []
+      try_again.search('category2:text2').ids.should == [1]
+      try_again.search('category2:text3').ids.should == []
     
-    try_again.search('category3:text1').ids.should == []
-    try_again.search('category3:text2').ids.should == []
-    try_again.search('category3:text3').ids.should == [1]
+      try_again.search('category3:text1').ids.should == []
+      try_again.search('category3:text2').ids.should == []
+      try_again.search('category3:text3').ids.should == [1]
     
-    try_again.search('category1,category2:text1').ids.should == []
-    try_again.search('category1,category2:text2').ids.should == [1]
-    try_again.search('category1,category2:text3').ids.should == []
+      try_again.search('category1,category2:text1').ids.should == []
+      try_again.search('category1,category2:text2').ids.should == [1]
+      try_again.search('category1,category2:text3').ids.should == []
     
-    try_again.search('category1,category3:text1').ids.should == []
-    try_again.search('category1,category3:text2').ids.should == []
-    try_again.search('category1,category3:text3').ids.should == [1]
+      try_again.search('category1,category3:text1').ids.should == []
+      try_again.search('category1,category3:text2').ids.should == []
+      try_again.search('category1,category3:text3').ids.should == [1]
     
-    try_again.search('category2,category3:text1').ids.should == []
-    try_again.search('category2,category3:text2').ids.should == [1]
-    try_again.search('category2,category3:text3').ids.should == [1]
+      try_again.search('category2,category3:text1').ids.should == []
+      try_again.search('category2,category3:text2').ids.should == [1]
+      try_again.search('category2,category3:text3').ids.should == [1]
     
-    try_again.search('category1,category2,category3:text1').ids.should == []
-    try_again.search('category1,category2,category3:text2').ids.should == [1]
-    try_again.search('category1,category2,category3:text3').ids.should == [1]
+      try_again.search('category1,category2,category3:text1').ids.should == []
+      try_again.search('category1,category2,category3:text2').ids.should == [1]
+      try_again.search('category1,category2,category3:text3').ids.should == [1]
+    end.to raise_error
   end
 end

data/spec/functional/pool_spec.rb

@@ -0,0 +1,82 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+require 'ostruct'
+
+describe 'GC stats: searching' do
+
+  PoolSpecThing = Struct.new :id, :first, :last, :other
+  
+  before(:each) do
+    Picky::Indexes.clear_indexes
+  end
+  
+  let(:amount) { 5_000 }
+  let(:data) do
+    index = Picky::Index.new :sorted do
+      category :first
+      category :last
+      category :other
+    end
+    3.times do |i|
+      index.add PoolSpecThing.new(i+1, 'Abracadabra', 'Mirgel',  'whatever it')
+      index.add PoolSpecThing.new(i+2, 'Abraham',     'Minder',  'is not too')
+      index.add PoolSpecThing.new(i+3, 'Azzie',       'Mueller', 'unimportant')
+    end
+    index
+  end
+  let(:search) { Picky::Search.new data }
+
+  # TODO Study what the problem is.
+  #
+  context 'without pool' do
+    it 'runs the GC more' do
+      # Quickly check if the pool is removed.
+      #
+      fail 'object pool still installed' if Picky::Query::Token.respond_to? :release_all
+      
+      try = search
+      query = 'abracadabra mirgel'
+      gc_runs_of do
+        amount.times { try.search query }
+      end.should <= 13
+    end
+    it 'is less (?) performant' do
+      try = search
+      query = 'abracadabra mirgel'
+      performance_of do
+        amount.times { try.search query }
+      end.should <= 0.42
+    end
+  end
+  context 'with pool' do
+    before(:each) do
+      Picky::Pool.install
+    end
+    after(:each) do
+      # Reload since installing the Pool taints the classes.
+      #
+      Picky::Loader.load_framework
+    end
+    it 'runs the GC less' do
+      # Quickly check that the pool is added.
+      #
+      fail 'object pool not installed' unless Picky::Query::Token.respond_to? :release_all
+      
+      try = search
+      query = 'abracadabra mirgel'
+      gc_runs_of do
+        amount.times { try.search query; Picky::Pool.release_all }
+      end.should <= 1 # Definitely less GC runs.
+    end
+    it 'is more (?) performant' do
+      try = search
+      query = 'abracadabra mirgel'
+      performance_of do
+        amount.times { try.search query }
+      end.should <= 0.42
+    end
+  end
+  
+end

data/spec/functional/remap_qualifiers_spec.rb

@@ -28,15 +28,7 @@ describe 'qualifier remapping' do
     #
     try.search('b').ids.should == [2]
     
-    # But not with qualifier!
-    #
-    try.search('b:b').ids.should == []
-    
-    # So remap the qualifiers.
-    #
-    try.remap_qualifiers
-    
-    # Now it works!
+    # It already also finds it with a qualifier!
     #
     try.search('b:b').ids.should == [2]
   end

data/spec/lib/categories_indexed_spec.rb

@@ -83,7 +83,7 @@ describe Picky::Categories do
       end
       context "with similar token" do
         before(:each) do
-          @token.stub :similar? => true
+          @token.stub :similar? => true, :categorize => nil
         end
         it "calls the right method" do
           @categories.should_receive(:similar_possible_for).once.with @token
@@ -93,7 +93,7 @@ describe Picky::Categories do
       end
       context "with non-similar token" do
         before(:each) do
-          @token.stub :similar? => false
+          @token.stub :similar? => false, :categorize => nil
         end
         it "calls the right method" do
           @categories.should_receive(:possible_for).once.with @token

data/spec/lib/extensions/array_spec.rb

@@ -8,24 +8,6 @@ describe Array do
     end
   end
   
-  describe "clustered_uniq_fast" do
-    it "should generate a new array" do
-      ary = [:test1, :test2, :test1]
-      ary.clustered_uniq_fast.object_id.should_not == ary.object_id
-    end
-    it "should not change clusteredly unique arrays" do
-      [:test1, :test2, :test1].clustered_uniq_fast.should == [:test1, :test2, :test1]
-    end
-    it "should not skip interspersed elements" do
-      [:test1, :test1, :test2, :test1].clustered_uniq_fast.should == [:test1, :test2, :test1]
-    end
-    it "should work like uniq if no interspersed elements exist" do
-      [:test1, :test1, :test2, :test2, :test3].clustered_uniq_fast.should == [:test1, :test2, :test3]
-    end
-    it "is fast" do
-      performance_of { [:test1, :test1, :test2, :test2, :test3].clustered_uniq_fast }.should < 0.00001
-    end
-  end
   describe "clustered_uniq" do
     it "should generate a new array" do
       ary = [:test1, :test2, :test1]
@@ -41,8 +23,26 @@ describe Array do
       [:test1, :test1, :test2, :test2, :test3].clustered_uniq.should == [:test1, :test2, :test3]
     end
     it "is fast" do
-      performance_of { [:test1, :test1, :test2, :test2, :test3].clustered_uniq }.should < 0.000012
+      performance_of { [:test1, :test1, :test2, :test2, :test3].clustered_uniq }.should < 0.00001
     end
   end
+  # describe "clustered_uniq" do
+  #   it "should generate a new array" do
+  #     ary = [:test1, :test2, :test1]
+  #     ary.clustered_uniq.object_id.should_not == ary.object_id
+  #   end
+  #   it "should not change clusteredly unique arrays" do
+  #     [:test1, :test2, :test1].clustered_uniq.should == [:test1, :test2, :test1]
+  #   end
+  #   it "should not skip interspersed elements" do
+  #     [:test1, :test1, :test2, :test1].clustered_uniq.should == [:test1, :test2, :test1]
+  #   end
+  #   it "should work like uniq if no interspersed elements exist" do
+  #     [:test1, :test1, :test2, :test2, :test3].clustered_uniq.should == [:test1, :test2, :test3]
+  #   end
+  #   it "is fast" do
+  #     performance_of { [:test1, :test1, :test2, :test2, :test3].clustered_uniq }.should < 0.000012
+  #   end
+  # end
 
 end

data/spec/lib/extensions/object_spec.rb

@@ -1,19 +1,12 @@
 require 'spec_helper'
 
+require 'time'
+
 describe Object do
 
   context 'basic object' do
     let(:object) { described_class.new }
 
-    # describe "exclaim" do
-    #   it "delegates to puts" do
-    #     STDOUT.should_receive(:puts).once.with :bla
-    #     STDOUT.should_receive(:flush).once.with
-    #
-    #     object.exclaim :bla
-    #   end
-    # end
-
     describe "timed_exclaim" do
       it "should exclaim right" do
         Time.stub! :now => Time.parse('07-03-1977 12:34:56')
@@ -25,8 +18,18 @@ describe Object do
 
     describe 'warn_gem_missing' do
       it 'should warn right' do
-        object.should_receive(:warn).once.with "gnorf gem missing!\nTo use gnarble gnarf, you need to:\n  1. Add the following line to Gemfile:\n     gem 'gnorf'\n  2. Then, run:\n     bundle update\n"
-
+        Picky.logger.should_receive(:warn).once.with <<-EXPECTED
+Warning: gnorf gem missing!
+To use gnarble gnarf, you need to:
+  1. Add the following line to Gemfile:
+     gem 'gnorf'
+     or
+     require 'gnorf'
+     for example at the top of your app.rb file.
+  2. Then, run:
+     bundle update
+EXPECTED
+        
         object.warn_gem_missing 'gnorf', 'gnarble gnarf'
       end
     end

data/spec/lib/extensions/symbol_spec.rb

@@ -13,7 +13,7 @@ describe Symbol do
       performance_of { @token.each_subtoken { |subtoken| } }.should < 0.00065
     end
     it 'is fast enough' do
-      performance_of { @token.each_intoken { |intoken| } }.should < 0.035 # THINK Is this too slow?
+      performance_of { @token.each_intoken { |intoken| } }.should < 0.0375
     end
   end
 

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

@@ -2,20 +2,27 @@
 #
 require 'spec_helper'
 
-describe Picky::Generators::Similarity::Phonetic do
+require 'text'
 
-  it 'raises if you try to use Phonetic directly' do
-    expect {
-      described_class.new
-    }.to raise_error("In Picky 2.0+, the Similarity::Phonetic has been renamed to Similarity::DoubleMetaphone. Please use that one. Thanks!")
-  end
+describe Picky::Generators::Similarity::Phonetic do
 
   it "raises when you don't have the text gem" do
     instance = Class.new(described_class).allocate
 
     instance.should_receive(:require).any_number_of_times.and_raise LoadError
+    
+    Picky.logger.should_receive(:warn).once.with <<-EXPECTED
+Warning: text gem missing!
+To use a phonetic Similarity, you need to:
+  1. Add the following line to Gemfile:
+     gem 'text'
+     or
+     require 'text'
+     for example at the top of your app.rb file.
+  2. Then, run:
+     bundle update
+EXPECTED
 
-    instance.should_receive(:warn).once.with "text gem missing!\nTo use a phonetic Similarity, you need to:\n  1. Add the following line to Gemfile:\n     gem 'text'\n  2. Then, run:\n     bundle update\n"
     instance.should_receive(:exit).once.with 1
 
     instance.send :initialize

data/spec/lib/picky_spec.rb

@@ -5,7 +5,7 @@ describe Picky do
   it 'sets the right internal encoding' do
     Encoding.default_external.should == Encoding::UTF_8
   end
-  # TODO Set default external encoding.
+  # THINK What to set default external encoding to?
   #
   # it 'sets the right external encoding' do
   #   Encoding.default_internal.should == Encoding::UTF_8

data/spec/lib/pool_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Picky::Pool do
   
-  let(:pool) do
+  let(:pool_klass) do
     Class.new do
       extend Picky::Pool
     
@@ -30,50 +30,50 @@ describe Picky::Pool do
   context 'functional' do
     before(:each) do
       described_class.clear
-      pool.clear
+      pool_klass.clear
       other.clear
     end
     it 'lets me get an instance' do
-      pool.new(1).should be_kind_of(pool)
+      pool_klass.new(1).should be_kind_of(pool_klass)
     end
     it 'does not create a new reference if it has free ones' do
-      p1 = pool.new 1
-      p2 = pool.new 2
+      p1 = pool_klass.new 1
+      p2 = pool_klass.new 2
       p1.release
       
-      pool.free_size.should == 1
+      pool_klass.free_size.should == 1
     end
     it 'gives me the released reference if I try to new' do
-      p1 = pool.new 1
-      p2 = pool.new 2
+      p1 = pool_klass.new 1
+      p2 = pool_klass.new 2
       p1.release
       
-      pool.new(3).number.should == 3
+      pool_klass.new(3).number.should == 3
     end
     it 'releases all PoolTests if called on PoolTest' do
-      p1 = pool.new 1
-      pool.new 2
+      p1 = pool_klass.new 1
+      pool_klass.new 2
       other.new 1
       other.new 2
       
       other.free_size.should == 0 
       
-      pool.release_all
+      pool_klass.release_all
       
-      pool.new(3).should == p1
+      pool_klass.new(3).should == p1
       other.free_size.should == 0
     end
     it 'releases all if called on Pool' do
-      pool.new 1
-      pool.new 2
+      pool_klass.new 1
+      pool_klass.new 2
       other.new 1
       other.new 2
       
-      pool.free_size.should == 0
+      pool_klass.free_size.should == 0
       
       described_class.release_all
       
-      pool.free_size.should == 2
+      pool_klass.free_size.should == 2
     end
   end
   

data/spec/lib/{query/qualifier_category_mapper_spec.rb → qualifier_mapper_spec.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Picky::Query::QualifierCategoryMapper do
+describe Picky::QualifierMapper do
   
-  let(:index) do
-    categories = Picky::Index.new :categories
-    @category1 = categories.category :category1, :qualifiers => ['t1', 'tt1', 'ttt1']
-    @category2 = categories.category :category2, :qualifiers => [:t2, :tt2, :ttt2]
-    @category3 = categories.category :category3, :qualifiers => [:t3, :tt3, :ttt3]
+  let(:categories) do
+    index      = Picky::Index.new :test
+    categories = Picky::Categories.new
+    @category1 = categories << Picky::Category.new(:category1, index, :qualifiers => ['t1', 'tt1', 'ttt1'])
+    @category2 = categories << Picky::Category.new(:category2, index, :qualifiers => [:t2, :tt2, :ttt2])
+    @category3 = categories << Picky::Category.new(:category3, index, :qualifiers => [:t3, :tt3, :ttt3])
     categories
   end
-  let(:indexes) { [index] }
-  let(:mapper) { described_class.new indexes }
+  let(:mapper) { described_class.new categories }
   
   def self.it_should_map(qualifier, expected)
     it "should map #{qualifier} to #{expected}" do

data/spec/lib/query/token_spec.rb

@@ -14,17 +14,20 @@ describe Picky::Query::Token do
   
   describe 'categorize' do
     let(:mapper) do
-      categories = Picky::Index.new :categories
-      @category1 = categories.category :category1
-      @category2 = categories.category :category2
-      @category3 = categories.category :category3
-      Picky::Query::QualifierCategoryMapper.new [categories]
+      # TODO Can we remove the index?
+      #
+      index      = Picky::Index.new :mapper
+      categories = Picky::Categories.new
+      @category1 = categories << Picky::Category.new(:category1, index)
+      @category2 = categories << Picky::Category.new(:category2, index)
+      @category3 = categories << Picky::Category.new(:category3, index)
+      Picky::QualifierMapper.new categories
     end
     context 'with qualifiers' do
       let(:token) { described_class.processed 'category1:qualifier', 'category1:Qualifier' }
       context 'unrestricted' do
         it 'categorizes correctly' do
-          token.categorize(mapper).should == [@category1]
+          token.predefined_categories(mapper).should == [@category1]
         end
       end
       context 'restricted' do
@@ -32,7 +35,7 @@ describe Picky::Query::Token do
           mapper.restrict_to :category1
         end
         it 'categorizes correctly' do
-          token.categorize(mapper).should == [@category1]
+          token.predefined_categories(mapper).should == [@category1]
         end
       end
       context 'restricted' do
@@ -40,7 +43,7 @@ describe Picky::Query::Token do
           mapper.restrict_to :category2, :category3
         end
         it 'categorizes correctly' do
-          token.categorize(mapper).should == []
+          token.predefined_categories(mapper).should == []
         end
       end
     end
@@ -48,7 +51,7 @@ describe Picky::Query::Token do
       let(:token) { described_class.processed 'noqualifier', 'NoQualifier' }
       context 'unrestricted' do
         it 'categorizes correctly' do
-          token.categorize(mapper).should == nil
+          token.predefined_categories(mapper).should == nil
         end
       end
       context 'restricted' do
@@ -56,7 +59,7 @@ describe Picky::Query::Token do
           mapper.restrict_to :category1
         end
         it 'categorizes correctly' do
-          token.categorize(mapper).should == [@category1]
+          token.predefined_categories(mapper).should == [@category1]
         end
       end
       context 'restricted' do
@@ -64,7 +67,7 @@ describe Picky::Query::Token do
           mapper.restrict_to :category2, :category3
         end
         it 'categorizes correctly' do
-          token.categorize(mapper).should == [@category2, @category3]
+          token.predefined_categories(mapper).should == [@category2, @category3]
         end
       end
     end
@@ -94,7 +97,9 @@ describe Picky::Query::Token do
         token.similar_tokens_for(@category).map(&:original).should == ['array', 'of', 'similar']
       end
       it 'returns a list of tokens with the right categorization' do
-        token.similar_tokens_for(@category).map(&:predefined_categories).should == [[@category], [@category], [@category]]
+        token.similar_tokens_for(@category).map do |token|
+          token.predefined_categories nil # TODO Clean this up.
+        end.should == [[@category], [@category], [@category]]
       end
     end
     context 'without similar' do

data/spec/lib/rack/harakiri_spec.rb

@@ -1,6 +1,11 @@
 # encoding: utf-8
 require 'spec_helper'
 
+# If you want to use Rack::Harakiri, you
+# need to explicitly require it.
+#
+require 'picky/rack/harakiri'
+
 describe Rack::Harakiri do
   before(:each) do
     @app = stub :app