Fix Elastica_Document::toArray() #178

ruflin · Jun 9, 2012 · 9316dee · 9316dee
1 parent 8a0eb56
commit 9316dee
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/changes.txt b/changes.txt
@@ -2,6 +2,7 @@ CHANGES
 
 2012-06-09
 - Change $_parent to null to also support 0 for an id
+- Fix Elasitca_Document->toArray()
 
 2012-05-01
 - Release v0.19.3.0

diff --git a/lib/Elastica/Document.php b/lib/Elastica/Document.php
@@ -27,14 +27,14 @@ class Elastica_Document {
 	 * 
 	 * @var string Document type name
 	 */
-	protected $_type = '';
+	protected $_type = null;
 
 	/**
 	 * Document index name
 	 * 
 	 * @var string Document index name
 	 */
-	protected $_index = '';
+	protected $_index = null;
 
 	/**
 	 * Document version
@@ -207,7 +207,7 @@ public function setType($type) {
 	public function getType() {
 		$type = $this->_type;
 
-		if (empty($type)) {
+		if (is_null($type)) {
 			throw new Elastica_Exception_Invalid('Type not set');
 		}
 		return $type;
@@ -233,7 +233,7 @@ public function setIndex($index) {
 	public function getIndex() {
 		$index = $this->_index;
 
-		if (empty($index)) {
+		if (is_null($index)) {
 			throw new Elastica_Exception_Invalid('Index not set');
 		}
 		return $index;
@@ -326,19 +326,31 @@ public function getPercolate() {
 	 * @return array
 	 */
 	public function toArray() {
-		$index = array('_index' => $this->getIndex(), '_type' => $this->getType(), '_id' => $this->getId());
+		$doc = array();
+
+		if (!is_null($this->_index)) {
+			$doc['_index'] = $this->_index;
+		}
+
+		if (!is_null($this->_type)) {
+			$doc['_type'] = $this->_type;
+		}
+
+		if (!is_null($this->_index)) {
+			$doc['_id'] = $this->getId();
+		}
 
 		$version = $this->getVersion();
 		if (!empty($version)) {
-			$index['_version'] = $version;
+			$doc['_version'] = $version;
 		}
 
 		$parent = $this->getParent();
 		if (!is_null($parent)) {
-			$index['_parent'] = $parent;
+			$doc['_parent'] = $parent;
 		}
 
-		$params[] = $action;
-		$params[] = $doc->getData();
+		$doc['_source'] = $this->getData();
+		return $doc;
 	}
 }
diff --git a/test/lib/Elastica/DocumentTest.php b/test/lib/Elastica/DocumentTest.php
@@ -39,4 +39,16 @@ public function testSetData()
 		$returnValue = $doc->setData(array('data'));
 		$this->assertInstanceOf('Elastica_Document', $returnValue);
 	}
+
+	public function testToArray() {
+		$id = 17;
+		$data = array('hello' => 'world');
+		$type = 'testtype';
+		$index = 'textindex';
+
+		$doc = new Elastica_Document($id, $data, $type, $index);
+
+		$result = array('_index' => $index, '_type' => $type, '_id' => $id, '_source' => $data);
+		$this->assertEquals($result, $doc->toArray());
+	}
 }