From 047b7ff54ab8d980c1a5f9506120bd88298025de Mon Sep 17 00:00:00 2001
From: Erik Donohoo <erikdonohoo@gmail.com>
Date: Sat, 20 Dec 2014 12:57:47 -0700
Subject: [PATCH] release v0.7.0

---
 bower.json             |  2 +-
 dist/resourcify.js     | 17 +++++++++++++----
 dist/resourcify.min.js |  4 ++--
 package.json           |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index 5f52c91..13c1ad6 100755
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "resourcify",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "authors": [
     "Erik Donohoo <erikdonohoo@gmail.com>"
   ],
diff --git a/dist/resourcify.js b/dist/resourcify.js
index 3f2cd14..eb2e0c8 100644
--- a/dist/resourcify.js
+++ b/dist/resourcify.js
@@ -298,17 +298,26 @@ function resourcificator ($http, $q, utils, Cache) {
     // Before fn
     (config.before || angular.noop).apply(value);
 
+    // Strip $ from value for data
+    var sendData = {};
+    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) ? value : undefined;
+    httpConfig.data = /^(POST|PUT|PATCH|DELETE)$/i.test(config.method) ? sendData : undefined;
     $http(utils.extendDeep({}, classConfig, config.config || {}, httpConfig)).then(function ok(response) {
-      if ((config.isArray && !angular.isArray(response.data)) || (!config.isArray && angular.isArray(response.data))) {
+      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(response.data, function (item) {
+        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);
@@ -318,7 +327,7 @@ function resourcificator ($http, $q, utils, Cache) {
           value = cache.addList(url, value);
         }
       } else {
-        value = (typeof response.data === 'object') ? angular.extend(value, response.data) : angular.extend(value, {data: response.data});
+        value = (typeof dataToUse === 'object') ? angular.extend(value, dataToUse) : angular.extend(value, {data: dataToUse});
         if (cache && !config.noCache) {
           value = cache.add(value, (config.method === cache.$options.saveMethod));
         }
diff --git a/dist/resourcify.min.js b/dist/resourcify.min.js
index 337876a..874f50d 100644
--- a/dist/resourcify.min.js
+++ b/dist/resourcify.min.js
@@ -1,2 +1,2 @@
-/*! resourcify 20-12-2014 v0.6.0 */
-!function(a,b){"use strict";function c(){function b(b){this.$cache={},this.$options=a.extend({id:"id",saveMethod:"POST",key:["id"]},b),this.$lists={}}return 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 c=this.$cache,d=0;d<b.length-1;d++)c=c[b[d]];delete c[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.addList=function(b,c){return this.$lists[b]?a.forEach(c,function(c){var d=!1;c=this.add(c),a.forEach(this.$lists[b],function(a){c===a&&(d=!0)}.bind(this)),d||this.$lists[b].push(c)}.bind(this)):(this.$lists[b]=c,a.forEach(c,function(a){this.add(a)}.bind(this))),this.$lists[b]},{createCache:function(a){return new b(a)}}}function d(a,b){return new Function("return function (call) { return function "+a+" () { return call(this, arguments) }; };")()(Function.apply.bind(b))}function e(a){var b=a.toString();return b=b.substr("function ".length),b=b.substr(0,b.indexOf("("))}function f(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 g(c,g,h,i){function j(b,c,h){if(!b||!c)throw new Error("Must supply a name and a url when constructing");this.url=g.when(c),this.name=b,this.config=h||{},this.config.httpConfig=this.config.httpConfig||{},this.subs=[];var j=this;this.$$ResourceConstructor=d(this.name,function(b){a.extend(this,b||{}),a.forEach(j.subs,function(a){var b=a[0],c=a[1],d=e(b),g=f(b);g.prototype.$paramMap=c,g.prototype.$parentItem=this,this[d]=g},this),(j.config.constructor||a.noop).bind(this)(b)}),this.$$ResourceConstructor.$$builder=this,this.config.cache&&(this.cache=i.createCache(a.isObject(this.config.cache)?this.config.cache:{}),this.$$ResourceConstructor.$clearCache=this.cache.clear)}function k(b,c){if(!b.method||!b.name)throw new Error("Request config must contain a HTTP method and a name");b.url=b.url?g.when(b.url):null,b.$Const=c,b.config=b.config||{},b.isInstance?(c.prototype[b.name]=o(b),c.prototype[b.name].withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c.prototype[b.name].force=o(a.extend({$force:!0},b)),c.prototype[b.name].force.withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))})):(c[b.name]=o(b),c[b.name].withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c[b.name].force=o(a.extend({$force:!0},b)),c[b.name].force.withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))}))}function l(d,e,f,g,i,j){function k(){e.$resolved=!0,e.$url=d,g(e),f.$defer.resolve(e)}var l={url:d,method:f.method},m=f.$Const.$$builder.cache;if(m&&!f.noCache&&!f.$force)if(a.isArray(e)){var n=m.getList(d);if(n&&!n.$invalid)return n.$promise=e.$promise,e=n,void k()}else{var o=m.get(m.getKey(a.extend(f.params,e)));if(o&&!o.$invalid)return o.$promise=e.$promise,e=o,void k()}(f.before||a.noop).apply(e);var p=f.$Const.$$builder.config.httpConfig;l.data=/^(POST|PUT|PATCH|DELETE)$/i.test(f.method)?e:b,c(h.extendDeep({},p,f.config||{},l)).then(function(b){if(f.isArray&&!a.isArray(b.data)||!f.isArray&&a.isArray(b.data))throw new Error("Saw array or object when expecting the opposite when making "+f.method+" call to "+d);f.isArray?(a.forEach(b.data,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&&m,e.push(b)}),m&&!f.noCache&&(e=m.addList(d,e))):(e="object"==typeof b.data?a.extend(e,b.data):a.extend(e,{data:b.data}),m&&!f.noCache&&(e=m.add(e,f.method===m.$options.saveMethod))),m&&(e.$invalid=!1),e.$response=b,(f.after||a.noop).apply(e),k()},function(a){i(a),f.$defer.reject(a)})}function m(b,c,d,e){var f={};return b.$parentItem&&(f=m(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 n(b,c){return b.$parentItem&&(c=n(b.$parentItem,c)),a.forEach(b,function(a,d){b.hasOwnProperty(d)&&(c[d]=a)}),c}function o(b){return function(c,d,e,f){var i=this,j={},k={},o=a.noop,p=a.noop,q=b.$Const.$$builder.cache;switch(arguments.length){case 4:p=f,o=e;case 3:case 2:if(!a.isFunction(d)){j=c,k=d,o=e;break}if(a.isFunction(c)){o=c,p=d;break}o=d,p=e;case 1:a.isFunction(c)?o=c:/^(POST|PUT|PATCH)$/i.test(b.method)?k=c:j=c;break;case 0:break;default:throw new Error("Expected up to 4 arguments [params, data, success, error], got"+arguments.length+" args")}var r=this instanceof b.$Const?this:b.isArray?[]:this.prototype instanceof b.$Const?new this(k):new b.$Const(k),s={};return(this.$parentItem||this.prototype&&this.prototype.$parentItem)&&(this.$paramMap||this.prototype&&this.prototype.$paramMap?j=m(this.$parentItem||this.prototype.$parentItem,j,this.$paramMap||this.prototype.$paramMap,1):s=n(this.$parentItem||this.prototype.$parentItem,s)),b.$defer=g.defer(),b.params=j,r.$promise=b.$defer.promise,r.$resolved=!1,(b.url||b.$Const.$$builder.url).then(function(a){l(h.replaceParams(j,a,r,s),r,b,o,p,i)}.bind(this),function(){throw new Error("Could not resolve URL for "+b.toString())}),q||b.$Const.$$builder.config.usePromise?r.$promise:r}}return j.prototype.subResource=function(a,b){return this.subs.push([a,b]),this},j.prototype.method=function(a,b){return this.$$ResourceConstructor.prototype[a]=b,this},j.prototype.request=function(a){return k(a,this.$$ResourceConstructor),this},j.prototype.create=function(){return this.$$ResourceConstructor},j}function h(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 i(b){return a.forEach(arguments,function(c){c!==b&&a.forEach(c,function(a,c){b[c]&&b[c].constructor&&b[c].constructor===Object?i(b[c],a):b[c]=a})}),b}function j(){function b(b,c,d,e){var f,g=/[\/=.](:\w*[a-zA-Z]\w*)/,i=a.copy(c),j="__|cut|__",k=a.copy(b);d=d||{},e=e||{};var l=h(i),m={};for(-1!==i.indexOf("?")&&(i=i.substring(0,i.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(i);){var n=f[1],o=f[1].substring(1);if(i=i.replace(n,k[o]||d[o]||e[o]||j),k[o])delete k[o];else if(-1!==i.indexOf("/"+j)){i=i.substring(0,i.indexOf("/"+j));break}}k=a.extend({},m,k);var p=[];return a.forEach(k,function(a,b){p.push(b+"="+a)}),i+=(p.length?"?":"")+p.join("&")}return{replaceParams:b,extendDeep:i}}a.module("resourcify",[]),a.module("resourcify").factory("ResourcifyCache",c),g.$inject=["$http","$q","resourcifyUtils","ResourcifyCache"],a.module("resourcify").service("Resourcify",g),a.module("resourcify").factory("resourcifyUtils",j)}(angular);
\ No newline at end of file
+/*! resourcify 20-12-2014 v0.7.0 */
+!function(a,b){"use strict";function c(){function b(b){this.$cache={},this.$options=a.extend({id:"id",saveMethod:"POST",key:["id"]},b),this.$lists={}}return 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 c=this.$cache,d=0;d<b.length-1;d++)c=c[b[d]];delete c[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.addList=function(b,c){return this.$lists[b]?a.forEach(c,function(c){var d=!1;c=this.add(c),a.forEach(this.$lists[b],function(a){c===a&&(d=!0)}.bind(this)),d||this.$lists[b].push(c)}.bind(this)):(this.$lists[b]=c,a.forEach(c,function(a){this.add(a)}.bind(this))),this.$lists[b]},{createCache:function(a){return new b(a)}}}function d(a,b){return new Function("return function (call) { return function "+a+" () { return call(this, arguments) }; };")()(Function.apply.bind(b))}function e(a){var b=a.toString();return b=b.substr("function ".length),b=b.substr(0,b.indexOf("("))}function f(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 g(c,g,h,i){function j(b,c,h){if(!b||!c)throw new Error("Must supply a name and a url when constructing");this.url=g.when(c),this.name=b,this.config=h||{},this.config.httpConfig=this.config.httpConfig||{},this.subs=[];var j=this;this.$$ResourceConstructor=d(this.name,function(b){a.extend(this,b||{}),a.forEach(j.subs,function(a){var b=a[0],c=a[1],d=e(b),g=f(b);g.prototype.$paramMap=c,g.prototype.$parentItem=this,this[d]=g},this),(j.config.constructor||a.noop).bind(this)(b)}),this.$$ResourceConstructor.$$builder=this,this.config.cache&&(this.cache=i.createCache(a.isObject(this.config.cache)?this.config.cache:{}),this.$$ResourceConstructor.$clearCache=this.cache.clear)}function k(b,c){if(!b.method||!b.name)throw new Error("Request config must contain a HTTP method and a name");b.url=b.url?g.when(b.url):null,b.$Const=c,b.config=b.config||{},b.isInstance?(c.prototype[b.name]=o(b),c.prototype[b.name].withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c.prototype[b.name].force=o(a.extend({$force:!0},b)),c.prototype[b.name].force.withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))})):(c[b.name]=o(b),c[b.name].withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(b).apply(this,[].slice.call(arguments,1))},b.$Const.$$builder.cache&&(c[b.name].force=o(a.extend({$force:!0},b)),c[b.name].force.withConfig=function(){return h.extendDeep(b.config,arguments[0]),o(a.extend({$force:!0},b)).apply(this,[].slice.call(arguments,1))}))}function l(d,e,f,g,i,j){function k(){e.$resolved=!0,e.$url=d,g(e),f.$defer.resolve(e)}var l={url:d,method:f.method},m=f.$Const.$$builder.cache;if(m&&!f.noCache&&!f.$force)if(a.isArray(e)){var n=m.getList(d);if(n&&!n.$invalid)return n.$promise=e.$promise,e=n,void k()}else{var o=m.get(m.getKey(a.extend(f.params,e)));if(o&&!o.$invalid)return o.$promise=e.$promise,e=o,void k()}(f.before||a.noop).apply(e);var p={};a.forEach(e,function(a,b){e.hasOwnProperty(b)&&"$"!==b.charAt(0)&&(p[b]=a)});var q=f.$Const.$$builder.config.httpConfig;l.data=/^(POST|PUT|PATCH|DELETE)$/i.test(f.method)?p:b,c(h.extendDeep({},q,f.config||{},l)).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);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&&m,e.push(b)}),m&&!f.noCache&&(e=m.addList(d,e))):(e="object"==typeof c?a.extend(e,c):a.extend(e,{data:c}),m&&!f.noCache&&(e=m.add(e,f.method===m.$options.saveMethod))),m&&(e.$invalid=!1),e.$response=b,(f.after||a.noop).apply(e),k()},function(a){i(a),f.$defer.reject(a)})}function m(b,c,d,e){var f={};return b.$parentItem&&(f=m(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 n(b,c){return b.$parentItem&&(c=n(b.$parentItem,c)),a.forEach(b,function(a,d){b.hasOwnProperty(d)&&(c[d]=a)}),c}function o(b){return function(c,d,e,f){var i=this,j={},k={},o=a.noop,p=a.noop,q=b.$Const.$$builder.cache;switch(arguments.length){case 4:p=f,o=e;case 3:case 2:if(!a.isFunction(d)){j=c,k=d,o=e;break}if(a.isFunction(c)){o=c,p=d;break}o=d,p=e;case 1:a.isFunction(c)?o=c:/^(POST|PUT|PATCH)$/i.test(b.method)?k=c:j=c;break;case 0:break;default:throw new Error("Expected up to 4 arguments [params, data, success, error], got"+arguments.length+" args")}var r=this instanceof b.$Const?this:b.isArray?[]:this.prototype instanceof b.$Const?new this(k):new b.$Const(k),s={};return(this.$parentItem||this.prototype&&this.prototype.$parentItem)&&(this.$paramMap||this.prototype&&this.prototype.$paramMap?j=m(this.$parentItem||this.prototype.$parentItem,j,this.$paramMap||this.prototype.$paramMap,1):s=n(this.$parentItem||this.prototype.$parentItem,s)),b.$defer=g.defer(),b.params=j,r.$promise=b.$defer.promise,r.$resolved=!1,(b.url||b.$Const.$$builder.url).then(function(a){l(h.replaceParams(j,a,r,s),r,b,o,p,i)}.bind(this),function(){throw new Error("Could not resolve URL for "+b.toString())}),q||b.$Const.$$builder.config.usePromise?r.$promise:r}}return j.prototype.subResource=function(a,b){return this.subs.push([a,b]),this},j.prototype.method=function(a,b){return this.$$ResourceConstructor.prototype[a]=b,this},j.prototype.request=function(a){return k(a,this.$$ResourceConstructor),this},j.prototype.create=function(){return this.$$ResourceConstructor},j}function h(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 i(b){return a.forEach(arguments,function(c){c!==b&&a.forEach(c,function(a,c){b[c]&&b[c].constructor&&b[c].constructor===Object?i(b[c],a):b[c]=a})}),b}function j(){function b(b,c,d,e){var f,g=/[\/=.](:\w*[a-zA-Z]\w*)/,i=a.copy(c),j="__|cut|__",k=a.copy(b);d=d||{},e=e||{};var l=h(i),m={};for(-1!==i.indexOf("?")&&(i=i.substring(0,i.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(i);){var n=f[1],o=f[1].substring(1);if(i=i.replace(n,k[o]||d[o]||e[o]||j),k[o])delete k[o];else if(-1!==i.indexOf("/"+j)){i=i.substring(0,i.indexOf("/"+j));break}}k=a.extend({},m,k);var p=[];return a.forEach(k,function(a,b){p.push(b+"="+a)}),i+=(p.length?"?":"")+p.join("&")}return{replaceParams:b,extendDeep:i}}a.module("resourcify",[]),a.module("resourcify").factory("ResourcifyCache",c),g.$inject=["$http","$q","resourcifyUtils","ResourcifyCache"],a.module("resourcify").service("Resourcify",g),a.module("resourcify").factory("resourcifyUtils",j)}(angular);
\ No newline at end of file
diff --git a/package.json b/package.json
index 8f13a25..6ce4645 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "resourcify",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Dead simple rich data models for angular",
   "main": "Gruntfile.js",
   "scripts": {