From 883f9db193aa8347bea1926282df5318c11e88cf Mon Sep 17 00:00:00 2001
From: Erik Donohoo <erikdonohoo@gmail.com>
Date: Tue, 24 Mar 2015 16:17:30 -0600
Subject: [PATCH] cache coverage 100%

---
 dist/resourcify.js     | 665 -----------------------------------------
 dist/resourcify.min.js |   2 -
 test/spec/cache.js     |  17 ++
 3 files changed, 17 insertions(+), 667 deletions(-)
 delete mode 100644 dist/resourcify.js
 delete mode 100644 dist/resourcify.min.js

diff --git a/dist/resourcify.js b/dist/resourcify.js
deleted file mode 100644
index ae4a009..0000000
--- a/dist/resourcify.js
+++ /dev/null
@@ -1,665 +0,0 @@
-(function (angular, undefined) {
-
-'use strict';
-
-angular.module('resourcify', []);
-
-function removeFromLists(item, lists) {
-  angular.forEach(lists, function (list) {
-    if (list.indexOf(item) !== -1) list.splice(list.indexOf(item), 1);
-  });
-}
-
-function ResourcifyCache() {
-
-  function Cache (options) {
-    this.$cache = {};
-    this.$options = angular.extend({
-      id: 'id',
-      saveMethod: 'POST',
-      key: ['id']
-    }, options || {});
-    this.$lists = {};
-  }
-
-  Cache.prototype.isCacheable = function (config) {
-    return !config.noCache && !config.$force && config.method === 'GET';
-  };
-
-  Cache.prototype.add = function (item, postCall) {
-    // If cache contains item, update it
-    // If cache doesn't contain item, add it
-    // and reset query
-    var key = this.getKey(item);
-    var cache = this.$cache;
-    for (var i = 0; i < key.length - 1; i++) {
-      if (!cache[key[i]]) cache[key[i]] = {};
-      cache = cache[key[i]];
-    }
-
-    if (!cache[key[key.length - 1]]) {
-      if (postCall) {
-        angular.forEach(this.$lists, function (val) {
-          val.$invalid = true;
-        });
-      }
-      var that = this;
-      // Self-removing function from cache
-      item.$clearCache = function () {
-        that.remove(that.getKey(this));
-      }.bind(item);
-      return cache[key[key.length - 1]] = item;
-    } else {
-      // Need to update references in other arrays
-      // extends doesn't copy
-      angular.extend(cache[key[key.length - 1]], item);
-      return cache[key[key.length - 1]];
-    }
-  };
-
-  Cache.prototype.getKey = function (obj) {
-    var key = [];
-    var keyConfig = angular.isArray(this.$options.key) ? this.$options.key : [this.$options.key];
-    keyConfig.forEach(function (keyPiece) {
-      key.push(obj[keyPiece]);
-    });
-    return key;
-  };
-
-  Cache.prototype.remove = function (key) {
-    if (!angular.isArray(key)) {
-      key = [key];
-    }
-    var cache = this.$cache;
-    for (var i = 0; i < key.length - 1; i++) {
-      cache = cache[key[i]];
-    }
-
-    var item = cache[key[key.length - 1]];
-    removeFromLists(item, this.$lists);
-    delete cache[key[key.length - 1]];
-  };
-
-  Cache.prototype.clear = function () {
-    this.$cache = {};
-    this.$lists = {};
-  };
-
-  Cache.prototype.get = function (key) {
-    if (!angular.isArray(key)) {
-      key = [key];
-    }
-    var cache = this.$cache;
-    for (var i = 0; i < key.length - 1; i++) {
-      cache = cache[key[i]];
-    }
-    return cache[key[key.length - 1]];
-  };
-
-  Cache.prototype.getList = function (key) {
-    return this.$lists[key] ? this.$lists[key] : null;
-  };
-
-  Cache.prototype.addItemToList = function (list, item) {
-
-    if (!this.get(this.getKey(item))) {
-      item = this.add(item);
-      list.push(item);
-    } else {
-      item = this.add(item);
-      var match = false;
-      for (var i = 0; i < list.length; i++) {
-        if (item === list[i] || angular.equals(this.getKey(item), this.getKey(list[i]))) {
-          match = true;
-          break;
-        }
-      }
-
-      if (!match) list.push(item);
-    }
-  };
-
-  Cache.prototype.addList = function (key, list) {
-    if (!this.$lists[key]) {
-      this.$lists[key] = list;
-      for (var i = 0; i < list.length; i++) {
-        list[i] = this.add(list[i]);
-      }
-    } else {
-      // Merge lists, add new values to cache
-      angular.forEach(list, function (newItem) {
-        var match = false;
-        newItem = this.add(newItem);
-        angular.forEach(this.$lists[key], function (item) {
-          if (item === newItem || angular.equals(this.getKey(item), this.getKey(newItem))) {
-            match = true;
-          }
-        }.bind(this));
-        if (!match) {
-          this.$lists[key].push(newItem);
-        }
-      }.bind(this));
-    }
-    return this.$lists[key];
-  };
-
-  return {
-    createCache: function (options) {
-      return new Cache(options);
-    }
-  };
-}
-
-angular.module('resourcify').factory('ResourcifyCache', ResourcifyCache);
-
-/* jshint evil: true */
-// We need this function to allow users to name the constructors we are making
-function renameFunction (name, fn) {
-  return (new Function('return function (call) { return function ' + name +
-    ' () { return call(this, arguments) }; };')())(Function.apply.bind(fn));
-}
-/* jshint evil: false */
-
-function functionName (fun) {
-  var ret = fun.toString();
-  ret = ret.substr('function '.length);
-  ret = ret.substr(0, ret.indexOf('('));
-  return ret;
-}
-
-function cloneConstructor (ToClone) {
-
-  function Clone() {
-    ToClone.apply(this, arguments);
-  }
-
-  Clone.prototype = new ToClone();
-
-  for (var key in ToClone) {
-    if (ToClone.hasOwnProperty(key)) {
-      Clone[key] = angular.copy(ToClone[key]);
-    }
-  }
-
-  return Clone;
-}
-
-function makeParams(method, args) {
-
-  // Set params, ripped from angular's $resource
-  /* jshint -W086 */ /* (purposefully fall through case statements) */
-  var obj = {}, e = args[3], p = args[0], b = args[1], s = args[2];
-  obj.error = obj.success = angular.noop;
-  obj.params = obj.body = {};
-  switch (args.length) {
-    case 4:
-      obj.error = e;
-      obj.success = s;
-      // fallthrough
-    case 3:
-    case 2:
-      if (angular.isFunction(b)) {
-        if (angular.isFunction(p)) {
-          obj.success = p;
-          obj.error = b;
-          break;
-        }
-
-        obj.success = b;
-        obj.error = s || angular.noop;
-        // fallthrough
-      } else {
-        obj.params = p;
-        obj.body = b;
-        obj.success = s || angular.noop;
-        break;
-      }
-    case 1:
-      if (angular.isFunction(p)) {
-        obj.success = p;
-      } else if (/^(POST|PUT|PATCH)$/i.test(method)) {
-        obj.body = p;
-      } else {
-        obj.params = p;
-      }
-      break;
-    case 0: break;
-    default:
-      throw new Error('Expected up to 4 arguments [params, data, success, error], got ' +
-      args.length + ' args');
-  }
-  /* jshint +W086 */ /* (purposefully fall through case statements) */
-
-  return obj;
-}
-
-function resourcificator ($http, $q, utils, Cache) {
-
-  function Resourcify (name, url, config) {
-
-    if (!name || !url) {
-      throw new Error('Must supply a name and a url when constructing');
-    }
-
-    this.url = $q.when(url);
-    this.name = name;
-    this.config = config || {};
-
-    // Set defaults
-    this.config.idProp = this.config.idProp || 'id';
-    this.config.usePromise = (this.config.usePromise != null) ?
-      this.config.usePromise :
-      this.config.cache ?
-        true :
-        false;
-
-    this.config.httpConfig = this.config.httpConfig || {};
-    this.subs = [];
-    var that = this;
-
-    // Make constructor
-    this.$$ResourceConstructor = renameFunction(this.name, function (data) {
-      angular.extend(this, data || {});
-
-      /* Add parentItem to sub constructors
-
-      // Make a copy of each sub constructor with a
-      // prototype that points at the object it is attached to
-      // as well as the prototype of the original constructor
-      // so that when new is called on it, it has all the instance functions
-      // as well as it will be an instanceof the original constructor
-      */
-
-      angular.forEach(that.subs, function (l) {
-        var con = l[0], map = l[1];
-        var name = functionName(con);
-        var clone = cloneConstructor(con);
-        clone.prototype.$paramMap = map;
-        clone.prototype.$parentItem = this;
-        this[name] = clone;
-      }, this);
-
-      (that.config.constructor || angular.noop).bind(this)(data);
-    });
-
-    this.$$ResourceConstructor.$$builder = this;
-
-    if (this.config.cache) {
-      this.cache = Cache.createCache(angular.isObject(this.config.cache) ? this.config.cache : {});
-      this.$$ResourceConstructor.$clearCache = this.cache.clear;
-    }
-  }
-
-  Resourcify.prototype.subResource = function (Resource, map) {
-    this.subs.push([Resource, map]);
-    return this;
-  };
-
-  Resourcify.prototype.method = function (name, fn) {
-    this.$$ResourceConstructor.prototype[name] = fn;
-    return this;
-  };
-
-  Resourcify.prototype.request = function (config) {
-    addRequest(config, this.$$ResourceConstructor);
-    return this;
-  };
-
-  Resourcify.prototype.create = function () {
-    return this.$$ResourceConstructor;
-  };
-
-  function addRequest (config, Constructor) {
-    if (!config.method || !config.name) {
-      throw new Error('Request config must contain a HTTP method and a name');
-    }
-
-    config.url = config.url ? $q.when(config.url) : null;
-    config.$Const = Constructor;
-    config.isInstance = (config.isInstance == null) ? true : config.isInstance;
-    config.config = config.config || {};
-
-    // No before/after on class level
-    if (config.isInstance === false && (config.before || config.after)) {
-      throw new Error('Before/After functions not supported on Class level requests');
-    }
-
-    if (config.isInstance) {
-      Constructor.prototype[config.name] = generateRequest(config);
-      Constructor.prototype[config.name].withConfig = function () {
-        utils.extendDeep(config.config, arguments[0]);
-        return generateRequest(config).apply(this, [].slice.call(arguments, 1));
-      };
-
-      if (config.$Const.$$builder.cache) {
-        Constructor.prototype[config.name].force = generateRequest(angular.extend({$force: true}, config));
-        Constructor.prototype[config.name].force.withConfig = function () {
-          utils.extendDeep(config.config, arguments[0]);
-          return generateRequest(angular.extend({$force: true}, config)).apply(this, [].slice.call(arguments, 1));
-        };
-      }
-    } else {
-      Constructor[config.name] = generateRequest(config);
-      Constructor[config.name].withConfig = function () {
-        utils.extendDeep(config.config, arguments[0]);
-        return generateRequest(config).apply(this, [].slice.call(arguments, 1));
-      };
-
-      if (config.$Const.$$builder.cache) {
-        Constructor[config.name].force = generateRequest(angular.extend({$force: true}, config));
-        Constructor[config.name].force.withConfig = function () {
-          utils.extendDeep(config.config, arguments[0]);
-          return generateRequest(angular.extend({$force: true}, config)).apply(this, [].slice.call(arguments, 1));
-        };
-      }
-    }
-  }
-
-  function doRequest (url, value, config, success, error, Maybe) {
-
-    var cacheDefer;
-
-    function resolve() {
-      value.$resolved = true;
-      value.$url = url;
-      success(value);
-      value.$$defer.resolve(value);
-      if (cacheDefer) cacheDefer.resolve(value);
-    }
-
-    var httpConfig = {
-      url: url,
-      method: config.method
-    };
-
-    // Check if what we are requesting is already in the cache
-    // If so, make sure initial 'value' is from the cache, and get out of here
-    var cache = config.$Const.$$builder.cache;
-    if (cache && cache.isCacheable(config)) {
-      if (!angular.isArray(value)) {
-        var cValue = cache.get(cache.getKey(angular.extend(value.$$params, value)));
-        if (cValue && !cValue.$invalid) {
-          cacheDefer = value.$$defer;
-          value = cValue;
-          value.$promise.then(resolve);
-          return;
-        } else {
-          // add to cache
-          // TODO wont handle multi key
-          if (!value[config.$Const.$$builder.config.idProp]) {
-            if (value.$$params[config.$Const.$$builder.config.idProp]) {
-              value[config.$Const.$$builder.config.idProp] = value.$$params[config.$Const.$$builder.config.idProp];
-              value = cache.add(value);
-            }
-          } else {
-            value = cache.add(value);
-          }
-        }
-      } else {
-        var lValue = cache.getList(url);
-        if (lValue && !lValue.$invalid) {
-          cacheDefer = value.$$defer;
-          value = lValue;
-          value.$promise.then(resolve);
-          return;
-        } else {
-          // Add to cache
-          value = cache.addList(url, value);
-        }
-      }
-    }
-
-    // Before fn
-    (config.before || angular.noop).apply(value);
-
-    // Strip $ from value for data
-    var sendData = {};
-    if (!angular.isArray(value) && config.method !== 'GET') {
-      angular.forEach(value, function (v, key) {
-        if (value.hasOwnProperty(key) && key.charAt(0) !== '$') {
-          sendData[key] = v;
-        }
-      });
-    }
-
-    var classConfig = config.$Const.$$builder.config.httpConfig;
-    httpConfig.data = /^(POST|PUT|PATCH|DELETE)$/i.test(config.method) ? sendData : undefined;
-    $http(utils.extendDeep({}, classConfig, config.config || {}, httpConfig)).then(function ok(response) {
-      var dataToUse = config.propName ? response.data[config.propName] : response.data;
-      if ((config.isArray && !angular.isArray(dataToUse)) || (!config.isArray && angular.isArray(dataToUse))) {
-        throw new Error('Saw array or object when expecting the opposite when making ' + config.method +
-          ' call to ' + url);
-      }
-
-      // Build item and handle cache
-      if (config.isArray) {
-        angular.forEach(dataToUse, function (item) {
-          var model = typeof item === 'object' ? (Maybe.prototype instanceof config.$Const ?
-            new Maybe(item) : new config.$Const(item)) : {data: item};
-          model.$invalid = (config.invalidateListModels && cache);
-          if (cache && !config.noCache) {
-            cache.addItemToList(value, model);
-          } else {
-            value.push(model);
-          }
-        });
-      } else {
-
-        value = (typeof dataToUse === 'object') ? angular.extend(value, dataToUse) : angular.extend(value, {data: dataToUse});
-
-        // Check for Location header
-        var location;
-        if (location = response.headers('Location')) {
-          value[config.$Const.$$builder.config.idProp] = location.substring(location.lastIndexOf('/') + 1);
-        }
-
-        if (cache && !config.noCache) {
-          value = cache.add(value, (config.method === cache.$options.saveMethod));
-        }
-      }
-
-      // We just updated the value, so cache is good now
-      if (cache) {
-        value.$invalid = false;
-      }
-
-      // Provide access to raw response
-      value.$response = response;
-
-      // After fun
-      (config.after || angular.noop).apply(value);
-
-      resolve();
-
-    }, function rejection(err) {
-      error(err);
-      value.$$defer.reject(err);
-    });
-  }
-
-  function buildSubResourceParams (curObj, params, map, depth) {
-    // As long as curObj has a $parentItem property, we will recurse
-    // The lowest level object will always win
-    var lowerParams = {};
-    if (curObj.$parentItem) {
-      lowerParams = buildSubResourceParams(curObj.$parentItem, params, map, depth + 1);
-    }
-
-    // Set the values in the params
-    angular.forEach(map, function (value, key) {
-      var v, d;
-      if (value.indexOf('@') !== -1) {
-        v = value.substr(0, value.indexOf('@'));
-        d = parseInt(value.substr(value.indexOf('@') + 1));
-      } else {
-        v = value;
-        d = 0;
-      }
-      if (d && d === depth && curObj[v]) {
-        lowerParams[key] = curObj[v];
-      } else if (d === 0 && curObj[v]) {
-        lowerParams[key] = curObj[v];
-      }
-    });
-
-    params = angular.extend(lowerParams, params);
-    return params;
-  }
-
-  function recurseParent (parent, pParams) {
-    if (parent.$parentItem) {
-      pParams = recurseParent(parent.$parentItem, pParams);
-    }
-
-    // Set the values in the params
-    angular.forEach(parent, function (value, key) {
-      if (parent.hasOwnProperty(key)) {
-        pParams[key] = value;
-      }
-    });
-
-    return pParams;
-  }
-
-  function generateRequest (config) {
-    return function request() {
-      var that = this;
-      var cache = config.$Const.$$builder.cache;
-
-      var args = makeParams(config.method, arguments);
-
-      // Set value
-      var value = (this instanceof config.$Const) ? this : (config.isArray ? [] :
-        (this.prototype instanceof config.$Const) ? new this(args.body) : new config.$Const(args.body));
-
-      // Is the requester a nested sub resource?
-      // If so include parent properties
-      var parentParams = {};
-      if (this.$parentItem || (this.prototype && this.prototype.$parentItem)) {
-        if (!this.$paramMap && (!this.prototype || !this.prototype.$paramMap)) {
-          parentParams = recurseParent(this.$parentItem || this.prototype.$parentItem, parentParams);
-        } else {
-          args.params = buildSubResourceParams(this.$parentItem || this.prototype.$parentItem,
-            args.params, this.$paramMap || this.prototype.$paramMap, 1);
-        }
-      }
-
-      value.$$defer = $q.defer();
-      value.$$params = args.params;
-      value.$promise = value.$$defer.promise;
-      value.$resolved = false;
-
-      // Resolve path
-      (config.url || config.$Const.$$builder.url).then(function resolved(path) {
-        doRequest(utils.replaceParams(args.params, path, value, parentParams),
-          value, config, args.success, args.error, that);
-      }.bind(this), function rejected() {
-        throw new Error('Could not resolve URL for ' + config.toString());
-      });
-
-      return (cache || config.$Const.$$builder.config.usePromise) ? value.$promise : value;
-    };
-  }
-
-  return Resourcify;
-}
-
-resourcificator.$inject = ['$http', '$q', 'resourcifyUtils', 'ResourcifyCache'];
-
-angular.module('resourcify').service('Resourcify', resourcificator);
-
-// Strip off any query params, and put them in a params object
-function objectifyQueryParams (url) {
-  var params = {}, query = url.substring(url.indexOf('?'));
-  if (query !== url) {
-    query.replace(
-        new RegExp('([^?=&]+)(=([^&]*))?', 'g'),
-        function ($0, $1, $2, $3) { params[$1] = $3; }
-    );
-  }
-  return params;
-}
-
-/* Extends the destination object `dst` by copying all of the properties from the `src` object(s)
-* to `dst`. You can specify multiple `src` objects.
-* @param   {Boolean} deep If true, the merge becomes recursive (optional aka deep copy)
-* @param   {Object}  dst  Destination object.
-* @param   {Object}  src  Source object(s).
-* @returns {Object}       Reference to `dst`.
-*
-* angular.extend(object, object2) // shallow copy
-* angular.extend(true, object, object2) // deep copy
-*/
-function extendDeep(dst) {
-  angular.forEach(arguments, function (obj) {
-    if (obj !== dst) {
-      angular.forEach(obj, function (value, key) {
-        if (dst[key] && dst[key].constructor && dst[key].constructor === Object) {
-          extendDeep(dst[key], value);
-        } else {
-          dst[key] = value;
-        }
-      });
-    }
-  });
-  return dst;
-}
-
-function resourcifyUtils () {
-
-  // Finds and replaces query params and path params
-  function replaceParams (params, url, object, parentParams) {
-    var findParam = /[\/=.](:\w*[a-zA-Z]\w*)/, copiedPath = angular.copy(url),
-    match, cut = '__|cut|__', copiedParams = angular.copy(params);
-    object = object || {};
-    parentParams = parentParams || {};
-
-    // Pull off query
-    var qParams = objectifyQueryParams(copiedPath), finalParams = {};
-    if (copiedPath.indexOf('?') !== -1) {
-      copiedPath = copiedPath.substring(0, copiedPath.indexOf('?'));
-    }
-
-    // Fill in missing values in query params
-    angular.forEach(qParams, function (value, key) {
-      var pseudoKey = value.substring(1);
-      if (value.charAt(0) === ':' && (copiedParams[pseudoKey] || object[pseudoKey] || parentParams[pseudoKey])) {
-        finalParams[key] = copiedParams[pseudoKey] || object[pseudoKey] || parentParams[pseudoKey];
-        delete copiedParams[pseudoKey]; // Don't re-use param as query param if it filled one
-      } else if (value.charAt(0) !== ':') {
-        finalParams[key] = value;
-      }
-    });
-
-    // Replace pieces in path
-    while ((match = findParam.exec(copiedPath))) {
-      var regexVal = match[1], key = match[1].substring(1);
-      copiedPath = copiedPath.replace(regexVal, copiedParams[key] || object[key] || parentParams[key] || cut);
-      if (copiedParams[key]) {
-        delete copiedParams[key];
-      } else if (copiedPath.indexOf('/' + cut) !== -1) {
-        copiedPath = copiedPath.substring(0, copiedPath.indexOf('/' + cut));
-        break;
-      }
-    }
-
-    // Add on remaining query params
-    copiedParams = angular.extend({}, finalParams, copiedParams);
-    var stringParams = [];
-    angular.forEach(copiedParams, function (value, key) {
-      stringParams.push(key + '=' + value);
-    });
-    copiedPath += ((stringParams.length) ? '?' : '') + stringParams.join('&');
-
-    return copiedPath;
-  }
-
-  return {
-    replaceParams: replaceParams,
-    extendDeep: extendDeep
-  };
-}
-
-angular.module('resourcify').factory('resourcifyUtils', resourcifyUtils);
-
-})(angular);
diff --git a/dist/resourcify.min.js b/dist/resourcify.min.js
deleted file mode 100644
index 714fa40..0000000
--- a/dist/resourcify.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! resourcify 24-03-2015 v1.0.6 */
-!function(a,b){"use strict";function c(b,c){a.forEach(c,function(a){-1!==a.indexOf(b)&&a.splice(a.indexOf(b),1)})}function d(){function b(b){this.$cache={},this.$options=a.extend({id:"id",saveMethod:"POST",key:["id"]},b||{}),this.$lists={}}return b.prototype.isCacheable=function(a){return!a.noCache&&!a.$force&&"GET"===a.method},b.prototype.add=function(b,c){for(var d=this.getKey(b),e=this.$cache,f=0;f<d.length-1;f++)e[d[f]]||(e[d[f]]={}),e=e[d[f]];if(e[d[d.length-1]])return a.extend(e[d[d.length-1]],b),e[d[d.length-1]];c&&a.forEach(this.$lists,function(a){a.$invalid=!0});var g=this;return b.$clearCache=function(){g.remove(g.getKey(this))}.bind(b),e[d[d.length-1]]=b},b.prototype.getKey=function(b){var c=[],d=a.isArray(this.$options.key)?this.$options.key:[this.$options.key];return d.forEach(function(a){c.push(b[a])}),c},b.prototype.remove=function(b){a.isArray(b)||(b=[b]);for(var d=this.$cache,e=0;e<b.length-1;e++)d=d[b[e]];var f=d[b[b.length-1]];c(f,this.$lists),delete d[b[b.length-1]]},b.prototype.clear=function(){this.$cache={},this.$lists={}},b.prototype.get=function(b){a.isArray(b)||(b=[b]);for(var c=this.$cache,d=0;d<b.length-1;d++)c=c[b[d]];return c[b[b.length-1]]},b.prototype.getList=function(a){return this.$lists[a]?this.$lists[a]:null},b.prototype.addItemToList=function(b,c){if(this.get(this.getKey(c))){c=this.add(c);for(var d=!1,e=0;e<b.length;e++)if(c===b[e]||a.equals(this.getKey(c),this.getKey(b[e]))){d=!0;break}d||b.push(c)}else c=this.add(c),b.push(c)},b.prototype.addList=function(b,c){if(this.$lists[b])a.forEach(c,function(c){var d=!1;c=this.add(c),a.forEach(this.$lists[b],function(b){(b===c||a.equals(this.getKey(b),this.getKey(c)))&&(d=!0)}.bind(this)),d||this.$lists[b].push(c)}.bind(this));else{this.$lists[b]=c;for(var d=0;d<c.length;d++)c[d]=this.add(c[d])}return this.$lists[b]},{createCache:function(a){return new b(a)}}}function e(a,b){return new Function("return function (call) { return function "+a+" () { return call(this, arguments) }; };")()(Function.apply.bind(b))}function f(a){var b=a.toString();return b=b.substr("function ".length),b=b.substr(0,b.indexOf("("))}function g(b){function c(){b.apply(this,arguments)}c.prototype=new b;for(var d in b)b.hasOwnProperty(d)&&(c[d]=a.copy(b[d]));return c}function h(b,c){var d={},e=c[3],f=c[0],g=c[1],h=c[2];switch(d.error=d.success=a.noop,d.params=d.body={},c.length){case 4:d.error=e,d.success=h;case 3:case 2:if(!a.isFunction(g)){d.params=f,d.body=g,d.success=h||a.noop;break}if(a.isFunction(f)){d.success=f,d.error=g;break}d.success=g,d.error=h||a.noop;case 1:a.isFunction(f)?d.success=f:/^(POST|PUT|PATCH)$/i.test(b)?d.body=f:d.params=f;break;case 0:break;default:throw new Error("Expected up to 4 arguments [params, data, success, error], got "+c.length+" args")}return d}function i(c,d,i,j){function k(b,c,h){if(!b||!c)throw new Error("Must supply a name and a url when constructing");this.url=d.when(c),this.name=b,this.config=h||{},this.config.idProp=this.config.idProp||"id",this.config.usePromise=null!=this.config.usePromise?this.config.usePromise:this.config.cache?!0:!1,this.config.httpConfig=this.config.httpConfig||{},this.subs=[];var i=this;this.$$ResourceConstructor=e(this.name,function(b){a.extend(this,b||{}),a.forEach(i.subs,function(a){var b=a[0],c=a[1],d=f(b),e=g(b);e.prototype.$paramMap=c,e.prototype.$parentItem=this,this[d]=e},this),(i.config.constructor||a.noop).bind(this)(b)}),this.$$ResourceConstructor.$$builder=this,this.config.cache&&(this.cache=j.createCache(a.isObject(this.config.cache)?this.config.cache:{}),this.$$ResourceConstructor.$clearCache=this.cache.clear)}function l(b,c){if(!b.method||!b.name)throw new Error("Request config must contain a HTTP method and a name");if(b.url=b.url?d.when(b.url):null,b.$Const=c,b.isInstance=null==b.isInstance?!0:b.isInstance,b.config=b.config||{},b.isInstance===!1&&(b.before||b.after))throw new Error("Before/After functions not supported on Class level requests");b.isInstance?(c.prototype[b.name]=p(b),c.prototype[b.name].withConfig=function(){return i.extendDeep(b.config,arguments[0]),p(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c.prototype[b.name].force=p(a.extend({$force:!0},b)),c.prototype[b.name].force.withConfig=function(){return i.extendDeep(b.config,arguments[0]),p(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))})):(c[b.name]=p(b),c[b.name].withConfig=function(){return i.extendDeep(b.config,arguments[0]),p(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c[b.name].force=p(a.extend({$force:!0},b)),c[b.name].force.withConfig=function(){return i.extendDeep(b.config,arguments[0]),p(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))}))}function m(d,e,f,g,h,j){function k(){e.$resolved=!0,e.$url=d,g(e),e.$$defer.resolve(e),l&&l.resolve(e)}var l,m={url:d,method:f.method},n=f.$Const.$$builder.cache;if(n&&n.isCacheable(f))if(a.isArray(e)){var o=n.getList(d);if(o&&!o.$invalid)return l=e.$$defer,e=o,void e.$promise.then(k);e=n.addList(d,e)}else{var p=n.get(n.getKey(a.extend(e.$$params,e)));if(p&&!p.$invalid)return l=e.$$defer,e=p,void e.$promise.then(k);e[f.$Const.$$builder.config.idProp]?e=n.add(e):e.$$params[f.$Const.$$builder.config.idProp]&&(e[f.$Const.$$builder.config.idProp]=e.$$params[f.$Const.$$builder.config.idProp],e=n.add(e))}(f.before||a.noop).apply(e);var q={};a.isArray(e)||"GET"===f.method||a.forEach(e,function(a,b){e.hasOwnProperty(b)&&"$"!==b.charAt(0)&&(q[b]=a)});var r=f.$Const.$$builder.config.httpConfig;m.data=/^(POST|PUT|PATCH|DELETE)$/i.test(f.method)?q:b,c(i.extendDeep({},r,f.config||{},m)).then(function(b){var c=f.propName?b.data[f.propName]:b.data;if(f.isArray&&!a.isArray(c)||!f.isArray&&a.isArray(c))throw new Error("Saw array or object when expecting the opposite when making "+f.method+" call to "+d);if(f.isArray)a.forEach(c,function(a){var b="object"==typeof a?j.prototype instanceof f.$Const?new j(a):new f.$Const(a):{data:a};b.$invalid=f.invalidateListModels&&n,n&&!f.noCache?n.addItemToList(e,b):e.push(b)});else{e="object"==typeof c?a.extend(e,c):a.extend(e,{data:c});var g;(g=b.headers("Location"))&&(e[f.$Const.$$builder.config.idProp]=g.substring(g.lastIndexOf("/")+1)),n&&!f.noCache&&(e=n.add(e,f.method===n.$options.saveMethod))}n&&(e.$invalid=!1),e.$response=b,(f.after||a.noop).apply(e),k()},function(a){h(a),e.$$defer.reject(a)})}function n(b,c,d,e){var f={};return b.$parentItem&&(f=n(b.$parentItem,c,d,e+1)),a.forEach(d,function(a,c){var d,g;-1!==a.indexOf("@")?(d=a.substr(0,a.indexOf("@")),g=parseInt(a.substr(a.indexOf("@")+1))):(d=a,g=0),g&&g===e&&b[d]?f[c]=b[d]:0===g&&b[d]&&(f[c]=b[d])}),c=a.extend(f,c)}function o(b,c){return b.$parentItem&&(c=o(b.$parentItem,c)),a.forEach(b,function(a,d){b.hasOwnProperty(d)&&(c[d]=a)}),c}function p(a){return function(){var b=this,c=a.$Const.$$builder.cache,e=h(a.method,arguments),f=this instanceof a.$Const?this:a.isArray?[]:this.prototype instanceof a.$Const?new this(e.body):new a.$Const(e.body),g={};return(this.$parentItem||this.prototype&&this.prototype.$parentItem)&&(this.$paramMap||this.prototype&&this.prototype.$paramMap?e.params=n(this.$parentItem||this.prototype.$parentItem,e.params,this.$paramMap||this.prototype.$paramMap,1):g=o(this.$parentItem||this.prototype.$parentItem,g)),f.$$defer=d.defer(),f.$$params=e.params,f.$promise=f.$$defer.promise,f.$resolved=!1,(a.url||a.$Const.$$builder.url).then(function(c){m(i.replaceParams(e.params,c,f,g),f,a,e.success,e.error,b)}.bind(this),function(){throw new Error("Could not resolve URL for "+a.toString())}),c||a.$Const.$$builder.config.usePromise?f.$promise:f}}return k.prototype.subResource=function(a,b){return this.subs.push([a,b]),this},k.prototype.method=function(a,b){return this.$$ResourceConstructor.prototype[a]=b,this},k.prototype.request=function(a){return l(a,this.$$ResourceConstructor),this},k.prototype.create=function(){return this.$$ResourceConstructor},k}function j(a){var b={},c=a.substring(a.indexOf("?"));return c!==a&&c.replace(new RegExp("([^?=&]+)(=([^&]*))?","g"),function(a,c,d,e){b[c]=e}),b}function k(b){return a.forEach(arguments,function(c){c!==b&&a.forEach(c,function(a,c){b[c]&&b[c].constructor&&b[c].constructor===Object?k(b[c],a):b[c]=a})}),b}function l(){function b(b,c,d,e){var f,g=/[\/=.](:\w*[a-zA-Z]\w*)/,h=a.copy(c),i="__|cut|__",k=a.copy(b);d=d||{},e=e||{};var l=j(h),m={};for(-1!==h.indexOf("?")&&(h=h.substring(0,h.indexOf("?"))),a.forEach(l,function(a,b){var c=a.substring(1);":"===a.charAt(0)&&(k[c]||d[c]||e[c])?(m[b]=k[c]||d[c]||e[c],delete k[c]):":"!==a.charAt(0)&&(m[b]=a)});f=g.exec(h);){var n=f[1],o=f[1].substring(1);if(h=h.replace(n,k[o]||d[o]||e[o]||i),k[o])delete k[o];else if(-1!==h.indexOf("/"+i)){h=h.substring(0,h.indexOf("/"+i));break}}k=a.extend({},m,k);var p=[];return a.forEach(k,function(a,b){p.push(b+"="+a)}),h+=(p.length?"?":"")+p.join("&")}return{replaceParams:b,extendDeep:k}}a.module("resourcify",[]),a.module("resourcify").factory("ResourcifyCache",d),i.$inject=["$http","$q","resourcifyUtils","ResourcifyCache"],a.module("resourcify").service("Resourcify",i),a.module("resourcify").factory("resourcifyUtils",l)}(angular);
\ No newline at end of file
diff --git a/test/spec/cache.js b/test/spec/cache.js
index 6032fdc..ec0efa8 100644
--- a/test/spec/cache.js
+++ b/test/spec/cache.js
@@ -205,4 +205,21 @@ describe('Cache', function () {
     cache.addItemToList(list, i2);
     expect(list.length).toBe(2);
   });
+
+  it('should merge lists', function () {
+    var cache = Cache.createCache();
+    var i = new Item({id: '1'});
+    var i2 = new Item({id: '2'});
+    var list = [i, i2];
+    list.key = 'http://localhost/1/stuff?thing';
+    list = cache.addList(list.key, list);
+    var list2 = [new Item({id: 1})];
+    list2.key = list.key;
+    list2 = cache.addList(list2.key, list2);
+    expect(list).toBe(list2);
+    var list3 = [new Item({id: 3})];
+    list3.key = list.key;
+    list3 = cache.addList(list3.key, list3);
+    expect(list3).toBe(list2);
+  });
 });