picky 1.4.1 → 1.4.2

data/lib/tasks/index.rake

@@ -16,11 +16,11 @@ namespace :index do
     Indexes.take_snapshot
   end
   
-  desc "Generates a specific index from index snapshots."
+  desc "Generates a specific index from index snapshots (category optional)."
   task :specific, [:index, :category] => :application do |_, options|
     index, category = options.index, options.category
-    Indexes.generate_index_only index.to_sym, category.to_sym
-    Indexes.generate_cache_only index.to_sym, category.to_sym
+    Indexes.generate_index_only index.to_sym, category && category.to_sym
+    Indexes.generate_cache_only index.to_sym, category && category.to_sym
   end
   
   desc 'Checks the index files for files that are suspiciously small or missing.'

data/lib/tasks/try.rake

@@ -6,7 +6,7 @@ namespace :try do
   task :index, [:text, :index_and_category] => :application do |_, options|
     text, index_and_category = options.text, options.index_and_category
     
-    tokenizer = index_and_category ? Indexes.find(*index_and_category.split(':')).tokenizer : Tokenizers::Index.default
+    tokenizer = index_and_category ? Indexes.find(*index_and_category.split(':')).tokenizer : Internals::Tokenizers::Index.default
     
     puts "\"#{text}\" is saved in the index as             #{tokenizer.tokenize(text.dup).to_a}"
   end
@@ -15,7 +15,7 @@ namespace :try do
   task :query, [:text] => :application do |_, options|
     text = options.text
     
-    puts "\"#{text}\" as a query will be preprocessed into #{Tokenizers::Query.default.tokenize(text.dup).to_a.map(&:to_s).map(&:to_sym)}"
+    puts "\"#{text}\" as a query will be preprocessed into #{Internals::Tokenizers::Query.default.tokenize(text.dup).to_a.map(&:to_s).map(&:to_sym)}"
   end
   
   # desc "Try the given text with both the index and the query (type:category optional)."

data/spec/lib/aliases_spec.rb

@@ -0,0 +1,9 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe 'aliases' do
+  it 'exists an Indexes class that is an instance of API::Indexes' do
+    Indexes.class.should == IndexBundle
+  end
+end

data/spec/lib/application_spec.rb

@@ -19,8 +19,8 @@ describe Application do
           route %r{^/books/full} => full
           route %r{^/books/live} => live
         end
-        Tokenizers::Index.default.tokenize 'some text'
-        Tokenizers::Query.default.tokenize 'some text'
+        Internals::Tokenizers::Index.default.tokenize 'some text'
+        Internals::Tokenizers::Query.default.tokenize 'some text'
       }.should_not raise_error
     end
     it "should run ok" do
@@ -97,7 +97,7 @@ describe Application do
       lambda { Application.rack_adapter }.should_not raise_error
     end
     it "should return a new FrontendAdapters::Rack instance" do
-      Application.rack_adapter.should be_kind_of(FrontendAdapters::Rack)
+      Application.rack_adapter.should be_kind_of(Internals::FrontendAdapters::Rack)
     end
     it "should cache the instance" do
       Application.rack_adapter.should == Application.rack_adapter

data/spec/lib/generators/aliases_spec.rb

@@ -0,0 +1 @@
+# TODO aliases spec.

data/spec/lib/{index_api_spec.rb → index/base_spec.rb}

@@ -2,16 +2,16 @@
 #
 require 'spec_helper'
 
-describe IndexAPI do
+describe Index::Base do
   
   context 'initializer' do
     it 'works' do
-      lambda { IndexAPI.new :some_index_name, :some_source }.should_not raise_error
+      lambda { described_class.new :some_index_name, :some_source }.should_not raise_error
     end
     it 'registers with the indexes' do
-      @api = IndexAPI.allocate
+      @api = described_class.allocate
       
-      Indexes.should_receive(:register).once.with @api
+      ::Indexes.should_receive(:register).once.with @api
       
       @api.send :initialize, :some_index_name, :some_source
     end
@@ -19,7 +19,7 @@ describe IndexAPI do
   
   context 'unit' do
     before(:each) do
-      @api = IndexAPI.new :some_index_name, :some_source
+      @api = described_class.new :some_index_name, :some_source
     end
 
     describe 'define_category' do
@@ -32,8 +32,8 @@ describe IndexAPI do
         end
         it 'yields both the indexing category and the indexed category' do
           @api.define_category(:some_name) do |indexing, indexed|
-            indexing.should be_kind_of(Indexing::Category)
-            indexed.should be_kind_of(Indexed::Category)
+            indexing.should be_kind_of(Internals::Indexing::Category)
+            indexed.should be_kind_of(Internals::Indexed::Category)
           end
         end
         it 'yields the indexing category which has the given name' do

