picky 2.7.0 → 3.0.0.pre1

data/spec/lib/backend/redis/string_hash_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Backend::Redis::StringHash do
+describe Picky::Backend::Redis::StringHash do
   
   let(:index) { described_class.new :some_namespace }
     
@@ -17,7 +17,7 @@ describe Backend::Redis::StringHash do
   
   describe 'collection' do
     it 'raises' do
-      expect { index.collection :anything }.to raise_error("Can't retrieve collection for :anything from a StringHash. Use Index::Redis::ListHash.")
+      expect { index.collection :anything }.to raise_error("Can't retrieve collection for :anything from a StringHash. Use Indexes::Redis::ListHash.")
     end
   end
   
@@ -40,7 +40,7 @@ describe Backend::Redis::StringHash do
   
   describe 'to_s' do
     it 'returns the cache path with the default file extension' do
-      index.to_s.should == 'Backend::Redis::StringHash(some_namespace:*)'
+      index.to_s.should == 'Picky::Backend::Redis::StringHash(some_namespace:*)'
     end
   end
   

data/spec/lib/backend/redis_spec.rb

@@ -1,16 +1,18 @@
 require 'spec_helper'
 
-describe Backend::Redis do
+describe Picky::Backend::Redis do
 
   context 'indexing' do
     let(:category) do
       index    = stub :index,
                       :name => :some_index,
-                      :indexing_bundle_class => Indexing::Bundle::Memory,
-                      :indexed_bundle_class  => Indexed::Bundle::Memory
-      category = Category.new :some_category, index
+                      :indexing_bundle_class => Picky::Indexing::Bundle::Memory,
+                      :indexed_bundle_class  => Picky::Indexed::Bundle::Memory,
+                      :identifier => :some_index_identifier
+      Picky::Category.new :some_category, index
     end
-    let(:redis) { described_class.new :some_name, category }
+    let(:bundle) { Picky::Indexing::Bundle::Memory.new :some_bundle, category, nil, nil, nil }
+    let(:redis) { described_class.new bundle }
 
     describe 'setting' do
       it 'delegates to the configuration' do
@@ -78,13 +80,15 @@ describe Backend::Redis do
   
   context 'indexed' do
     let(:category) do
-      index    = stub :index,
-                      :name => :some_index,
-                      :indexing_bundle_class => Indexing::Bundle::Memory,
-                      :indexed_bundle_class  => Indexed::Bundle::Memory
-      category = Category.new :some_category, index
+      index = stub :index,
+                   :name => :some_index,
+                   :indexing_bundle_class => Picky::Indexing::Bundle::Memory,
+                   :indexed_bundle_class  => Picky::Indexed::Bundle::Memory,
+                   :identifier => :some_index_identifier
+      Picky::Category.new :some_category, index
     end
-    let(:redis) { described_class.new :some_name, category }
+    let(:bundle) { Picky::Indexing::Bundle::Memory.new :some_bundle, category, nil, nil, nil }
+    let(:redis) { described_class.new bundle }
 
     describe 'setting' do
       it 'delegates to the configuration' do
@@ -153,10 +157,13 @@ describe Backend::Redis do
   describe 'to_s' do
     it 'returns the right value' do
       category = stub :category,
+                      :name => :some_category,
                       :identifier => "category_identifier",
-                      :prepared_index_path => "prepared/index/path"
+                      :prepared_index_path => "prepared/index/path",
+                      :index_directory => 'some/index/directory'
+      bundle = Picky::Indexing::Bundle::Memory.new :some_bundle, category, nil, nil, nil
       
-      described_class.new("some_bundle", category).to_s.should == "Backend::Redis(Backend::File::Text(prepared/index/path.txt), some_bundle, category_identifier)"
+      described_class.new(bundle).to_s.should == "Picky::Backend::Redis(category_identifier:some_bundle)"
     end
   end
 

data/spec/lib/calculations/location_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Calculations::Location do
+describe Picky::Calculations::Location do
   
   context 'with precision 1' do
     before(:each) do

data/spec/lib/categories_indexed_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Categories do
+describe Picky::Categories do
   context 'with option ignore_unassigned_tokens' do
     context 'ignore_unassigned_tokens true' do
       before(:each) do
@@ -22,16 +22,16 @@ describe Categories do
   
   context "with real categories" do
     before(:each) do
-      @index1 = Index::Memory.new :name, source: []
+      @index1 = Picky::Indexes::Memory.new :name, source: []
       
       @categories = described_class.new
-      @categories << Category.new(:category1, @index1)
-      @categories << Category.new(:category2, @index1)
-      @categories << Category.new(:category3, @index1)
+      @categories << Picky::Category.new(:category1, @index1)
+      @categories << Picky::Category.new(:category2, @index1)
+      @categories << Picky::Category.new(:category3, @index1)
     end
     describe "similar_possible_for" do
       before(:each) do
