picky 0.11.0 → 0.11.1

data/lib/picky/bundle.rb

@@ -18,6 +18,8 @@ class Bundle
     #
     # TODO Move Files somewhere. Shared?
     #
+    # Files and the identifier are parametrized, the rest is not!
+    #
     @files = Index::Files.new name, category.name, type.name
   end
   

data/lib/picky/index/category.rb

@@ -37,8 +37,6 @@ module Index
     
     # Loads the index from cache.
     #
-    # TODO Metaprogram delegation? each_delegate?
-    #
     def load_from_cache
       timed_exclaim "Loading index #{identifier}."
       exact.load

data/lib/picky/index/files.rb

@@ -1,7 +1,5 @@
 module Index
   
-  # TODO Think about using 3 instances of this in the bundle.
-  #
   class Files
     
     attr_reader :bundle_name, :category_name, :type_name

data/lib/picky/indexers/base.rb

@@ -21,6 +21,8 @@ module Indexers
     #
     # TODO Duplicate code in Index::Files.
     #
+    # TODO Rename to prepared_index_file_name.
+    #
     def search_index_file_name
       @category.search_index_file_name
     end
@@ -37,7 +39,7 @@ module Indexers
       @category.source || raise_no_source
     end
     def raise_no_source
-      raise NoSourceSpecifiedException.new "No source given for index:#{@type.name}, category:#{@category.name}." # TODO field.identifier
+      raise NoSourceSpecifiedException.new("No source given for index:#{@type.name}, category:#{@category.name}.") # TODO field.identifier
     end
     
     # Selects the original id (indexed id) and a column to process. The column data is called "token".
@@ -50,7 +52,17 @@ module Indexers
       
       indexing_message
       
-      # TODO Move open to Index::File. 
+      # TODO Move open to Index::File.
+      #
+      # @category.prepared_index do |file|
+      #   source.harvest(@type, @category) do |indexed_id, text|
+      #     tokenizer.tokenize(text).each do |token_text|
+      #       next unless token_text
+      #       file.buffer indexed_id << comma << token_text << newline
+      #     end
+      #     file.write_maybe
+      #   end
+      # end
       #
       File.open(search_index_file_name, 'w:binary') do |file|
         result = []

data/lib/picky/indexers/default.rb

@@ -1,3 +1,3 @@
 module Indexers
-  Default = Field
+  Default = Base
 end

data/lib/picky/indexing/categories.rb

@@ -29,6 +29,8 @@ module Indexing
         next unless category.name == category_name
         return category
       end
+      
+      raise %Q{Index category "#{category_name}" not found. Possible categories: "#{categories.map(&:name).join('", "')}".}
     end
     
   end

data/lib/picky/indexing/category.rb

@@ -26,6 +26,8 @@ module Indexing
       @exact   = options[:exact_indexing_bundle]   || Bundle.new(:exact,   self, type, similarity, Cacher::Partial::None.new, weights)
       @partial = options[:partial_indexing_bundle] || Bundle.new(:partial, self, type, Cacher::Similarity::None.new, partial, weights)
       
+      # TODO Move to Query.
+      #
       # @remove          = options[:remove]        || false
       # @filter          = options[:filter]        || true
       
@@ -66,27 +68,11 @@ module Indexing
       exact.delete
       partial.delete
     end
-    def create_directory_structure
-      timed_exclaim "Creating directory structure for #{identifier}."
-      exact.create_directory
-      partial.create_directory
-    end
-    
-    # Used for testing.
-    #
-    # TODO Remove?
-    #
-    def generate_indexes_from_exact_index
-      generate_derived_exact
-      generate_partial
-      generate_derived_partial
-    end
-    def generate_derived_exact
-      exact.generate_derived
-    end
-    def generate_derived_partial
-      partial.generate_derived
-    end
+    # def create_directory_structure
+    #   timed_exclaim "Creating directory structure for #{identifier}."
+    #   exact.create_directory
+    #   partial.create_directory
+    # end
     
     # Generates all caches for this category.
     #
