picky 2.5.0 → 2.5.1

data/lib/picky/index/base.rb

@@ -218,9 +218,7 @@ INDEX
 
     # Define a key_format on the index.
     #
-    # Parameter is a source, either one of the standard sources or
-    # anything responding to #each and returning objects that
-    # respond to id and the category names (or the category from option).
+    # Parameter is a method name to use on the key (e.g. :to_i, :to_s, :strip).
     #
     def key_format key_format
       internal_indexing.define_key_format key_format

data/lib/picky/index_bundle.rb

@@ -9,14 +9,12 @@ class IndexBundle # :nodoc:all
            :to => :indexes
 
   delegate :analyze,
-           :reload,
            :load_from_cache,
+           :reload,
            :to => :indexed
 
   delegate :check_caches,
            :find,
-           :generate_cache_only,
-           :generate_index_only,
            :index,
            :index_for_tests,
            :to => :indexing
@@ -29,10 +27,6 @@ class IndexBundle # :nodoc:all
     @indexing = Indexing::Indexes.new
   end
 
-  def to_s
-    indexes.map &:to_stats
-  end
-
   def register index
     self.indexes << index
     self.index_mapping[index.name] = index
@@ -46,5 +40,9 @@ class IndexBundle # :nodoc:all
 
     self.index_mapping[name]
   end
+  
+  def to_s
+    indexes.map &:to_stats
+  end
 
 end

data/lib/picky/indexed/indexes.rb

@@ -5,13 +5,18 @@ module Indexed # :nodoc:all
   class Indexes
 
     attr_reader :indexes, :index_mapping
-
+    
     each_delegate :load_from_cache,
                   :to => :indexes
 
     def initialize
       clear
     end
+    
+    # Reloads all indexes, one after another,
+    # in the order they were added.
+    #
+    alias reload load_from_cache
 
     def to_s
       indexes.indented_to_s
@@ -24,13 +29,6 @@ module Indexed # :nodoc:all
       @index_mapping = {}
     end
 
-    # Reloads all indexes, one after another,
-    # in the order they were added.
-    #
-    def reload
-      load_from_cache
-    end
-
     # Registers an index with the indexes.
     #
     def register index

data/lib/picky/indexing/indexes.rb

@@ -66,22 +66,9 @@ module Indexing # :nodoc:all
       end
     end
 
-    # Generate only the index for the given index:category pair.
-    #
-    def generate_index_only index_name, category_name = nil
-      found = find index_name, category_name
-      found.index! if found
-    end
-    # Generate only the cache for the given index:category pair.
-    #
-    def generate_cache_only index_name, category_name = nil
-      found = find index_name, category_name
-      found.generate_caches if found
-    end
-
     # Find a given index:category pair.
     #
-    def find index_name, category_name
+    def find index_name, category_name = nil
       index_name = index_name.to_sym
 
       indexes.each do |index|

data/lib/picky/internals/indexed/category.rb

@@ -57,7 +57,7 @@ CATEGORY
       # Loads the index from cache.
       #
       def load_from_cache
-        timed_exclaim %Q{"#{identifier}": Loading index.}
+        timed_exclaim %Q{"#{identifier}": Loading index from cache.}
         exact.load
         partial.load
       end

data/lib/picky/internals/indexing/bundle/base.rb

@@ -33,9 +33,9 @@ module Internals
         #
 
         # This method
-        # * loads the base index from the db
-        # * generates derived indexes
-        # * dumps all the indexes into files
+        # * Loads the base index from the "prepared..." file.
+        # * Generates derived indexes.
+        # * Dumps all the indexes into files.
         #
         def generate_caches_from_source
           load_from_index_file

data/lib/picky/internals/indexing/category.rb

@@ -103,7 +103,9 @@ module Internals
         exact.delete
         partial.delete
       end
-
+      
+      # Indexes, creates the "prepared_..." file.
+      #
       def index!
         prepare_index_directory
         indexer.index
@@ -113,7 +115,6 @@ module Internals
       #
       def cache!
         prepare_index_directory
-        configure
         generate_caches
       end
       # We need to set what formatting method should be used.
@@ -124,6 +125,7 @@ module Internals
         partial[:key_format] = self.key_format
       end
       def generate_caches
+        configure
         generate_caches_from_source
         generate_partial
         generate_caches_from_memory

data/lib/tasks/index.rake

@@ -23,8 +23,9 @@ namespace :index do
   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 && category.to_sym
-    Indexes.generate_cache_only index.to_sym, category && category.to_sym
+    specific_index = Indexes.find index.to_sym, (category && category.to_sym)
+    specific_index.index!
+    specific_index.cache!
   end
 
 end

data/spec/lib/index_bundle_spec.rb

@@ -28,8 +28,6 @@ describe IndexBundle do
     
     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

data/spec/lib/indexing/indexes_spec.rb

@@ -17,50 +17,6 @@ describe Indexing::Indexes do
       indexes.register @index1
       indexes.register @index2
     end
-    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
-    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(:generate_caches).once.with
-          
-          indexes.generate_cache_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(:generate_caches).never
-          
-          indexes.generate_cache_only :index, :category
-        end
-      end
-    end
     describe 'index_for_tests' do
       it 'takes a snapshot, then indexes and caches each' do
         indexes.should_receive(:take_snapshot).once.with.ordered
@@ -86,7 +42,7 @@ describe Indexing::Indexes do
     end
     def self.it_delegates_each name
       describe name do
-        it 'calls load_from_cache on each in order' do
+        it "calls #{name} on each in order" do
           @index1.should_receive(name).once.with.ordered
           @index2.should_receive(name).once.with.ordered
 

data/spec/lib/internals/indexing/category_spec.rb

@@ -96,6 +96,7 @@ describe Internals::Indexing::Category do
 
     describe 'generate_caches' 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
@@ -168,11 +169,6 @@ describe Internals::Indexing::Category do
         
         category.cache!
       end
-      it "configures" do
-        category.should_receive(:configure).once.with
-        
-        category.cache!
-      end
       it "tells the indexer to index" do
         category.should_receive(:generate_caches).once.with
         

metadata

@@ -2,7 +2,7 @@
 name: picky
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 2.5.1
   type: :development
   version_requirements: *id002
 description: Fast Ruby semantic text search engine with comfortable single field interface.