+ evaluate source block once for each indexing stage

server/lib/picky/indexers/base.rb

@@ -20,21 +20,22 @@ def initialize index_or_category
       # Starts the indexing process.
       #
       def prepare categories, scheduler = Scheduler.new
-        check_source
+        source_for_prepare = source
+        check source_for_prepare
         categories.empty
-        process categories, scheduler do |prepared_file|
+        process source_for_prepare, categories, scheduler do |prepared_file|
           notify_finished prepared_file
         end
       end
 
       # Explicitly reset the source to avoid caching trouble.
       #
-      def reset_source
+      def reset source
         source.reset      if source.respond_to?(:reset)
         source.reconnect! if source.respond_to?(:reconnect!)
       end
 
-      def check_source # :nodoc:
+      def check source # :nodoc:
         raise "Trying to index without a source for #{@index_or_category.name}." unless source
       end
 

server/lib/picky/indexers/parallel.rb

@@ -15,7 +15,7 @@ class Parallel < Base
       # Parameters:
       #  * categories: An Enumerable of Category-s.
       #
-      def process categories, scheduler = Scheduler.new
+      def process source_for_prepare, categories, scheduler = Scheduler.new
         # Prepare a combined object - array.
         #
         combined = categories.map do |category|
@@ -26,9 +26,9 @@ def process categories, scheduler = Scheduler.new
         #
         objects = []
 
-        reset_source
+        reset source_for_prepare
 
-        source.each do |object|
+        source_for_prepare.each do |object|
 
           # Accumulate objects.
           #

server/lib/picky/indexers/serial.rb

@@ -16,7 +16,7 @@ class Serial < Base
       # Parameters:
       #  * categories: An enumerable of Category-s.
       #
-      def process categories, scheduler = Scheduler.new
+      def process source_for_prepare, categories, scheduler = Scheduler.new
         categories.each do |category|
 
           category.prepared_index_file do |file|
@@ -25,7 +25,7 @@ def process categories, scheduler = Scheduler.new
             result = []
             tokenizer = category.tokenizer
 
-            reset_source
+            reset source_for_prepare
 
             source.harvest(category) do |*data|
 

server/spec/lib/indexers/base_spec.rb

@@ -35,7 +35,7 @@
     it 'processes' do
       categories = stub :categories, :empty => nil, :cache => nil
 
-      indexer.should_receive(:process).once.with categories, anything
+      indexer.should_receive(:process).once.with :some_source, categories, anything
 
       indexer.prepare categories
     end