picky 2.7.0 → 3.0.0.pre1

data/spec/lib/indexing/bundle/base_spec.rb

@@ -1,12 +1,14 @@
 require 'spec_helper'
 
-describe Indexing::Bundle::Base do
+describe Picky::Indexing::Bundle::Base do
 
   before(:each) do
-    @configuration = stub :configuration, :identifier => 'some_identifier'
-    Backend::Files.stub! :new
-    @similarity = Similarity::DoubleMetaphone.new 3
-    @bundle = described_class.new :some_name, @configuration, :some_weights, :some_partial, @similarity
+    @category = stub :category,
+                     :prepared_index_path => 'prepared/index/path',
+                     :identifier => 'some_identifier'
+    Picky::Backend::Files.stub! :new
+    @similarity = Picky::Similarity::DoubleMetaphone.new 3
+    @bundle = described_class.new :some_name, @category, :some_weights, :some_partial, @similarity
   end
   
   describe 'identifier' do

data/spec/lib/indexing/bundle/memory_partial_generation_speed_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Indexing::Bundle::Memory do
+describe Picky::Indexing::Bundle::Memory do
 
   before(:each) do
-    @index            = Index::Memory.new :some_index, source: []
-    @category         = Category.new :some_category, @index
+    @index            = Picky::Indexes::Memory.new :some_index, source: []
+    @category         = Picky::Category.new :some_category, @index
     
-    @partial_strategy = Generators::Partial::Substring.new :from => 1
+    @partial_strategy = Picky::Generators::Partial::Substring.new :from => 1
     @exact            = described_class.new :some_name, @category, nil, @partial_strategy, nil
   end
 

data/spec/lib/indexing/bundle/memory_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Indexing::Bundle::Memory do
+describe Picky::Indexing::Bundle::Memory do
 
   before(:each) do
-    @index    = Index::Memory.new :some_index, source: []
-    @category = Category.new :some_category, @index
+    @index    = Picky::Indexes::Memory.new :some_index, source: []
+    @category = Picky::Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights
@@ -59,9 +59,9 @@ describe Indexing::Bundle::Memory do
   
   describe 'retrieve' do
     before(:each) do
-      files = stub :files
-      files.should_receive(:retrieve).once.and_yield '  1234', :some_token
-      index.stub! :files => files
+      prepared = stub :prepared
+      prepared.should_receive(:retrieve).once.and_yield '  1234', :some_token
+      index.stub! :prepared => prepared
       
       @ary = stub :ary
       inverted = stub :inverted, :[] => @ary
@@ -69,7 +69,7 @@ describe Indexing::Bundle::Memory do
     end
     context 'id key format' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return :to_i
+        @category.stub! :key_format => :to_i
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234
@@ -79,7 +79,7 @@ describe Indexing::Bundle::Memory do
     end
     context 'other key format' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return :strip
+        @category.stub! :key_format => :strip
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with '1234'
@@ -89,7 +89,7 @@ describe Indexing::Bundle::Memory do
     end
     context 'no key format - default' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return nil
+        @category.stub! :key_format => nil
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234
@@ -211,11 +211,11 @@ describe Indexing::Bundle::Memory do
   end
   describe 'warn_if_similarity_small' do
     before(:each) do
-      @files = index.files
+      @backend = index.backend
     end
     context "files similarity cache small" do
       before(:each) do
-        @files.stub! :similarity_cache_small? => true
+        @backend.stub! :similarity_cache_small? => true
       end
       it "warns" do
         index.should_receive(:warn_cache_small).once.with :similarity
@@ -225,7 +225,7 @@ describe Indexing::Bundle::Memory do
     end
     context "files similarity cache not small" do
       before(:each) do
-        @files.stub! :similarity_cache_small? => false
+        @backend.stub! :similarity_cache_small? => false
       end
       it "does not warn" do
         index.should_receive(:warn_cache_small).never
@@ -236,11 +236,11 @@ describe Indexing::Bundle::Memory do
   end
   describe 'raise_unless_similarity_ok' do
     before(:each) do
-      @files = index.files
+      @backend = index.backend
     end
     context "files similarity cache ok" do
       before(:each) do