data/spec/lib/index_bundle_spec.rb

@@ -0,0 +1,71 @@
+# encoding: utf-8
+#
+require 'spec_helper'
+
+describe IndexBundle do
+  
+  let(:some_index) { stub :index, :name => :some_index, :indexed => :indexed_index, :indexing => :indexing_index }
+  let(:indexes) { described_class.new }
+  let(:indexed) { stub :indexed, :register => nil }
+  let(:indexing) { stub :indexing, :register => nil }
+  
+  before(:each) do
+    indexes.stub! :indexing => indexing
+    indexes.stub! :indexed  => indexed
+  end
+  
+  def self.it_delegates method, receiver
+    it "delegates #{method} to #{receiver}" do
+      indexes.send(receiver).should_receive(method.to_sym).once
+      
+      indexes.send method
+    end
+  end
+  
+  describe 'delegation' do
+    it_delegates :reload, :indexed
+    it_delegates :load_from_cache, :indexed
+    
+    it_delegates :check_caches, :indexing
+    it_delegates :find, :indexing
+    it_delegates :generate_cache_only, :indexing
+    it_delegates :generate_index_only, :indexing
+    it_delegates :index, :indexing
+    it_delegates :index_for_tests, :indexing
+  end
+  
+  describe '[]' do
+    before(:each) do
+      indexes.register some_index
+    end
+    it 'takes strings' do
+      indexes['some_index'].should == some_index
+    end
+    it 'takes symbols' do
+      indexes[:some_index].should == some_index
+    end
+  end
+  
+  describe 'register' do
+    it 'registers with the indexes' do
+      indexes.register some_index
+      
+      indexes.indexes.should == [some_index]
+    end
+    it 'registers with the index map' do
+      indexes.register some_index
+      
+      indexes[some_index.name].should == some_index
+    end
+    it 'registers with the indexing' do
+      indexing.should_receive(:register).once.with :indexing_index
+      
+      indexes.register some_index
+    end
+    it 'registers with the indexed' do
+      indexed.should_receive(:register).once.with :indexed_index
+      
+      indexes.register some_index
+    end
+  end
+end

data/spec/lib/indexed/indexes_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Indexed::Indexes do
+
+  context 'after initialize' do
+    let(:indexes) { described_class.new }
+    it 'has an empty mapping' do
+      indexes.index_mapping.should == {}
+    end
+    it 'has no indexes' do
+      indexes.indexes.should == []
+    end
+  end
+  
+  describe 'methods' do
+    let(:indexes) { described_class.new }
+    before(:each) do
+      @index1 = stub :index1, :name => :index1
+      @index2 = stub :index2, :name => :index2
+      indexes.register @index1
+      indexes.register @index2
+    end
+    describe '[]' do
+      it 'should use the mapping' do
+        indexes[:index2].should == @index2
+      end
+      it 'should allow strings' do
+        indexes['index1'].should == @index1
+      end
+    end
+    describe 'register' do
+      it 'should have indexes' do
+        indexes.indexes.should == [@index1, @index2]
+      end
+      it 'should have a mapping' do
+        indexes.index_mapping.should == { :index1 => @index1, :index2 => @index2 }
+      end
+    end
+    describe 'clear' do
+      it 'clears the indexes' do
+        indexes.clear
+        
+        indexes.indexes.should == []
+      end
+      it 'clears the mapping' do
+        indexes.clear
+        
+        indexes.index_mapping.should == {}
+      end
+    end
+    describe 'reload' do
+      it 'calls load_from_cache on each in order' do
+        @index1.should_receive(:load_from_cache).once.with.ordered
+        @index2.should_receive(:load_from_cache).once.with.ordered
+
+        indexes.reload
+      end
+    end
+  end
+  
+end

data/spec/lib/indexing/indexes_spec.rb

@@ -1,36 +1,106 @@
 require 'spec_helper'
 
 describe Indexing::Indexes do
-  
-  before(:each) do
-    @indexes = Indexing::Indexes.new
+
+  context 'after initialize' do
+    let(:indexes) { described_class.new }
+    it 'has no indexes' do
+      indexes.indexes.should == []
+    end
   end
   
-  describe 'indexes' do
-    it 'exists' do
-      lambda { @indexes.indexes }.should_not raise_error
+  describe 'methods' do
+    let(:indexes) { described_class.new }
+    before(:each) do
+      @index1 = stub :index1, :name => :index1
+      @index2 = stub :index2, :name => :index2
+      indexes.register @index1
+      indexes.register @index2
     end
