Merge pull request #575 from pentarim/master

handling of doc => string data in Bulk Action

Author: ruflin

changes.txt

@@ -2,6 +2,9 @@ CHANGES
 2014-03-24
 - Added Filter\Indices #574
 
+2014-03-25
+- Allow json string as data srouce for Bulk\Action on update #575
+
 2014-03-20
 - Allow for request params in delete by query calls #573
 

lib/Elastica/Bulk/Action.php

@@ -190,6 +190,8 @@ public function toString()
             $source = $this->getSource();
             if (is_string($source)) {
                 $string.= $source;
+            } elseif (is_array($source) && array_key_exists('doc', $source) && is_string($source['doc'])) {
+                $string.= '{"doc": ' . $source['doc'] . '}';
             } else {
                 $string.= json_encode($source, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES);
             }

test/lib/Elastica/Test/BulkTest.php

@@ -558,6 +558,24 @@ public function testUpdate()
         $doc = $type->getDocument(6);
         $this->assertEquals('test', $doc->test);
 
+        //test updating via document with json string as data
+        $doc3 = $type->createDocument(2);
+        $bulk = new Bulk($client);
+        $bulk->setType($type);
+        $doc3->setData('{"name" : "Paul it is"}');
+        $updateAction = new \Elastica\Bulk\Action\UpdateDocument($doc3);
+        $bulk->addAction($updateAction);
+        $response = $bulk->send();
+
+        $this->assertTrue($response->isOk());
+        $this->assertFalse($response->hasError());
+
+        $index->refresh();
+
+        $doc = $type->getDocument(2);
+        $docData = $doc->getData();
+        $this->assertEquals('Paul it is', $docData['name']);
+
         $index->delete();
     }