-        @files.stub! :similarity_cache_ok? => true
+        @backend.stub! :similarity_cache_ok? => true
       end
       it "warns" do
         index.should_receive(:raise_cache_missing).never
@@ -250,7 +250,7 @@ describe Indexing::Bundle::Memory do
     end
     context "files similarity cache not ok" do
       before(:each) do
-        @files.stub! :similarity_cache_ok? => false
+        @backend.stub! :similarity_cache_ok? => false
       end
       it "does not warn" do
         index.should_receive(:raise_cache_missing).once.with :similarity

data/spec/lib/indexing/bundle/redis_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Indexing::Bundle::Redis do
+describe Picky::Indexing::Bundle::Redis do
 
   before(:each) do
-    @index       = Index::Memory.new :some_index, source: []
-    @category    = Category.new :some_category, @index
+    @index       = Picky::Indexes::Memory.new :some_index, source: []
+    @category    = Picky::Category.new :some_category, @index
     
     @partial     = stub :partial
     @weights     = stub :weights
@@ -59,9 +59,9 @@ describe Indexing::Bundle::Redis do
   
   describe 'retrieve' do
     before(:each) do
-      files = stub :files
-      files.should_receive(:retrieve).once.and_yield '  1234', :some_token
-      index.stub! :files => files
+      prepared = stub :prepared
+      prepared.should_receive(:retrieve).once.and_yield '  1234', :some_token
+      index.stub! :prepared => prepared
       
       @ary = stub :ary
       inverted = stub :inverted, :[] => @ary
@@ -69,7 +69,7 @@ describe Indexing::Bundle::Redis do
     end
     context 'id key format' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return :to_i
+        @category.stub! :key_format => :to_i
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234
@@ -79,7 +79,7 @@ describe Indexing::Bundle::Redis do
     end
     context 'other key format' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return :strip
+        @category.stub! :key_format => :strip
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with '1234'
@@ -89,7 +89,7 @@ describe Indexing::Bundle::Redis do
     end
     context 'no key format - default' do
       before(:each) do
-        index.should_receive(:[]).once.with(:key_format).and_return nil
+        @category.stub! :key_format => nil
       end
       it 'should call the other methods correctly' do
         @ary.should_receive(:<<).once.with 1234

data/spec/lib/interfaces/live_parameters_spec.rb

@@ -2,19 +2,19 @@
 #
 require 'spec_helper'
 
-describe LiveParameters do
+describe Picky::Interfaces::LiveParameters do
   
   before(:each) do
     @parent = stub :parent
     @child  = stub :child
     IO.stub! :pipe => [@child, @parent]
-    @parameters = LiveParameters.new
+    @parameters = described_class.new
     @parameters.stub! :exclaim
   end
   
-  describe Interfaces::LiveParameters::CouldNotUpdateConfigurationError do
+  describe Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError do
     before(:each) do
-      @error = Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new :some_key, 'some message'
+      @error = Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new :some_key, 'some message'
     end
   end
   
@@ -53,7 +53,7 @@ describe LiveParameters do
     end
     context 'updating failed' do
       before(:each) do
-        @parameters.should_receive(:try_updating_configuration_with).and_raise Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new(:a, 'hello')
+        @parameters.should_receive(:try_updating_configuration_with).and_raise Picky::Interfaces::LiveParameters::CouldNotUpdateConfigurationError.new(:a, 'hello')
       end
       it 'kills itself and returns' do
         @parameters.should_receive(:close_child).once.ordered

data/spec/lib/loader_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Loader do
+describe Picky::Loader do
 
   before(:each) do
     @loader_path = File.absolute_path("#{File.dirname(__FILE__)}/../../lib/picky/loader.rb")
@@ -8,55 +8,53 @@ describe Loader do
   
   describe 'load_application' do
     before(:each) do
-      Loader.stub! :load
-      Loader.stub! :exclaim
+      Picky::Application.stub! :reload
     end
     it "does ok" do
-      lambda { Loader.load_application }.should_not raise_error
+      lambda { Picky::Loader.load_application }.should_not raise_error
     end
   end
   
   describe 'load_framework' do
     before(:each) do
