ddimaria / Laravel-REST-CMS

app/Console/Commands/CallRoute.php

Indentation +24 added lines, -24 removed lines

@@ -10,29 +10,29 @@
 
 class CallRoute extends Command {
 
-    protected $name = 'route:call';
-    protected $description = 'Call route from CLI';
-
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    public function fire()
-    {
-        $request = Request::create((string)$this->option('uri'), 'GET');
-        $request->headers->set('X-Authorization', $this->option('token'));
-        $this->info(strip_tags(
-        	app()['Illuminate\Contracts\Http\Kernel']->handle($request)
-        ));
-    }
-
-    protected function getOptions()
-    {
-        return [
-            ['token', null, InputOption::VALUE_REQUIRED, 'The auth token', null],
-            ['uri', null, InputOption::VALUE_REQUIRED, 'The path of the route to be called', null],
-        ];
-    }
+	protected $name = 'route:call';
+	protected $description = 'Call route from CLI';
+
+	public function __construct()
+	{
+		parent::__construct();
+	}
+
+	public function fire()
+	{
+		$request = Request::create((string)$this->option('uri'), 'GET');
+		$request->headers->set('X-Authorization', $this->option('token'));
+		$this->info(strip_tags(
+			app()['Illuminate\Contracts\Http\Kernel']->handle($request)
+		));
+	}
+
+	protected function getOptions()
+	{
+		return [
+			['token', null, InputOption::VALUE_REQUIRED, 'The auth token', null],
+			['uri', null, InputOption::VALUE_REQUIRED, 'The path of the route to be called', null],
+		];
+	}
 
 }

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 
     public function fire()
     {
-        $request = Request::create((string)$this->option('uri'), 'GET');
+        $request = Request::create((string) $this->option('uri'), 'GET');
         $request->headers->set('X-Authorization', $this->option('token'));
         $this->info(strip_tags(
         	app()['Illuminate\Contracts\Http\Kernel']->handle($request)

app/Library/Sftp.php

Indentation +127 added lines, -127 removed lines

@@ -7,154 +7,154 @@
 class Sftp
 {
     
-    protected $connectionName;
-
-    /**
-     * Constructor
-     *
-     * @param string $connectionName
-     */
-    public function __construct($connectionName)
-    {
-        $this->connectionName = $connectionName;
-    }
-
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string $remoteDir 
-     * @param  string $localDir 
-     * @return array
-     */
+	protected $connectionName;
+
+	/**
+	 * Constructor
+	 *
+	 * @param string $connectionName
+	 */
+	public function __construct($connectionName)
+	{
+		$this->connectionName = $connectionName;
+	}
+
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string $remoteDir 
+	 * @param  string $localDir 
+	 * @return array
+	 */
    	public function getFiles($remoteDir, $localDir)
    	{    	
-    	$files = $this->remoteListPackaged($remoteDir);
+		$files = $this->remoteListPackaged($remoteDir);
 
-    	foreach ($files as $file) {			
+		foreach ($files as $file) {			
 			$this->getFile($file['fullFileName'], $localDir . '/' . $file['fileName']);
 		}
 
-    	return $files;
+		return $files;
   	}
 
-    /**
-     * Gets all XML files from a remote folder
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
-     * @return array
-     */
+	/**
+	 * Gets all XML files from a remote folder
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
+	 * @return array
+	 */
    	public function remoteListPackaged($dir, $sorted = true, $sortOrder = 'desc')
    	{    	
-    	$files = [];
+		$files = [];
 		$all = $this->remoteList($dir, $sorted, $sortOrder);
 		
-        foreach ($all as $file=>$val) {
+		foreach ($all as $file=>$val) {
 			if ($this->isValidExtension($val['filename'])) {
 				$files[] = [
-                    'fileName' => $val['filename'], 
-                    'fullFileName' => $dir . '/' .$val['filename'],
-                    'size' => $val['size'],
-                    'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
-                ];
+					'fileName' => $val['filename'], 
+					'fullFileName' => $dir . '/' .$val['filename'],
+					'size' => $val['size'],
+					'modified' => gmdate("m/d/Y H:i:s", $val['mtime']),
+				];
 			}
 		}
 
 		return $files;
-    }
+	}
 
-    /**
-     * Retrieves a file from a SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	/**
+	 * Retrieves a file from a SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function getFile($remoteFile, $localFile)
-    {	
-    	return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
-    }
-
-    /**
-     * Places a file on a remote SSH/SFTP server
-     * 
-     * @param  string $remoteFile 
-     * @param  string $localFile 
+	 */
+	public function getFile($remoteFile, $localFile)
+	{	
+		return \SSH::into($this->connectionName)->get($remoteFile, $localFile);    
+	}
+
+	/**
+	 * Places a file on a remote SSH/SFTP server
+	 * 
+	 * @param  string $remoteFile 
+	 * @param  string $localFile 
 	 * @return \Symfony\Component\Console\Output\OutputInterface
-     */
-    public function putFile($remoteFile, $localFile)
-    {
-    	return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string 	$dir 
-     * @param  bool     $sorted 
-     * @param  string   $sortOrder 
+	 */
+	public function putFile($remoteFile, $localFile)
+	{
+		return \SSH::into($this->connectionName)->put($localFile, $remoteFile);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string 	$dir 
+	 * @param  bool     $sorted 
+	 * @param  string   $sortOrder 
 	 * @return array 	array of files and folders	
-     */
-    public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
-    {
-    	$conn = $this->getConnection();
-    	$conn->chdir($dir);
-        $list = $conn->rawlist();
-
-        if ($sorted) {
-            $list = $this->sortList($list, $sortOrder);
-        }
+	 */
+	public function remoteList($dir, $sorted = true, $sortOrder = 'desc')
+	{
+		$conn = $this->getConnection();
+		$conn->chdir($dir);
+		$list = $conn->rawlist();
+
+		if ($sorted) {
+			$list = $this->sortList($list, $sortOrder);
+		}
     	
-    	return $list;    
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  array    $list 
-     * @param  string   $sortOrder 
-     * @return array    sorted array of a folder
-     */
-    public function sortList($list, $sortOrder = 'desc')
-    {
-        usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
-
-        return $sortOrder == 'asc' ? $list : array_reverse($list);
-    }
-
-    /**
-     * Retrieves a listing from directory
-     * 
-     * @param  string   $remoteFileFrom 
-     * @param  string   $remoteFileTo 
-     * @return boolean  success
-     */
-    public function rename($remoteFileFrom, $remoteFileTo)
-    {
-        $conn = $this->getConnection();
-        //print $conn->getSFTPLog();
-        return $conn->rename($remoteFileFrom, $remoteFileTo);
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @return Net_SFTP connection
-     */
-    protected function getConnection()
-    {
-    	return \SSH::into($this->connectionName)->getGateway()->getConnection();
-    }
-
-    /**
-     * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
-     * 
-     * @param  string $fileName 
-     * @return bool 	
-     */
-    protected function isValidExtension($fileName)
-    {
-    	return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
-    }
+		return $list;    
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  array    $list 
+	 * @param  string   $sortOrder 
+	 * @return array    sorted array of a folder
+	 */
+	public function sortList($list, $sortOrder = 'desc')
+	{
+		usort($list, function($a, $b) { return $a['mtime'] - $b['mtime']; }); 
+
+		return $sortOrder == 'asc' ? $list : array_reverse($list);
+	}
+
+	/**
+	 * Retrieves a listing from directory
+	 * 
+	 * @param  string   $remoteFileFrom 
+	 * @param  string   $remoteFileTo 
+	 * @return boolean  success
+	 */
+	public function rename($remoteFileFrom, $remoteFileTo)
+	{
+		$conn = $this->getConnection();
+		//print $conn->getSFTPLog();
+		return $conn->rename($remoteFileFrom, $remoteFileTo);
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @return Net_SFTP connection
+	 */
+	protected function getConnection()
+	{
+		return \SSH::into($this->connectionName)->getGateway()->getConnection();
+	}
+
+	/**
+	 * Gets a Net_SFTP connection as Laravels SSH doesn't have all the functionality
+	 * 
+	 * @param  string $fileName 
+	 * @return bool 	
+	 */
+	protected function isValidExtension($fileName)
+	{
+		return substr(strrchr($fileName,'.'),1) === 'xml' || substr(strrchr($fileName,'.'),1) === 'err';
+	}
 }
\ No newline at end of file

app/LaravelRestCms/BaseModel.php

Indentation +44 added lines, -44 removed lines

@@ -28,43 +28,43 @@ 
 	/**
 	 * The plural version of the table name
 	 * 
-	* @var string
+	 * @var string
 	 */
 	protected $plural;
 
 	/**
 	 * The Validator object
 	 * 
-	* @var \Validator
+	 * @var \Validator
 	 */
 	protected $validation;
 
 	/**
 	 * Rules to validate when creating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $createRules;
 
 	/**
 	 * Rules to validate when updating a model
 	 * 
-	* @var array
+	 * @var array
 	 */
 	protected static $updateRules;
 
 	/**
-     * The "booting" method of the model.
-     *
-     * @return void
-     */
-    protected static function boot()
-    {
-        parent::boot();
-
-        static::savedEvent();
-        static::deletingEvent();
-    }	 
+	 * The "booting" method of the model.
+	 *
+	 * @return void
+	 */
+	protected static function boot()
+	{
+		parent::boot();
+
+		static::savedEvent();
+		static::deletingEvent();
+	}	 
 	
 	/**
 	 * Gets the table name of the model.
@@ -77,35 +77,35 @@ 
 		return $this->table;
 	}
 
-    /**
-     * Hooks into the "saved" event
-     * 
-     * @return void
-     */
-    protected static function savedEvent()
-    {
-        static::saved(function($model)
-        {
-            static::addToCache($model);
-
-            return true;
-        });
-    }
-
-    /**
-     * Hooks into the "deleting" event
-     * 
-     * @return void
-     */
-    protected static function deletingEvent()
-    {
-        static::deleting(function($model)
-        {
-           static::removeFromCache($model);
-
-            return true;
-        });
-    }
+	/**
+	 * Hooks into the "saved" event
+	 * 
+	 * @return void
+	 */
+	protected static function savedEvent()
+	{
+		static::saved(function($model)
+		{
+			static::addToCache($model);
+
+			return true;
+		});
+	}
+
+	/**
+	 * Hooks into the "deleting" event
+	 * 
+	 * @return void
+	 */
+	protected static function deletingEvent()
+	{
+		static::deleting(function($model)
+		{
+		   static::removeFromCache($model);
+
+			return true;
+		});
+	}
 	
 	/**
 	 * Retrieves the singular name of the table

app/LaravelRestCms/ApiKey/ApiKeyTransformer.php

Indentation +13 added lines, -13 removed lines

@@ -5,17 +5,17 @@
 
 class ApiKeyTransformer extends TransformerAbstract {
 
-    /**
-     * Perform transformations on the data
-     * 
-     * @param  ApiKey $apiKey Eloquent collection
-     * @return array
-     */
-    public function transform(ApiGuardApiKey $apiKey)
-    {
-        return [
-            'key'   => $apiKey->key,
-            'level' => $apiKey->level,
-        ];
-    }
+	/**
+	 * Perform transformations on the data
+	 * 
+	 * @param  ApiKey $apiKey Eloquent collection
+	 * @return array
+	 */
+	public function transform(ApiGuardApiKey $apiKey)
+	{
+		return [
+			'key'   => $apiKey->key,
+			'level' => $apiKey->level,
+		];
+	}
 }
\ No newline at end of file

app/LaravelRestCms/SearchTrait.php

Indentation +68 added lines, -68 removed lines

@@ -2,81 +2,81 @@
 
 trait SearchTrait {
 
-    public static $labelCol = [];
-    public static $searchCols = [];
+	public static $labelCol = [];
+	public static $searchCols = [];
 
-    /**
-     * Adds search methods to the model
-     *         
-     * @param string $keyword
-     * @param string $labelCol
-     * @return \BaseModel
-     */
-    public function addSearch($keyword = null, $labelCol = null)
-    {
-        $searchCols = self::getSearchCols(null, $labelCol);
-        $keyword = strtolower($keyword);
+	/**
+	 * Adds search methods to the model
+	 *         
+	 * @param string $keyword
+	 * @param string $labelCol
+	 * @return \BaseModel
+	 */
+	public function addSearch($keyword = null, $labelCol = null)
+	{
+		$searchCols = self::getSearchCols(null, $labelCol);
+		$keyword = strtolower($keyword);
         
-        if ($searchCols && !is_null($keyword) && trim($keyword) != '') {
+		if ($searchCols && !is_null($keyword) && trim($keyword) != '') {
             
-            return self::orWhere(function($query) use ($searchCols, $keyword)
-            {
-                foreach ($searchCols as $key=>$val) {
-                    $query->orWhere($val, 'like', "%{$keyword}%");
-                }
-            });
-        } else {
-            return $this;
-        }
-    }
+			return self::orWhere(function($query) use ($searchCols, $keyword)
+			{
+				foreach ($searchCols as $key=>$val) {
+					$query->orWhere($val, 'like', "%{$keyword}%");
+				}
+			});
+		} else {
+			return $this;
+		}
+	}
     
-    /**
-     * Retrieves the columns to search
-     * 
-     * @param  string $override
-     * @param  string $default
-     * @return array
-     */
-    public function getSearchCols($override = null, $default = null)
-    {
-        if (!is_null($override)) {
-            $searchCols = $override;
-        } else if (!is_null(static::$searchCols)) {
-            $searchCols = static::$searchCols;
-        } else if (!is_null(static::$labelCol)) {
-            $searchCols = static::$labelCol;
-        } else if (!is_null($default)) {
-            $searchCols = $default;
-        } else {
-            return false;
-        }
+	/**
+	 * Retrieves the columns to search
+	 * 
+	 * @param  string $override
+	 * @param  string $default
+	 * @return array
+	 */
+	public function getSearchCols($override = null, $default = null)
+	{
+		if (!is_null($override)) {
+			$searchCols = $override;
+		} else if (!is_null(static::$searchCols)) {
+			$searchCols = static::$searchCols;
+		} else if (!is_null(static::$labelCol)) {
+			$searchCols = static::$labelCol;
+		} else if (!is_null($default)) {
+			$searchCols = $default;
+		} else {
+			return false;
+		}
         
-        return (array) $searchCols;
-    }
+		return (array) $searchCols;
+	}
     
-    /**
-     * Eloquent scope of the search
-     * 
-     * @param  Illuminate\Database\Eloquent\Builder $query
-     * @param  string $keyword
-     * @return Illuminate\Database\Eloquent\Builder
-     */
-    public function scopeSearch($query, $keyword = null) 
-    {        
-        $searchCols = $this->getSearchCols(null, static::$labelCol);
-        $query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
-        $match = '';
+	/**
+	 * Eloquent scope of the search
+	 * 
+	 * @param  Illuminate\Database\Eloquent\Builder $query
+	 * @param  string $keyword
+	 * @return Illuminate\Database\Eloquent\Builder
+	 */
+	public function scopeSearch($query, $keyword = null) 
+	{        
+		$searchCols = $this->getSearchCols(null, static::$labelCol);
+		$query->select('*', implode(' ', static::$labelCol) .  ' as label', 'url');
+		$match = '';
 
-        // make search results use the "and" clause
-        $keyword[0] = '"' . $keyword[0] . '"';
+		// make search results use the "and" clause
+		$keyword[0] = '"' . $keyword[0] . '"';
 
-        if (is_array($searchCols)) {
-            foreach ($searchCols as $searchCol) {
-                $match = "MATCH(" . $searchCol . ") AGAINST (? IN BOOLEAN MODE)";
-                $query = $query->whereRaw($match, $keyword);
-            }
-        }
+		if (is_array($searchCols)) {
+			foreach ($searchCols as $searchCol) {
+				$match = "MATCH(" . $searchCol . ") AGAINST (? IN BOOLEAN MODE)";
+				$query = $query->whereRaw($match, $keyword);
+			}
+		}
                
-        return $query->orderByRaw($match . ' desc', $keyword);  
-    }
+		return $query->orderByRaw($match . ' desc', $keyword);  
+	}
 }
\ No newline at end of file

app/LaravelRestCms/User/UserTransformer.php

Indentation +23 added lines, -23 removed lines

@@ -4,28 +4,28 @@
 
 class UserTransformer extends TransformerAbstract {
 
-    /**
-     * List of resources possible to include
-     *
-     * @var array
-     */
-    protected $availableIncludes = [
-    ];
+	/**
+	 * List of resources possible to include
+	 *
+	 * @var array
+	 */
+	protected $availableIncludes = [
+	];
 
-    /**
-     * Transforms a User model
-     * 
-     * @param  User $user
-     * @return array
-     */
-    public function transform(User $user)
-    {
-        return [
-            'id'     => (int) $user->id,
-            'first_name' => $user->first_name,
-            'last_name' => $user->last_name,
-            'api_key' => $user->apiKey->key,
-            'version' => \Config::get('laravel-rest-cms.version'),
-        ];
-    }
+	/**
+	 * Transforms a User model
+	 * 
+	 * @param  User $user
+	 * @return array
+	 */
+	public function transform(User $user)
+	{
+		return [
+			'id'     => (int) $user->id,
+			'first_name' => $user->first_name,
+			'last_name' => $user->last_name,
+			'api_key' => $user->apiKey->key,
+			'version' => \Config::get('laravel-rest-cms.version'),
+		];
+	}
 }
\ No newline at end of file

app/LaravelRestCms/CacheTrait.php

Indentation +89 added lines, -89 removed lines

@@ -2,105 +2,105 @@
 
 trait CacheTrait {
 
-    /**
-     * The key to use to cache this model
-     * @var string
-     */
-    public static $cacheKeyPart = 'id';
+	/**
+	 * The key to use to cache this model
+	 * @var string
+	 */
+	public static $cacheKeyPart = 'id';
     
-    /**
-     * The
-     * @var [type]
-     */
-    public static $cacheTime = '3600'; 
+	/**
+	 * The
+	 * @var [type]
+	 */
+	public static $cacheTime = '3600'; 
         
     
-    /**
-     * Tie caching features into the Eloquent::boot() method
-     */
-    public static function bootCacheTrait()
-    {
-        static::$cacheTime = \Config::get('laravel-rest-cms.cacheTime');
-    }
+	/**
+	 * Tie caching features into the Eloquent::boot() method
+	 */
+	public static function bootCacheTrait()
+	{
+		static::$cacheTime = \Config::get('laravel-rest-cms.cacheTime');
+	}
 
-    /**
-     * Adds a model to the cache
-     * 
-     * @param  string   $model      The name of the model
-     * @return void
-     */
-    protected static function addToCache($model)
-    {
-        $model::cache($model, $model->{$model::$cacheKeyPart}, $model::getModelCache($model));
-    }
+	/**
+	 * Adds a model to the cache
+	 * 
+	 * @param  string   $model      The name of the model
+	 * @return void
+	 */
+	protected static function addToCache($model)
+	{
+		$model::cache($model, $model->{$model::$cacheKeyPart}, $model::getModelCache($model));
+	}
 
-    /**
-     * Removes a model from the cache
-     * 
-     * @param  string   $model      The name of the model
-     * @return void
-     */
-    protected static function removeFromCache($model)
-    {
-        \Cache::forget($model::getCacheKey($model));
-    }
+	/**
+	 * Removes a model from the cache
+	 * 
+	 * @param  string   $model      The name of the model
+	 * @return void
+	 */
+	protected static function removeFromCache($model)
+	{
+		\Cache::forget($model::getCacheKey($model));
+	}
 
-    /**
-     * Retrieves the model
-     * Override this function to create a custom cache with eager loading
-     * 
-     * @param  string $model The name of the model
-     * @return string
-     */
-    public static function getModelCache($model)
-    {
-        return $model;
-    }       
+	/**
+	 * Retrieves the model
+	 * Override this function to create a custom cache with eager loading
+	 * 
+	 * @param  string $model The name of the model
+	 * @return string
+	 */
+	public static function getModelCache($model)
+	{
+		return $model;
+	}       
     
-    /**
-     * Caches a model
-     * 
-     * @param  string   $model      The name of the model
-     * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
-     * @param  App\LaravelRestCms\BaseModel $data   The model instance
-     * @return string
-     */
-    public static function cache($model, $keyPart, $data)
-    {
-        $key = static::getCacheKey($model, $keyPart);
-        \Cache::forget($key);
-        \Cache::put($key, $data, static::$cacheTime);
+	/**
+	 * Caches a model
+	 * 
+	 * @param  string   $model      The name of the model
+	 * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
+	 * @param  App\LaravelRestCms\BaseModel $data   The model instance
+	 * @return string
+	 */
+	public static function cache($model, $keyPart, $data)
+	{
+		$key = static::getCacheKey($model, $keyPart);
+		\Cache::forget($key);
+		\Cache::put($key, $data, static::$cacheTime);
         
-        return $model;
-    }       
+		return $model;
+	}       
     
-    /**
-     * Caches a model
-     * 
-     * @param  string   $model      The name of the model
-     * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
-     * @return string
-     */
-    public static function getCache($model, $keyPart)
-    {
-        $key = static::getCacheKey($model, $keyPart);
+	/**
+	 * Caches a model
+	 * 
+	 * @param  string   $model      The name of the model
+	 * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
+	 * @return string
+	 */
+	public static function getCache($model, $keyPart)
+	{
+		$key = static::getCacheKey($model, $keyPart);
         
-        return \Cache::get($key);
-    }
+		return \Cache::get($key);
+	}
     
-    /**
-     * Gets the cache key for a model
-     * 
-     * @param  string   $model      The name of the model
-     * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
-     * @return string
-     */
-    public static function getCacheKey($model, $keyPart = null)
-    {
-        if (is_null($keyPart)) {
-            $keyPart = static::$cacheKeyPart;
-        }
+	/**
+	 * Gets the cache key for a model
+	 * 
+	 * @param  string   $model      The name of the model
+	 * @param  string   $keyPart    The key to use to cache the model (e.g. primary key)
+	 * @return string
+	 */
+	public static function getCacheKey($model, $keyPart = null)
+	{
+		if (is_null($keyPart)) {
+			$keyPart = static::$cacheKeyPart;
+		}
         
-        return with(new $model)->getTable() . '.' . $keyPart;
-    }
+		return with(new $model)->getTable() . '.' . $keyPart;
+	}
 }
\ No newline at end of file

app/Http/Controllers/API/V1/ApiController.php

Indentation +143 added lines, -143 removed lines

@@ -12,160 +12,160 @@
 
 abstract class ApiController extends ApiGuardController
 {
-    /**
-     * Laraponse object, which abstracts Fractal
-     * 
-     * @var EllipseSynergie\ApiResponse\Laravel\Response
-     */
-    public $response;
+	/**
+	 * Laraponse object, which abstracts Fractal
+	 * 
+	 * @var EllipseSynergie\ApiResponse\Laravel\Response
+	 */
+	public $response;
     
-    /**
-     * The string name of the Eloquen Model
-     * 
-     * @var string
-     */
-    protected $modelName;
+	/**
+	 * The string name of the Eloquen Model
+	 * 
+	 * @var string
+	 */
+	protected $modelName;
     
-    /**
-     * The Eloquent Model
-     * 
-     * @var Illuminate\Database\Eloquent\Model
-     */
-    protected $model;
+	/**
+	 * The Eloquent Model
+	 * 
+	 * @var Illuminate\Database\Eloquent\Model
+	 */
+	protected $model;
     
-    /**
-     * The string name of the Transformer class
-     * 
-     * @var string
-     */
-    protected $transformerName;
+	/**
+	 * The string name of the Transformer class
+	 * 
+	 * @var string
+	 */
+	protected $transformerName;
     
-    /**
-     * The name of the collection that is returned in the JSON response
-     * 
-     * @var string
-     */
-    protected $collectionName;
+	/**
+	 * The name of the collection that is returned in the JSON response
+	 * 
+	 * @var string
+	 */
+	protected $collectionName;
     
-    /**
-     * The Fractal Manager
-     * 
-     * @var \League\Fractal\Manager
-     */
-    public $manager;
-
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->response =  \Response::api();
+	/**
+	 * The Fractal Manager
+	 * 
+	 * @var \League\Fractal\Manager
+	 */
+	public $manager;
+
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		$this->response =  \Response::api();
         
-        if (!empty($this->modelName)) {
-            $this->model = new $this->modelName;
-        }
-
-        // if no collection name provided, use the model's table name
-        if (empty($this->collectionName)) {
-            $this->collectionName = $this->model->getTable();
-        }
+		if (!empty($this->modelName)) {
+			$this->model = new $this->modelName;
+		}
+
+		// if no collection name provided, use the model's table name
+		if (empty($this->collectionName)) {
+			$this->collectionName = $this->model->getTable();
+		}
         
-        // parse includes
-        if (\Input::get('include') != '') {
-            $this->manager = new \League\Fractal\Manager;
-            $this->manager->parseIncludes(explode(',', \Input::get('include')));
-        }
-
-        parent::__construct();
-    }
-
-    /**
-     * Create an item
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function create($data = null)
-    {   
-        $data = $data ?: \Input::json()->all();
-
-        try {
-            $this->model->validate($data);
-            $item = $this->model->create($data);
+		// parse includes
+		if (\Input::get('include') != '') {
+			$this->manager = new \League\Fractal\Manager;
+			$this->manager->parseIncludes(explode(',', \Input::get('include')));
+		}
+
+		parent::__construct();
+	}
+
+	/**
+	 * Create an item
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function create($data = null)
+	{   
+		$data = $data ?: \Input::json()->all();
+
+		try {
+			$this->model->validate($data);
+			$item = $this->model->create($data);
             
-            return $this->showByObject($item);
+			return $this->showByObject($item);
         
-        } catch (ValidationException $e) {
-            return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  int $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function show($id)
-    {        
-        try {
+		} catch (ValidationException $e) {
+			return $this->response->setStatusCode(422)->withError($e->errors()->toArray(), 'GEN-UNPROCESSABLE-ENTITY');
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  int $id
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function show($id)
+	{        
+		try {
             
-            return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
+			return $this->response->withItem($this->model->findOrFail($id), new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a single item
-     * 
-     * @param  object $object
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function showByObject($object)
-    {        
-        try {
-            return $this->response->withItem($object, new $this->transformerName);
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a single item
+	 * 
+	 * @param  object $object
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function showByObject($object)
+	{        
+		try {
+			return $this->response->withItem($object, new $this->transformerName);
         
-        } catch (ModelNotFoundException $e) {
-
-            return $this->respondNotFound();
-        }
-    }
-
-    /**
-     * Returns a paginated collection
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function collection()
-    {
-        $limit = \Input::get('limit') ?: 10;
-        $model = $this->model;
+		} catch (ModelNotFoundException $e) {
+
+			return $this->respondNotFound();
+		}
+	}
+
+	/**
+	 * Returns a paginated collection
+	 * 
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function collection()
+	{
+		$limit = \Input::get('limit') ?: 10;
+		$model = $this->model;
         
-        if (\Request::has('order')) {
-            list($orderCol, $orderBy) = explode('|', \Input::get('order'));
-            $model = $model->orderBy($orderCol, $orderBy);
-        }
-
-        return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
-    }
-
-    /**
-     * Handles 404 errors
-     * 
-     * @param  string $msg
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function respondNotFound($msg = 'Not found!')
-    {
-        return \Response::json([
-            'error' => [
-                'message' => $msg,
-                'status_code' => 404
-            ]
-        ], 404);
-    }
+		if (\Request::has('order')) {
+			list($orderCol, $orderBy) = explode('|', \Input::get('order'));
+			$model = $model->orderBy($orderCol, $orderBy);
+		}
+
+		return $this->response->withPaginator($model->paginate($limit), new $this->transformerName, $this->collectionName);
+	}
+
+	/**
+	 * Handles 404 errors
+	 * 
+	 * @param  string $msg
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function respondNotFound($msg = 'Not found!')
+	{
+		return \Response::json([
+			'error' => [
+				'message' => $msg,
+				'status_code' => 404
+			]
+		], 404);
+	}
 }
\ No newline at end of file

app/Http/Controllers/API/V1/UserController.php

Indentation +122 added lines, -122 removed lines

@@ -10,131 +10,131 @@
 
 class UserController extends ApiGuardController
 {
-    /**
-     * The name of the model to use for this package
-     * 
-     * @var string
-     */
-    protected $modelName = 'App\LaravelRestCms\User\User';
+	/**
+	 * The name of the model to use for this package
+	 * 
+	 * @var string
+	 */
+	protected $modelName = 'App\LaravelRestCms\User\User';
     
-    /**
-     * The name of the transformer to use for this package
-     * 
-     * @var string
-     */
-    protected $transformerName = 'App\LaravelRestCms\User\UserTransformer';
+	/**
+	 * The name of the transformer to use for this package
+	 * 
+	 * @var string
+	 */
+	protected $transformerName = 'App\LaravelRestCms\User\UserTransformer';
     
-    /**
-     * The key to use as a key for this collection in the output
-     * 
-     * @var string
-     */
-    protected $collectionName = 'users';
-
-    /**
-     * The methods that don't require api authentication
-     * 
-     * @var array
-     */
-    protected $apiMethods = [
-        'authenticate' => [
-            'keyAuthentication' => false
-        ],
-        'deauthenticate' => [
-            'keyAuthentication' => false
-        ]
-    ];
-
-    /**
-     * Authenticate the login
-     * 
-     * @return \Illuminate\Http\JsonResponse|Illuminate\Contracts\Routing\ResponseFactory
-     */
-    public function authenticate() 
-    {
-        $credentials = [
-            'username' => Input::get('username'),
-            'password' => Input::get('password'),
-        ];
+	/**
+	 * The key to use as a key for this collection in the output
+	 * 
+	 * @var string
+	 */
+	protected $collectionName = 'users';
+
+	/**
+	 * The methods that don't require api authentication
+	 * 
+	 * @var array
+	 */
+	protected $apiMethods = [
+		'authenticate' => [
+			'keyAuthentication' => false
+		],
+		'deauthenticate' => [
+			'keyAuthentication' => false
+		]
+	];
+
+	/**
+	 * Authenticate the login
+	 * 
+	 * @return \Illuminate\Http\JsonResponse|Illuminate\Contracts\Routing\ResponseFactory
+	 */
+	public function authenticate() 
+	{
+		$credentials = [
+			'username' => Input::get('username'),
+			'password' => Input::get('password'),
+		];
         
-        $validator = Validator::make([
-                'username' => $credentials['username'],
-                'password' => $credentials['password']
-            ],
-            [
-                'username' => 'required|max:255',
-                'password' => 'required|max:255'
-            ]
-        );
+		$validator = Validator::make([
+				'username' => $credentials['username'],
+				'password' => $credentials['password']
+			],
+			[
+				'username' => 'required|max:255',
+				'password' => 'required|max:255'
+			]
+		);
         
-        if ($validator->fails()) {
-            return $this->response->errorWrongArgsValidator($validator);
-        }
-
-        try {
-            $user                 = with(new User)->authenticate($credentials['username'], $credentials['password'])->first();
-            $credentials['email'] = $user->email;
-        } catch (\ErrorException $e) {
-            return $this->response->errorUnauthorized("Your username or password is incorrect");
-        }
-
-        // We have validated this user
-        // Assign an API key for this session
-        $apiKey = ApiKey::where('user_id', '=', $user->id)->first();
+		if ($validator->fails()) {
+			return $this->response->errorWrongArgsValidator($validator);
+		}
+
+		try {
+			$user                 = with(new User)->authenticate($credentials['username'], $credentials['password'])->first();
+			$credentials['email'] = $user->email;
+		} catch (\ErrorException $e) {
+			return $this->response->errorUnauthorized("Your username or password is incorrect");
+		}
+
+		// We have validated this user
+		// Assign an API key for this session
+		$apiKey = ApiKey::where('user_id', '=', $user->id)->first();
         
-        if (!isset($apiKey)) {
-            $apiKey                = new ApiKey;
-            $apiKey->user_id       = $user->id;
-            $apiKey->key           = $apiKey->generateKey();
-            $apiKey->level         = 5;
-            $apiKey->ignore_limits = 0;
-        } else {
-            $apiKey->generateKey();
-        }
-
-        if (!$apiKey->save()) {
-            return $this->response->errorInternalError("Failed to create an API key. Please try again.");
-        }
-
-
-        // We have an API key.. i guess we only need to return that.
-        return $this->response->withItem($user, new \App\LaravelRestCms\User\UserTransformer);
-    }
-
-    /**
-     * Retrieve the user model
-     * 
-     * @return Model
-     */
-    public function getUserDetails() 
-    {
-        $user = $this->apiKey->user;
-
-        return isset($user) ? $user : $this->response->errorNotFound();
-    }
-
-    /**
-     * Log the user out
-     * 
-     * @param  string $apiKey
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function deauthenticate($apiKey) 
-    {
-        $this->apiKey = ApiKey::where('key', $apiKey)->first();
-
-        if (empty($this->apiKey)) {
-            return $this->response->errorUnauthorized("There is no such user to deauthenticate.");
-        }
-
-        $this->apiKey->delete();
-
-        return $this->response->withArray([
-            'ok' => [
-                'code'      => 'SUCCESSFUL',
-                'http_code' => 200,
-                'message'   => 'User was successfuly deauthenticated'
-            ]
-        ]);
-    }
+		if (!isset($apiKey)) {
+			$apiKey                = new ApiKey;
+			$apiKey->user_id       = $user->id;
+			$apiKey->key           = $apiKey->generateKey();
+			$apiKey->level         = 5;
+			$apiKey->ignore_limits = 0;
+		} else {
+			$apiKey->generateKey();
+		}
+
+		if (!$apiKey->save()) {
+			return $this->response->errorInternalError("Failed to create an API key. Please try again.");
+		}
+
+
+		// We have an API key.. i guess we only need to return that.
+		return $this->response->withItem($user, new \App\LaravelRestCms\User\UserTransformer);
+	}
+
+	/**
+	 * Retrieve the user model
+	 * 
+	 * @return Model
+	 */
+	public function getUserDetails() 
+	{
+		$user = $this->apiKey->user;
+
+		return isset($user) ? $user : $this->response->errorNotFound();
+	}
+
+	/**
+	 * Log the user out
+	 * 
+	 * @param  string $apiKey
+	 * @return \Illuminate\Http\JsonResponse
+	 */
+	public function deauthenticate($apiKey) 
+	{
+		$this->apiKey = ApiKey::where('key', $apiKey)->first();
+
+		if (empty($this->apiKey)) {
+			return $this->response->errorUnauthorized("There is no such user to deauthenticate.");
+		}
+
+		$this->apiKey->delete();
+
+		return $this->response->withArray([
+			'ok' => [
+				'code'      => 'SUCCESSFUL',
+				'http_code' => 200,
+				'message'   => 'User was successfuly deauthenticated'
+			]
+		]);
+	}
 }
\ No newline at end of file