Merge pull request bgultekin#68 from yajra/bllim

case insensitive filtering with config and unit testing added

Author: MarkVaughn

README.md

@@ -31,12 +31,17 @@ Composer will download the package. After package downloaded, open "app/config/a
     ),
 
 
- 
+
     'aliases' => array(
         ...
         'Datatables'      => 'Bllim\Datatables\Datatables',
     ),
 
+Finally you need to publish a configuration file by running the following Artisan command.
+
+```php
+$ php artisan config:publish bllim/datatables
+```
 
 ### Usage
 
@@ -49,7 +54,7 @@ It is better, you know these:
 - You can remove any column by using remove_column($column) method
 - You can add columns by using add_column($column_name, $content, $order)
 - You can use Blade Template Engine in your $content values
-- The name of columns is set by returned array. 
+- The name of columns is set by returned array.
     - That means, for 'posts.id' it is 'id' and also for 'owner.name as ownername' it is 'ownername'
 
 
@@ -72,18 +77,18 @@ It is better, you know these:
     ->add_column('operations','<a href="{{ URL::route( \'admin.post\', array( \'edit\',$id )) }}">edit</a>
                     <a href="{{ URL::route( \'admin.post\', array( \'delete\',$id )) }}">delete</a>
                 ')
-    ->edit_column('status','@if($status) 
-                                Active 
-                            @else 
-                                Passive 
+    ->edit_column('status','@if($status)
+                                Active
+                            @else
+                                Passive
                             @endif')
     // you can also give a function as parameter to edit_column and add_column instead of blade string
     ->edit_column('ownername','Author of this post is {{ $ownername }}')
     ->remove_column('id')
     ->make();
 
-**Notice:** If you use double quotes while giving content of add_column or edit_column, you should escape variables with backslash (\) else you get error. For example: 
-    
+**Notice:** If you use double quotes while giving content of add_column or edit_column, you should escape variables with backslash (\) else you get error. For example:
+
     edit_column('id',"- {{ \$id }}") .
 
 

composer.json

@@ -12,9 +12,15 @@
     "require": {
         "php": ">=5.3.0",
         "illuminate/support": ">=4.0.0",
+        "illuminate/database": ">=4.0.0",
         "illuminate/view": ">=4.0.0",
         "illuminate/filesystem": ">=4.0.0"
     },
+    "require-dev": {
+        "laravel/laravel": ">=4.0.0",
+        "mockery/mockery": "0.7.2",
+        "phpunit/phpunit": "3.7.*"
+    },
     "autoload": {
         "classmap": [
             "src/migrations"

phpunit.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         bootstrap="vendor/autoload.php"
+         bootstrap="tests/bootstrap/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"

src/Bllim/Datatables/Datatables.php

@@ -369,7 +369,7 @@ private function clean_columns( $cols, $use_alias  = true)
 		foreach ( $cols as  $i=> $col )
 		{
 			preg_match('#^(.*?)\s+as\s+(\S*?)$#si',$col,$matches);
-			$return[$i] = empty($matches) ? $col : $matches[$use_alias?2:1]; 
+			$return[$i] = empty($matches) ? $col : $matches[$use_alias?2:1];
 		}
 
 		return $return;
@@ -384,7 +384,7 @@ private function clean_columns( $cols, $use_alias  = true)
 	private function filtering()
 	{
 		$columns = $this->clean_columns( $this->columns, false );
-		
+
 		if (Input::get('sSearch','') != '')
 		{
 			$copy_this = $this;
@@ -393,25 +393,25 @@ private function filtering()
 			$this->query->where(function($query) use ($copy_this) {
 
 				$db_prefix = $copy_this->database_prefix();
-				
-				
+
+
 
 				for ($i=0,$c=count($copy_this->columns);$i<$c;$i++)
 				{
 					if (Input::get('bSearchable_'.$i) == "true")
 					{
 						$column = $copy_this->columns[$i];
-						
-						if (stripos($column, ' AS ') !== false){ 
+
+						if (stripos($column, ' AS ') !== false){
 							$column = substr($column, stripos($column, ' AS ')+4);
 						}
-						
+
 						$keyword = '%'.Input::get('sSearch').'%';
 
 						if(Config::get('datatables.search.use_wildcards', false)) {
 							$keyword = $copy_this->wildcard_like_string(Input::get('sSearch'));
 						}
-						
+
 						// Check if the database driver is PostgreSQL
 						// If it is, cast the current column to TEXT datatype
 						$cast_begin = null;
@@ -420,10 +420,10 @@ private function filtering()
 							$cast_begin = "CAST(";
 							$cast_end = " as TEXT)";
 						}
-						
+
 						$column = $db_prefix . $column;
 						if(Config::get('datatables.search.case_insensitive', false)) {
-							$query->orwhere(DB::raw('LOWER('.$cast_begin.$column.$cast_end.')'), 'LIKE', $keyword);
+							$query->orwhere(DB::raw('LOWER('.$cast_begin.$column.$cast_end.')'), 'LIKE', strtolower($keyword));
 						} else {
 							$query->orwhere(DB::raw($cast_begin.$column.$cast_end), 'LIKE', $keyword);
 						}
@@ -432,7 +432,7 @@ private function filtering()
 			});
 
 		}
-    
+
 		$db_prefix = $this->database_prefix();
 
 		for ($i=0,$c=count($columns);$i<$c;$i++)
@@ -447,7 +447,7 @@ private function filtering()
 
 				if(Config::get('datatables.search.case_insensitive', false)) {
 					$column = $db_prefix . $columns[$i];
-					$this->query->where(DB::raw('LOWER('.$column.')'),'LIKE', $keyword);
+					$this->query->where(DB::raw('LOWER('.$column.')'),'LIKE', strtolower($keyword));
 				} else {
 					$col = strstr($columns[$i],'(')?DB::raw($columns[$i]):$columns[$i];
 					$this->query->where($col, 'LIKE', $keyword);
@@ -546,8 +546,8 @@ private function output()
 			"sColumns" => $sColumns
 		);
 
-		if(Config::get('application.profiler', false)) {
-			Log::write('$this->result_array', '<pre>'.print_r($this->result_array, true).'</pre>');
+		if(Config::get('app.debug', false)) {
+			$output['aQueries'] = DB::getQueryLog();
 		}
 		return Response::json($output);
 	}

src/config/datatables.php

@@ -0,0 +1,10 @@
+<?php
+
+return array(
+
+	'search' => array(
+		'case_insensitive' => true,
+		'use_wildcards' => false,
+	)
+
+);

tests/Datatables.php

@@ -0,0 +1,55 @@
+<?php
+
+use Mockery as m;
+use Bllim\Datatables\Datatables as Datatables;
+
+/**
+* Demo Table
+*/
+class Demo extends Illuminate\Database\Eloquent\Model {}
+
+class DatatablesTest extends Illuminate\Foundation\Testing\TestCase  {
+
+	public function createApplication()
+	{
+		$unitTesting = true;
+
+		$testEnvironment = 'testing';
+
+		return require __DIR__.'/bootstrap/start.php';
+	}
+
+	public function setUp()
+	{
+		parent::setUp();
+
+		Config::set('database.default', 'sqlite');
+		Config::set('database.sqlite.database', ':memory:');
+
+		Schema::dropIfExists('demos');
+		Schema::create('demos', function($table){
+			$table->increments('id');
+			$table->string('name');
+		});
+		Demo::insert(array('name'=>'demo datatables'));
+	}
+
+	public function tearDown()
+	{
+		Schema::dropIfExists('demos');
+	}
+
+	public function test_demo_count()
+	{
+		$this->assertEquals(1, Demo::count());
+	}
+
+	public function test_datatables_make_function()
+	{
+		$demo = DB::table('demos')->select('id','name');
+		$output = Datatables::of($demo)->make();
+		$this->assertInstanceOf('Illuminate\Http\JsonResponse', $output);
+	}
+
+
+}

tests/bootstrap/autoload.php

@@ -0,0 +1,75 @@
+<?php
+
+define('LARAVEL_START', microtime(true));
+
+/*
+|--------------------------------------------------------------------------
+| Register The Composer Auto Loader
+|--------------------------------------------------------------------------
+|
+| Composer provides a convenient, automatically generated class loader
+| for our application. We just need to utilize it! We'll require it
+| into the script here so that we do not have to worry about the
+| loading of any our classes "manually". Feels great to relax.
+|
+*/
+
+require __DIR__.'/../../vendor/autoload.php';
+
+/*
+|--------------------------------------------------------------------------
+| Include The Compiled Class File
+|--------------------------------------------------------------------------
+|
+| To dramatically increase your application's performance, you may use a
+| compiled class file which contains all of the classes commonly used
+| by a request. The Artisan "optimize" is used to create this file.
+|
+*/
+
+if (file_exists($compiled = __DIR__.'/compiled.php'))
+{
+	require $compiled;
+}
+
+/*
+|--------------------------------------------------------------------------
+| Setup Patchwork UTF-8 Handling
+|--------------------------------------------------------------------------
+|
+| The Patchwork library provides solid handling of UTF-8 strings as well
+| as provides replacements for all mb_* and iconv type functions that
+| are not available by default in PHP. We'll setup this stuff here.
+|
+*/
+
+Patchwork\Utf8\Bootup::initMbstring();
+
+/*
+|--------------------------------------------------------------------------
+| Register The Laravel Auto Loader
+|--------------------------------------------------------------------------
+|
+| We register an auto-loader "behind" the Composer loader that can load
+| model classes on the fly, even if the autoload files have not been
+| regenerated for the application. We'll add it to the stack here.
+|
+*/
+
+Illuminate\Support\ClassLoader::register();
+
+/*
+|--------------------------------------------------------------------------
+| Register The Workbench Loaders
+|--------------------------------------------------------------------------
+|
+| The Laravel workbench provides a convenient place to develop packages
+| when working locally. However we will need to load in the Composer
+| auto-load files for the packages so that these can be used here.
+|
+*/
+
+if (is_dir($workbench = __DIR__.'/../../workbench'))
+{
+	Illuminate\Workbench\Starter::start($workbench);
+}

tests/bootstrap/paths.php

@@ -0,0 +1,57 @@
+<?php
+
+return array(
+
+	/*
+	|--------------------------------------------------------------------------
+	| Application Path
+	|--------------------------------------------------------------------------
+	|
+	| Here we just defined the path to the application directory. Most likely
+	| you will never need to change this value as the default setup should
+	| work perfectly fine for the vast majority of all our applications.
+	|
+	*/
+
+	'app' => __DIR__.'/../../vendor/laravel/laravel/app',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Public Path
+	|--------------------------------------------------------------------------
+	|
+	| The public path contains the assets for your web application, such as
+	| your JavaScript and CSS files, and also contains the primary entry
+	| point for web requests into these applications from the outside.
+	|
+	*/
+
+	'public' => __DIR__.'/../../vendor/laravel/laravel/public',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Base Path
+	|--------------------------------------------------------------------------
+	|
+	| The base path is the root of the Laravel installation. Most likely you
+	| will not need to change this value. But, if for some wild reason it
+	| is necessary you will do so here, just proceed with some caution.
+	|
+	*/
+
+	'base' => __DIR__.'/../..',
+
+	/*
+	|--------------------------------------------------------------------------
+	| Storage Path
+	|--------------------------------------------------------------------------
+	|
+	| The storage path is used by Laravel to store cached Blade views, logs
+	| and other pieces of information. You may modify the path here when
+	| you want to change the location of this directory for your apps.
+	|
+	*/
+
+	'storage' => __DIR__.'/../../vendor/laravel/laravel/app/storage',
+
+);