-        @token = Query::Token.processed 'similar~'
+        @token = Picky::Query::Token.processed 'similar~'
       end
       it "returns possible categories" do
         @categories.similar_possible_for(@token).should == []
@@ -65,11 +65,11 @@ describe Categories do
   
   context 'without options' do
     before(:each) do
-      @index1 = Index::Memory.new :some_index, source: []
+      @index1 = Picky::Indexes::Memory.new :some_index, source: []
       
-      @category1 = Category.new :category1, @index1
-      @category2 = Category.new :category2, @index1
-      @category3 = Category.new :category3, @index1
+      @category1 = Picky::Category.new :category1, @index1
+      @category2 = Picky::Category.new :category2, @index1
+      @category3 = Picky::Category.new :category3, @index1
       
       @categories = described_class.new
       @categories << @category1
@@ -77,7 +77,7 @@ describe Categories do
       @categories << @category3
     end
     
-    describe "possible_combinations_for" do
+    describe "possible_combinations" do
       before(:each) do
         @token = stub :token
       end
@@ -88,7 +88,7 @@ describe Categories do
         it "calls the right method" do
           @categories.should_receive(:similar_possible_for).once.with @token
           
-          @categories.possible_combinations_for @token
+          @categories.possible_combinations @token
         end
       end
       context "with non-similar token" do
@@ -98,7 +98,7 @@ describe Categories do
         it "calls the right method" do
           @categories.should_receive(:possible_for).once.with @token
           
-          @categories.possible_combinations_for @token
+          @categories.possible_combinations @token
         end
       end
     end
@@ -107,7 +107,7 @@ describe Categories do
       context 'without preselected categories' do
         context 'user defined exists' do
           before(:each) do
-            @token = stub :token, :user_defined_category_names => [:category2]
+            @token = stub :token, :user_defined_categories => [@category2]
           end
           context 'combination exists' do
             before(:each) do
@@ -139,7 +139,7 @@ describe Categories do
     describe 'possible_categories' do
       context 'user defined exists' do
         before(:each) do
-          @token = stub :token, :user_defined_category_names => [:category2]
+          @token = stub :token, :user_defined_categories => [@category2]
         end
         it 'should return the right categories' do
           @categories.possible_categories(@token).should == [@category2]
@@ -147,7 +147,7 @@ describe Categories do
       end
       context 'user defined does not exist' do
         before(:each) do
-          @token = stub :token, :user_defined_category_names => nil
+          @token = stub :token, :user_defined_categories => nil
         end
         it 'should return all categories' do
           @categories.possible_categories(@token).should == [@category1, @category2, @category3]
@@ -155,24 +155,6 @@ describe Categories do
       end
     end
 
-    describe 'user_defined_categories' do
-      context 'category exists' do
-        before(:each) do
-          @token = stub :token, :user_defined_category_names => [:category2]
-        end
-        it 'should return the right categories' do
-          @categories.user_defined_categories(@token).should == [@category2]
-        end
-      end
-      context 'category does not exist' do
-        before(:each) do
-          @token = stub :token, :user_defined_category_names => [:gnoergel]
-        end
-        it 'should return nil' do
-          @categories.user_defined_categories(@token).should == []
-        end
-      end
-    end
   end
   
 end

data/spec/lib/category_indexed_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Category do
+describe Picky::Category do
 
   before(:each) do
-    @index               = Index::Base.new :some_index, source: []
+    @index               = Picky::Indexes::Index.new :some_index, source: []
     @partial_strategy    = stub :partial, :use_exact_for_partial? => false
     @weights_strategy    = stub :weights
     @similarity_strategy = stub :similarity
@@ -29,53 +29,35 @@ describe Category do
           @partial_strategy.stub! :use_exact_for_partial? => true
         end
         it 'returns the partial index' do
-          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Memory)
+          @category.indexed_partial.should be_kind_of(Picky::Indexed::Bundle::Memory)
         end
       end
       context 'with a partial strategy that uses the partial index (default)' do
         it 'returns the partial index' do
-          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Memory)
+          @category.indexed_partial.should be_kind_of(Picky::Indexed::Bundle::Memory)
         end
       end
     end
     context 'indexed_bundle_class defined differently' do
       before(:each) do
-        @category = described_class.new :some_name, Index::Redis.new(:some_index_name, source: [])
+        @category = described_class.new :some_name, Picky::Indexes::Redis.new(:some_index_name, source: [])
       end
       context 'with a partial strategy that uses the exact index' do
         before(:each) do
           @partial_strategy.stub! :use_exact_for_partial? => true
         end
         it 'returns the partial index' do
