Merge branch 'billjohnston-master'

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "restangular",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "main": "./dist/restangular.js",
   "description": "Restful Resources service for AngularJS apps",
   "repository": {
@@ -16,4 +16,4 @@
     "components",
     "lib"
   ]
-}
+}

dist/restangular.js

@@ -1,6 +1,6 @@
 /**
  * Restful Resources service for AngularJS apps
- * @version v1.4.0 - 2015-04-03 * @link https://github.com/mgonto/restangular
+ * @version v1.5.2 - 2016-02-08 * @link https://github.com/mgonto/restangular
  * @author Martin Gontovnikas <[email protected]>
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */(function() {
@@ -18,7 +18,7 @@ restangular.provider('Restangular', function() {
      */
     var safeMethods= ['get', 'head', 'options', 'trace', 'getlist'];
     config.isSafe = function(operation) {
-      return _.contains(safeMethods, operation.toLowerCase());
+      return _.includes(safeMethods, operation.toLowerCase());
     };
 
     var absolutePattern = /^https?:\/\//i;
@@ -395,7 +395,7 @@ restangular.provider('Restangular', function() {
     object.setParentless = function(values) {
       if (_.isArray(values)) {
         config.shouldSaveParent = function(route) {
-          return !_.contains(values, route);
+          return !_.includes(values, route);
         };
       } else if (_.isBoolean(values)) {
         config.shouldSaveParent = function() {
@@ -1165,9 +1165,9 @@ restangular.provider('Restangular', function() {
           var fullParams = response.config.params;
           var elem = parseResponse(resData, operation, route, fetchUrl, response, deferred);
           if (elem) {
-
+            var data;
             if (operation === 'post' && !__this[config.restangularFields.restangularCollection]) {
-              var data = restangularizeElem(
+              data = restangularizeElem(
                 __this[config.restangularFields.parentResource],
                 elem,
                 route,
@@ -1177,7 +1177,7 @@ restangular.provider('Restangular', function() {
               );
               resolvePromise(deferred, response, data, filledObject);
             } else {
-              var data = restangularizeElem(
+              data = restangularizeElem(
                 __this[config.restangularFields.parentResource],
                 elem,
                 __this[config.restangularFields.route],
@@ -1312,7 +1312,7 @@ restangular.provider('Restangular', function() {
         serv.getList = _.bind(collection.getList, collection);
 
         for (var prop in collection) {
-          if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.contains(knownCollectionMethods, prop)) {
+          if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.includes(knownCollectionMethods, prop)) {
             serv[prop] = _.bind(collection[prop], collection);
           }
         }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "restangular",
   "description": "Restful Resources service for AngularJS apps",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "filename": "restangular.min.js",
   "main": "./dist/restangular.min.js",
   "homepage": "https://github.com/mgonto/restangular",
@@ -32,24 +32,25 @@
     "lodash": ">=1.3.0"
   },
   "devDependencies": {
+    "grunt": "^0.4.5",
+    "grunt-bower": "*",
+    "grunt-bower-task": "*",
     "grunt-cli": ">= 0.1.7",
     "grunt-contrib-concat": "*",
     "grunt-contrib-jshint": "*",
     "grunt-contrib-uglify": "*",
-    "grunt-bower": "*",
-    "grunt-bower-task": "*",
-    "grunt-karma": "latest",
     "grunt-conventional-changelog": "0.0.12",
+    "grunt-karma": "latest",
     "grunt-zip": "*",
-    "karma": "~0.12.1",
-    "karma-mocha-reporter": "0.2.8",
-    "karma-jasmine": "~0.1.5",
+    "karma": "^0.13.19",
     "karma-chrome-launcher": "~0.1.2",
-    "karma-phantomjs-launcher": "~0.1.2",
-    "karma-firefox-launcher": "~0.1.3"
+    "karma-firefox-launcher": "~0.1.3",
+    "karma-jasmine": "~0.1.5",
+    "karma-mocha-reporter": "0.2.8",
+    "karma-phantomjs-launcher": "~0.1.2"
   },
   "scripts": {
     "test": "grunt test --verbose"
   },
   "license": "MIT"
-}
+}

src/restangular.js

@@ -13,7 +13,7 @@ restangular.provider('Restangular', function() {
      */
     var safeMethods= ['get', 'head', 'options', 'trace', 'getlist'];
     config.isSafe = function(operation) {
-      return _.contains(safeMethods, operation.toLowerCase());
+      return _.includes(safeMethods, operation.toLowerCase());
     };
 
     var absolutePattern = /^https?:\/\//i;
@@ -390,7 +390,7 @@ restangular.provider('Restangular', function() {
     object.setParentless = function(values) {
       if (_.isArray(values)) {
         config.shouldSaveParent = function(route) {
-          return !_.contains(values, route);
+          return !_.includes(values, route);
         };
       } else if (_.isBoolean(values)) {
         config.shouldSaveParent = function() {
@@ -1160,9 +1160,9 @@ restangular.provider('Restangular', function() {
           var fullParams = response.config.params;
           var elem = parseResponse(resData, operation, route, fetchUrl, response, deferred);
           if (elem) {
-
+            var data;
             if (operation === 'post' && !__this[config.restangularFields.restangularCollection]) {
-              var data = restangularizeElem(
+              data = restangularizeElem(
                 __this[config.restangularFields.parentResource],
                 elem,
                 route,
@@ -1172,7 +1172,7 @@ restangular.provider('Restangular', function() {
               );
               resolvePromise(deferred, response, data, filledObject);
             } else {
-              var data = restangularizeElem(
+              data = restangularizeElem(
                 __this[config.restangularFields.parentResource],
                 elem,
                 __this[config.restangularFields.route],
@@ -1307,7 +1307,7 @@ restangular.provider('Restangular', function() {
         serv.getList = _.bind(collection.getList, collection);
 
         for (var prop in collection) {
-          if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.contains(knownCollectionMethods, prop)) {
+          if (collection.hasOwnProperty(prop) && _.isFunction(collection[prop]) && !_.includes(knownCollectionMethods, prop)) {
             serv[prop] = _.bind(collection[prop], collection);
           }
         }