picky 2.5.2 → 2.6.0

data/spec/lib/{internals/index → backend}/file/marshal_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Index::File::Marshal do
+describe Backend::File::Marshal do
   
   before(:each) do
     @file = described_class.new "some_cache_path"

data/spec/lib/{internals/index → backend}/file/text_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Index::File::Text do
+describe Backend::File::Text do
   
   before(:each) do
     @file = described_class.new "some_cache_path"

data/spec/lib/{internals/index → backend}/files_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Index::Files do
+describe Backend::Files do
 
   before(:each) do
-    index         = stub :index, :name => :some_index, :bundle_class => nil
-    category      = Internals::Indexing::Category.new :some_category, index
+    index         = Index::Memory.new :some_index, source: []
+    category      = Category.new :some_category, index
     
     @files         = described_class.new :some_name, category
     

data/spec/lib/{internals/index → backend}/redis/basic_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Index::Redis::Basic do
+describe Backend::Redis::Basic do
   
   let(:redis) { described_class.new "some_namespace" }
 

data/spec/lib/{internals/index → backend}/redis/list_hash_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Index::Redis::ListHash do
+describe Backend::Redis::ListHash do
   
   let(:index) { described_class.new :some_namespace }
   

data/spec/lib/{internals/index → backend}/redis/string_hash_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Index::Redis::StringHash do
+describe Backend::Redis::StringHash do
   
   let(:index) { described_class.new :some_namespace }
     

data/spec/lib/{internals/index → backend}/redis_spec.rb

@@ -1,11 +1,14 @@
 require 'spec_helper'
 
-describe Internals::Index::Redis do
+describe Backend::Redis do
 
   context 'indexing' do
     let(:category) do
-      index    = stub :index, :name => :some_index, :bundle_class => nil
-      category = Internals::Indexing::Category.new :some_category, index
+      index    = stub :index,
+                      :name => :some_index,
+                      :indexing_bundle_class => Indexing::Bundle::Memory,
+                      :indexed_bundle_class  => Indexed::Bundle::Memory
+      category = Category.new :some_category, index
     end
     let(:redis) { described_class.new :some_name, category }
 
@@ -75,8 +78,11 @@ describe Internals::Index::Redis do
   
   context 'indexed' do
     let(:category) do
-      index    = stub :index, :name => :some_index
-      category = Internals::Indexed::Category.new :some_category, index
+      index    = stub :index,
+                      :name => :some_index,
+                      :indexing_bundle_class => Indexing::Bundle::Memory,
+                      :indexed_bundle_class  => Indexed::Bundle::Memory
+      category = Category.new :some_category, index
     end
     let(:redis) { described_class.new :some_name, category }
 

data/spec/lib/{internals/calculations → calculations}/location_spec.rb

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

