picky 4.0.0pre1 → 4.0.0pre2

data/spec/functional/realtime_spec.rb

@@ -219,7 +219,7 @@ describe "Realtime Indexing" do
 
         index.replace Book.new(1, "Title New", "Author New")
 
-        books.search('Nuw~').ids.should == [1, 1] # TODO FIXME Not really what I'd expect.
+        books.search('Nuw~').ids.should == [1]
       end
       it 'handles more complex cases' do
         books.search('Now~').ids.should == []
@@ -443,7 +443,7 @@ describe "Realtime Indexing" do
 
         index.replace Book.new("one", "Title New", "Author New")
 
-        books.search('Nuw~').ids.should == [:one, :one] # TODO FIXME Not really what I'd expect.
+        books.search('Nuw~').ids.should == [:one]
       end
       it 'handles more complex cases' do
         books.search('Now~').ids.should == []

data/spec/functional/speed_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 #
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 
 describe "Speccing Ruby for speed" do
   describe "various versions for allocation id concatenating – with symbols" do
@@ -91,5 +91,5 @@ describe "Speccing Ruby for speed" do
       end
     end
   end
-  
+
 end

data/spec/functional/terminate_early_spec.rb

@@ -172,7 +172,7 @@ describe 'Search#terminate_early' do
     fast = performance_of do
       try_fast.search 'hello hello'
     end
-    (slow/fast).should >= 1.4
+    (slow/fast).should >= 1.2
 
     try_slow = Picky::Search.new index
     slow = performance_of do
@@ -184,7 +184,7 @@ describe 'Search#terminate_early' do
     fast = performance_of do
       try_fast.search 'hello hello hello'
     end
-    (slow/fast).should >= 1.7
+    (slow/fast).should >= 1.4
 
     try_slow = Picky::Search.new index
     slow = performance_of do
@@ -196,7 +196,7 @@ describe 'Search#terminate_early' do
     fast = performance_of do
       try_fast.search 'hello hello hello hello'
     end
-    (slow/fast).should >= 2.0
+    (slow/fast).should >= 1.7
   end
 
 end

data/spec/lib/analytics_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # Not loaded by default.
 #
-require File.expand_path '../../../lib/picky/analytics', __FILE__
+require_relative '../../lib/picky/analytics'
 
 describe Picky::Analytics do
 

data/spec/lib/analyzer_spec.rb

@@ -2,10 +2,12 @@
 #
 require 'spec_helper'
 
+require_relative '../../lib/picky/analyzer'
+
 describe Analyzer do
-  
+
   let(:analyzer) { described_class.new }
-  
+
   context 'after initialize' do
     it 'sets the comments' do
       analyzer.comments.should == []
@@ -14,5 +16,5 @@ describe Analyzer do
       analyzer.analysis.should == {}
     end
   end
-  
+
 end

data/spec/lib/categories_indexed_spec.rb

@@ -1,26 +1,44 @@
 require 'spec_helper'
 
 describe Picky::Categories do
-  
+
   context "with real categories" do
     before(:each) do
       @index1 = Picky::Index.new :name
-      
+
+      @category1 = Picky::Category.new :category1, @index1
+      @category2 = Picky::Category.new :category2, @index1
+      @category3 = Picky::Category.new :category3, @index1
+
       @categories = described_class.new
-      @categories << Picky::Category.new(:category1, @index1)
-      @categories << Picky::Category.new(:category2, @index1)
-      @categories << Picky::Category.new(:category3, @index1)
+      @categories << @category1
+      @categories << @category2
+      @categories << @category3
     end
     describe "similar_possible_for" do
       before(:each) do
         @token = Picky::Query::Token.processed 'similar~', 'Similar~'
       end