-    it 'is empty by default' do
-      @indexes.indexes.should be_empty
+    describe 'generate_index_only' do
+      context 'with index:category found' do
+        before(:each) do
+          indexes.should_receive(:find).once.with(:index, :category).and_return @index1
+        end
+        it 'indexes' do
+          @index1.should_receive(:index).once.with
+          
+          indexes.generate_index_only :index, :category
+        end
+      end
+      context 'with index not found' do
+        before(:each) do
+          indexes.should_receive(:find).once.with(:index, :category).and_return nil
+        end
+        it 'indexes' do
+          @index1.should_receive(:index).never
+          
+          indexes.generate_index_only :index, :category
+        end
+      end
     end
-  end
-  
-  describe 'clear' do
-    it 'clears the indexes' do
-      @indexes.register :some_index
-      
-      @indexes.clear
-      
-      @indexes.indexes.should == []
+    describe 'generate_cache_only' do
+      context 'with index:category found' do
+        before(:each) do
+          indexes.should_receive(:find).once.with(:index, :category).and_return @index1
+        end
+        it 'indexes' do
+          @index1.should_receive(:index).once.with
+          
+          indexes.generate_index_only :index, :category
+        end
+      end
+      context 'with index not found' do
+        before(:each) do
+          indexes.should_receive(:find).once.with(:index, :category).and_return nil
+        end
+        it 'indexes' do
+          @index1.should_receive(:index).never
+          
+          indexes.generate_index_only :index, :category
+        end
+      end
     end
-  end
-  
-  describe 'register' do
-    it 'adds the given index to the indexes' do
-      @indexes.register :some_index
-      
-      @indexes.indexes.should == [:some_index]
+    describe 'index_for_tests' do
+      it 'takes a snapshot, then indexes and caches each' do
+        indexes.should_receive(:take_snapshot).once.with.ordered
+        @index1.should_receive(:index).once.with.ordered
+        @index1.should_receive(:cache).once.with.ordered
+        @index2.should_receive(:index).once.with.ordered
+        @index2.should_receive(:cache).once.with.ordered
+        
+        indexes.index_for_tests
+      end
+    end
+    describe 'register' do
+      it 'should have indexes' do
+        indexes.indexes.should == [@index1, @index2]
+      end
+    end
+    describe 'clear' do
+      it 'clears the indexes' do
+        indexes.clear
+        
+        indexes.indexes.should == []
+      end
+    end
+    def self.it_delegates_each name
+      describe name do
+        it 'calls load_from_cache on each in order' do
+          @index1.should_receive(name).once.with.ordered
+          @index2.should_receive(name).once.with.ordered
+
+          indexes.send name
+        end
+      end
     end
+    it_delegates_each :take_snapshot
+    it_delegates_each :generate_caches
+    it_delegates_each :backup_caches
+    it_delegates_each :restore_caches
+    it_delegates_each :check_caches
+    it_delegates_each :clear_caches
+    it_delegates_each :create_directory_structure
   end
   
 end

data/spec/lib/{adapters → internals/adapters}/rack/base_spec.rb

@@ -2,10 +2,10 @@
 #
 require 'spec_helper'
 
-describe Adapters::Rack::Base do
+describe Internals::Adapters::Rack::Base do
   
   before(:each) do
-    @adapter = Adapters::Rack::Base.new
+    @adapter = described_class.new
   end
   
   describe 'respond_with' do

data/spec/lib/{adapters → internals/adapters}/rack/live_parameters_spec.rb

@@ -2,11 +2,11 @@
 #
 require 'spec_helper'
 
-describe Adapters::Rack::LiveParameters do
+describe Internals::Adapters::Rack::LiveParameters do
   
   before(:each) do
     @live_parameters = stub :live_parameters
-    @adapter         = Adapters::Rack::LiveParameters.new @live_parameters
+    @adapter         = described_class.new @live_parameters
   end
   
   describe 'to_app' do

data/spec/lib/{adapters → internals/adapters}/rack/query_spec.rb

@@ -2,11 +2,11 @@
 #
 require 'spec_helper'
 
-describe Adapters::Rack::Query do
+describe Internals::Adapters::Rack::Query do
   
   before(:each) do
     @query   = stub :query
-    @adapter = Adapters::Rack::Query.new @query
+    @adapter = described_class.new @query
   end
   
   describe 'to_app' do

data/spec/lib/{cli_spec.rb → internals/cli_spec.rb}

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 # We need to load the CLI file explicitly as the CLI is not loaded with the Loader (not needed in the server, only for script runs).
 #
-require File.expand_path '../../../lib/picky/cli', __FILE__
+require File.expand_path '../../../../lib/picky/internals/cli', __FILE__
 
 # TODO Finish this prototype Spec, redesign.
 #