data/spec/lib/{internals/indexed/categories_spec.rb → categories_indexed_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Categories do
+describe Categories do
   context 'with option ignore_unassigned_tokens' do
     context 'ignore_unassigned_tokens true' do
       before(:each) do
@@ -22,16 +22,16 @@ describe Internals::Indexed::Categories do
   
   context "with real categories" do
     before(:each) do
-      @index1 = stub :index1, :name => :some_index
+      @index1 = Index::Memory.new :name, source: []
       
       @categories = described_class.new
-      @categories << Internals::Indexed::Category.new(:category1, @index1)
-      @categories << Internals::Indexed::Category.new(:category2, @index1)
-      @categories << Internals::Indexed::Category.new(:category3, @index1)
+      @categories << Category.new(:category1, @index1)
+      @categories << Category.new(:category2, @index1)
+      @categories << Category.new(:category3, @index1)
     end
     describe "similar_possible_for" do
       before(:each) do
-        @token = Internals::Query::Token.processed 'similar~'
+        @token = Query::Token.processed 'similar~'
       end
       it "returns possible categories" do
         @categories.similar_possible_for(@token).should == []
@@ -65,11 +65,11 @@ describe Internals::Indexed::Categories do
   
   context 'without options' do
     before(:each) do
-      @index1 = stub :index1, :name => :some_index
+      @index1 = Index::Memory.new :some_index, source: []
       
-      @category1 = Internals::Indexed::Category.new :category1, @index1
-      @category2 = Internals::Indexed::Category.new :category2, @index1
-      @category3 = Internals::Indexed::Category.new :category3, @index1
+      @category1 = Category.new :category1, @index1
+      @category2 = Category.new :category2, @index1
+      @category3 = Category.new :category3, @index1
       
       @categories = described_class.new
       @categories << @category1

data/spec/lib/{internals/indexed/category_spec.rb → category_indexed_spec.rb}

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Category do
+describe Category do
 
   before(:each) do
-    @index               = stub :index, :name => :some_index
+    @index               = Index::Base.new :some_index, source: []
     @partial_strategy    = stub :partial, :use_exact_for_partial? => false
     @weights_strategy    = stub :weights
     @similarity_strategy = stub :similarity
@@ -29,30 +29,30 @@ describe Internals::Indexed::Category do
           @partial_strategy.stub! :use_exact_for_partial? => true
         end
         it 'returns the partial index' do
-          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Memory)
+          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Memory)
         end
       end
       context 'with a partial strategy that uses the partial index (default)' do
         it 'returns the partial index' do
-          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Memory)
+          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Memory)
         end
       end
     end
-    context 'indexed_bundle_class defined' do
+    context 'indexed_bundle_class defined differently' do
       before(:each) do
-        @category = described_class.new :some_name, @index, :indexed_bundle_class => Internals::Indexed::Bundle::Redis
+        @category = described_class.new :some_name, Index::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.partial.should be_kind_of(Internals::Indexed::Bundle::Redis)
+          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Redis)
         end
       end
       context 'with a partial strategy that uses the partial index (default)' do
         it 'returns the partial index' do
-          @category.partial.should be_kind_of(Internals::Indexed::Bundle::Redis)
+          @category.indexed_partial.should be_kind_of(Indexed::Bundle::Redis)
         end
       end
     end
@@ -143,10 +143,10 @@ describe Internals::Indexed::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(Internals::Query::Combination)
+        @category.combination_for(@token).should be_kind_of(Query::Combination)
       end
       it 'should create the combination correctly' do
-        Internals::Query::Combination.should_receive(:new).once.with @token, @category
+        Query::Combination.should_receive(:new).once.with @token, @category
 
         @category.combination_for @token
       end
@@ -155,8 +155,8 @@ describe Internals::Indexed::Category do
   
   context 'stubbed exact/partial' do
     before(:each) do
-      @category.stub! :exact => (@exact = stub :exact)
-      @category.stub! :partial => (@partial = stub :partial)
+      @category.stub! :indexed_exact => (@exact = stub :exact)
+      @category.stub! :indexed_partial => (@partial = stub :partial)
     end
     describe 'bundle_for' do
       it 'should return the right bundle' do

data/spec/lib/{internals/indexing/category_spec.rb → category_indexing_spec.rb}

@@ -1,16 +1,16 @@
 require 'spec_helper'
 
-describe Internals::Indexing::Category do
+describe Category do
   
   before(:each) do
-    @index  = stub :index, :name => :some_index, :bundle_class => nil
+    @index  = Index::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 } }
   
   context "unit specs" do
-    let(:exact) { category.exact }
-    let(:partial) { category.partial }
+    let(:exact) { category.indexing_exact }
+    let(:partial) { category.indexing_partial }
     
     describe 'backup_caches' do
       it 'delegates to both bundles' do
@@ -134,7 +134,7 @@ describe Internals::Indexing::Category do
           end
           context 'it has an index' do
             before(:each) do
-              category.stub! :index => stub(:index, :key_format => :yet_another_key_format)
+              category.instance_variable_set :@index, stub(:index, :key_format => :yet_another_key_format)
             end
             it 'returns that key_format' do
               category.key_format.should == :yet_another_key_format
