Merge branch 'feature/refactor-to-trait' into develop

Author: mikebronner

CHANGELOG.md

@@ -4,6 +4,14 @@ 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.2.25] - 16 Feb 2018
+### Fixed
+- readme spelling errors (thanks @fridzema!).
+
+## [0.2.24] - 16 Feb 2018
+### Fixed
+- whereNotIn query caching.
+
 ## [0.2.23] - 13 Feb 2018
 ### Fixed
 - whereBetween and value bindings parsing.

README.md

@@ -14,7 +14,7 @@ I created this package in response to a client project that had complex, nested
 forms with many `<select>`'s that resulted in over 700 database queries on one
 page. I needed a package that abstracted the caching process out of the model
 for me, and one that would let me cache custom queries, as well as cache model
-relationships. This package is the attempt to address those requirements.
+relationships. This package is an attempt to address those requirements.
 
 ## Features
 -   automatic, self-invalidating relationship (both eager- and lazy-loaded) caching.
@@ -36,7 +36,7 @@ composer require genealabs/laravel-model-caching
 If you would like to use a different cache store than the default one used by
 your Laravel application, you may do so by setting the `MODEL_CACHE_STORE`
 environment variable in your `.env` file to the name of a cache store configured
-in `config/cache.php` (you can define any custom cache store base on your
+in `config/cache.php` (you can define any custom cache store based on your
 specific needs there). For example:
 ```
 MODEL_CACHE_STORE=redis
@@ -99,8 +99,7 @@ In testing this has optimized performance on some pages up to 900%! Most often
 you should see somewhere around 100% performance increase.
 
 ## Commitment to Quality
-During package development I try as best as possible to embrace good design and
-development practices to try to ensure that this package is as good as it can
+During package development I try as best as possible to embrace good design and development practices, to help ensure that this package is as good as it can
 be. My checklist for package development includes:
 
 -   ✅ Achieve as close to 100% code coverage as possible using unit tests.

src/CacheKey.php

@@ -90,7 +90,7 @@ protected function getQueryColumns(array $columns) : string
 
     protected function getTypeClause($where) : string
     {
-        $type =in_array($where['type'], ['In', 'Null', 'NotNull', 'between'])
+        $type =in_array($where['type'], ['In', 'NotIn', 'Null', 'NotNull', 'between'])
             ? strtolower($where['type'])
             : strtolower($where['operator']);
 

tests/Unit/CachedBuilderTest.php

@@ -793,4 +793,24 @@ public function testWhereDatesResults()
         $this->assertTrue($cachedResults->diffKeys($books)->isEmpty());
         $this->assertTrue($liveResults->diffKeys($books)->isEmpty());
     }
+
+    public function testWhereNotInResults()
+    {
+        $books = (new Book)
+            ->whereNotIn('id', [1, 2])
+            ->get();
+        $key = sha1('genealabslaravelmodelcachingtestsfixturesbook-id_notin_1_2');
+        $tags = [
+            'genealabslaravelmodelcachingtestsfixturesbook',
+        ];
+
+        $cachedResults = cache()->tags($tags)
+            ->get($key);
+        $liveResults = (new UncachedAuthor)
+            ->whereNotIn('id', [1, 2])
+            ->get();
+
+        $this->assertTrue($cachedResults->diffKeys($books)->isEmpty());
+        $this->assertTrue($liveResults->diffKeys($books)->isEmpty());
+    }
 }