active-model-adapter-source 1.13.2 → 1.13.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDA1ZDg0OTk5YTgxMGNhNTJjZjczOWZjNjM3NTEzYzk5YWU0OGM3MA==
+    MjcyOWE1YjIxMTgwYjQ5NjU3ZjAwNDA3NmY5NjQ0NDkzMWYxMzQ1MQ==
   data.tar.gz: !binary |-
-    NjcxMjMxMDUzNTI0YmIzYmRiYWNmZjU1YmU5M2ZjMjhkZjg4ZjM4OA==
+    OWE2MWIwYzAwNjFkYTAzZjRkODYwMGQ1ZDc1MDY0OGNiMjk5NzAwNA==
 SHA512:
   metadata.gz: !binary |-
-    ZmQ0ZWMzMzkzOTAwNzZiMTA5ZGIxMjhlYjRiOTg5ZWM4YjMxZjBlOTdmZmM5
-    N2YxYzYzMWI0MjVkZWM0ZjAwOTJlODliY2M5M2VjNzI2ODQ3N2ZjZGViMjc5
-    YTFjZmU0OGM0ZmIzNTA0MTdmMjUwM2I0ZjQ4NzFhMTMyNjhjNmE=
+    NTlmOGRkMTcyNWFmZDEzMTViMjBjNGFmZTdiNzEwMjliZDcwNDE0N2NjMjVj
+    MDhiMTFiZDRlZDhhZjI4NjhmMDczY2JiYjA0OTBhYjFhOGI0MzE2MjllZjA3
+    Yzk1MmJjMzM2MTZjNjEyYzI2ODEzNzNmMzQ4MGJlNGFjNjE4NmY=
   data.tar.gz: !binary |-
-    MjFhZDM0NGZmMWQ4NTc1Yzk3ZGI1NTBmMzNkYmYyMzQ1NGRhYjBlZGM1YzJm
-    NTMzMzYyMWYzZGI5NTg2MDU5ZDg0OWQ2NTA5ODQ1NWMwYzFlNzJmNzcwM2M0
-    NWE1YmM0OTI3NjczOTlmMzQwNmJhZDgwY2RkMDBlYmMyNTlkNWU=
+    OWM1MmEwYTFhMmQ1MzVjODIwZWY1ODY4NjM0NWQ4YzgwNjczMGI2NTcyYzVk
+    MzM4YTk0MjVmMGY0NWRjMTNmNjBkZjM4NDk0YzZiNjdhYmFkZGM2YWEwNTk1
+    OTE0NmMwYjRkOTU2ZTFkYWZlY2U2MmMwMGM1N2FmMWRlNmViYTc=

data/dist/active-model-adapter.js