@@ -117,6 +103,8 @@ module Indexing
     
     # TODO Partially move to type. Duplicate Code in indexers/field.rb.
     #
+    # TODO Use the Files object.
+    #
     def search_index_root
       File.join PICKY_ROOT, 'index'
     end
@@ -128,6 +116,7 @@ module Indexing
     end
     def index
       prepare_cache_directory
+      # files.create_directory # TODO Make this possible!
       indexer.index
     end
     def prepare_cache_directory

data/lib/picky/indexing/types.rb

@@ -46,14 +46,25 @@ module Indexing
       timed_exclaim "INDEXING FINISHED."
     end
     
+    # For testing.
+    #
+    def index_for_tests
+      take_snapshot
+      
+      self.types.each do |type|
+        type.index
+        type.cache
+      end
+    end
+    
     # TODO Spec
     #
-    def generate_index_only type_name, field_name
-      found = find type_name, field_name
+    def generate_index_only type_name, category_name
+      found = find type_name, category_name
       found.index if found
     end
     def generate_cache_only type_name, category_name
-      found = find type_name, field_name
+      found = find type_name, category_name
       found.generate_caches if found
     end
     
@@ -68,6 +79,8 @@ module Indexing
         found = type.categories.find category_name
         return found if found
       end
+      
+      raise %Q{Index "#{type_name}" not found. Possible indexes: "#{types.map(&:name).join('", "')}".}
     end
     
   end

data/lib/picky/loader.rb

@@ -120,7 +120,6 @@ module Loader
     #
     load_relative 'indexers/no_source_specified_error'
     load_relative 'indexers/base'
-    load_relative 'indexers/field'
     load_relative 'indexers/default'
     #
     # load_relative 'indexers/solr'

data/lib/picky/sources/couch.rb

@@ -37,7 +37,7 @@ module Sources
     end
 
     def raise_no_db_given field_names
-      raise NoCouchDBGiven.new field_names.join(', ')
+      raise NoCouchDBGiven.new(field_names.join(', '))
     end
   end
 end

data/lib/picky/sources/csv.rb

@@ -18,7 +18,7 @@ module Sources
     #
     #
     def raise_no_file_given field_names
-      raise NoCSVFileGiven.new field_names.join(', ')
+      raise NoCSVFileGiven.new(field_names.join(', '))
     end
     
     # Harvests the data to index.

data/lib/picky/types.rb

@@ -8,7 +8,9 @@ class Types
            :load_from_cache,
            :to => :@indexes
   
-  delegate :index,
+  delegate :find,
+           :index,
+           :index_for_tests,
            :generate_index_only,
            :generate_cache_only,
            :to => :@indexings

data/lib/tasks/index.rake

@@ -12,17 +12,16 @@ namespace :index do
   #   end
   # end
   
-  # TODO Make option to also use non-random.
-  #      rake index:randomly (default)
-  #      rake index:ordered
-  #
-  desc "Takes a snapshot, indexes, and caches."
-  task :generate, [:order] => :application do |_, options|
-    randomly = (options.order == 'ordered') ? false : true
-    Indexes.index randomly
+  desc "Takes a snapshot, indexes, and caches in random order."
+  task :randomly => :application do
+    Indexes.index true
+  end
+  desc "Takes a snapshot, indexes, and caches in order given."
+  task :ordered => :application do
+    Indexes.index false
   end
   
-  desc "Generates the index snapshots."
+  # desc "Generates the index snapshots."
   task :generate_snapshots => :application do
     Indexes.take_snapshot
   end

data/lib/tasks/shortcuts.rake

@@ -1,6 +1,6 @@
-desc "Generate the index."
+desc "Generate the index (random order)."
 task :index => :application do
-  Rake::Task[:'index:generate'].invoke
+  Rake::Task[:'index:randomly'].invoke
 end
 
 desc "Try the given text in the indexer/query (type:field optional)."

data/spec/lib/indexing/category_spec.rb

