From 9f7d3616618a31bc3944f81cbcbd3a0b87871730 Mon Sep 17 00:00:00 2001
From: Andy Wermke <andy@dev.next-step-software.com>
Date: Thu, 6 Aug 2015 21:59:16 +0200
Subject: [PATCH] Implement ConfigCachingService, update controller and add JS
 code

---
 README.md                                     | 18 ++++-
 config/config.php                             | 19 +++++
 gulpfile.js                                   |  4 +-
 package.json                                  |  1 +
 public/js/localization.min.js                 |  2 +-
 resources/js/config.js                        | 35 +++++++++
 src/Caching/AbstractCachingService.php        | 37 +++++++--
 src/Caching/ConfigCachingService.php          | 67 ++++++++++++++--
 src/Caching/MessageCachingService.php         | 10 +--
 src/Console/RefreshCommand.php                |  2 +
 src/Facades/ConfigCachingService.php          | 28 +++++++
 src/Facades/MessageCachingService.php         |  2 +-
 .../Controllers/JsLocalizationController.php  | 77 +++++++++++++++----
 src/Http/routes.php                           |  3 +-
 src/bindings.php                              |  6 ++
 .../Caching/ConfigCachingServiceTest.php      | 57 ++++++++++++++
 .../Caching/MessageCachingServiceTest.php     |  4 +-
 .../JsLocalizationControllerTest.php          | 74 +++++++++++++++---
 .../Http/LocalizationScriptTest.php           | 11 ++-
 tests/TestCase.php                            | 17 +++-
 20 files changed, 414 insertions(+), 60 deletions(-)
 create mode 100644 resources/js/config.js
 create mode 100644 src/Facades/ConfigCachingService.php
 create mode 100644 tests/JsLocalization/Caching/ConfigCachingServiceTest.php

diff --git a/README.md b/README.md
index 799edd0..f9d0ff7 100644
--- a/README.md
+++ b/README.md
@@ -67,7 +67,7 @@ return [
         'reminder' => [
             'password', 'user', 'token'
         ]
-    ]
+    ],
 
     /*
      * in short:
@@ -82,18 +82,29 @@ return [
      *     'reminder.token'
      * ]
      */
+     
+     // Set the keys of config properties you want to use in javascript.
+     // Caution: Do not expose any configuration values that should be kept privately!
+     'config' => [
+         'app.debug'
+     ],
+     
+     // Disables the config cache if set to true, so you don't have to run `php artisan js-localization:refresh`
+     // each time you change configuration files.
+     // Attention: Should not be used in production mode due to decreased performance.
+     'disable_config_cache' => false,
 ];
 ```
 
 __Important:__
 
-The messages configuration will be cached when the JsLocalizationController is used for the first time. After changing the messages configuration you will need to call __`php artisan js-localization:refresh`__ to refresh that cache.
+The messages configuration will be cached when the JsLocalizationController is used for the first time. After changing the messages configuration you will need to call __`php artisan js-localization:refresh`__ to refresh that cache. That also affects the config properties you export to javascript, since they are cached, too.
 
 
 Usage
 -----
 
-You just need to add the neccessary `<script>` tags to your layout. Here is an example blade view:
+You just need to add the necessary `<script>` tags to your layout. Here is an example blade view:
 
 ```html
 @include('js-localization::head')
@@ -118,6 +129,7 @@ Features
 --------
 
 You may use Lang.get(), Lang.has(), Lang.choice(), Lang.locale() and trans() (alias for Lang.get()) in your Javascript code. They work just like Laravel's `Lang` facade.
+Additionally, you are able to pass configuration properties to your Javascript code as well. There is Config.get() in Javascript, too. Configure which config properties to pass to the client using the `config` field in `config/js-localization.php`. Attention: Do not export any security-critical properties like DB credentials or similar, since they would be visible to anyone using your application!
 
 Variables in messages are supported. For instance: `"This is my test string for :name."`.
 
diff --git a/config/config.php b/config/config.php
index 44ed702..278e855 100644
--- a/config/config.php
+++ b/config/config.php
@@ -30,4 +30,23 @@
 
     'messages' => [],
 