-      Loader.stub! :load
-      Loader.stub! :exclaim
+      Picky::Loader.stub! :load_relative
     end
     it "does ok" do
-      lambda { Loader.load_framework }.should_not raise_error
+      lambda { Picky::Loader.load_framework }.should_not raise_error
     end
   end
   
   describe 'load_self' do
     before(:each) do
-      Loader.stub! :load
-      Loader.stub! :exclaim
+      Picky::Loader.stub! :load
+      Picky::Loader.stub! :exclaim
     end
     after(:each) do
-      Loader.load_self
+      Picky::Loader.load_self
     end
     it 'should load __SELF__' do
-      Loader.should_receive(:load).once.with @loader_path
+      Picky::Loader.should_receive(:load).once.with @loader_path
     end
   end
 
   describe 'reload' do
     before(:each) do
       load @loader_path
-      Loader.stub! :exclaim
-      Loader.stub! :load_framework
-      Loader.stub! :load_application
+      Picky::Loader.stub! :exclaim
+      Picky::Loader.stub! :load_framework
+      Picky::Loader.stub! :load_application
       Dir.stub! :chdir
     end
     after(:each) do
-      Loader.reload
+      Picky::Loader.reload
     end
     it 'should call the right methods in order' do
-      Loader.should_receive(:load_self).ordered
-      Loader.should_receive(:load_framework).ordered
-      Loader.should_receive(:load_application).ordered
+      Picky::Loader.should_receive(:load_self).ordered
+      Picky::Loader.should_receive(:load_framework).ordered
+      Picky::Loader.should_receive(:load_application).ordered
     end
     it 'should load itself only once' do
-      Loader.should_receive(:load_self).once
+      Picky::Loader.should_receive(:load_self).once
     end
     # it 'should load the app only once' do
     #   Loader.should_receive(:load_framework).once

data/spec/lib/loggers/search_spec.rb

@@ -2,11 +2,11 @@
 #
 require 'spec_helper'
 
-describe Loggers::Search do
+describe Picky::Loggers::Search do
   
   before(:each) do
     @destination = stub :destination
-    @logger      = Loggers::Search.new @destination
+    @logger      = described_class.new @destination
   end
   describe "log" do
     it "should delegate to info" do

data/spec/lib/query/allocation_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Query::Allocation do
+describe Picky::Query::Allocation do
   
   before(:each) do
     @combinations = stub :combinations

data/spec/lib/query/allocations_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Query::Allocations do
+describe Picky::Query::Allocations do
 
   describe 'reduce_to' do
     before(:each) do

data/spec/lib/query/combination_spec.rb

@@ -2,11 +2,11 @@
 #
 require 'spec_helper'
 
-describe Query::Combination do
+describe Picky::Query::Combination do
 
   before(:each) do
     @bundle      = stub :bundle, :identifier => :bundle_name
-    @token       = Query::Token.processed('some_text~')
+    @token       = Picky::Query::Token.processed('some_text~')
     @category    = stub :category, :bundle_for => @bundle, :name => :some_category_name
 
     @combination = described_class.new @token, @category
@@ -41,9 +41,9 @@ describe Query::Combination do
   describe 'to_result' do
     context 'functional with qualifier' do
       before(:each) do
-        token = Tokenizers::Query.new.tokenize('name:Blä~').first
+        token = Picky::Tokenizers::Query.new.tokenize('name:Blä~').first
 
-        @combination = Query::Combination.new token, @category
+        @combination = Picky::Query::Combination.new token, @category
       end
       it 'should return a correct result' do
         @combination.to_result.should == [:some_category_name, 'Blä~', :blä] # Note: Characters not substituted. That's ok.

data/spec/lib/query/combinations/base_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Query::Combinations::Base do
+describe Picky::Query::Combinations::Base do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/combinations/memory_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Query::Combinations::Memory do
+describe Picky::Query::Combinations::Memory do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/combinations/redis_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Query::Combinations::Redis do
+describe Picky::Query::Combinations::Redis do
 
   before(:each) do
     @combinations_ary = stub :combinations_ary