@@ -159,7 +159,7 @@ describe Internals::Indexing::Category do
       end
     end
     
-    describe "cache!" do
+    describe "cache" do
       before(:each) do
         category.stub! :generate_caches
         category.stub! :configure
@@ -167,12 +167,12 @@ describe Internals::Indexing::Category do
       it "prepares the cache directory" do
         category.should_receive(:prepare_index_directory).once.with
         
-        category.cache!
+        category.cache
       end
       it "tells the indexer to index" do
         category.should_receive(:generate_caches).once.with
         
-        category.cache!
+        category.cache
       end
     end
     describe "index" do
@@ -183,12 +183,12 @@ describe Internals::Indexing::Category do
       it "prepares the cache directory" do
         category.should_receive(:prepare_index_directory).once.with
         
-        category.index!
+        category.prepare
       end
       it "tells the indexer to index" do
         @indexer.should_receive(:index).once.with
         
-        category.index!
+        category.prepare
       end
     end
     describe "source" do

data/spec/lib/{internals/frontend_adapters → frontend_adapters}/rack_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::FrontendAdapters::Rack do
+describe FrontendAdapters::Rack do
   
   before(:each) do
     @rack_adapter = described_class.new
@@ -188,7 +188,7 @@ describe Internals::FrontendAdapters::Rack do
         @rack_adapter.route %r{regexp1} => :query1, %r{regexp2} => :query2, :some => :option
       end
       it 'does not accept nil queries' do
-        lambda { @rack_adapter.route %r{some/regexp} => nil }.should raise_error(Internals::FrontendAdapters::Rack::RouteTargetNilError, /Routing for \/some\\\/regexp\/ was defined with a nil target object, i.e. \/some\\\/regexp\/ => nil./)
+        lambda { @rack_adapter.route %r{some/regexp} => nil }.should raise_error(FrontendAdapters::Rack::RouteTargetNilError, /Routing for \/some\\\/regexp\/ was defined with a nil target object, i.e. \/some\\\/regexp\/ => nil./)
       end
     end
     
@@ -202,7 +202,7 @@ describe Internals::FrontendAdapters::Rack do
     
     describe 'route_one' do
       before(:each) do
-        Internals::Adapters::Rack.stub! :app_for => :some_query_app
+        Adapters::Rack.stub! :app_for => :some_query_app
       end
       it 'should add the right route' do
         @routes.should_receive(:add_route).once.with :some_query_app, { :request_method => "GET", :path_info => /some_url/ }, {}, "some_query"
@@ -223,7 +223,7 @@ describe Internals::FrontendAdapters::Rack do
     
     describe 'default' do
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with nil, Internals::FrontendAdapters::Rack::STATUSES[200]
+        @rack_adapter.should_receive(:answer).once.with nil, FrontendAdapters::Rack::STATUSES[200]
         
         @rack_adapter.default 200
       end
@@ -231,21 +231,21 @@ describe Internals::FrontendAdapters::Rack do
     
     describe 'STATUSES' do
       it 'is a lambda' do
-        Internals::FrontendAdapters::Rack::STATUSES[200].respond_to?(:call).should == true
+        FrontendAdapters::Rack::STATUSES[200].respond_to?(:call).should == true
       end
       it 'is a lambda' do
-        Internals::FrontendAdapters::Rack::STATUSES[404].respond_to?(:call).should == true
+        FrontendAdapters::Rack::STATUSES[404].respond_to?(:call).should == true
       end
     end
     
     describe 'root' do
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with %r{^/$}, Internals::FrontendAdapters::Rack::STATUSES[200]
+        @rack_adapter.should_receive(:answer).once.with %r{^/$}, FrontendAdapters::Rack::STATUSES[200]
         
         @rack_adapter.root 200
       end
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with %r{^/$}, Internals::FrontendAdapters::Rack::STATUSES[404]
+        @rack_adapter.should_receive(:answer).once.with %r{^/$}, FrontendAdapters::Rack::STATUSES[404]
         
         @rack_adapter.root 404
       end
