=Fixes a bug in converting MySQL Parser. Also, addes a new option for the command that generated fields-file

Author: malhayek2014

README.md

@@ -1,6 +1,6 @@
 # An awesome code generator for laravel framework - with client-side validation
 
-For full documentation and screenshots please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.0" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
+For full documentation and screenshots please visit <a href="https://crestapps.com/laravel-code-generator/docs/1.1" target="_blank" title="Laravel Code Generator Documentation">CrestApps.com</a>
 
 
 ## Introduction
@@ -9,7 +9,7 @@ A clean code generator for Laravel framework that will save you time! This aweso
 
 ## Features
 
-* Create full resource using a single command with/without <strong>migration</strong> or from <strong>existing database</strong>.
+* Create full resources using a single command with/without <strong>migration</strong> or from <strong>existing database</strong>.
 * Create standard CRUD controllers with simple or form-request validation.
 * Create model with relations.
 * Create named routes.
@@ -20,57 +20,42 @@ A clean code generator for Laravel framework that will save you time! This aweso
 * Auto multiple-response storing in the database.
 * Create form-request.
 * Customizable view’s templates to enable you to change the standard look and feel of your application.
-* Create view's layouts.
-* Change the template at run time.
+* Create view's layouts with and without client-side validation.
+* Change the template at run time to generate different views.
 * Create code to upload file.
+* Ability to generate views with and without Laravel-Collective.
 * Lots of documentation.
 
 
-
 ## Installation
 
-> If you don't have LaravelCollective Forms & HTML package installed, it will be installed for you. However you'll still have to update your config/app.php to bootstrap the package to the framework.
-
-
 
  To download this package into your laravel project, use the command-line to execute the following command 
 ```
 composer require crestapps/laravel-code-generator --dev
 ```
 
- To bootstrap the packages into your project, open the `config/app.php` file in your project and follow the 
+ To bootstrap the packages into your project, open the `config/app.php` file in your project. Then, look for the providers array.
 
+Add the following line to bootstrap laravel-code-generator to the framework.
 
-First, look for the `providers` array. Add the following line to bootstrap laravel-code-generator to the framework.
 ```
 CrestApps\CodeGenerator\CodeGeneratorServiceProvider::class,
 ```
 
-Add the following line to bootstrap "LaravelCollective Forms & HTML package" to the framework.
-```
-Collective\Html\HtmlServiceProvider::class,
-```
-
-Second, look for the `aliases` array. Then, add the following two lines to create an aliase for "LaravelCollective Forms & HTML package".
-```
-'Form' => Collective\Html\FormFacade::class,
-'Html' => Collective\Html\HtmlFacade::class,
-```
-
-
 Finally, execute the following command from the command-line to publish the package's config and the default template to start generating awesome code.
 ```
-php artisan vendor:publish --provider="CrestApps\CodeGenerator\CodeGeneratorServiceProvider"
+php artisan vendor:publish --provider="CrestApps\CodeGenerator\CodeGeneratorServiceProvider" --tag=default
 ```
 
-> A layout is required for the default views! The code generator allows you to create a layout using the command-line. Of cource you can use your own layout. You'll only need to include [CSS bootstrap framework](http://getbootstrap.com/ "CSS bootstrap framework") in your layout for the default templates to work properly. Additionally, you can chose to you design your own templetes using a different framework.
+> A layout is required for the default views! The code generator allows you to create a layout using the command-line. Of cource you can use your own layout. You'll only need to include [CSS bootstrap framework](http://getbootstrap.com/ "CSS bootstrap framework") in your layout for the default templates to work properly. Additionally, you can chose to you design your own templetes using a different or no css framework. 
 
 
 ## Available Commands
 
-> The command in wetween the square brackets [] must be replaced with a variable of your choice.
+> The command in between the square brackets [] must be replaced with a variable of your choice.
 
-* php artisan create:resource [model-name]
+* php artisan create:resources [model-name]
 * php artisan create:layout [application-name]
 * php artisan create:controller [controller-name]
 * php artisan create:model [model-name]
@@ -86,7 +71,7 @@ php artisan vendor:publish --provider="CrestApps\CodeGenerator\CodeGeneratorServ
 * php artisan create:language [language-file-name]
 * php artisan create:fields-file [table-name]
 