data/spec/lib/query/indexes_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Query::Indexes do
+describe Picky::Query::Indexes do
 
   3.times do |i|
     n       = i + 1
@@ -9,7 +9,12 @@ describe Query::Indexes do
     let(name) { stub name, :internal_indexed => stub(indexed) }
   end
 
-  let(:indexes) { described_class.new index1, index2, index3 }
+  let(:indexes) do
+    indexes = described_class.allocate
+    indexes.stub! :map_categories
+    indexes.send :initialize, index1, index2, index3
+    indexes
+  end
   
   describe 'expand_combinations_from' do
     it 'generates all possible combinations from the given ones' do

data/spec/lib/query/qualifier_category_mapper_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+describe Picky::Query::QualifierCategoryMapper do
+  
+  let(:mapper) { described_class.new }
+  before(:each) do
+    @category1 = stub(:category1, :qualifiers => ['t1', 'tt1', 'ttt1'])
+    @category2 = stub(:category2, :qualifiers => [:t2, :tt2, :ttt2])
+    @category3 = stub(:category3, :qualifiers => [:t3, :tt3, :ttt3])
+    mapper.add @category1
+    mapper.add @category2
+    mapper.add @category3
+  end
+  
+  def self.it_should_map(qualifier, expected)
+    it "should map #{qualifier} to #{expected}" do
+      mapper.map(qualifier).should == expected
+    end
+  end
+
+  describe "mapping" do
+    it { mapper.map(:t1).should   == @category1 }
+    it { mapper.map(:tt1).should  == @category1 }
+    it { mapper.map(:ttt1).should == @category1 }
+    
+    it { mapper.map(:t2).should   == @category2 }
+    it { mapper.map(:tt2).should  == @category2 }
+    it { mapper.map(:ttt2).should == @category2 }
+    
+    it { mapper.map(:t3).should   == @category3 }
+    it { mapper.map(:tt3).should  == @category3 }
+    it { mapper.map(:ttt3).should == @category3 }
+  end
+end

data/spec/lib/query/token_spec.rb

@@ -1,12 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe Query::Token do
-  
-  before(:all) do
-    Query::Qualifiers.instance << Query::Qualifier.new(:specific, [:sp, :spec])
-    Query::Qualifiers.instance.prepare
-  end
+describe Picky::Query::Token do
   
   describe '==' do
     it 'is equal if the originals are equal' do
@@ -154,13 +149,30 @@ describe Query::Token do
         described_class.new(text).qualify.should == expected_result
       end
     end
-    it_should_qualify 'spec:qualifier',    [:specific]
-    it_should_qualify 'with:qualifier',    []
-    it_should_qualify 'without qualifier', nil
-    it_should_qualify 'name:',             nil
-    it_should_qualify ':broken qualifier', [] # Unsure about that. Probably should recognize it as text.
-    it_should_qualify '',                  nil
-    it_should_qualify 'sp:text',           [:specific]
+    it_should_qualify 'spec:qualifier',    [['spec'],      'qualifier']
+    it_should_qualify 'with:qualifier',    [['with'],      'qualifier']
+    it_should_qualify 'without qualifier', [nil,           'without qualifier']
+    it_should_qualify 'name:',             [nil,           'name']
+    it_should_qualify ':broken qualifier', [[],            'broken qualifier'] # Unsure about that. Probably should recognize it as text.
+    it_should_qualify '',                  [nil,           '']
+    it_should_qualify 'sp:text',           [['sp'],        'text']
+    it_should_qualify '""',                [nil,           '""']
+    it_should_qualify 'name:',             [nil,           'name']
+    it_should_qualify 'name:hanke',        [['name'],      'hanke']
+    it_should_qualify 'g:gaga',            [['g'],         'gaga']
+    it_should_qualify ':nothing',          [[],            'nothing']
+    it_should_qualify 'hello',             [nil,           'hello']
+    it_should_qualify 'a:b:c',             [['a'],         'b:c']
+    it_should_qualify 'a,b:c',             [['a','b'],     'c']
+    it_should_qualify 'a,b,c:d',           [['a','b','c'], 'd']
+    it_should_qualify ':',                 [nil,           '']
+    it_should_qualify 'vorname:qualifier', [['vorname'],   'qualifier']
+    it_should_qualify 'with:qualifier',    [['with'],      'qualifier']
+    it_should_qualify 'without qualifier', [nil,           'without qualifier']
+    it_should_qualify 'name:',             [nil,           'name']
+    it_should_qualify ':broken qualifier', [[],            'broken qualifier']
+    it_should_qualify '',                  [nil,           '']
+    it_should_qualify 'fn:text',           [['fn'],        'text']
   end
 
   describe 'processed' do