@@ -5,7 +5,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   1.13.2
+ * @version   1.13.3
  */
 
 (function() {
@@ -210,18 +210,18 @@ define("ember-data", ["exports"], function (exports) {
   exports["default"] = DS;
 });
 define('active-model-adapter', ['exports', 'ember', 'ember-data'], function (exports, _ember, _emberData) {
+  var InvalidError = _emberData["default"].InvalidError;
+  var errorsHashToArray = _emberData["default"].errorsHashToArray;
+  var RESTAdapter = _emberData["default"].RESTAdapter;
+  var _Ember$String = _ember["default"].String;
+  var pluralize = _Ember$String.pluralize;
+  var decamelize = _Ember$String.decamelize;
+  var underscore = _Ember$String.underscore;
 
   /**
-    @module active-model-adapter
+    @module ember-data
   */
 
-  var decamelize = _ember["default"].String.decamelize;
-  var underscore = _ember["default"].String.underscore;
-  var pluralize = _ember["default"].String.pluralize;
-  var RESTAdapter = _emberData["default"].RESTAdapter;
-  var InvalidError = _emberData["default"].InvalidError;
-  var errorsHashToArray = _emberData["default"].errorsHashToArray;
-
   /**
     The ActiveModelAdapter is a subclass of the RESTAdapter designed to integrate
     with a JSON API that uses an underscored naming convention instead of camelCasing.
@@ -341,11 +341,9 @@ define('active-model-adapter', ['exports', 'ember', 'ember-data'], function (exp
       content was not semantically correct or meaningful per the API.
        For more information on 422 HTTP Error code see 11.2 WebDAV RFC 4918
       https://tools.ietf.org/html/rfc4918#section-11.2
-       @method handleResponse
-      @param  {Number} status
-      @param  {Object} headers
-      @param  {Object} payload
-      @return {Object | DS.AdapterError} response
+       @method ajaxError
+      @param {Object} jqXHR
+      @return error
     */
     handleResponse: function (status, headers, payload) {
       if (this.isInvalid(status, headers, payload)) {
@@ -358,32 +356,22 @@ define('active-model-adapter', ['exports', 'ember', 'ember-data'], function (exp
     }
   });
 
-  if (!errorsHashToArray) {
-    ActiveModelAdapter.reopen({
-      ajaxError: function (jqXHR) {
-        var error = this._super.apply(this, arguments);
-
-        if (jqXHR && jqXHR.status === 422) {
-          var response = _ember["default"].$.parseJSON(jqXHR.responseText);
-          return new InvalidError(response);
-        } else {
-          return error;
-        }
-      }
-    });
-  }
-
   exports["default"] = ActiveModelAdapter;
 });
-define('active-model-serializer', ['exports', 'ember', 'ember-data'], function (exports, _ember, _emberData) {
-  var forEach = _ember["default"].EnumerableUtils.forEach;
+define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (exports, _emberData, _ember) {
+
+  /**
+    @module ember-data
+   */
+
   var _Ember$String = _ember["default"].String;
   var singularize = _Ember$String.singularize;
-  var camelize = _Ember$String.camelize;
   var classify = _Ember$String.classify;
   var decamelize = _Ember$String.decamelize;
+  var camelize = _Ember$String.camelize;
   var underscore = _Ember$String.underscore;
   var RESTSerializer = _emberData["default"].RESTSerializer;
+  var normalizeModelName = _emberData["default"].normalizeModelName;
 
   /**
     The ActiveModelSerializer is a subclass of the RESTSerializer designed to integrate
@@ -546,9 +534,7 @@ define('active-model-serializer', ['exports', 'ember', 'ember-data'], function (
       if (_ember["default"].isNone(belongsTo)) {
         json[jsonKey] = null;
       } else {
-        json[jsonKey] = classify(belongsTo.modelName).replace(/(\/)([a-z])/g, function (match, separator, chr) {
-          return match.toUpperCase();
-        }).replace('/', '::');
+        json[jsonKey] = classify(belongsTo.modelName).replace('/', '::');
       }
     },
 
@@ -632,6 +618,8 @@ define('active-model-serializer', ['exports', 'ember', 'ember-data'], function (
 
       if (this.keyForRelationship) {
         typeClass.eachRelationship(function (key, relationship) {
+          var _this = this;
+
           var payloadKey, payload;
           if (relationship.options.polymorphic) {
             payloadKey = this.keyForAttribute(key, 'deserialize');
@@ -639,9 +627,8 @@ define('active-model-serializer', ['exports', 'ember', 'ember-data'], function (
             if (payload && payload.type) {
               payload.type = this.modelNameFromPayloadKey(payload.type);
             } else if (payload && relationship.kind === 'hasMany') {
-              var self = this;
-              forEach(payload, function (single) {
-                single.type = self.modelNameFromPayloadKey(single.type);
+              payload.forEach(function (single) {
+                return single.type = _this.modelNameFromPayloadKey(single.type);
               });
             }
           } else {
@@ -661,18 +648,13 @@ define('active-model-serializer', ['exports', 'ember', 'ember-data'], function (
       }
     },
     modelNameFromPayloadKey: function (key) {
-      var convertedFromRubyModule = camelize(singularize(key)).replace(/(^|\:)([A-Z])/g, function (match, separator, chr) {
-        return match.toLowerCase();
-      }).replace('::', '/');
-      return this._super(convertedFromRubyModule);
+      var convertedFromRubyModule = singularize(key.replace('::', '/'));
+      return normalizeModelName(convertedFromRubyModule);
     }
   });
 
   exports["default"] = ActiveModelSerializer;
 });
-/**
-  @module active-model-adapter
-*/
 define('index', ['exports', './active-model-adapter', './active-model-serializer'], function (exports, _activeModelAdapter, _activeModelSerializer) {
   exports["default"] = _activeModelAdapter["default"];
   exports.ActiveModelAdapter = _activeModelAdapter["default"];
@@ -683,7 +665,7 @@ define("initializers/active-model-adapter", ["exports", "active-model-adapter",
     name: "active-model-adapter",
     initialize: function (registry, application) {
       registry.register("adapter:-active-model", _activeModelAdapter["default"]);
-      registry.register("serializer:-active-model", _activeModelAdapterActiveModelSerializer["default"]);
+      registry.register("serializer:-active-model", _activeModelAdapterActiveModelSerializer["default"].extend({ isNewSerializerAPI: true }));
     }
   };
 });

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "active-model-adapter",
-  "version": "1.13.2",
-  "repository": "https://github.com/ember-data/active-model-adapter.git",
+  "version": "1.13.3",
+  "repository": "",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
     "doc": "doc",
@@ -12,7 +12,6 @@
     "build": "ember build",
     "test": "ember try:testall"
   },
-  "repository": "",
   "engines": {
     "node": ">= 0.10.0"
   },
@@ -25,13 +24,13 @@
     "broccoli-es3-safe-recast": "^2.0.0",
     "broccoli-funnel": "^0.2.3",
     "broccoli-merge-trees": "^0.2.1",
+    "broccoli-replace": "^0.3.1",
     "broccoli-stew": "^0.3.2",
     "ember-cli": "0.2.7",
     "ember-cli-app-version": "0.3.3",
     "ember-cli-content-security-policy": "0.4.0",
     "ember-cli-dependency-checker": "^1.0.0",
     "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-ic-ajax": "0.1.1",
     "ember-cli-inject-live-reload": "^1.3.0",
     "ember-cli-qunit": "0.3.13",
     "ember-cli-uglify": "^1.0.1",
@@ -39,8 +38,8 @@
     "ember-disable-prototype-extensions": "^1.0.0",
     "ember-disable-proxy-controllers": "^1.0.0",
     "ember-export-application-global": "^1.0.2",
-    "ember-try": "0.0.6",
-    "broccoli-replace": "^0.3.1"
+    "ember-try": "0.0.7",
+    "ember-watson": "^0.5.7"
   },
   "keywords": [
     "ember-addon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active-model-adapter-source
 version: !ruby/object:Gem::Version
-  version: 1.13.2
+  version: 1.13.3
 platform: ruby
 authors:
 - Igor Terzic
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ember-data-source