[EXT] Moved the :transform option for "Reindex" extension

Moved the `:transform` option from `:target` into the top level
of Hash arguments -- this seems like a more natural way.

Related: #270

Author: karmi

elasticsearch-extensions/lib/elasticsearch/extensions/reindex.rb

@@ -68,19 +68,19 @@ def reindex(arguments={})
       #
       #     reindex = Elasticsearch::Extensions::Reindex.new \
       #                 source: { index: 'test1', client: client },
-      #                 target: { index: 'test2' },
-      #                 transform: lambda { |doc| doc['_source']['category'].upcase! }
+      #                 target: { index: 'test2', transform: lambda { |doc| doc['_source']['category'].upcase! } }
+      #
       #
       # The reindexing process works by "scrolling" an index and sending
       # batches via the "Bulk" API to the target index/cluster
       #
       # @option arguments [String] :source The source index/cluster definition (*Required*)
       # @option arguments [String] :target The target index/cluster definition (*Required*)
+      # @option arguments [Proc] :transform A block which will be executed for each document
       # @option arguments [Integer] :batch_size The size of the batch for scroll operation (Default: 1000)
       # @option arguments [String] :scroll The timeout for the scroll operation (Default: 5min)
       # @option arguments [Boolean] :refresh Whether to refresh the target index after
       #                                      the operation is completed (Default: false)
-      # @option arguments [Proc] :transform A block which will be executed for each document
       #
       # Be aware, that if you want to change the target index settings and/or mappings,
       # you have to do so in advance by using the "Indices Create" API.
@@ -137,7 +137,7 @@ def perform
             bulk = documents.map do |doc|
               doc['_index'] = arguments[:target][:index]
 
-              arguments[:target][:transform].call(doc) if arguments[:target][:transform]
+              arguments[:transform].call(doc) if arguments[:transform]
 
               doc['data'] = doc['_source']
               doc.delete('_score')

elasticsearch-extensions/test/reindex/integration/reindex_test.rb

@@ -43,7 +43,8 @@ class Elasticsearch::Extensions::ReindexIntegrationTest < Elasticsearch::Test::I
     should "transform documents with a lambda" do
       reindex = Elasticsearch::Extensions::Reindex.new \
                   source: { index: 'test1', client: @client },
-                  target: { index: 'test2', transform: lambda { |d| d['_source']['category'].upcase! } },
+                  target: { index: 'test2' },
+                  transform: lambda { |d| d['_source']['category'].upcase! },
                   refresh: true
 
       result = reindex.perform

elasticsearch-extensions/test/reindex/unit/reindex_test.rb

@@ -83,7 +83,8 @@ class Elasticsearch::Extensions::ReindexTest < Test::Unit::TestCase
         client  = mock()
         subject = Elasticsearch::Extensions::Reindex.new \
           source: { index: 'foo', client: client },
-          target: { index: 'bar', transform: lambda { |d| d['_source']['foo'].upcase!; d } }
+          target: { index: 'bar' },
+          transform: lambda { |d| d['_source']['foo'].upcase!; d }
 
         client.expects(:search).returns({ '_scroll_id' => 'scroll_id_1' })
         client.expects(:scroll).returns(@default_response)