-      it "returns possible categories" do
-        @categories.similar_possible_for(@token).should == []
+      context 'with nothing similar' do
+        it "returns possible categories" do
+          @categories.similar_possible_for(@token).should == []
+        end
+      end
+      context 'with some similar' do
+        before(:each) do
+          @bundle1 = stub :bundle1, :similar => ['similar', 'text'], :weight => 1, :identifier => ''
+          @category1.stub! :bundle_for => @bundle1
+        end
+        # it "returns possible categories" do
+        #   @categories.similar_possible_for(@token).should == [
+        #     Picky::Query::Combination.new(Picky::Query::Token.new('similar', 'similar', @category1), @category1),
+        #     Picky::Query::Combination.new(Picky::Query::Token.new('text', 'text', @category1), @category1)
+        #   ]
+        # end
       end
     end
   end
-  
+
   describe 'clear_categories' do
     before(:each) do
       @categories = described_class.new
@@ -31,34 +49,34 @@ describe Picky::Categories do
     end
     it "isn't clear anymore after adding" do
       @categories << stub(:category, :name => :some_name)
-      
+
       @categories.categories.should_not be_empty
       @categories.category_hash.should_not be_empty
     end
     it "is clear again after clearing" do
       @categories << stub(:category, :name => :some_name)
-      
+
       @categories.clear_categories
-      
+
       @categories.categories.should be_empty
-      @categories.category_hash.should be_empty      
+      @categories.category_hash.should be_empty
     end
   end
-  
+
   context 'without options' do
     before(:each) do
       @index1 = Picky::Index.new :some_index
-      
+
       @category1 = Picky::Category.new :category1, @index1
       @category2 = Picky::Category.new :category2, @index1
       @category3 = Picky::Category.new :category3, @index1
-      
+
       @categories = described_class.new
       @categories << @category1
       @categories << @category2
       @categories << @category3
     end
-    
+
     describe "possible_combinations" do
       before(:each) do
         @token = stub :token
@@ -69,7 +87,7 @@ describe Picky::Categories do
         end
         it "calls the right method" do
           @categories.should_receive(:similar_possible_for).once.with @token
-          
+
           @categories.possible_combinations @token
         end
       end
@@ -79,12 +97,12 @@ describe Picky::Categories do
         end
         it "calls the right method" do
           @categories.should_receive(:possible_for).once.with @token
-          
+
           @categories.possible_combinations @token
         end
       end
     end
-    
+
     describe 'possible_for' do
       context 'without preselected categories' do
         context 'user defined exists' do
@@ -138,5 +156,5 @@ describe Picky::Categories do
     end
 
   end
-  
+
 end

data/spec/lib/category/location_spec.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe Picky::Category::Location do
+
+  let(:category) do
+    category = Class.new do
+      attr_accessor :exact, :partial
+    end.new
+    category.exact = :exact
+    described_class.install_on(category, 1, 1, 1)
+  end
+
+  describe 'tokenizer' do
+    it 'installs a basic tokenizer' do
+      category.tokenizer.should be_kind_of(Picky::Tokenizer)
+    end
+  end
+
+  describe 'bundles' do
+    it 'installs an exact bundle' do
+      category.exact.should be_kind_of(Picky::Wrappers::Bundle::Location)
+    end
+    it 'installs an partial bundle' do
+      category.partial.should be_kind_of(Picky::Wrappers::Bundle::Location)
+    end
+  end
+
+end

data/spec/lib/character_substituters/west_european_spec.rb

@@ -24,6 +24,7 @@ describe Picky::CharacterSubstituters::WestEuropean do
   #
   describe "speed" do
     it "is fast" do
+      substituter.substitute 'ä' # Prerun
       result = performance_of { substituter.substitute('ä') }
       result.should < 0.00009
     end

data/spec/lib/extensions/hash_spec.rb

@@ -3,10 +3,10 @@ require 'spec_helper'
 describe Hash do
 
   describe "to_json" do
-    before(:each) do
+    let(:obj) do
       # A very realistic example.
       #