-> Full documentation available at [CrestApps.com](https://crestapps.com/laravel-code-generator/docs/1.0 "Laravel Code Generator Documentation"). 
+> Full documentation available at [CrestApps.com](https://crestapps.com/laravel-code-generator/docs/1.1 "Laravel Code Generator Documentation"). 
 
 
 ## License

composer.json

@@ -1,8 +1,10 @@
 {
     "name": "crestapps/laravel-code-generator",
     "license": "MIT",
-    "description": "A clean code generator for Laravel framework that will save you time! This awesome tool will help you generate resources like views, controllers, routes, migrations, languages or request-forms! It is extremely flexible and customizable to cover many on the use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application",
-    "version": "v1.0.5",
+    "description": "A clean code generator for Laravel framework that will save you time!
+    This awesome tool will help you generate resources like views, controllers, routes, migrations, languages or request-forms!
+    It is extremely flexible and customizable to cover many use cases. It is shipped with cross-browsers compatible template, along with a client-side validation to modernize your application.",
+    "version": "v1.1.0",
     "keywords": [
         "laravel","crud","crud generator",
         "laravel crud generator","laravel crud builder",

src/CodeGeneratorServiceProvider.php

@@ -55,7 +55,7 @@ public function register()
             'CrestApps\CodeGenerator\Commands\CreateFormRequestCommand',
             'CrestApps\CodeGenerator\Commands\CreateRoutesCommand',
             'CrestApps\CodeGenerator\Commands\CreateMigrationCommand',
-            'CrestApps\CodeGenerator\Commands\CreateResourceCommand',
+            'CrestApps\CodeGenerator\Commands\CreateResourcesCommand',
             'CrestApps\CodeGenerator\Commands\CreateViewLayoutCommand',
             'CrestApps\CodeGenerator\Commands\CreateLayoutCommand',
             'CrestApps\CodeGenerator\Commands\CreateFieldsFileCommand'

src/commands/CreateResourceCommand.php renamed to src/Commands/CreateResourcesCommand.php

@@ -6,7 +6,7 @@
 use CrestApps\CodeGenerator\Support\Helpers;
 use CrestApps\CodeGenerator\Traits\CommonCommand;
 
-class CreateResourceCommand extends Command
+class CreateResourcesCommand extends Command
 {
     use CommonCommand;
 
@@ -15,7 +15,7 @@ class CreateResourceCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'create:resource
+    protected $signature = 'create:resources
                             {model-name : The model name that this resource will represent.}
                             {--controller-name= : The name of the controler.}
                             {--controller-directory= : The directory where the controller should be created under. }

src/DatabaseParsers/MysqlParser.php

@@ -66,10 +66,36 @@ protected function setOptions(Field & $field, $type)
 	{
 		if( ($options = $this->getOptions($type)) !== null )
 		{
-			foreach($options as $option)
+			if(empty($this->languages))
 			{
-				$field->addOption($this->getLabelName($option), $this->tableName, true, $this->locale, $option);
+				return $this->addOptionsFor($field, $options, true, $this->locale);
 			}
+
+			foreach($this->languages as $language)
+			{
+				$this->addOptionsFor($field, $options, false, $language);
+			}
+			
+		}
+
+		return $this;
+	}
+
+    /**
+     * Adds options for a giving field.
+     *
+     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param array $options
+     * @param bool $isPlain
+     * @param string $locale
+     *
+     * @return $this
+    */
+	protected function addOptionsFor(Field & $field, array $options, $isPlain, $locale)
+	{
+		foreach($options as $option)
+		{
+			$field->addOption($this->getLabelName($option), $this->tableName, $isPlain, $locale, $option);
 		}
 
 		return $this;

src/DatabaseParsers/ParserBase.php

@@ -3,7 +3,6 @@
 
 use CrestApps\CodeGenerator\Support\Field;
 use CrestApps\CodeGenerator\Support\FieldOptimizer;
-
 use Exception;
 use App;
 use DB;
@@ -38,19 +37,28 @@ abstract class ParserBase
      */
 	protected $fields;
 
+    /**
+     * The langugaes to create labels form.
+     *
+     * @var array
+     */
+    protected $langugaes;
+
     /**
      * Creates a new field instance.
      *
      * @param string $tableName
      * @param string $databaseName
+     * @param array $langugaes
      *
      * @return void
      */
-	public function __construct($tableName, $databaseName)
+	public function __construct($tableName, $databaseName, array $languages = [])
 	{
 		$this->tableName = $tableName;
 		$this->databaseName = $databaseName;
-		$this->locale = App::getLocale();
+        $this->languages = $languages;
+        $this->locale = App::getLocale();
 	}
 
     /**
@@ -75,20 +83,6 @@ public function getFields()
 		return $this->fields;
 	}
 
-    /**
-     * Gets column meta info from the information schema.
-     *
-     * @return array
-    */
-	abstract protected function getColumn();
-
-    /**
-     * Gets the field after transfering it from a giving query object.
-     *
-     * @return CrestApps\CodeGenerator\Support\Field;
-    */
-	abstract protected function getTransfredField($column);
-
     /**
      * Gets array of field after transfering each column meta into field.
      *
@@ -231,12 +225,34 @@ protected function setDefault(Field & $field, $default)
     */
 	protected function setLabel(Field & $field, $name)
 	{
-        
-		$field->addLabel( $this->getLabelName($name), $this->tableName, true, $this->locale);
+        if(empty($this->languages))
+        {
+            $field->addLabel($this->getLabelName($name), $this->tableName, true, $this->locale);
 
-		return $this;
+            return $this;
+        }
+		
+		return $this->addLabelForLanguages($field, $name);
 	}
 
+    /**
+     * Add labels for a giving field.
+     *
+     * @param CrestApps\CodeGenerator\Support\Field $field
+     * @param string $name
+     *
+     * @return $this
+    */
+    protected function addLabelForLanguages(Field $field, $name)
+    {
+        foreach($this->languages as $language)
+        {
+            $field->addLabel($this->getLabelName($name), $this->tableName, false, $language);
+        }
+
+        return $this;
+    }
+
     /**
      * Set the keys for a giving field.
      *
@@ -320,4 +336,18 @@ protected function setComment(Field & $field, $comment)
 
 		return $this;
 	}
+
+    /**
+     * Gets column meta info from the information schema.
+     *
+     * @return array
+    */
+    abstract protected function getColumn();
+
+    /**
+     * Gets the field after transfering it from a giving query object.
+     *
+     * @return CrestApps\CodeGenerator\Support\Field;
+    */
+    abstract protected function getTransfredField($column);
 }

src/commands/CreateFieldsFileCommand.php

@@ -24,6 +24,7 @@ class CreateFieldsFileCommand extends Command
                             {table-name : The dtabase table name to fetch the field from.}
                             {--database-name= : The database name the table is stored in.}
                             {--fields-filename= : The destination file name to create.}
+                            {--translation-for= : A comma seperated string of languages to create fields for.}
                             {--force : This option will override the view if one already exists.}';
 
     /**
@@ -99,7 +100,7 @@ protected function getFields()
 
         if($driver == 'mysql')
         {
-            return (new MysqlParser($this->getTableName(), $this->getDatabaseName()))->getFields();
+            return (new MysqlParser($this->getTableName(), $this->getDatabaseName(), $this->getLangugaes()))->getFields();
         } 
         else 
         {
@@ -149,4 +150,14 @@ protected function getTableName()
     {
         return trim($this->argument('table-name'));
     }
+
+    /**
+     * Gets the languages to create lang keys for.
+     *
+     * @return array
+     */
+    protected function getLangugaes()
+    {
+        return Helpers::convertStringToArray($this->option('translation-for'));
+    }
 }

src/support/Field.php

@@ -348,9 +348,9 @@ public function toArray()
     {
         return [
             'name' => $this->name,
-            'labels' => $this->labelsToJson($this->getLabels()),
+            'labels' => $this->labelsToRaw($this->getLabels()),
             'html-type' => $this->htmlType,
-            'options' => $this->optionsToJson($this->getOptions()),
+            'options' => $this->optionsToRaw($this->getOptions()),
             'html-value' => $this->htmlValue,
             'validation' => implode('|', $this->validationRules),
             'is-on-index' => $this->isOnIndexView,
@@ -384,19 +384,34 @@ public function toJson()
         return json_encode($this->toArray());
     }
 
-    protected function labelsToJson(array $labels)
+    /**
+     * Gets current labels in a raw format.
+     *
+     * @return mix (string|object)
+     */
+    protected function labelsToRaw(array $labels)
     {
         $final = [];
 
         foreach($labels as $label)
         {
+            if($label->isPlain)
+            {
+                return $label->text;
+            }
+
             $final[$label->lang] = $label->text;
         }
 
         return (object) $final;
     }
 
-    protected function optionsToJson(array $options)
+    /**
+     * Gets current Options into a raw format.
+     *
+     * @return object
+     */
+    protected function optionsToRaw(array $options)
     {
         $final = [];