Move cache to own file and make sure we share the same cache object

Author: erwan

dist/prismic.io-1.1.0.min.js

@@ -11,6 +11,7 @@ var gulp = require('gulp'),
 var SOURCES = [
     'src/polyfill.js',
     'src/api.js',
+    'src/cache.js',
     'src/utils.js',
     'src/documents.js',
     'src/fragments.js',

dist/prismic.io-1.1.2.min.js

@@ -207,7 +207,7 @@
             this.url = url + (accessToken ? (url.indexOf('?') > -1 ? '&' : '?') + 'access_token=' + accessToken : '');
             this.accessToken = accessToken;
             this.requestHandler = maybeRequestHandler || Global.Prismic.Utils.request();
-            this.apiCache = maybeApiCache || new ApiCache();
+            this.apiCache = maybeApiCache || globalCache();
             this.apiCacheKey = this.url + (this.accessToken ? ('#' + this.accessToken) : '');
             this.apiDataTTL = maybeApiDataTTL || 5;
             return this;
@@ -667,52 +667,18 @@
     }
     Ref.prototype = {};
 
-    /**
-     * Api cache
-     */
-    function ApiCache() {
-        this.cache = {};
-        this.states = {};
-    }
-
-    ApiCache.prototype = {
-
-        get: function(key, cb) {
-            var maybeEntry = this.cache[key];
-            if(maybeEntry && !this.isExpired(key)) {
-                return cb(null, maybeEntry.data);
-            }
-            return cb();
-        },
-
-        set: function(key, value, ttl, cb) {
-            this.cache[key] = {
-                data: value,
-                expiredIn: ttl ? (Date.now() + (ttl * 1000)) : 0
-            };
-
-            return cb();
-        },
-
-        isExpired: function(key) {
-            var entry = this.cache[key];
-            if(entry) {
-                return entry.expiredIn !== 0 && entry.expiredIn < Date.now();
-            } else {
-                return false;
-            }
-        },
-
-        remove: function(key, cb) {
-            delete this.cache[key];
-            return cb();
-        },
-
-        clear: function(key, cb) {
-            this.cache = {};
-            return cb();
+    function globalCache() {
+        var g;
+        if (typeof global == 'object') {
+            g = global; // NodeJS
+        } else {
+            g = window; // browser
         }
-    };
+        if (!g.prismicCache) {
+            g.prismicCache = new Global.Prismic.ApiCache();
+        }
+        return g.prismicCache;
+    }
 
     // -- Export Globally
 

gulpfile.js

@@ -0,0 +1,54 @@
+(function (Global, undefined) {
+
+    "use strict";
+
+    /**
+     * Api cache
+     */
+    function ApiCache() {
+        this.cache = {};
+        this.states = {};
+    }
+
+    ApiCache.prototype = {
+
+        get: function(key, cb) {
+            var maybeEntry = this.cache[key];
+            if(maybeEntry && !this.isExpired(key)) {
+                return cb(null, maybeEntry.data);
+            }
+            return cb();
+        },
+
+        set: function(key, value, ttl, cb) {
+            this.cache[key] = {
+                data: value,
+                expiredIn: ttl ? (Date.now() + (ttl * 1000)) : 0
+            };
+
+            return cb();
+        },
+
+        isExpired: function(key) {
+            var entry = this.cache[key];
+            if(entry) {
+                return entry.expiredIn !== 0 && entry.expiredIn < Date.now();
+            } else {
+                return false;
+            }
+        },
+
+        remove: function(key, cb) {
+            delete this.cache[key];
+            return cb();
+        },
+
+        clear: function(key, cb) {
+            this.cache = {};
+            return cb();
+        }
+    };
+
+    Global.Prismic.ApiCache = ApiCache;
+
+}(typeof exports === 'object' && exports ? exports : (typeof module === "object" && module && typeof module.exports === "object" ? module.exports : window)));

src/api.js

@@ -13,6 +13,7 @@
 <script>mocha.setup('bdd')</script>
 <!-- Load local lib and tests. -->
 <script src="../src/api.js"></script>
+<script src="../src/cache.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/documents.js"></script>
 <script src="../src/fragments.js"></script>

src/cache.js

@@ -13,6 +13,7 @@
 <script>mocha.setup('bdd')</script>
 <!-- Load local lib and tests. -->
 <script src="../src/api.js"></script>
+<script src="../src/cache.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/documents.js"></script>
 <script src="../src/fragments.js"></script>

test/doc.html

@@ -13,6 +13,7 @@
 <script>mocha.setup('bdd')</script>
 <!-- Load local lib and tests. -->
 <script src="../src/api.js"></script>
+<script src="../src/cache.js"></script>
 <script src="../src/utils.js"></script>
 <script src="../src/documents.js"></script>
 <script src="../src/fragments.js"></script>

test/fragments.html

@@ -372,15 +372,21 @@
         it('Test cache', function (done) {
             Prismic.Api(testRepository, function (err, Api) {
                 if (err) return done(err);
-                var form = Api.form('products').ref(Api.master()).query('');
+                var form = Api.form('products').ref(Api.master()).query('[[:d = at(my.product.flavour, "Caramel")]]');
+                var olderKeys = Object.keys(Api.apiCache.cache);
                 form.submit(function (err, response) {
                     if (err) {
                         console.log(err);
                         return done(err);
                     }
 
-                    var keys = Object.keys(Api.apiCache.cache);
-                    var key = keys[0] === 'https://lesbonneschoses.prismic.io/api' ? keys[1] : keys[0];
+                    var key = null;
+                    Object.keys(Api.apiCache.cache).forEach(function (candidate) {
+                        if (olderKeys.indexOf(candidate) == -1) {
+                            key = candidate;
+                        }
+                    });
+
                     Api.apiCache.get(key, function (err, value) {
                         assert.equal(value.results.length, response.results.length);
                         done();

test/test.html

@@ -13,6 +13,7 @@
     <script>mocha.setup('bdd')</script>
     <!-- Load local lib and tests. -->
     <script src="../src/api.js"></script>
+    <script src="../src/cache.js"></script>
     <script src="../src/utils.js"></script>
     <script src="../src/documents.js"></script>
     <script src="../src/fragments.js"></script>