move config.isSafe to utils.isSafeOperation

mcortesi · mcortesi · commit b19c2905f603 · 2014-10-06T12:30:02.000-03:00
diff --git a/src/configuration.js b/src/configuration.js
@@ -1,16 +1,21 @@
+/**
+ * Those are HTTP safe methods for which there is no need to pass any data with the request.
+ */
+var safeMethods = ['get', 'head', 'options', 'trace', 'getlist'];
+function isSafeOperation(operation) {
+  return _.contains(safeMethods, operation.toLowerCase());
+};
+
+
+var utils = {
+  isSafe: isSafe
+};
+
 // Configuration
 var Configurer = {};
 Configurer.init = function (object, config) {
   object.configuration = config;
 
-  /**
-   * Those are HTTP safe methods for which there is no need to pass any data with the request.
-   */
-  var safeMethods = ['get', 'head', 'options', 'trace', 'getlist'];
-  config.isSafe = function (operation) {
-    return _.contains(safeMethods, operation.toLowerCase());
-  };
-
   var absolutePattern = /^https?:\/\//i;
   config.isAbsoluteUrl = function (string) {
     return _.isUndefined(config.absoluteUrl) || _.isNull(config.absoluteUrl) ?
@@ -478,7 +483,7 @@ Configurer.init = function (object, config) {
         delete value.params;
       }
 
-      if (config.isSafe(value.method)) {
+      if (utils.isSafeOperation(value.method)) {
 
         resource[key] = function () {
           return $http(_.extend(value, {
@@ -507,7 +512,7 @@ Configurer.init = function (object, config) {
     var headers = _.defaults(callHeaders || {}, this.config.defaultHeaders);
 
     if (etag) {
-      if (!config.isSafe(operation)) {
+      if (!utils.isSafeOperation(operation)) {
         headers['If-Match'] = etag;
       } else {
         headers['If-None-Match'] = etag;
diff --git a/src/models/base.js b/src/models/base.js
@@ -34,7 +34,7 @@ var RestangularBase = {
       return bindedFunction(callParams.params, callParams.headers, callParams.elem);
     };
 
-    if (this.$config.isSafe(operation)) {
+    if (utils.isSafeOperation(operation)) {
       this[name] = createdFunction;
     } else {
       this[name] = function(elem, params, headers) {
diff --git a/src/service.js b/src/service.js
@@ -278,7 +278,7 @@ RestangularService.prototype.elemFunction = function (baseElement, operation, wh
   };
 
   var errorCallback = function(response) {
-    if (response.status === 304 && __this.config.isSafe(operation)) {
+    if (response.status === 304 && utils.isSafeOperation(operation)) {
       __this.resolvePromise(deferred, response, __this, filledObject);
     } else if ( _.every(config.errorInterceptors, function(cb) { return cb(response, deferred, okCallback) !== false; }) ) {
       // triggered if no callback returns false
@@ -297,7 +297,7 @@ RestangularService.prototype.elemFunction = function (baseElement, operation, wh
   }
 
   // FIXME don't use $http here
-  if (__this.config.isSafe(operation)) {
+  if (utils.isSafeOperation(operation)) {
     if (isOverrideOperation) {
       this.urlHandler.resource(baseElement, $http, request.httpConfig, callHeaders, request.params,
         what, etag, callOperation)[callOperation]({}).then(okCallback, errorCallback);