-      @obj = { :allocations => [
+      { :allocations => [
           ['c', 17.53, 275179, [["name","s*","s"]],[]],
           ['c', 15.01, 164576, [["category","s*","s"]],[]],
           ['p', 12.94, 415634, [["street","s*","s"]],[]],
@@ -27,13 +27,14 @@ describe Hash do
       }
     end
     it "should be correct" do
-      @obj.to_json.should == '{"allocations":[["c",17.53,275179,[["name","s*","s"]],[]],["c",15.01,164576,[["category","s*","s"]],[]],["p",12.94,415634,[["street","s*","s"]],[]],["p",12.89,398247,[["name","s*","s"]],[]],["p",12.67,318912,[["city","s*","s"]],[]],["p",12.37,235933,[["first_name","s*","s"]],[]],["p",11.76,128259,[["maiden_name","s*","s"]],[]],["p",11.73,124479,[["occupation","s*","s"]],[]],["c",11.35,84807,[["street","s*","s"]],[]],["c",11.15,69301,[["city","s*","s"]],[]],["p",4.34,77,[["street_number","s*","s"]],[]],["c",2.08,8,[["street_number","s*","s"]],[]],["c",1.61,5,[["adword","s*","s"]],[]]],"offset":0,"duration":0.04,"total":2215417}'
+      obj.to_json.should == '{"allocations":[["c",17.53,275179,[["name","s*","s"]],[]],["c",15.01,164576,[["category","s*","s"]],[]],["p",12.94,415634,[["street","s*","s"]],[]],["p",12.89,398247,[["name","s*","s"]],[]],["p",12.67,318912,[["city","s*","s"]],[]],["p",12.37,235933,[["first_name","s*","s"]],[]],["p",11.76,128259,[["maiden_name","s*","s"]],[]],["p",11.73,124479,[["occupation","s*","s"]],[]],["c",11.35,84807,[["street","s*","s"]],[]],["c",11.15,69301,[["city","s*","s"]],[]],["p",4.34,77,[["street_number","s*","s"]],[]],["c",2.08,8,[["street_number","s*","s"]],[]],["c",1.61,5,[["adword","s*","s"]],[]]],"offset":0,"duration":0.04,"total":2215417}'
     end
     it "should take options" do
-      lambda { @obj.to_json(:some => :option) }.should_not raise_error
+      lambda { obj.to_json(:some => :option) }.should_not raise_error
     end
     it "should be fast" do
-      performance_of { @obj.to_json }.should < 0.000065
+      obj.to_json # Prerun
+      performance_of { obj.to_json }.should < 0.000065
     end
   end
 

data/spec/lib/extensions/module_spec.rb

@@ -6,21 +6,21 @@ describe Module do
     context "with correct params" do
       before(:each) do
         @klass = Class.new do
-          
+
           each_delegate :bli, :bla, :blu, :to => :@some_enumerable
-          
+
           def initialize some_enumerable
             @some_enumerable = some_enumerable
           end
-          
+
         end
       end
       it 'should send each a bli' do
         bli = stub :bli
         delegating = @klass.new [bli, bli, bli, bli]
-        
+
         bli.should_receive(:bli).exactly(4).times
-        
+
         delegating.bli
       end
     end
@@ -34,5 +34,5 @@ describe Module do
       end
     end
   end
-  
+
 end

data/spec/lib/extensions/object_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe Object do
-  
+
   context 'basic object' do
     let(:object) { described_class.new }
-    
+
     describe "exclaim" do
       it "delegates to puts" do
-        object.should_receive(:puts).once.with :bla
+        STDOUT.should_receive(:puts).once.with :bla
+        STDOUT.should_receive(:flush).once.with
 
         object.exclaim :bla
       end
@@ -24,17 +25,17 @@ 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     or\n     require 'gnorf'\n     for example on top of your app.rb/application.rb\n  2. Then, run:\n     bundle update\n"
+        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     or\n     require 'gnorf'\n     for example at the top of your app.rb file.\n  2. Then, run:\n     bundle update\n"
 
         object.warn_gem_missing 'gnorf', 'gnarble gnarf'
       end
     end
   end
-  
+
   describe 'indented_to_s' do
     describe String do
       let(:string) { String.new("Hello\nTest") }
-      
+
       it 'indents a default amount' do
         string.indented_to_s.should == "  Hello\n  Test"
       end
@@ -47,7 +48,7 @@ describe Object do
     end
     describe Array do
       let(:array) { Array.new(["Hello", "Test"]) }
-      
+
       it 'indents a default amount' do
         array.indented_to_s.should == "  Hello\n  Test"
       end
@@ -56,5 +57,5 @@ describe Object do
       end
     end
   end
-  
+
 end

data/spec/lib/extensions/string_spec.rb

@@ -13,7 +13,7 @@ describe String do
       performance_of { @token.each_subtoken { |subtoken| } }.should < 0.00065
     end
     it 'is fast enough' do
-      performance_of { @token.each_intoken { |intoken| } }.should < 0.025 # TODO Slow!
+      performance_of { @token.each_intoken { |intoken| } }.should < 0.025
     end
   end
 

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

@@ -10,6 +10,17 @@ describe Picky::Generators::Similarity::Phonetic do
     }.to raise_error("In Picky 2.0+, the Similarity::Phonetic has been renamed to Similarity::DoubleMetaphone. Please use that one. Thanks!")
   end
 
+  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
+
+    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     or\n     require 'text'\n     for example at the top of your app.rb file.\n  2. Then, run:\n     bundle update\n"
+    instance.should_receive(:exit).once.with 1
+
+    instance.send :initialize
+  end
+
   describe 'sort!' do
     let(:phonetic) { described_class.allocate }
     it 'sorts correctly' do

data/spec/lib/index_realtime_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Picky::Index, "Realtime API" do
 
-  Thing = Struct.new :id, :text
+  RealtimeThing = Struct.new :id, :text
 
   let(:index) do
     described_class.new :some_index_name do
@@ -13,22 +13,22 @@ describe Picky::Index, "Realtime API" do
   end
 
   it 'offers an add method' do
-    index.add Thing.new(1, 'text')
+    index.add RealtimeThing.new(1, 'text')
   end
   it 'offers a remove method' do
     index.remove 1
   end
   it 'offers a replace method' do
-    index.replace Thing.new(1, 'text')
+    index.replace RealtimeThing.new(1, 'text')
   end
   it 'offers a << method' do
-    index << Thing.new(1, 'text')
+    index << RealtimeThing.new(1, 'text')
   end
   # it 'offers a >> method' do
   #   Thing.new(1, 'text') >> index # I mean, as long as we're dreaming.
   # end
   it 'offers an unshift method' do
-    index.unshift Thing.new(1, 'text')
+    index.unshift RealtimeThing.new(1, 'text')
   end
 
 end

data/spec/lib/interfaces/{live_parameters_spec.rb → live_parameters/master_child_spec.rb}

@@ -2,8 +2,8 @@
 #
 require 'spec_helper'
 
-describe Picky::Interfaces::LiveParameters do
-  
+describe Picky::Interfaces::LiveParameters::MasterChild do
+
   before(:each) do
     @parent = stub :parent
     @child  = stub :child
@@ -11,13 +11,13 @@ describe Picky::Interfaces::LiveParameters do
     @parameters = described_class.new
     @parameters.stub! :exclaim
   end
-  
-  describe Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError do
+
+  describe Picky::Interfaces::LiveParameters::MasterChild::CouldNotUpdateConfigurationError do
     before(:each) do
-      @error = Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new :some_key, 'some message'
+      @error = Picky::Interfaces::LiveParameters::MasterChild::CouldNotUpdateConfigurationError.new :some_key, 'some message'
     end
   end
-  
+
   describe 'querying_removes_characters' do
     it 'works' do
       expect do
@@ -39,7 +39,7 @@ describe Picky::Interfaces::LiveParameters do
       end.to_not raise_error
     end
   end
-  
+
   describe 'parameters' do
     context 'all goes well' do
       it 'does a few things in order' do
@@ -47,45 +47,45 @@ describe Picky::Interfaces::LiveParameters do
         @parameters.should_receive(:try_updating_configuration_with).once.with(:a => :b).ordered
         @parameters.should_receive(:write_parent).once.with(:a => :b).ordered
         @parameters.should_receive(:extract_configuration).once.with().ordered
-        
+
         @parameters.parameters :a => :b
       end
     end
     context 'updating failed' do
       before(:each) do
-        @parameters.should_receive(:try_updating_configuration_with).and_raise Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new(:a, 'hello')
+        @parameters.should_receive(:try_updating_configuration_with).and_raise Picky::Interfaces::LiveParameters::MasterChild::CouldNotUpdateConfigurationError.new(:a, 'hello')
       end
       it 'kills itself and returns' do
         @parameters.should_receive(:close_child).once.ordered
         @parameters.should_receive(:harakiri).once.ordered
-        
+
         @parameters.parameters( :a => :b ).should == { :a => :ERROR }
       end
     end
   end
-  
+
   describe 'harakiri' do
     before(:each) do
       Process.stub! :pid => :some_pid
     end
     it 'kills itself' do
       Process.should_receive(:kill).once.with :QUIT, :some_pid
-      
+
       @parameters.harakiri
     end
   end
-  
+
   describe 'write_parent' do
     before(:each) do
       Process.stub! :pid => :some_pid
     end
     it 'calls the parent' do
       @parent.should_receive(:write).once.with "[:some_pid, {:a=>:b}];;;"
-      
+
       @parameters.write_parent :a => :b
     end
   end
-  
+
   describe 'close_child' do
     context 'child is closed' do
       before(:each) do
@@ -93,7 +93,7 @@ describe Picky::Interfaces::LiveParameters do
       end
       it 'does not receive close' do
         @child.should_receive(:close).never
-        
+
         @parameters.close_child
       end
     end
@@ -103,12 +103,12 @@ describe Picky::Interfaces::LiveParameters do
       end
       it 'does receives close' do
         @child.should_receive(:close).once.with()
-        
+
         @parameters.close_child
       end
     end
   end
-  
+
   describe 'kill_worker' do
     context 'all goes well' do
       it 'uses Process.kill' do
@@ -120,14 +120,14 @@ describe Picky::Interfaces::LiveParameters do
     context 'there is no such process' do
       it 'uses Process.kill' do
         Process.should_receive(:kill).and_raise Errno::ESRCH.new
-        
+
         @parameters.should_receive(:remove_worker).once.with :some_pid
-        
+
         @parameters.kill_worker :some_signal, :some_pid
       end
     end
   end
-  
+
   describe 'kill_each_worker_except' do
     context 'worker pid in the worker pids' do
       before(:each) do
@@ -136,10 +136,10 @@ describe Picky::Interfaces::LiveParameters do
       it 'kills each except the one' do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 1)
         @parameters.should_receive(:kill_worker).once.with(:KILL, 2)
-        
+
         @parameters.should_receive(:kill_worker).once.with(:KILL, 4)
-        
-        @parameters.kill_each_worker_except 3 
+
+        @parameters.kill_each_worker_except 3
       end
     end
     context 'worker pid not in the worker pids (unrealistic, but...)' do
@@ -151,10 +151,10 @@ describe Picky::Interfaces::LiveParameters do
         @parameters.should_receive(:kill_worker).once.with(:KILL, 2)
         @parameters.should_receive(:kill_worker).once.with(:KILL, 3)
         @parameters.should_receive(:kill_worker).once.with(:KILL, 4)
-        
+
         @parameters.kill_each_worker_except 5
       end
     end
   end
-  
+
 end