License, updated composer rules, wrapping up Response code

Author: polyfractal

.gitignore

@@ -1,5 +1,4 @@
 #composer related
-composer.json
 composer.lock
 vendor/
 

LICENSE

@@ -0,0 +1,7 @@
+Copyright (C) 2013 Zachary Tong
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

composer.json

@@ -0,0 +1,29 @@
+{
+    "name": "sherlock/sherlock",
+    "description": "PHP Client for Elasticsearch",
+    "keywords": ["search","client", "elasticsearch"],
+    "homepage": "https://github.com/polyfractal/elasticsearch-sherlock",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Zachary Tong",
+            "homepage": "http://euphonious-intuition.com/"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "guzzle/guzzle": "~3.1"
+        "analog/analog": "dev-master"
+
+    },
+    "require-dev": {
+        "phpunit/phpunit": "3.7.*"
+    },
+    "autoload": {
+        "psr-0": {
+            "sherlock": "src/",
+            "sherlock/tests" : "tests/"
+        }
+    }
+}

src/Sherlock/Sherlock.php

@@ -7,7 +7,7 @@
 
 namespace sherlock;
 
-use sherlock\Template;
+
 use sherlock\requests;
 use sherlock\components;
 use sherlock\common\exceptions;
@@ -83,35 +83,6 @@ public function autodetect()
 	}
 
 
-	public function loadTemplates($path = "", $merge = true)
-	{
-		if($path == "") {
-			$path = $this->settings['templates.path'];
-		}
-
-		$files = $this->directoryScan($path);
-		$newTemplates = array();
-		foreach($files as $file => $fullPath){
-			$newTemplates[$file] = new \sherlock\Template\Template($path.$fullPath);
-		}
-
-		if ($merge == true)
-			$this->templates = array_merge($this->templates, $newTemplates);
-		else
-			$this->templates = $newTemplates;
-
-	}
-
-	/**
-	 * @param $key
-	 * @return \sherlock\Template\Template
-	 */
-	public function getTemplate($key)
-	{
-		return $this->templates[$key];
-	}
-
-
 	/**
 	 * Add a new node to the ES cluster
 	 * @param string $host server host address (either IP or domain)

src/Sherlock/requests/SearchRequest.php

@@ -145,7 +145,7 @@ public function execute()
 		//parent and children under Strict
 		$this->_uri = $uri;
 		$this->_data = $finalQuery;
-		parent::execute();
+		return parent::execute();
 	}
 }
 

src/Sherlock/responses/Response.php

@@ -8,18 +8,100 @@
 namespace sherlock\responses;
 use Guzzle\Http\Message;
 
-class Response
+class Response implements \IteratorAggregate, \Countable
 {
+	/**
+	 * @var int
+	 */
+	public $took;
+
+	/**
+	 * @var bool
+	 */
+	public $timed_out;
 
-	protected $responseData;
+	/**
+	 * @var int
+	 */
+	public $total;
+
+	/**
+	 * @var float
+	 */
+	public $max_score;
+
+	/**
+	 * @var array
+	 */
+	public $hits;
+
+	/**
+	 * @var array
+	 */
+	public $responseData;
+
+
+	private $_key;
 
 	/**
 	 * @param \Guzzle\Http\Message\Response $response
+	 * @throws \sherlock\common\exceptions\BadMethodCallException
 	 */
 	public function __construct($response)
 	{
+		if (!isset($response))
+		{
+			\Analog\Analog::log("Response must be set in constructor.",\Analog\Analog::ERROR);
+			throw new \sherlock\common\exceptions\BadMethodCallException("Response must be set in constructor.");
+		}
+
 		$this->responseData = $response->json();
+		\Analog\Analog::log("Response->__construct() : ".print_r($this->responseData,true),\Analog\Analog::DEBUG);
+
+		$this->took = $this->responseData['took'];
+		$this->timed_out = ($this->responseData['timed_out'] == '') ? false : true;
+
+		if (isset($this->responseData['hits']['total']))
+			$this->total = $this->responseData['hits']['total'];
+
+		if (isset($this->responseData['hits']['max_score']))
+			$this->max_score = $this->responseData['hits']['max_score'];
+
+		if (isset($this->responseData['hits']['hits']))
+		{
+			$this->hits = $this->responseData['hits']['hits'];
+
+			//get rid of the underscores
+			foreach($this->hits as $hitKey => $hit)
+			{
+				foreach($hit as $key => $value)
+				{
+					if (substr($key,0,1)=='_'){
+						$this->hits[$hitKey][ltrim($key, '_')] = $value;
+						unset($this->hits[$hitKey][$key]);
+					}
+				}
+			}
+
+		}
+
+
+
 	}
 
 
+	public function getIterator()
+	{
+		return new \ArrayIterator($this->hits);
+	}
+
+	public function count()
+	{
+		return sizeof($this->hits);
+	}
+
+
+
+
+
 }

src/Sherlock/template/Template.php

@@ -43,14 +43,22 @@ public function testAddNode()
 
     /**
      * @covers sherlock\Sherlock::query
+	 * @todo make this test actually assert things
      */
     public function testBuildQuery()
     {
-		$ret = $this->object->addNode('loopback.com', '9200');
+		$this->object->addNode('loopback.com', '9200');
 		$req = $this->object->search();
 		$req->index("test")->type("benchmark");
 		$req->query($this->object->query()->Term()->field("field1")->term("town"));
-		$req->execute();
+		$resp = $req->execute();
+
+		echo $resp->took;
+		foreach($resp as $hit)
+		{
+			echo $hit['score'].' - '.$hit['source']['field1']."\r\n";
+		}
+