@@ -30,6 +30,9 @@ describe Picky::CLI do
       it 'returns Live for live' do
         @cli.executor_class_for(:live).should == [Picky::CLI::Live, "host:port/path (default: localhost:8080/admin)", "port (default: 4568)"]
       end
+      it 'returns Help for silly input' do
+        @cli.executor_class_for(:gagagagagagaga).should == [Picky::CLI::Help]
+      end
     end
   end
   

data/spec/lib/{configuration → internals/configuration}/index_spec.rb

@@ -42,7 +42,7 @@ describe 'Configuration::Index' do
       @config.identifier.should equal(@config.identifier)
     end
     it "returns the right thing" do
-      @config.identifier.should == 'some_index some_category'
+      @config.identifier.should == 'some_index:some_category'
     end
   end
   describe "index_root" do

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

@@ -2,10 +2,10 @@
 #
 require 'spec_helper'
 
-describe FrontendAdapters::Rack do
+describe Internals::FrontendAdapters::Rack do
   
   before(:each) do
-    @rack_adapter = FrontendAdapters::Rack.new
+    @rack_adapter = described_class.new
     @rack_adapter.stub! :exclaim
   end
   
@@ -102,7 +102,7 @@ describe FrontendAdapters::Rack do
       env = rack_defaults_for '/searches/some_route?query=some_query'
       
       full = stub :full
-      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Results::Full.new)
+      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Internals::Results::Full.new)
       Query::Full.stub! :new => full
       
       @rack_adapter.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index)
@@ -114,7 +114,7 @@ describe FrontendAdapters::Rack do
       env = rack_defaults_for '/searches/some_route?query=some_query&type=some_type'
       
       full = stub :full
-      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Results::Full.new)
+      full.should_receive(:search_with_text).once.with(anything, 0).and_return(Internals::Results::Full.new)
       Query::Full.stub! :new => full
       
       @rack_adapter.route '/searches/some_route' => Query::Full.new(:some_index, :some_other_index), :query => { :type => :some_type }
@@ -175,7 +175,7 @@ describe 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(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(Internals::FrontendAdapters::Rack::RouteTargetNilError, /Routing for \/some\\\/regexp\/ was defined with a nil target object, i.e. \/some\\\/regexp\/ => nil./)
       end
     end
     
@@ -189,7 +189,7 @@ describe FrontendAdapters::Rack do
     
     describe 'route_one' do
       before(:each) do
-        Adapters::Rack.stub! :app_for => :some_query_app
+        Internals::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/ }
@@ -210,7 +210,7 @@ describe FrontendAdapters::Rack do
     
     describe 'default' do
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with nil, FrontendAdapters::Rack::STATUSES[200]
+        @rack_adapter.should_receive(:answer).once.with nil, Internals::FrontendAdapters::Rack::STATUSES[200]
         
         @rack_adapter.default 200
       end
@@ -218,12 +218,12 @@ describe FrontendAdapters::Rack do
     
     describe 'root' do
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with %r{^/$}, FrontendAdapters::Rack::STATUSES[200]
+        @rack_adapter.should_receive(:answer).once.with %r{^/$}, Internals::FrontendAdapters::Rack::STATUSES[200]
         
         @rack_adapter.root 200
       end
       it 'should call answer' do
-        @rack_adapter.should_receive(:answer).once.with %r{^/$}, FrontendAdapters::Rack::STATUSES[404]
+        @rack_adapter.should_receive(:answer).once.with %r{^/$}, Internals::FrontendAdapters::Rack::STATUSES[404]
         
         @rack_adapter.root 404
       end
@@ -252,14 +252,14 @@ describe FrontendAdapters::Rack do
       context 'without app' do
         context 'with url' do
           it 'should use the 404 with default_options from the url' do
-            @routes.should_receive(:add_route).once.with FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET", :path_info => /some_url/ }
+            @routes.should_receive(:add_route).once.with Internals::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 404 with default_options' do
-            @routes.should_receive(:add_route).once.with FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET" }
+            @routes.should_receive(:add_route).once.with Internals::FrontendAdapters::Rack::STATUSES[200], { :request_method => "GET" }
             
             @rack_adapter.answer
           end

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

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe Cacher::Strategy do
+describe Internals::Generators::Strategy do
   
   describe "saved?" do
     it "returns the right answer" do
-      Cacher::Strategy.new.saved?.should == true
+      described_class.new.saved?.should == true
     end
   end
   

data/spec/lib/internals/generators/partial/default_spec.rb

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

data/spec/lib/internals/generators/partial/none_spec.rb

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