From ad959d33190156e58570d66f9886a16060ef2eae Mon Sep 17 00:00:00 2001
From: Rene Bartkowiak <bart@users.noreply.github.com>
Date: Fri, 24 Oct 2014 15:40:20 +0200
Subject: [PATCH 1/6] Updated illuminate packages versions for L5

---
 composer.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index df8ff45..ae3ad7b 100644
--- a/composer.json
+++ b/composer.json
@@ -14,9 +14,9 @@
     ],
     "require": {
         "php": ">=5.3.0",
-        "illuminate/support": "4.*",
-        "illuminate/view": "4.*",
-        "illuminate/config": "4.*"
+        "illuminate/support": "~5.0",
+        "illuminate/view": "~5.0",
+        "illuminate/config": "~5.0"
     },
     "require-dev": {
         "phpunit/phpunit": "3.7.*",

From 1d399385676ad04efcdf765809f2be6fb38a4909 Mon Sep 17 00:00:00 2001
From: Rene Bartkowiak <bart@users.noreply.github.com>
Date: Sat, 25 Oct 2014 14:03:27 +0200
Subject: [PATCH 2/6] Updated curly-braces to work with L5

---
 src/views/javascript.blade.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/javascript.blade.php b/src/views/javascript.blade.php
index ec23629..7c2df24 100644
--- a/src/views/javascript.blade.php
+++ b/src/views/javascript.blade.php
@@ -1,14 +1,14 @@
 <script type="text/javascript">
     jQuery(document).ready(function(){
         // dynamic table
-        oTable = jQuery('#{{ $id }}').dataTable({
+        oTable = jQuery('#{!! $id !!}').dataTable({
 
         @foreach ($options as $k => $o)
-            {{ json_encode($k) }}: @if(!is_array($o)) @if(preg_match("/function/", $o)) {{ $o }} @else {{ json_encode($o) }}, @endif
+            {!! json_encode($k) !!}: @if(!is_array($o)) @if(preg_match("/function/", $o)) {!! $o !!} @else {!! json_encode($o) !!}, @endif
                 @else
                 [{
                     @foreach ($o as $x => $r) 
-                    {{ json_encode($x) }}: @if(is_array($r)) {{ json_encode($r) }}, @elseif(preg_match("/function/", $r)) {{ $r }}, @else {{ json_encode($r) }} @endif
+                    {!! json_encode($x) !!}: @if(is_array($r)) {!! json_encode($r) !!}, @elseif(preg_match("/function/", $r)) {!! $r !!}, @else {!! json_encode($r) !!} @endif
                     @endforeach
                 }],
                 @endif
@@ -16,7 +16,7 @@
         @endforeach
 
         @foreach ($callbacks as $k => $o)
-            {{ json_encode($k) }}: {{ $o }},
+            {!! json_encode($k) !!}: {!! $o !!},
         @endforeach
 
         });

From 23b46826134b6cf5556b951e6fd9d1efceb5dcb2 Mon Sep 17 00:00:00 2001
From: Rene Bartkowiak <bart@users.noreply.github.com>
Date: Thu, 5 Feb 2015 16:45:01 +0100
Subject: [PATCH 3/6] No more need for the boot method since 5.0 stable

---
 src/Chumper/Datatable/DatatableServiceProvider.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Chumper/Datatable/DatatableServiceProvider.php b/src/Chumper/Datatable/DatatableServiceProvider.php
index b7c8968..7b51ec3 100644
--- a/src/Chumper/Datatable/DatatableServiceProvider.php
+++ b/src/Chumper/Datatable/DatatableServiceProvider.php
@@ -12,11 +12,6 @@ class DatatableServiceProvider extends ServiceProvider {
 	 */
 	protected $defer = false;
 
-    public function boot()
-    {
-        $this->package('chumper/datatable');
-    }
-
     /**
 	 * Register the service provider.
 	 *
@@ -40,4 +35,4 @@ public function provides()
         return array('datatable');
     }
 
-}
\ No newline at end of file
+}

From c14deb98c816d960574354a3aa8c4865b43eeae4 Mon Sep 17 00:00:00 2001
From: Rene Bartkowiak <info@rene-bartkowiak.com>
Date: Fri, 6 Feb 2015 20:12:27 +0100
Subject: [PATCH 4/6] Updated to work with L5 new Config::get() method

---
 src/Chumper/Datatable/DatatableServiceProvider.php | 12 ++++++++++++
 src/Chumper/Datatable/Engines/BaseEngine.php       |  2 +-
 src/Chumper/Datatable/Table.php                    |  2 +-
 src/views/template.blade.php                       |  2 +-
 tests/DatatableTest.php                            |  4 ++--
 tests/Engines/BaseEngineTest.php                   |  2 +-
 tests/Engines/CollectionEngineTest.php             |  4 ++--
 tests/Engines/QueryEngineTest.php                  |  2 +-
 tests/TableTest.php                                |  2 +-
 9 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Chumper/Datatable/DatatableServiceProvider.php b/src/Chumper/Datatable/DatatableServiceProvider.php
index 7b51ec3..7eca165 100644
--- a/src/Chumper/Datatable/DatatableServiceProvider.php
+++ b/src/Chumper/Datatable/DatatableServiceProvider.php
@@ -12,6 +12,18 @@ class DatatableServiceProvider extends ServiceProvider {
 	 */
 	protected $defer = false;
 
+    /**
+     * Bootstrap the application events.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        $this->publishes([
+            __DIR__.'/../../config/config.php' => config_path('packages/chumper_datatable.php'),
+        ]);
+    }
+
     /**
 	 * Register the service provider.
 	 *
diff --git a/src/Chumper/Datatable/Engines/BaseEngine.php b/src/Chumper/Datatable/Engines/BaseEngine.php
index ef030a5..b2554f1 100644
--- a/src/Chumper/Datatable/Engines/BaseEngine.php
+++ b/src/Chumper/Datatable/Engines/BaseEngine.php
@@ -127,7 +127,7 @@ abstract class BaseEngine {
     function __construct()
     {
         $this->columns = new Collection();
-        $this->config = Config::get('datatable::engine');
+        $this->config = Config::get('chumper_datatable.engine');
         $this->setExactWordSearch( $this->config['exactWordSearch'] );
         return $this;
     }
diff --git a/src/Chumper/Datatable/Table.php b/src/Chumper/Datatable/Table.php
index 651d34d..5b34071 100644
--- a/src/Chumper/Datatable/Table.php
+++ b/src/Chumper/Datatable/Table.php
@@ -80,7 +80,7 @@ class Table {
 
     function __construct()
     {
-        $this->config = Config::get('datatable::table');
+        $this->config = Config::get('chumper_datatable.table');
 
         $this->setId( $this->config['id'] );
         $this->setClass( $this->config['class'] );
diff --git a/src/views/template.blade.php b/src/views/template.blade.php
index 96fd379..4b58fee 100644
--- a/src/views/template.blade.php
+++ b/src/views/template.blade.php
@@ -23,5 +23,5 @@
 </table>
 
 @if (!$noScript)
-    @include(Config::get('datatable::table.script_view'), array('id' => $id, 'options' => $options, 'callbacks' =>  $callbacks))
+    @include(Config::get('chumper_datatable.table.script_view'), array('id' => $id, 'options' => $options, 'callbacks' =>  $callbacks))
 @endif
\ No newline at end of file
diff --git a/tests/DatatableTest.php b/tests/DatatableTest.php
index 1b1a73f..00d618d 100644
--- a/tests/DatatableTest.php
+++ b/tests/DatatableTest.php
@@ -14,12 +14,12 @@ class DatatableTest extends PHPUnit_Framework_TestCase {
     protected function setUp()
     {
         // set up config
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::engine")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.engine")->andReturn(
             array(
                 'exactWordSearch' => false,
             )
         );
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::table")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.table")->andReturn(
             array(
                 'class' => 'table table-bordered',
                 'id' => '',
diff --git a/tests/Engines/BaseEngineTest.php b/tests/Engines/BaseEngineTest.php
index 3099b1b..267ccd4 100644
--- a/tests/Engines/BaseEngineTest.php
+++ b/tests/Engines/BaseEngineTest.php
@@ -18,7 +18,7 @@ class BaseEngineTest extends TestCase {
     public function setUp()
     {
         // set up config
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::engine")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.engine")->andReturn(
             array(
                 'exactWordSearch' => false,
                 )
diff --git a/tests/Engines/CollectionEngineTest.php b/tests/Engines/CollectionEngineTest.php
index 2e185a8..0ddba2b 100644
--- a/tests/Engines/CollectionEngineTest.php
+++ b/tests/Engines/CollectionEngineTest.php
@@ -26,7 +26,7 @@ class CollectionEngineTest extends TestCase {
 
     public function setUp()
     {
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::engine")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.engine")->andReturn(
             array(
                 'exactWordSearch' => false,
             )
@@ -34,7 +34,7 @@ public function setUp()
 
         parent::setUp();
 
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::engine")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.engine")->andReturn(
             array(
                 'exactWordSearch' => false,
             )
diff --git a/tests/Engines/QueryEngineTest.php b/tests/Engines/QueryEngineTest.php
index e9f5739..837c204 100644
--- a/tests/Engines/QueryEngineTest.php
+++ b/tests/Engines/QueryEngineTest.php
@@ -21,7 +21,7 @@ class QueryEngineTest extends PHPUnit_Framework_TestCase {
     public function setUp()
     {
 
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::engine")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.engine")->andReturn(
             array(
                 'exactWordSearch' => false,
             )
diff --git a/tests/TableTest.php b/tests/TableTest.php
index 2e4b3d7..d0ed602 100644
--- a/tests/TableTest.php
+++ b/tests/TableTest.php
@@ -14,7 +14,7 @@ protected function setUp()
     {
         parent::setUp();
 
-        Config::shouldReceive('get')->zeroOrMoreTimes()->with("datatable::table")->andReturn(
+        Config::shouldReceive('get')->zeroOrMoreTimes()->with("chumper_datatable.table")->andReturn(
             array(
                 'class' => 'table table-bordered',
                 'id' => '',

From 75ef56c4011191065d0d66459b17036f88e959f6 Mon Sep 17 00:00:00 2001
From: Brandon Martus <bmartus@gmail.com>
Date: Thu, 5 Mar 2015 18:49:38 -0600
Subject: [PATCH 5/6] updates to work with L5

---
 src/Chumper/Datatable/DatatableServiceProvider.php | 2 ++
 src/Chumper/Datatable/Table.php                    | 2 +-
 src/views/template.blade.php                       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Chumper/Datatable/DatatableServiceProvider.php b/src/Chumper/Datatable/DatatableServiceProvider.php
index 7eca165..673e396 100644
--- a/src/Chumper/Datatable/DatatableServiceProvider.php
+++ b/src/Chumper/Datatable/DatatableServiceProvider.php
@@ -22,6 +22,8 @@ public function boot()
         $this->publishes([
             __DIR__.'/../../config/config.php' => config_path('packages/chumper_datatable.php'),
         ]);
+
+        $this->loadViewsFrom(__DIR__.'/../../', 'Chumper');
     }
 
     /**
diff --git a/src/Chumper/Datatable/Table.php b/src/Chumper/Datatable/Table.php
index 5b34071..c5514fe 100644
--- a/src/Chumper/Datatable/Table.php
+++ b/src/Chumper/Datatable/Table.php
@@ -80,7 +80,7 @@ class Table {
 
     function __construct()
     {
-        $this->config = Config::get('chumper_datatable.table');
+        $this->config = Config::get('packages.chumper_datatable.table');
 
         $this->setId( $this->config['id'] );
         $this->setClass( $this->config['class'] );
diff --git a/src/views/template.blade.php b/src/views/template.blade.php
index 4b58fee..565a22a 100644
--- a/src/views/template.blade.php
+++ b/src/views/template.blade.php
@@ -23,5 +23,5 @@
 </table>
 
 @if (!$noScript)
-    @include(Config::get('chumper_datatable.table.script_view'), array('id' => $id, 'options' => $options, 'callbacks' =>  $callbacks))
+    @include(Config::get('packages.chumper_datatable.table.script_view'), array('id' => $id, 'options' => $options, 'callbacks' =>  $callbacks))
 @endif
\ No newline at end of file

From ae55bd4238103e94c32119725641a11507af72c6 Mon Sep 17 00:00:00 2001
From: Brandon Martus <bmartus@gmail.com>
Date: Thu, 5 Mar 2015 19:56:30 -0600
Subject: [PATCH 6/6] fix template path

---
 src/config/config.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/config/config.php b/src/config/config.php
index 9212bab..4b4ea30 100644
--- a/src/config/config.php
+++ b/src/config/config.php
@@ -93,7 +93,7 @@
         |
         */
 
-        'table_view' => 'datatable::template',
+        'table_view' => 'Chumper::views.template',
 
 
         /*
@@ -106,7 +106,7 @@
         |
         */
 
-        'script_view' => 'datatable::javascript',
+        'script_view' => 'Chumper::views.javascript',
 
 
     ),