Merge pull request #24 from talyssonoc/config_changes

Config changes

Author: talyssonoc

CHANGELOG.md

@@ -0,0 +1,12 @@
+# 0.9 (2015-05-27)
+
+Features:
+
+- The `ReactServiceProvider` is now deferred.
+- Configs now are on a separated file from `config/app.php`, it's `config/react.php` now.
+
+# 0.8 (2015-05-09)
+
+Features:
+
+- React and component's source are now cached at production.

README.md

@@ -17,7 +17,7 @@ You can see how to install it here: [how to install v8js](install_v8js.md).
 You just need to add this to your `composer.json`'s `"require"`:
 
 ```json
-  "talyssonoc/react-laravel": "0.8"
+  "talyssonoc/react-laravel": "0.9"
 ```
 
 Also you got to set the `minimum-stability` of your `composer.json` to `dev`, adding this:
@@ -34,6 +34,14 @@ Then run:
 
 After that you should add `'React\ReactServiceProvider'` to your providers at the `config/app.php` file of your Laravel app.
 
+And then run:
+
+```sh
+  php artisan vendor:publish
+```
+
+And the `react.php` file will be available at the `config` folder of your app.
+
 # Usage
 
 After the installation and configuration, you'll be able to use the `@react_component` directive in your views.
@@ -76,13 +84,13 @@ You can choose to use any React installation greater than `v0.13.1`, but if you'
 
 # Configurations
 
-You can add settings to `react-laravel` adding this to your `config/app.php` file:
+You can change settings to `react-laravel` at the `config/react.php` file:
 
 ```php
-  'react' => [
+  return [
     'source' => 'path_for_react.js',
     'components' => 'path_for_file_containing_your_components.js'
-  ]
+  ];
 ```
 
 Both of then are optional.

config/config.php

@@ -0,0 +1,6 @@
+<?php
+
+return [
+  'source'     => public_path('vendor/react-laravel/react.js'),
+  'components' => public_path('js/components.js'),
+];

lib/ReactServiceProvider.php

@@ -8,6 +8,8 @@
 
 class ReactServiceProvider extends ServiceProvider {
 
+  protected $defer = true;
+
   public function boot() {
 
     Blade::extend(function($view, $compiler) {
@@ -17,8 +19,12 @@ public function boot() {
     });
 
     $this->publishes([
-      __DIR__ . '/../assets' => public_path('vendor/react-laravel'),
-    ]);
+      __DIR__ . '/../assets'            => public_path('vendor/react-laravel'),
+    ], 'assets');
+
+    $this->publishes([
+      __DIR__ . '/../config/config.php' => config_path('react.php'),
+    ], 'config');
   }
 
   public function register() {
@@ -34,26 +40,25 @@ public function register() {
 
       }
       else {
-        $defaultReactPath = implode(DIRECTORY_SEPARATOR,
-                                    [App::publicPath(), 'vendor', 'react-laravel', 'react.js']);
 
-        $defaultComponentsPath = implode(DIRECTORY_SEPARATOR,
-                                  [App::publicPath(), 'js', 'components.js']);
+        $this->mergeConfigFrom(__DIR__ . '/../config/config.php', 'react');
 
-        $reactPath = Config::get('app.react.source', $defaultReactPath);
-        $componentsPath = Config::get('app.react.components', $defaultComponentsPath);
-
-        $reactSource = file_get_contents($reactPath);
-        $componentsSource = file_get_contents($componentsPath);
+        $reactSource = file_get_contents(config('react.source'));
+        $componentsSource = file_get_contents(config('react.components'));
 
         if(App::environment('production')) {
           Cache::forever('reactSource', $reactSource);
           Cache::forever('componentsSource', $componentsSource);
         }
-
       }
 
       return new React($reactSource, $componentsSource);
     });
   }
+
+  public function provides() {
+    return ['React'];
+  }
+
+
 }