+    /*
+    |--------------------------------------------------------------------------
+    | Set the keys of config properties you want to use in javascript.
+    | Caution: Do not expose any configuration values that should be kept privately!
+    |--------------------------------------------------------------------------
+    */
+    'config' => [
+        'app.debug'
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Disables the config cache if set to true, so you don't have to
+    | run `php artisan js-localization:refresh` each time you change configuration files.
+    | Attention: Should not be used in production mode due to decreased performance.
+    |--------------------------------------------------------------------------
+    */
+    'disable_config_cache' => false,
+
 ];
diff --git a/gulpfile.js b/gulpfile.js
index 63272a3..e63e082 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,10 +1,12 @@
 
 var gulp = require('gulp');
+var concat = require('gulp-concat');
 var rename = require('gulp-rename');
 var uglify = require('gulp-uglify');
 
 gulp.task('minify', function() {
-  return gulp.src('resources/js/localization.js')
+  return gulp.src('resources/js/*.js')
+    .pipe(concat('public/js/combined.js'))
     .pipe(uglify())
     .pipe(rename('localization.min.js'))
     .pipe(gulp.dest('public/js'));
diff --git a/package.json b/package.json
index 8ae3f1e..d24ed32 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
   "version": "0.1.0",
   "devDependencies": {
     "gulp": "^3.9.0",
+    "gulp-concat": "^2.6.0",
     "gulp-rename": "^1.2.2",
     "gulp-uglify": "^1.2.0"
   }
diff --git a/public/js/localization.min.js b/public/js/localization.min.js
index 39bb2c3..d3fe763 100644
--- a/public/js/localization.min.js
+++ b/public/js/localization.min.js
@@ -1 +1 @@
-!function(){var n,e={},r=function(n,e){for(var r in e){var t=e[r],i=new RegExp(":"+r,"g");n=n.replace(i,t)}return n},t=function(n){for(var e in n)if(n.hasOwnProperty(e))return!1;return!0},i={get:function(i,o,f){var a=n;if(f&&(a=f),"undefined"==typeof e[a][i]){var u={};for(var c in e[a])c.indexOf(i+".")>-1&&(u[c]=e[a][c]);return t(u)?i:u}var s=e[a][i];return o&&(s=r(s,o)),s},has:function(r){return"undefined"!=typeof e[n][r]},choice:function(t,i,o){if("undefined"==typeof e[n][t])return t;var f,a=e[n][t].split("|");return f=1==i?a[0]:a[1],o&&(f=r(f,o)),f},setLocale:function(r){if(n=r,!e[r])throw new Error('No messages defined for locale: "'+r+'". Did you forget to enable it in the configuration?')},locale:function(){return n},addMessages:function(n){for(var r in n)e[r]=n[r]}};this.Lang=i,this.trans=i.get,this.transChoice=i.choice}();
\ No newline at end of file
+!function(){var n={},e={get:function(e,r){return"undefined"!=typeof n[e]?n[e]:arguments.length>1?r:null},addConfig:function(e){for(var r in e)n[r]=e[r]}};this.Config=e}(),function(){var n,e={},r=function(n,e){for(var r in e){var t=e[r],i=new RegExp(":"+r,"g");n=n.replace(i,t)}return n},t=function(n){for(var e in n)if(n.hasOwnProperty(e))return!1;return!0},i={get:function(i,o,f){var u=n;if(f&&(u=f),"undefined"==typeof e[u][i]){var a={};for(var c in e[u])c.indexOf(i+".")>-1&&(a[c]=e[u][c]);return t(a)?i:a}var s=e[u][i];return o&&(s=r(s,o)),s},has:function(r){return"undefined"!=typeof e[n][r]},choice:function(t,i,o){if("undefined"==typeof e[n][t])return t;var f,u=e[n][t].split("|");return f=1==i?u[0]:u[1],o&&(f=r(f,o)),f},setLocale:function(r){if(n=r,!e[r])throw new Error('No messages defined for locale: "'+r+'". Did you forget to enable it in the configuration?')},locale:function(){return n},addMessages:function(n){for(var r in n)e[r]=n[r]}};this.Lang=i,this.trans=i.get,this.transChoice=i.choice}();
\ No newline at end of file
diff --git a/resources/js/config.js b/resources/js/config.js
new file mode 100644
index 0000000..e74712e
--- /dev/null
+++ b/resources/js/config.js
@@ -0,0 +1,35 @@
+(function() {
+    
+    var configData = {};
+    
+    
+    /* Config: */
+    
+    var Config = {
+        get: function(propertyName, defaultValue) {
+            if (typeof configData[propertyName] !== 'undefined') {
+                return configData[propertyName];
+            }
+            
+            // Config property not set
+            
+            if (arguments.length > 1) {
+                return defaultValue;
+            } else {
+                return null;
+            }
+        },
+        
+        addConfig: function(data) {
+            for (var propertyName in data) {
+                configData[propertyName] = data[propertyName];
+            }
+        }
+    };
+
+    
+    /* Export: */
+    
+    this.Config = Config;
+    
+})();
\ No newline at end of file
diff --git a/src/Caching/AbstractCachingService.php b/src/Caching/AbstractCachingService.php
index be03ef1..ea0b996 100644
--- a/src/Caching/AbstractCachingService.php
+++ b/src/Caching/AbstractCachingService.php
@@ -9,6 +9,7 @@
 namespace JsLocalization\Caching;
 
 use Cache;
+use DateTime;
 
 abstract class AbstractCachingService {
 
@@ -39,14 +40,18 @@ public function __construct($cacheKey, $cacheTimestampKey)
     }
 
     /**
-     * Returns the UNIX timestamp of the last
-     * refreshCache() call.
+     * Returns the timestamp of the last refreshCache() call.
      *
-     * @return int UNIX timestamp
+     * @return DateTime
      */
     public function getLastRefreshTimestamp()
     {
-        return Cache::get($this->cacheTimestampKey);
+        $unixTime = Cache::get($this->cacheTimestampKey);
+        
+        $dateTime = new DateTime;
+        $dateTime->setTimestamp($unixTime);
+        
+        return $dateTime;
     }
 
     /**
@@ -54,10 +59,32 @@ public function getLastRefreshTimestamp()
      *
      * @param mixed $data
      */
-    public function refreshCache($data)
+    public function refreshCacheUsing($data)
     {
         Cache::forever($this->cacheKey, $data);
         Cache::forever($this->cacheTimestampKey, time());
     }
+
+    /**
+     * Create up-to-date data and update cache using refreshCacheUsing().
+     * Trigger some event.
+     * 
+     * @return void
+     */
+    abstract public function refreshCache();
+
+    /**
+     * Return the cached data. Refresh cache if cache has not yet been initialized.
+     * 
+     * @return mixed
+     */
+    public function getData()
+    {
+        if (!Cache::has($this->cacheKey)) {
+            $this->refreshCache();
+        }
+
+        return Cache::get($this->cacheKey);
+    }
     
 }
\ No newline at end of file
diff --git a/src/Caching/ConfigCachingService.php b/src/Caching/ConfigCachingService.php
index 5762d1c..2977504 100644
--- a/src/Caching/ConfigCachingService.php
+++ b/src/Caching/ConfigCachingService.php
@@ -1,14 +1,69 @@
 <?php
+namespace JsLocalization\Caching;
+
+use Config;
+use Event;
+
 /**
- * Created by PhpStorm.
- * User: andy
- * Date: 03.08.15
- * Time: 00:11
+ * Class ConfigCachingService
+ * @package JsLocalization\Caching
  */
+class ConfigCachingService extends AbstractCachingService {
 
-namespace JsLocalization\Caching;
+    const CACHE_KEY = 'js-localization-config-json';
 
+    const CACHE_TIMESTAMP_KEY = 'js-localization-config-last-modified';
 
-class ConfigCachingService extends AbstractCachingService {
 
+    public function __construct()
+    {
+        parent::__construct(self::CACHE_KEY, self::CACHE_TIMESTAMP_KEY);
+    }
+
+    /**
+     * @return void
+     */
+    public function refreshCache()
+    {
+        Event::fire('JsLocalization.registerConfig');
+        
+        $configJson = $this->createConfigJson();
+        $this->refreshCacheUsing($configJson);
+    }
+
+    /**
+     * @return string   The JSON-encoded config exports.
+     */
+    public function getConfigJson()
+    {
+        if ($this->isDisabled()) {
+            return $this->createConfigJson();
+        } else {
+            return $this->getData();
+        }
+    }
+
+    /**
+     * @return bool Is config caching disabled? `true` means that this class does not cache, but create the data on the fly.
+     */
+    public function isDisabled()
+    {
+        return Config::get('js-localization.disable_config_cache', false);
+    }
+
+    /**
+     * @return string
+     */
+    protected function createConfigJson()
+    {
+        $propertyNames = Config::get('js-localization.config', []);
+        $configArray = [];
+        
+        foreach ($propertyNames as $propertyName) {
+            $configArray[$propertyName] = Config::get($propertyName);
+        }
+        
+        return json_encode((object)$configArray);
+    }
+    
 }
\ No newline at end of file
diff --git a/src/Caching/MessageCachingService.php b/src/Caching/MessageCachingService.php
index 68b0cd3..3add5bf 100644
--- a/src/Caching/MessageCachingService.php
+++ b/src/Caching/MessageCachingService.php
@@ -23,7 +23,7 @@ class MessageCachingService extends AbstractCachingService
      *
      * @var string
      */
-    const CACHE_TIMESTAMP_KEY = 'js-localization-last-modified';
+    const CACHE_TIMESTAMP_KEY = 'js-localization-messages-last-modified';
 
     
     public function __construct()
@@ -39,11 +39,7 @@ public function __construct()
      */
     public function getMessagesJson()
     {
-        if (!Cache::has($this->cacheKey)) {
-            $this->refreshCache();
-        }
-
-        return Cache::get($this->cacheKey);
+        return $this->getData();
     }
 
     /**
@@ -61,7 +57,7 @@ public function refreshCache()
         $messageKeys = $this->getMessageKeys();
         $translatedMessages = $this->getTranslatedMessagesForLocales($messageKeys, $locales);
 
-        parent::refreshCache(json_encode($translatedMessages));
+        $this->refreshCacheUsing(json_encode($translatedMessages));
     }
 
     /**
diff --git a/src/Console/RefreshCommand.php b/src/Console/RefreshCommand.php
index 60fc711..b978871 100644
--- a/src/Console/RefreshCommand.php
+++ b/src/Console/RefreshCommand.php
@@ -4,6 +4,7 @@
 use Config;
 use Illuminate\Console\Command;
 use JsLocalization\Exceptions\ConfigException;
+use JsLocalization\Facades\ConfigCachingService;
 use JsLocalization\Facades\MessageCachingService;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
@@ -42,6 +43,7 @@ public function fire()
         }
 
         MessageCachingService::refreshCache();
+        ConfigCachingService::refreshCache();
     }
 
 }
diff --git a/src/Facades/ConfigCachingService.php b/src/Facades/ConfigCachingService.php
new file mode 100644
index 0000000..7cb4f44
--- /dev/null
+++ b/src/Facades/ConfigCachingService.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: andy
+ * Date: 03.08.15
+ * Time: 16:40
+ */
+
+namespace JsLocalization\Facades;
+
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * Class ConfigCachingService
+ * @package JsLocalization\Facades
+ *
+ * @method static void refreshCache()
+ * @method static \DateTime getLastRefreshTimestamp()
+ * @method static string getConfigJson()
+ * @method static bool isDisabled()
+ * @method static void public function refreshCache()
+ */
+class ConfigCachingService extends Facade {
+    protected static function getFacadeAccessor() {
+        return 'JsLocalizationConfigCachingService';
+    }
+}
\ No newline at end of file
diff --git a/src/Facades/MessageCachingService.php b/src/Facades/MessageCachingService.php
index 4d7ea22..cfafde5 100644
--- a/src/Facades/MessageCachingService.php
+++ b/src/Facades/MessageCachingService.php
@@ -8,7 +8,7 @@
  * @package JsLocalization\Facades
  * 
  * @method static void refreshCache()
- * @method static int getLastRefreshTimestamp()
+ * @method static \DateTime getLastRefreshTimestamp()
  * @method static string getMessagesJson()
  * @method static void public function refreshCache()
  */
diff --git a/src/Http/Controllers/JsLocalizationController.php b/src/Http/Controllers/JsLocalizationController.php
index d7cbce2..80d15e4 100644
--- a/src/Http/Controllers/JsLocalizationController.php
+++ b/src/Http/Controllers/JsLocalizationController.php
@@ -5,6 +5,7 @@
 use DateTime;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Lang;
+use JsLocalization\Facades\ConfigCachingService;
 use JsLocalization\Facades\MessageCachingService;
 use JsLocalization\Http\Responses\StaticFileResponse;
 
@@ -14,25 +15,41 @@ class JsLocalizationController extends Controller
     /**
      * Create the JS-Response for all configured translation messages
      *
-     * @return Http\Response
+     * @return \Illuminate\Http\Response
      */
     public function createJsMessages()
     {
-
-        $contents = $this->getMessages();
-
-        $lastModified = new DateTime();
-        $lastModified->setTimestamp(MessageCachingService::getLastRefreshTimestamp());
+        $contents = $this->getMessagesJson();
 
         return response($contents)
                 ->header('Content-Type', 'text/javascript')
-                ->setLastModified($lastModified);
+                ->setLastModified(MessageCachingService::getLastRefreshTimestamp());
+    }
+
+    /**
+     * @return \Illuminate\Http\Response
+     */
+    public function createJsConfig()
+    {
+        $contents = $this->getConfigJson();
+        
+        /** @var \Illuminate\Http\Response $response */
+        $response = response($contents);
+        $response->header('Content-Type', 'text/javascript');
+
+        if (ConfigCachingService::isDisabled()) {
+            $response->setEtag(md5($contents));
+        } else {
+            $response->setLastModified(ConfigCachingService::getLastRefreshTimestamp());
+        }
+
+        return $response;
     }
 
     /**
      * Deliver the Framework for getting the translation in JS
      *
-     * @return Http\Response
+     * @return \Illuminate\Http\Response
      */
     public function deliverLocalizationJS()
     {
@@ -47,22 +64,34 @@ public function deliverLocalizationJS()
      * Deliver one file that combines messages and framework.
      * Saves one additional HTTP-Request
      *
-     * @return Http\Response
+     * @return \Illuminate\Http\Response
      */
-    public function deliverLocalizationJSAndMessages()
+    public function deliverAllInOne()
     {
         $contents = file_get_contents( __DIR__."/../../../public/js/localization.min.js" );
         $contents .= "\n";
-        $contents .= $this->getMessages();
+        $contents .= $this->getMessagesJson();
+        $contents .= $this->getConfigJson();
 
-        $lastModified = new DateTime();
-        $lastModified->setTimestamp(MessageCachingService::getLastRefreshTimestamp());
+        /** @var \Illuminate\Http\Response $response */
+        $response = response($contents);
+        $response->header('Content-Type', 'text/javascript');
 
-        return response($contents)
-            ->header('Content-Type', 'text/javascript')
-            ->setLastModified($lastModified);
+        if (ConfigCachingService::isDisabled()) {
+            $response->setEtag(md5($contents));
+        } else {
+            $response->setLastModified(MessageCachingService::getLastRefreshTimestamp());
+        }
+
+        return $response;
     }
 
+    /**
+     * Transforms the cached data to stay compatible to old versions of the package.
+     * 
+     * @param string $messages
+     * @return string
+     */
     protected function ensureBackwardsCompatibility($messages)
     {
         if (preg_match('/^\\{"[a-z]{2}":/', $messages)) {
@@ -77,7 +106,7 @@ protected function ensureBackwardsCompatibility($messages)
      *
      * @return string
      */
-    private function getMessages()
+    protected function getMessagesJson()
     {
         $messages = MessageCachingService::getMessagesJson();
         $messages = $this->ensureBackwardsCompatibility($messages);
@@ -88,4 +117,18 @@ private function getMessages()
         return $contents;
     }
 
+    /**
+     * Get the JSON-encoded config properties that shall be passed to the client.
+     * 
+     * @return string
+     */
+    protected function getConfigJson()
+    {
+        $config = ConfigCachingService::getConfigJson();
+        
+        $contents = 'Config.addConfig(' . $config . ');';
+        
+        return $contents;
+    }
+
 }
diff --git a/src/Http/routes.php b/src/Http/routes.php
index 76386f4..254b71e 100644
--- a/src/Http/routes.php
+++ b/src/Http/routes.php
@@ -4,7 +4,8 @@
 Route::group([ 'namespace' => '\JsLocalization\Http\Controllers' ], function()
 {
     Route::get('/js-localization/messages', 'JsLocalizationController@createJsMessages');
+    Route::get('/js-localization/config', 'JsLocalizationController@createJsConfig');
     Route::get('/js-localization/localization.js', 'JsLocalizationController@deliverLocalizationJS');
 
-    Route::get('/js-localization/all.js', 'JsLocalizationController@deliverLocalizationJSAndMessages');
+    Route::get('/js-localization/all.js', 'JsLocalizationController@deliverAllInOne');
 });
diff --git a/src/bindings.php b/src/bindings.php
index 26e6e2f..e99b912 100644
--- a/src/bindings.php
+++ b/src/bindings.php
@@ -1,5 +1,6 @@
 <?php
 
+use JsLocalization\Caching\ConfigCachingService;
 use JsLocalization\Caching\MessageCachingService;
 use JsLocalization\Utils\Helper;
 
@@ -12,3 +13,8 @@
 {
     return new MessageCachingService;
 });
+
+App::singleton('JsLocalizationConfigCachingService', function()
+{
+    return new ConfigCachingService();
+});
diff --git a/tests/JsLocalization/Caching/ConfigCachingServiceTest.php b/tests/JsLocalization/Caching/ConfigCachingServiceTest.php
new file mode 100644
index 0000000..81c2e47
--- /dev/null
+++ b/tests/JsLocalization/Caching/ConfigCachingServiceTest.php
@@ -0,0 +1,57 @@
+<?php
+
+use Mockery as m;
+use JsLocalization\Facades\ConfigCachingService;
+
+class ConfigCachingServiceTest extends TestCase {
+
+    public function setUp()
+    {
+        parent::setUp();
+
+        Cache::forget(JsLocalization\Caching\ConfigCachingService::CACHE_KEY);
+        Cache::forget(JsLocalization\Caching\ConfigCachingService::CACHE_TIMESTAMP_KEY);
+    }
+
+    public function tearDown()
+    {
+        m::close();
+
+        parent::tearDown();
+    }
+    
+    public function testIsDisabled()
+    {
+        Config::set('js-localization.disable_config_cache', false);
+        $this->assertFalse(ConfigCachingService::isDisabled());
+
+        Config::set('js-localization.disable_config_cache', true);
+        $this->assertTrue(ConfigCachingService::isDisabled());
+    }
+    
+    public function testGetConfigJson()
+    {
+        $expectedJson = json_encode($this->testConfigExportFlat);
+        $this->assertEquals($expectedJson, ConfigCachingService::getConfigJson());
+        
+        // Test that getConfigJson() returns the old value after Config::set()
+        Config::set('js-localization.test-config', 'new value');
+        $this->assertEquals($expectedJson, ConfigCachingService::getConfigJson());
+    }
+
+    public function testGetConfigJsonWithCacheDisabled()
+    {
+        Config::set('js-localization.disable_config_cache', true);
+        
+        $expectedJson = json_encode($this->testConfigExportFlat);
+        $this->assertEquals($expectedJson, ConfigCachingService::getConfigJson());
+
+        // Test that getConfigJson() returns the new value after Config::set()
+        $this->testConfigExportFlat['js-localization.test-config'] = 'new value';
+        $expectedJson = json_encode($this->testConfigExportFlat);
+        
+        Config::set('js-localization.test-config', 'new value');
+        $this->assertEquals($expectedJson, ConfigCachingService::getConfigJson());
+    }
+    
+}
\ No newline at end of file
diff --git a/tests/JsLocalization/Caching/MessageCachingServiceTest.php b/tests/JsLocalization/Caching/MessageCachingServiceTest.php
index 1965ee0..88b112e 100644
--- a/tests/JsLocalization/Caching/MessageCachingServiceTest.php
+++ b/tests/JsLocalization/Caching/MessageCachingServiceTest.php
@@ -42,13 +42,13 @@ public function testGetMessagesJson()
 
     public function testGetLastRefreshTimestamp()
     {
-        $timestamp = MessageCachingService::getLastRefreshTimestamp();
+        $timestamp = MessageCachingService::getLastRefreshTimestamp()->getTimestamp();
         $this->assertEquals(0, $timestamp);
 
         MessageCachingService::refreshCache();
         $refreshTime = time();
 
-        $timestamp = MessageCachingService::getLastRefreshTimestamp();
+        $timestamp = MessageCachingService::getLastRefreshTimestamp()->getTimestamp();
         $this->assertEquals($refreshTime, $timestamp);
     }
 
diff --git a/tests/JsLocalization/Http/Controllers/JsLocalizationControllerTest.php b/tests/JsLocalization/Http/Controllers/JsLocalizationControllerTest.php
index 02b2531..af2440d 100644
--- a/tests/JsLocalization/Http/Controllers/JsLocalizationControllerTest.php
+++ b/tests/JsLocalization/Http/Controllers/JsLocalizationControllerTest.php
@@ -4,12 +4,12 @@
 
 class JsLocalizationControllerTest extends TestCase
 {
+    
     public function testCreateJsMessages()
     {
         // Prepare & Request
 
         $this->mockLang($locale = 'en');
-
         Artisan::call('js-localization:refresh');
 
         $response = $this->call('GET', '/js-localization/messages');
@@ -25,13 +25,53 @@ public function testCreateJsMessages()
 
         $this->assertLangAddMessages($content, $this->testMessagesFlat);
     }
+    
+    public function testCreateJsConfig()
+    {
+        // Prepare & Request
+
+        $this->mockLang($locale = 'en');
+        Artisan::call('js-localization:refresh');
+
+        $response = $this->call('GET', '/js-localization/config');
+        $content = $response->getContent();
+
+        $this->assertTrue($response->isOk());
+        
+        $this->assertNotNull($response->getLastModified());
+        $this->assertNull($response->getEtag());
+
+        // Test for Config.addConfig()
+        
+        $this->assertConfigAddConfig($content, $this->testConfigExportFlat);
+    }
+    
+    public function testCreateJsConfigWithCacheDisabled()
+    {
+        // Prepare & Request
+
+        $this->mockLang($locale = 'en');
+        Config::set('js-localization.disable_config_cache', true);
+
+        $response = $this->call('GET', '/js-localization/config');
+        $content = $response->getContent();
+
+        $this->assertTrue($response->isOk());
+
+        $this->assertNull($response->getLastModified());
+        $this->assertEquals('"'.md5($content).'"', $response->getEtag());
+
+        // Test for Config.addConfig()
+
+        $this->assertConfigAddConfig($content, $this->testConfigExportFlat);
+    }
 
     public function testBackwardsCompatibility()
     {
         // Prepare & Request
 
         $this->mockLang($locale = 'en');
-        $this->mockCachingService($this->testMessagesFlat['en']);
+        $this->mockMessageCachingService($this->testMessagesFlat['en']);
 
         $response = $this->call('GET', '/js-localization/messages');
         $content = $response->getContent();
@@ -43,30 +83,40 @@ public function testBackwardsCompatibility()
         $this->assertLangAddMessages($content, $this->testMessagesFlat);
     }
 
-    private function mockCachingService(array $messages)
+    private function mockMessageCachingService(array $messages)
     {
         $service = m::mock('CachingServiceMock');
         JsLocalization\Facades\MessageCachingService::swap($service);
-
+        
         $service->shouldReceive('getMessagesJson')
             ->andReturn(json_encode($messages));
 
         $service->shouldReceive('getLastRefreshTimestamp')
-            ->andReturn(time());
+            ->andReturn(new DateTime);
     }
 
     private function assertLangAddMessages($jsContent, array $expectedMessages)
     {
-        $addMessagesRegex = '/Lang\.addMessages\( (\{.*?\}) \);/x';
-        $this->assertRegExp($addMessagesRegex, $jsContent);
+        $this->assertJsCall($jsContent, 'Lang.addMessages', $expectedMessages);
+    }
+    
+    protected function assertConfigAddConfig($jsContent, array $expectedConfig)
+    {
+        $this->assertJsCall($jsContent, 'Config.addConfig', $expectedConfig);
+    }
+    
+    protected function assertJsCall($jsContent, $functionName, $functionParam)
+    {
+        $functionName = str_replace('.', '\\.', $functionName);
+        $functionNameRegex = '/' . $functionName . '\( (\{.*?\}) \);/x';
 
-        preg_match($addMessagesRegex, $jsContent, $matches);
-        $messagesJson = $matches[1];
+        preg_match($functionNameRegex, $jsContent, $matches);
+        $paramJson = $matches[1];
 
-        $this->assertJson($messagesJson);
-        $messages = json_decode($messagesJson, true);
+        $this->assertJson($paramJson);
+        $parsedParam = json_decode($paramJson, true);
 
-        $this->assertEquals($expectedMessages, $messages);
+        $this->assertEquals($functionParam, $parsedParam);
     }
 
 }
diff --git a/tests/JsLocalization/Http/LocalizationScriptTest.php b/tests/JsLocalization/Http/LocalizationScriptTest.php
index 3ab10e0..5450df1 100644
--- a/tests/JsLocalization/Http/LocalizationScriptTest.php
+++ b/tests/JsLocalization/Http/LocalizationScriptTest.php
@@ -11,7 +11,7 @@ public function testScriptRetrieval()
         
         // Test for JS content
         
-        $this->assertRegExp('/^\(function\(.*\);/', $content);
+        $this->assertRegExp('/^!?\(?function\(.*\);/', $content);
     }
     
     public function testScriptAndTranslationCombinedRetrieval()
@@ -23,16 +23,21 @@ public function testScriptAndTranslationCombinedRetrieval()
 
         // Test for JS content
 
-        $this->assertRegExp('/^\(function\(.*\);/', $content);
+        $this->assertRegExp('/^!?\(?function\(.*\);/', $content);
 
         // Test for Lang.setLocale()
 
         $locale = \Illuminate\Support\Facades\Lang::locale();
         $this->assertRegExp('/Lang\.setLocale\("'.$locale.'"\);/', $content);
         
-        // Test for Land.addMessages()
+        // Test for Lang.addMessages()
 
         $addMessagesRegex = '/Lang\.addMessages\( (\{.*?\}) \);/x';
         $this->assertRegExp($addMessagesRegex, $content);
+        
+        // Test for Config.addConfig()
+
+        $addConfigRegex = '/Config\.addConfig\( (\{.*?\}) \);/x';
+        $this->assertRegExp($addConfigRegex, $content);
     }
 }
\ No newline at end of file
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 8111856..395e484 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -9,7 +9,7 @@ class TestCase extends Orchestra\Testbench\TestCase
         'test_string',
         'test'              // this includes all messages with key 'test.*'
     ];
-
+    
     protected $testMessages = [
         'en' => [
             'test_string' => 'This is: test_string',
@@ -32,11 +32,17 @@ class TestCase extends Orchestra\Testbench\TestCase
         ]
     ];
 
+    protected $testConfigExportFlat = [
+        'js-localization.test-config' => 'some test property value'
+    ];
+
+
     public function setUp()
     {
         parent::setUp();
 
         $this->updateMessagesConfig($this->testMessagesConfig);
+        $this->updateConfigExportConfig($this->testConfigExportFlat);
         $this->mockLang();
     }
 
@@ -56,6 +62,15 @@ protected function updateMessagesConfig(array $config)
     {
         Config::set('js-localization.messages', $config);
     }
+    
+    protected function updateConfigExportConfig(array $configData)
+    {
+        Config::set('js-localization.config', array_keys($configData));
+        
+        foreach ($configData as $propertyName => $propertyValue) {
+            Config::set($propertyName, $propertyValue);
+        }
+    }
 
     protected function mockLang($locale = "en")
     {