Change environment variable MODEL_CACHE_DISABLED to MODEL_CACHE_ENABLED to better conform to standards

Fixes #266

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.6.0] - 2019-07-20
+### Changed
+- environment variable `MODEL_CACHE_DISABLED` to `MODEL_CACHE_ENABLED` to better conform to standards.
+
+### Fixed
+- how cache key is constructed for SQLite.
+
 ## [0.5.6] - 2019-06-20
 ### Removed
 - all use of helper methods to allow non-Laravel apps to use this package:

config/laravel-model-caching.php

@@ -3,7 +3,7 @@
 return [
     'cache-prefix' => '',
 
-    'disabled' => env('MODEL_CACHE_DISABLED', false),
+    'enabled' => env('MODEL_CACHE_ENABLED', true),
 
     'store' => env('MODEL_CACHE_STORE'),
 ];

src/Helper.php

@@ -8,17 +8,17 @@ public function runDisabled(callable $closure)
     {
         $originalSetting = Container::getInstance()
             ->make("config")
-            ->get('laravel-model-caching.disabled');
+            ->get('laravel-model-caching.enabled');
 
         Container::getInstance()
             ->make("config")
-            ->set(['laravel-model-caching.disabled' => true]);
+            ->set(['laravel-model-caching.enabled' => false]);
 
         $result = $closure();
 
         Container::getInstance()
             ->make("config")
-            ->set(['laravel-model-caching.disabled' => $originalSetting]);
+            ->set(['laravel-model-caching.enabled' => $originalSetting]);
 
         return $result;
     }

src/Traits/Caching.php

@@ -270,9 +270,9 @@ protected function checkCooldownAndFlushAfterPersisting(Model $instance, string
 
     public function isCachable() : bool
     {
-        $isCacheDisabled = Container::getInstance()
+        $isCacheDisabled = ! Container::getInstance()
             ->make("config")
-            ->get("laravel-model-caching.disabled");
+            ->get("laravel-model-caching.enabled");
 
         return $this->isCachable
             && ! $isCacheDisabled;

tests/Integration/CachedModelTest.php

@@ -65,7 +65,7 @@ public function testScopeDisablesCachingWhenCalledOnModel()
 
     public function testScopeDisableCacheDoesntCrashWhenCachingIsDisabledInConfig()
     {
-        config(['laravel-model-caching.disabled' => true]);
+        config(['laravel-model-caching.enabled' => false]);
         $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:test-prefix:authors:genealabslaravelmodelcachingtestsfixturesauthor");
         $tags = ["genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:test-prefix:genealabslaravelmodelcachingtestsfixturesauthor"];
         $authors = (new PrefixedAuthor)
@@ -83,14 +83,14 @@ public function testScopeDisableCacheDoesntCrashWhenCachingIsDisabledInConfig()
 
     public function testAllMethodCachingCanBeDisabledViaConfig()
     {
-        config(['laravel-model-caching.disabled' => true]);
+        config(['laravel-model-caching.enabled' => false]);
         $authors = (new Author)
             ->all();
         $key = sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor");
         $tags = [
             "genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:genealabslaravelmodelcachingtestsfixturesauthor",
         ];
-        config(['laravel-model-caching.disabled' => false]);
+        config(['laravel-model-caching.enabled' => true]);
 
         $cachedResults = $this
             ->cache()

tests/Integration/Traits/CachableTest.php

@@ -79,7 +79,7 @@ public function testAllReturnsCollection()
 
     public function testsCacheFlagDisablesCaching()
     {
-        config(['laravel-model-caching.disabled' => true]);
+        config(['laravel-model-caching.enabled' => false]);
 
         $authors = (new Author)->get();
         $cachedAuthors = $this
@@ -89,7 +89,7 @@ public function testsCacheFlagDisablesCaching()
             ])
             ->get(sha1("genealabs:laravel-model-caching:testing:{$this->testingSqlitePath}testing.sqlite:authors:genealabslaravelmodelcachingtestsfixturesauthor-authors.deleted_at_null"));
 
-        config(['laravel-model-caching.disabled' => false]);
+        config(['laravel-model-caching.enabled' => true]);
 
         $this->assertNull($cachedAuthors);
         $this->assertNotEmpty($authors);