-          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Redis)
+          @category.indexed_partial.should be_kind_of(Picky::Indexed::Bundle::Redis)
         end
       end
       context 'with a partial strategy that uses the partial index (default)' do
         it 'returns the partial index' do
-          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Redis)
+          @category.indexed_partial.should be_kind_of(Picky::Indexed::Bundle::Redis)
         end
       end
     end
   end
   
-  describe 'generate_qualifiers_from' do
-    context 'with qualifiers' do
-      it 'returns that' do
-        @category.generate_qualifiers_from(:qualifiers => [:a, :b]).should == [:a, :b]
-      end
-    end
-    context 'without anything' do
-      it 'returns that' do
-        @category.generate_qualifiers_from({}).should == nil
-      end
-    end
-    context 'with qualifier' do
-      it 'returns that' do
-        @category.generate_qualifiers_from(:qualifier => :a).should == [:a]
-      end
-    end
-  end
-  
   describe 'weight' do
     before(:each) do
       @token = stub :token, :text => :some_text
@@ -143,10 +125,10 @@ describe Category do
         @category.stub! :weight => :some_weight, :bundle_for => :bundle
       end
       it 'should return a new combination' do
-        @category.combination_for(@token).should be_kind_of(Query::Combination)
+        @category.combination_for(@token).should be_kind_of(Picky::Query::Combination)
       end
       it 'should create the combination correctly' do
-        Query::Combination.should_receive(:new).once.with @token, @category
+        Picky::Query::Combination.should_receive(:new).once.with @token, @category
 
         @category.combination_for @token
       end

data/spec/lib/category_indexing_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Category do
+describe Picky::Category do
   
   before(:each) do
-    @index  = Index::Memory.new :some_index, source: []
+    @index  = Picky::Indexes::Memory.new :some_index, source: []
     @source = stub :some_given_source, :key_format => nil
   end
   let(:category) { described_class.new(:some_category, @index, :source => @source).tap { |c| c.stub! :timed_exclaim } }
@@ -96,7 +96,6 @@ describe Category do
 
     describe 'cache' do
       it 'should call multiple methods in order' do
-        category.should_receive(:configure).once.with().ordered
         category.should_receive(:generate_caches_from_source).once.with().ordered
         category.should_receive(:generate_partial).once.with().ordered
         category.should_receive(:generate_caches_from_memory).once.with().ordered

data/spec/lib/category_spec.rb

@@ -1,22 +1,22 @@
 require 'spec_helper'
 
-describe Category do
+describe Picky::Category do
   
-  let(:index) { Index::Memory.new :some_index, source: [] }
+  let(:index) { Picky::Indexes::Memory.new :some_index, source: [] }
   let(:category) { described_class.new :some_category, index }
   
   it 'should set defaults correctly' do
-    category.indexing_exact.weights_strategy.should == Generators::Weights::Default
-    category.indexing_exact.partial_strategy.should be_kind_of(Generators::Partial::None)
-    category.indexing_exact.similarity_strategy.should == Generators::Similarity::Default
+    category.indexing_exact.weights_strategy.should == Picky::Generators::Weights::Default
+    category.indexing_exact.partial_strategy.should be_kind_of(Picky::Generators::Partial::None)
+    category.indexing_exact.similarity_strategy.should == Picky::Generators::Similarity::Default
     
-    category.indexing_partial.weights_strategy.should be_kind_of(Generators::Weights::Logarithmic)
-    category.indexing_partial.partial_strategy.should == Generators::Partial::Default
-    category.indexing_partial.similarity_strategy.should be_kind_of(Generators::Similarity::None)
+    category.indexing_partial.weights_strategy.should be_kind_of(Picky::Generators::Weights::Logarithmic)
+    category.indexing_partial.partial_strategy.should == Picky::Generators::Partial::Default
+    category.indexing_partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
     
-    category.indexed_exact.similarity_strategy.should == Generators::Similarity::Default
+    category.indexed_exact.similarity_strategy.should == Picky::Generators::Similarity::Default
     
-    category.indexed_partial.similarity_strategy.should be_kind_of(Generators::Similarity::None)
+    category.indexed_partial.similarity_strategy.should be_kind_of(Picky::Generators::Similarity::None)
   end
   
 end

data/spec/lib/character_substituters/west_european_spec.rb

@@ -2,19 +2,20 @@
 #
 require 'spec_helper'
 
-describe CharacterSubstituters do
+describe Picky::CharacterSubstituters::WestEuropean do
+  
   before(:all) do
-    @substituter = CharacterSubstituters::WestEuropean.new.tap { |s| s.substitute '' }
+    @substituter = described_class.new.tap { |s| s.substitute '' }
   end
 
   # A bit of metaprogramming to help with the myriads of its.
   #