@@ -24,41 +24,15 @@ describe Indexing::Category do
         @category.dump_caches
       end
     end
-
-    describe 'generate_derived_partial' do
-      it 'should delegate to partial' do
-        @partial.should_receive(:generate_derived).once.with
-
-        @category.generate_derived_partial
-      end
-    end
-
-    describe 'generate_derived_exact' do
-      it 'should delegate to exact' do
-        @exact.should_receive(:generate_derived).once.with
-
-        @category.generate_derived_exact
-      end
-    end
-
-    describe 'generate_indexes_from_exact_index' do
-      it 'should call three method in order' do
-        @category.should_receive(:generate_derived_exact).once.with().ordered
-        @category.should_receive(:generate_partial).once.with().ordered
-        @category.should_receive(:generate_derived_partial).once.with().ordered
-
-        @category.generate_indexes_from_exact_index
-      end
-    end
     
     describe 'generate_caches_from_memory' do
       it 'should delegate to partial' do
         @partial.should_receive(:generate_caches_from_memory).once.with
-
+        
         @category.generate_caches_from_memory
       end
     end
-
+    
     describe 'generate_partial' do
       it 'should return whatever the partial generation returns' do
         @exact.stub! :index

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 11
-  - 0
-  version: 0.11.0
+  - 1
+  version: 0.11.1
 platform: ruby
 authors: 
 - Florian Hanke
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-08 00:00:00 +01:00
+date: 2010-11-09 00:00:00 +01:00
 default_executable: picky
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,6 @@ files:
 - lib/picky/character_substitution/european.rb
 - lib/picky/configuration/indexes.rb
 - lib/picky/configuration/queries.rb
-- lib/picky/configuration/type.rb
 - lib/picky/cores.rb
 - lib/picky/ext/maybe_compile.rb
 - lib/picky/ext/ruby19/extconf.rb
@@ -90,7 +89,6 @@ files:
 - lib/picky/index/wrappers/exact_first.rb
 - lib/picky/indexers/base.rb
 - lib/picky/indexers/default.rb
-- lib/picky/indexers/field.rb
 - lib/picky/indexers/no_source_specified_error.rb
 - lib/picky/indexers/solr.rb
 - lib/picky/indexing/bundle.rb
@@ -192,7 +190,6 @@ files:
 - spec/lib/index/type_spec.rb
 - spec/lib/index/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
-- spec/lib/indexers/field_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
 - spec/lib/indexing/categories_spec.rb
@@ -294,7 +291,6 @@ test_files:
 - spec/lib/index/type_spec.rb
 - spec/lib/index/wrappers/exact_first_spec.rb
 - spec/lib/indexers/base_spec.rb
-- spec/lib/indexers/field_spec.rb
 - spec/lib/indexing/bundle_partial_generation_speed_spec.rb
 - spec/lib/indexing/bundle_spec.rb
 - spec/lib/indexing/categories_spec.rb

data/lib/picky/configuration/type.rb

@@ -1,20 +0,0 @@
-module Configuration
-  class Type
-    attr_reader :name,
-                :source,
-                :result_type,
-                :after_indexing,
-                :ignore_unassigned_tokens
-    def initialize name, source, options
-      @name                     = name
-      @source                   = source
-      
-      @result_type              = options[:result_type] || name
-      @after_indexing           = options[:after_indexing] # Where do I use this?
-      @ignore_unassigned_tokens = options[:ignore_unassigned_tokens] || false # TODO Move to query?
-    end
-    def generate
-      Index::Type.new name, source, result_type, ignore_unassigned_tokens
-    end
-  end
-end

data/lib/picky/indexers/field.rb

@@ -1,9 +0,0 @@
-module Indexers
-  # Base indexer for fields.
-  #
-  class Field < Base
-    
-    # TODO Still needed?
-    
-  end
-end

data/spec/lib/indexers/field_spec.rb

@@ -1,9 +0,0 @@
-# encoding: utf-8
-#
-require 'spec_helper'
-
-describe Indexers::Field do
-  
-  
-  
-end