merged conflict in readme

README.md

@@ -1,6 +1,8 @@
 Laravel-Datatables 
 ==================
-[![Build Status](https://travis-ci.org/Daveawb/Laravel-Datatables.svg?branch=master)](https://travis-ci.org/Daveawb/Laravel-Datatables) [![Coverage Status](https://img.shields.io/coveralls/Daveawb/Laravel-Datatables.svg)](https://coveralls.io/r/Daveawb/Laravel-Datatables?branch=development)
+
+[![Build Status](https://travis-ci.org/Daveawb/Laravel-Datatables.svg?branch=master)](https://travis-ci.org/Daveawb/Laravel-Datatables) [![Coverage Status](https://coveralls.io/repos/Daveawb/Laravel-Datatables/badge.png?branch=development)](https://coveralls.io/r/Daveawb/Laravel-Datatables?branch=development)
+
 #Introduction
 This project is aimed at anyone using the fantastic dataTables jQuery plugin written by [SpryMedia](http://sprymedia.co.uk/) and Laravel 4.1 or greater. It was written originally for dataTables 1.9.x, however since 1.10.x has now been released with a new API and data structure there will be updates to allow you to make use of the new syntax in the near future. If you haven't used datatables before check it out at [Datatables.net](http://datatables.net/).
 

phpunit.xml

@@ -11,6 +11,9 @@
          syntaxCheck="true"
 >
     <testsuites>
+    	<testsuite name="exceptions">
+    		<directory suffix=".php">./tests/exceptions</directory>    		
+    	</testsuite>
         <testsuite name="columns">
             <directory suffix=".php">./tests/columns</directory>
         </testsuite>

src/Daveawb/Datatables/Columns/Column.php

@@ -80,7 +80,7 @@ protected function setInterpretationData($data)
      * @return {String}
      */ 
     public function interpret($field, &$data)
-    {
+    {		
         if (count($this->interpret) < 1 && is_null($this->closure))
             return $data[$field];
 

src/Daveawb/Datatables/DatatablesServiceProvider.php

@@ -9,12 +9,12 @@ class DatatablesServiceProvider extends ServiceProvider {
 	 *
 	 * @var bool
 	 */
-	protected $defer = false;
+	protected $defer = true;
 
 	/**
 	 * Register the service provider.
 	 *
-	 * @return void
+	 * @return null
 	 */
 	public function register()
 	{
@@ -38,7 +38,10 @@ public function boot()
 	 */
 	public function provides()
 	{
-		return array();
+		return array(
+			"Daveawb\Datatables\Columns\Input\BaseInput",
+			"Daveawb\Datatables\Driver"
+		);
 	}
 
 }

src/Daveawb/Datatables/Driver.php

@@ -24,6 +24,12 @@ abstract class Driver {
      * @var {Array}
      */
     protected $config;
+
+	/**
+	 * Instance of config class
+	 * @var {Object} Illuminate\Config\Repository
+	 */
+	protected $repository;
 
     /**
      * Inject configuration options into the driver
@@ -76,6 +82,8 @@ public function factory(Factory $factory)
      */
     public function setConfig(Repository $config)
     {
+    	$this->repository = $config;
+
         $driverConfig = $this->getConfigName();
 
         $cfgArray = $driverConfig === "laravel" ?

src/Daveawb/Datatables/Drivers/Laravel.php

@@ -8,6 +8,7 @@
 use Illuminate\Database\Query\Builder as Fluent;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Query\Expression;
+use Illuminate\Support\Contracts\ArrayableInterface;
 
 use ErrorException;
 
@@ -100,7 +101,11 @@ public function config(array $config)
      */
     public function get()
     {
-        return $this->build()->get()->toArray();
+        $data = $this->build()->get();
+
+        return $data instanceof ArrayableInterface ? 
+        	$data->toArray() : 
+			json_decode(json_encode($data), true);
     }
 
     /**

src/Daveawb/Datatables/exceptions.php

@@ -21,7 +21,7 @@ class ValidationException extends DatatablesException {
 		 * of the validator as opposed to a string to save us some typing
 		 * @param Validator $validator failed validator object
 		 */
-		public function __construct($validator)
+		public function __construct(Validator $validator)
 	    {
 			$this->validator = $validator;
 			$this->messages = $validator->messages();

tests/columns/expressions/AppendTest.php

@@ -81,4 +81,24 @@ public function testDataPassedIsSameInDataOutputFieldData()
 
         $this->assertEquals("David Barker", $result);
 	}
+
+	public function testPlainEvaluationDoesNotIncludeField()
+	{
+		$data = array(
+            "first_name" => "David",
+            "last_name" => "Barker",
+            "username" => "daveawb",
+            "title" => "Mr"
+        );
+
+        $append = new Daveawb\Datatables\Columns\Expressions\Append(array(
+            "first_name",
+        ), $data);
+
+        $result = $append->plain(array(
+            "last_name"," "
+        ));
+
+        $this->assertEquals(" Barker", $result);
+	}
 }

tests/columns/expressions/PrependTest.php

@@ -63,4 +63,25 @@ public function testDataPassedAsAnArrayIsEvaluatedAndAppended()
         $this->assertEquals("prepended item: Mr prepended to David", $result);
 	}
 
+	public function testPlainEvaluationDoesNotReturnField()
+	{
+		$data = array(
+            "first_name" => "David",
+            "last_name" => "Barker",
+            "username" => "daveawb",
+            "title" => "Mr"
+        );
+
+        $combine = new Daveawb\Datatables\Columns\Expressions\Prepend(array(
+            "first_name",
+            "last_name"
+        ), $data);
+
+        $result = $combine->plain(array(
+            array("prepended item:","title", "prepended to"), " "
+        ));
+
+        $this->assertEquals("prepended item: Mr prepended to ", $result);
+	}
+
 }