-  def self.it_should_substitute(special_character, normal_character)
+  def self.it_should_substitute special_character, normal_character
     it "should substitute #{special_character} with #{normal_character}" do
       @substituter.substitute(special_character).should == normal_character
     end
   end
-  def self.it_should_not_substitute(special_character)
+  def self.it_should_not_substitute special_character 
     it "should not substitute #{special_character}" do
       @substituter.substitute(special_character).should == special_character
     end
@@ -36,7 +37,7 @@ describe CharacterSubstituters do
   
   describe 'to_s' do
     it 'outputs correctly' do
-      @substituter.to_s.should == 'CharacterSubstituters::WestEuropean'
+      @substituter.to_s.should == 'Picky::CharacterSubstituters::WestEuropean'
     end
   end
 

data/spec/lib/cores_spec.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require 'spec_helper'
 
-describe Cores do
+describe Picky::Cores do
   
   describe ".forked" do
     before(:each) do
@@ -10,13 +10,13 @@ describe Cores do
     context "with array" do
       context "with block" do
         it "runs ok" do
-          Cores.forked([1, 2]) do |e|
+          described_class.forked([1, 2]) do |e|
             
           end
         end
         it "yields the elements" do
           result = []
-          Cores.forked([1, 2]) do |e|
+          described_class.forked([1, 2]) do |e|
             result << e
           end
           result.should == [1, 2]
@@ -25,7 +25,7 @@ describe Cores do
       context "without block" do
         it "fails" do
           lambda {
-            Cores.forked [1, 2]
+            described_class.forked [1, 2]
           }.should raise_error("Block argument needed when running Cores.forked")
         end
       end
@@ -33,14 +33,14 @@ describe Cores do
     context "with empty array" do
       context "with block" do
         it "runs ok" do
-          Cores.forked([]) do
+          described_class.forked([]) do
             
           end
         end
       end
       context "without block" do
         it "runs ok" do
-          Cores.forked []
+          described_class.forked []
         end
       end
     end
@@ -50,57 +50,57 @@ describe Cores do
     before(:each) do
       @linux  = mock :linux,  :null_object => true
       @darwin = mock :darwin, :null_object => true
-      Cores.stub! :os_to_core_mapping => {
+      described_class.stub! :os_to_core_mapping => {
         'linux'  => @linux,
         'darwin' => @darwin
       }
     end
     context 'default' do
       before(:each) do
-        Cores.stub! :platform => 'mswin'
+        described_class.stub! :platform => 'mswin'
       end
       it 'should return 1' do
-        Cores.number_of_cores.should == 1
+        described_class.number_of_cores.should == 1
       end
     end
     context 'osx' do
       before(:each) do
-        Cores.stub! :platform => 'i386-darwin9.8.0'
+        described_class.stub! :platform => 'i386-darwin9.8.0'
       end
       it 'should return whatever darwin returns' do
         @darwin.stub! :call => '1234'
         
-        Cores.number_of_cores.should == 1234
+        described_class.number_of_cores.should == 1234
       end
       it 'should call darwin' do
         @darwin.should_receive(:call).once
         
-        Cores.number_of_cores
+        described_class.number_of_cores
       end
       it 'should not call linux' do
         @linux.should_receive(:call).never
         
-        Cores.number_of_cores
+        described_class.number_of_cores
       end
     end
     context 'linux' do
       before(:each) do
-        Cores.stub! :platform => 'x86_64-linux'
+        described_class.stub! :platform => 'x86_64-linux'
       end
       it 'should return whatever linux returns' do
         @linux.stub! :call => '1234'
         
-        Cores.number_of_cores.should == 1234
+        described_class.number_of_cores.should == 1234
       end
       it 'should call linux' do
         @linux.should_receive(:call).once
         
-        Cores.number_of_cores
+        described_class.number_of_cores
       end
       it 'should not call darwin' do
         @darwin.should_receive(:call).never
         
-        Cores.number_of_cores
+        described_class.number_of_cores
       end
     end
   end

data/spec/lib/extensions/symbol_spec.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
+#
 require 'spec_helper'
 
 describe Symbol do
   
   context 'performance' do
-    include Helpers::Measuring
+    include Picky::Helpers::Measuring
     before(:each) do
       @token = (((0..9).to_a)*10).to_s.to_sym
     end
@@ -99,6 +101,18 @@ describe Symbol do
         end
       end
     end
+    context 'japanese symbol' do
+      before(:each) do
+        @sym = :日本語
+      end
+      it "should return an array of japanese symbols, each 1 smaller than the other" do
+        result = []
+        @sym.each_subtoken do |subtoken|
+          result << subtoken
+        end
+        result.should == [:日本語, :日本, :日]
+      end
+    end
     context 'very short symbol' do
       before(:each) do
         @sym = :r