@@ -260,23 +272,6 @@ describe Query::Token do
     end
   end
 
-  describe 'split' do
-    def self.it_should_split text, expected_qualifier
-      it "should extract #{expected_qualifier} from #{text}" do
-        described_class.new('any').send(:split, text).should == expected_qualifier
-      end
-    end
-    it_should_split '""',         [nil, '""']
-    it_should_split 'name:',      [nil, 'name']
-    it_should_split 'name:hanke', [['name'], 'hanke']
-    it_should_split 'g:gaga',     [['g'], 'gaga']
-    it_should_split ':nothing',   [[], 'nothing']
-    it_should_split 'hello',      [nil, 'hello']
-    it_should_split 'a:b:c',      [['a'], 'b:c']
-    it_should_split 'a,b:c',      [['a','b'], 'c']
-    it_should_split 'a,b,c:d',      [['a','b','c'], 'd']
-  end
-
   describe "original" do
     it "should keep the original text even when processed" do
       token = described_class.processed "I'm the original token text."
@@ -303,25 +298,25 @@ describe Query::Token do
       it "should display qualifier and text combined with a ':'" do
         token = described_class.processed('sp:qualifier')
 
-        token.to_s.should == 'specific:qualifier'
+        token.to_s.should == 'Picky::Query::Token(qualifier, ["sp"])'
       end
     end
     describe "without qualifier" do
       it "should display just the text" do
         token = described_class.processed('text')
 
-        token.to_s.should == 'text'
+        token.to_s.should == 'Picky::Query::Token(text)'
       end
     end
   end
 
-  describe 'user_defined_category_name' do
+  describe 'qualifiers' do
     context 'with qualifier' do
       before(:each) do
         @token = described_class.processed('sp:qualifier')
       end
       it 'should return the qualifier' do
-        @token.user_defined_category_names.should == [:specific]
+        @token.qualifiers.should == ['sp']
       end
     end
     context 'with incorrect qualifier' do
@@ -329,7 +324,7 @@ describe Query::Token do
         @token = described_class.processed('specific:qualifier')
       end
       it 'should return the qualifier' do
-        @token.user_defined_category_names.should == []
+        @token.qualifiers.should == ['specific']
       end
     end
     context 'with multiple qualifiers' do
@@ -337,7 +332,7 @@ describe Query::Token do
         @token = described_class.processed('sp,spec:qualifier')
       end
       it 'should return the qualifier' do
-        @token.user_defined_category_names.should == [:specific, :specific]
+        @token.qualifiers.should == ['sp', 'spec']
       end
     end
     context 'without qualifier' do
@@ -345,25 +340,9 @@ describe Query::Token do
         @token = described_class.processed('noqualifier')
       end
       it 'should return nil' do
-        @token.user_defined_category_names.should == nil
-      end
-    end
-  end
-
-  describe "split" do
-    def self.it_should_split text, expected_result
-      it "should split #{expected_result} from #{text}" do
-        described_class.new('any').send(:split, text).should == expected_result
+        @token.qualifiers.should == nil
       end
     end
-    it_should_split ':',                 [nil,         '']
-    it_should_split 'vorname:qualifier', [['vorname'], 'qualifier']
-    it_should_split 'with:qualifier',    [['with'],    'qualifier']
-    it_should_split 'without qualifier', [nil,         'without qualifier']
-    it_should_split 'name:',             [nil,         'name']
-    it_should_split ':broken qualifier', [[],          'broken qualifier']
-    it_should_split '',                  [nil,         '']
-    it_should_split 'fn:text',           [['fn'],      'text']
   end
 
   describe 'partial=' do