@@ -274,14 +274,14 @@ describe Internals::FrontendAdapters::Rack do
       context 'without app' do
         context 'with url' do
           it 'should use the 200 with default_options from the url' do
-            @routes.should_receive(:add_route).once.with Internals::FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET", :path_info => /some_url/ }
+            @routes.should_receive(:add_route).once.with FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET", :path_info => /some_url/ }
             
             @rack_adapter.answer 'some_url'
           end
         end
         context 'without url' do
           it 'should use the 200 with default_options' do
-            @routes.should_receive(:add_route).once.with Internals::FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET" }
+            @routes.should_receive(:add_route).once.with FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET" }
             
             @rack_adapter.answer
           end

data/spec/lib/generators/aliases_spec.rb

@@ -3,13 +3,13 @@ require 'spec_helper'
 describe 'aliases' do
 
   it 'aliases correctly' do
-    Partial.should == Internals::Generators::Partial
+    Partial.should == Generators::Partial
   end
   it 'aliases correctly' do
-    Similarity.should == Internals::Generators::Similarity
+    Similarity.should == Generators::Similarity
   end
   it 'aliases correctly' do
-    Weights.should == Internals::Generators::Weights
+    Weights.should == Generators::Weights
   end
   
 end

data/spec/lib/{internals/generators → generators}/cacher_strategy_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Generators::Strategy do
+describe Generators::Strategy do
   
   describe "saved?" do
     it "returns the right answer" do

data/spec/lib/{internals/generators → generators}/partial/default_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Internals::Generators::Partial::Default do
+describe Generators::Partial::Default do
   
-  let(:default) { Internals::Generators::Partial::Default }
+  let(:default) { Generators::Partial::Default }
   
   it "should be a subtoken" do
-    default.should be_kind_of(Internals::Generators::Partial::Substring)
+    default.should be_kind_of(Generators::Partial::Substring)
   end
   it "should be a the right down to" do
     default.from.should == -3

data/spec/lib/{internals/generators → generators}/partial/none_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Internals::Generators::Partial::None do
+describe Generators::Partial::None do
   
   it 'is not saved' do
     described_class.new.saved?.should == false
   end
   it "has the right superclass" do
-    described_class.should < Internals::Generators::Partial::Strategy
+    described_class.should < Generators::Partial::Strategy
   end
   it "returns an empty index" do
     described_class.new.generate_from(:unimportant).should == {}

data/spec/lib/{internals/generators → generators}/partial/substring_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Generators::Partial::Substring do
+describe Generators::Partial::Substring do
   
   context 'default from' do
     let(:generator) { described_class.new }

data/spec/lib/{internals/generators → generators}/partial_generator_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
-describe Internals::Generators::PartialGenerator do
+describe Generators::PartialGenerator do
 
   context 'integration' do
     it 'should generate the correct values with a given strategy' do
       generator = described_class.new :meier => [1], :maier => [2]
       
