picky 4.8.1 → 4.9.0

data/lib/picky/bundle.rb

@@ -43,7 +43,9 @@ module Picky
 
     delegate :[], :[]=,        :to => :configuration
     delegate :index_directory, :to => :category
-
+    
+    # TODO Move the strategies into options.
+    #
     def initialize name, category, weight_strategy, partial_strategy, similarity_strategy, options = {}
       @name     = name
       @category = category

data/lib/picky/category.rb

@@ -60,25 +60,39 @@ module Picky
     # TODO I do a lot of helper method calls here. Refactor?
     #
     def configure_indexes_from options
-      index_name = @index.name
-      
-      weights    = Generators::Weights.from    options[:weight],     index_name, name
-      partial    = Generators::Partial.from    options[:partial],    index_name, name
-      similarity = Generators::Similarity.from options[:similarity], index_name, name
+      weights    = weights_from options
+      partial    = partial_from options
+      similarity = similarity_from options
 
-      no_partial    = Generators::Partial::None.new
-      no_similarity = Generators::Similarity::None.new
+      @exact     = exact_for weights, similarity, options
+      @partial   = partial_for @exact, partial, weights, options
 
-      @exact = Bundle.new :exact, self, weights, no_partial, similarity, options
-      if partial.respond_to?(:use_exact_for_partial?) && partial.use_exact_for_partial?
-        @partial = Wrappers::Bundle::ExactPartial.new @exact
+      @prepared  = Backends::Prepared::Text.new prepared_index_path
+    end
+    def weights_from options
+      Generators::Weights.from options[:weight], index_name, name
+    end
+    def partial_from options
+      Generators::Partial.from options[:partial], index_name, name
+    end
+    def similarity_from options
+      Generators::Similarity.from options[:similarity], index_name, name
+    end
+    def exact_for weights, similarity, options
+      Bundle.new :exact, self, weights, Generators::Partial::None.new, similarity, options
+    end
+    def partial_for exact, partial_options, weights, options
+      # TODO Also partial.extend Bundle::Exact like in the category.
+      #
+      # Instead of exact for partial, use respond_to? :exact= on eg. Partial::None, then set it on the instance? 
+      #
+      if partial_options.respond_to?(:use_exact_for_partial?) && partial_options.use_exact_for_partial?
+        Wrappers::Bundle::ExactPartial.new exact
       else
-        @partial = Bundle.new :partial, self, weights, partial, no_similarity, options
+        Bundle.new :partial, self, weights, partial_options, Generators::Similarity::None.new, options
       end
-
-      @prepared = Backends::Prepared::Text.new prepared_index_path
     end
-
+    
     # Indexes and loads the category.
     #
     def reindex

data/lib/picky/scheduler.rb

@@ -22,7 +22,11 @@ module Picky
         end
 
         def scheduler
-          @scheduler ||= Procrastinate::Scheduler.start Procrastinate::SpawnStrategy::Default.new(@factor)
+          @scheduler ||= create_scheduler
+        end
+        
+        def create_scheduler
+          Procrastinate::Scheduler.start Procrastinate::SpawnStrategy::Default.new(@factor)
         end
       else
         def schedule
@@ -36,7 +40,15 @@ module Picky
     end
 
     def fork?
+      require 'procrastinate'
       parallel && Process.respond_to?(:fork)
+    rescue LoadError => e
+      warn_procrastinate_missing
+      return false
+    end
+    def warn_procrastinate_missing
+      warn_gem_missing 'Procrastinate', 'parallelized indexing (with the procrastinate gem)' unless @gem_missing_warned
+      @gem_missing_warned = true
     end
 
   end

data/lib/picky.rb

@@ -24,7 +24,6 @@ module Picky
   require 'active_support/core_ext/enumerable'
   require 'active_support/multibyte'
   require 'multi_json'
-  require 'procrastinate'
   require 'rack_fast_escape' if defined? Rack
   require 'fileutils'
   

data/spec/functional/reloading_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe "Realtime Indexing" do
 
-  Book = Struct.new(:id, :title, :author)
+  ReloadingBook = Struct.new(:id, :title, :author)
 
   context 'default index' do
     let(:index) do
@@ -16,12 +16,12 @@ describe "Realtime Indexing" do
     let(:books) { Picky::Search.new index }
 
     before(:each) do
-      index.add Book.new(1, "Title", "Author")
+      index.add ReloadingBook.new(1, "Title", "Author")
     end
 
     context 'dumping and loading' do
       it "doesn't find books anymore after dumping and loading and updating" do
-        index.replace Book.new(2, "Title New", "Author New")
+        index.replace ReloadingBook.new(2, "Title New", "Author New")
 
         books.search("title").ids.should == [2, 1]
 
@@ -29,7 +29,7 @@ describe "Realtime Indexing" do
         index.load
         index.build_realtime_mapping
 
-        index.replace Book.new(2, "Blah New", "Author New")
+        index.replace ReloadingBook.new(2, "Blah New", "Author New")
 
         books.search("title").ids.should == [1]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: picky
 version: !ruby/object:Gem::Version
-  version: 4.8.1
+  version: 4.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-14 00:00:00.000000000 Z
+date: 2012-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 4.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 4.9.0
 - !ruby/object:Gem::Dependency
   name: text
   requirement: !ruby/object:Gem::Requirement
@@ -91,22 +91,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: procrastinate
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rack_fast_escape
   requirement: !ruby/object:Gem::Requirement