[MODEL] Minor changes and tweaks to the transform feature for import

Related: c4b42b5, elastic#113

Author: karmi

elasticsearch-model/lib/elasticsearch/model/adapters/active_record.rb

@@ -93,7 +93,7 @@ def __find_in_batches(options={}, &block)
           end
 
           def __transform
-            lambda {|model|  { index: { _id: model.id, data: model.__elasticsearch__.as_indexed_json } }}
+            lambda { |model|  { index: { _id: model.id, data: model.__elasticsearch__.as_indexed_json } } }
           end
         end
       end

elasticsearch-model/lib/elasticsearch/model/importing.rb

@@ -68,10 +68,10 @@ module ClassMethods
         #
         #    Article.import scope: 'published'
         #
-        # @example Customize how each record is [bulk imported](https://github.com/elasticsearch/elasticsearch-ruby/blob/master/elasticsearch-api/lib/elasticsearch/api/actions/bulk.rb)
+        # @example Transform records during the import with a lambda
         #
-        #    transform = lambda do |article|
-        #      {index: {_id: article.id, _parent: article.author_id, data: article.__elasticsearch__.as_indexed_json}}
+        #    transform = lambda do |a|
+        #      {index: {_id: a.id, _parent: a.author_id, data: a.__elasticsearch__.as_indexed_json}}
         #    end
         #
         #    Article.import transform: transform
@@ -83,8 +83,9 @@ def import(options={}, &block)
           target_type  = options.delete(:type)      || document_type
           transform    = options.delete(:transform) || __transform
 
-          if !transform.respond_to?(:call)
-            raise ArgumentError, "You must pass an object that supports #call method, #{transform.class} given"
+          unless transform.respond_to?(:call)
+            raise ArgumentError,
+                  "Pass an object responding to `call` as the :transport option, #{transform.class} given"
           end
 
           if options.delete(:force)
@@ -108,7 +109,7 @@ def import(options={}, &block)
         end
 
         def __batch_to_bulk(batch, transform)
-          batch.map {|model| transform.call(model)}
+          batch.map { |model| transform.call(model) }
         end
       end
 

elasticsearch-model/test/integration/active_record_import_test.rb

@@ -81,6 +81,18 @@ class ::ImportArticle < ActiveRecord::Base
           ImportArticle.__elasticsearch__.refresh_index!
           assert_equal 100, ImportArticle.search('*').results.total
         end
+
+        should "transform documents with the option" do
+          assert_equal 100, ImportArticle.count
+
+          assert_equal 0, ImportArticle.import( transform: ->(a) {{ index: { data: { name: a.title, foo: 'BAR' } }}} )
+
+          ImportArticle.__elasticsearch__.refresh_index!
+          assert_contains ImportArticle.search('*').results.first._source.keys, 'name'
+          assert_contains ImportArticle.search('*').results.first._source.keys, 'foo'
+          assert_equal 100, ImportArticle.search('test').results.total
+          assert_equal 100, ImportArticle.search('bar').results.total
+        end
       end
 
     end

elasticsearch-model/test/unit/adapter_active_record_test.rb

@@ -113,7 +113,7 @@ def ids
           assert_respond_to @transform, :call
         end
 
-        should "provide basic transformation" do
+        should "provide default transformation" do
           model = mock("model", id: 1, __elasticsearch__: stub(as_indexed_json: {}))
           assert_equal @transform.call(model), { index: { _id: 1, data: {} } }
         end

elasticsearch-model/test/unit/importing_test.rb

@@ -126,7 +126,7 @@ def importing_mixin
       DummyImportingModel.import index: 'my-new-index', type: 'my-other-type'
     end
 
-    should "default to the adapter's bulk transform" do
+    should "use the default transform from adapter" do
       client = mock('client', bulk: {'items' => []})
       transform = lambda {|a|}
 
@@ -137,7 +137,7 @@ def importing_mixin
       DummyImportingModel.import index: 'foo', type: 'bar'
     end
 
-    should "use the optioned transform" do
+    should "use the transformer from options" do
       client = mock('client', bulk: {'items' => []})
       transform = lambda {|a|}
 
@@ -147,7 +147,7 @@ def importing_mixin
       DummyImportingModel.import index: 'foo', type: 'bar', transform: transform
     end
 
-    should "raise an ArgumentError if transform is an object that doesn't respond to #call" do
+    should "raise an ArgumentError if transform doesn't respond to the call method" do
       assert_raise ArgumentError do
         DummyImportingModel.import index: 'foo', type: 'bar', transform: "not_callable"
       end