-      generator.generate(Internals::Generators::Partial::Substring.new).should == {
+      generator.generate(Generators::Partial::Substring.new).should == {
         :meier => [1],
         :meie => [1],
         :mei => [1],
@@ -21,7 +21,7 @@ describe Internals::Generators::PartialGenerator do
     it 'should generate the correct values with a given specific strategy' do
       generator = described_class.new :meier => [1], :maier => [2]
       
-      generator.generate(Internals::Generators::Partial::Substring.new(:from => 3)).should == {
+      generator.generate(Generators::Partial::Substring.new(:from => 3)).should == {
         :meier => [1],
         :meie => [1],
         :mei => [1],

data/spec/lib/{internals/generators → generators}/similarity/double_metaphone_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Generators::Similarity::DoubleMetaphone do
+describe Generators::Similarity::DoubleMetaphone do
 
   before(:each) do
     @similarity = described_class.new

data/spec/lib/{internals/generators → generators}/similarity/metaphone_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Generators::Similarity::Metaphone do
+describe Generators::Similarity::Metaphone do
 
   before(:each) do
     @similarity = described_class.new

data/spec/lib/{internals/generators → generators}/similarity/none_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Generators::Similarity::None do
+describe Generators::Similarity::None do
 
   before(:each) do
     @similarity = described_class.new

data/spec/lib/{internals/generators → generators}/similarity/phonetic_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Generators::Similarity::Phonetic do
+describe Generators::Similarity::Phonetic do
 
   it 'raises if you try to use Phonetic directly' do
     expect {

data/spec/lib/{internals/generators → generators}/similarity/soundex_spec.rb

@@ -2,7 +2,7 @@
 #
 require 'spec_helper'
 
-describe Internals::Generators::Similarity::Soundex do
+describe Generators::Similarity::Soundex do
 
   before(:each) do
     @similarity = described_class.new

data/spec/lib/{internals/generators → generators}/similarity_generator_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Generators::SimilarityGenerator do
+describe Generators::SimilarityGenerator do
 
   context 'integration' do
     it 'should generate the correct values' do
@@ -15,7 +15,7 @@ describe Internals::Generators::SimilarityGenerator do
                                                   :meyer => nil,
                                                   :peter => nil
 
-      generator.generate(Internals::Generators::Similarity::DoubleMetaphone.new).should == { :MR => [:meier, :maier, :mayer, :meyer], :PTR => [:peter] }
+      generator.generate(Generators::Similarity::DoubleMetaphone.new).should == { :MR => [:meier, :maier, :mayer, :meyer], :PTR => [:peter] }
     end
   end
 

data/spec/lib/{internals/generators → generators}/weights/logarithmic_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Internals::Generators::Weights::Logarithmic do
+describe Generators::Weights::Logarithmic do
 
   before(:each) do
     @cacher = described_class.new

data/spec/lib/{internals/generators → generators}/weights_generator_spec.rb

@@ -1,14 +1,14 @@
 require 'spec_helper'
 
-describe Internals::Generators::WeightsGenerator do
+describe Generators::WeightsGenerator do
 
   context 'integration' do
     it 'should generate the correct values' do
       generator = described_class.new :a => Array.new(0),
-                                        :b => Array.new(1),
-                                        :c => Array.new(10),
-                                        :d => Array.new(100),
-                                        :e => Array.new(1000)
+                                      :b => Array.new(1),
+                                      :c => Array.new(10),
+                                      :d => Array.new(100),
+                                      :e => Array.new(1000)
 
       result = generator.generate
 

data/spec/lib/{internals/indexed/index_spec.rb → index/base_indexed_spec.rb}

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Internals::Indexed::Index do
+describe Index::Base do
   
   context 'without stubbed categories' do
     before(:each) do
-      @index = described_class.new :some_index_name
+      @index = described_class.new :some_index_name, source: []
     end
     
     describe 'define_category' do
@@ -14,7 +14,7 @@ describe Internals::Indexed::Index do
         @index.categories.categories.size.should == 1 
       end
       it 'returns the new category' do
-        @index.define_category(:some_category_name).should be_kind_of(Internals::Indexed::Category)
+        @index.define_category(:some_category_name).should be_kind_of(Category)
       end
     end
   end
@@ -23,7 +23,7 @@ describe Internals::Indexed::Index do
     before(:each) do
       @categories = stub :categories
       
-      @index = described_class.new :some_name
+      @index = described_class.new :some_name, source: []
       @index.define_category :some_category_name1
       @index.define_category :some_category_name2
       
@@ -48,7 +48,7 @@ describe Internals::Indexed::Index do
   
   context "no categories" do
     it "works" do
-      described_class.new :some_name
+      described_class.new :some_name, source: []
     end
   end