lib/picky/indexes_indexing.rb in picky-3.6.16 vs lib/picky/indexes_indexing.rb in picky-4.0.0pre1

@@ -2,38 +2,35 @@
 
   # Indexes indexing.
   #
   class Indexes
 
-    instance_delegate :index,
-                      :clear,
-                      :index_for_tests,
+    extend Helpers::Indexing
+
+    instance_delegate :clear,
                       :tokenizer
 
     each_delegate :clear,
                   :to => :indexes
 
-    # Runs the indexers in parallel (prepare + cache).
     #
-    def index randomly = true
-      # Run in parallel.
-      #
-      timed_exclaim "Indexing using #{Cores.max_processors} processors, in #{randomly ? 'random' : 'given'} order."
-
-      # Run indexing/caching forked.
-      #
-      Cores.forked self.indexes, { randomly: randomly }, &:index
-
-      timed_exclaim "Indexing finished."
+    #
+    def self.index scheduler = Scheduler.new
+      timed_indexing scheduler do
+        instance.index scheduler
+      end
     end
 
-    # For integration testing – indexes for the tests
-    # without forking and shouting ;)
     #
-    # TODO Rename to #index_without_forking, or just #index.
     #
-    def index_for_tests
-      indexes.each(&:index)
+    def index scheduler = Scheduler.new
+      indexes.each { |index| index.prepare scheduler }
+      scheduler.finish
+
+      timed_exclaim "Tokenizing finished, generating data for indexes from tokenized data."
+
+      indexes.each { |index| index.cache scheduler }
+      scheduler.finish
     end
 
     #
     #
     def tokenizer
\ No newline at end of file