removed fetch()

Author: kyleheddon

README.md

@@ -33,19 +33,3 @@ cache.set('kyle', 'rox', { expiresIn: { minutes: 1 } }); // 1 minute
 cache.set('kyle', 'rox', { expiresIn: { hours: 1 } }); // 1 hour
 cache.set('kyle', 'rox', { expiresIn: { days: 1 } }); // 1 day
 ```
-
-fetch(key, options);
----
-```
-cache.fetch('mykey', {
-  expiresIn: 1000 * 60 * 2, // 2 minutes  
-  get: function(done){
-    makeAjaxCall(function(data){
-      done(data);
-    });
-  },
-  done: function(data){
-    doSomeStuff(data);
-  }
-});
-```

lib/cache.js

@@ -45,35 +45,11 @@ Cache.prototype.set = function(key, value, options){
     data[key] = value;
     store.call(this, data);
 
-    if(options){
+    if(hasExpiration(options)){
         setExpiration.call(this, key, options);
     }
 }
 
-Cache.prototype.fetch = function(key, options){
-    validateKey(key);
-    validateOption(options, 'get', 'fetch');
-    validateOption(options, 'done', 'fetch');
-
-    var self = this;
-    var value = self.get(key);
-
-    if(value){
-        options.done(value);
-        return;
-    }
-
-    options.done.__freshFetch = true;
-    options.get(function(value){
-        if(options.done.__freshFetch){
-            delete options.done.__freshFetch;
-            self.set(key, value, options);
-        }
-
-        done(value);
-    });
-}
-
 function load(){
     var stringifiedData = this.storage[this.options.namespace];
     if(stringifiedData === undefined){
@@ -87,18 +63,6 @@ function store(data){
     this.storage[this.options.namespace] = stringifiedData;
 }
 
-function validateKey(key){
-    if(!key){
-        throw 'key is required!';
-    }
-}
-
-function validateOption(options, key, functionName){
-    if(!options[key] || typeof options[key] !== 'function'){
-        throw 'Cache.' + functionName + '() requires you pass in a "' + key + '" callback option';
-    }
-}
-
 function setExpiration(key, options){
     var expirationMilli = getExpirationMilliSeconds(options);
     var date = new Date();
@@ -164,4 +128,8 @@ function number(num){
     }
 }
 
+function hasExpiration(options){
+    return typeof options == 'number' || (typeof options == 'string' && parseInt(options) != NaN) || (typeof options == 'object' && options.expiresIn)
+}
+
 module.exports = Cache;

tests/cache_test.js

@@ -11,19 +11,19 @@ describe('The module', function() {
         cache = new Cache({ localStorage: localStorage });
     });
 
-    describe('get', function() {
-        beforeEach(function(){
-            cache.set('kyle', 'rox');
-        });
-
-        it('Gets the value', function() {
-            assert(cache.get('kyle') == 'rox');
-        });
+    describe('get()', function() {
+        describe('When a value is set using set()', function(){
+            beforeEach(function(){
+                cache.set('kyle', 'rox');
+            });
 
+            it('Gets the value', function() {
+                assert(cache.get('kyle') == 'rox');
+            });
+        })
     });
 
-    describe('set', function(){
-
+    describe('set()', function(){
         describe('When expiration is set', function(){
             var itPasses = function(){
                 it('expires in that number * milliseconds', function(done){
@@ -87,5 +87,6 @@ describe('The module', function() {
 
         })
 
-    })
+    });
+
 });