active-model-adapter-source 2.0.3 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWM1NTBmYjFkZjliMmQxMjM4MjMyNjM5OWM1NWRlZjU0MzRiNzNkMQ==
+    ODY5OGU4MGY4MmFjMDYwZTExNWZkM2ZiNmJiZDU4ODI3MDdhNGJjZA==
   data.tar.gz: !binary |-
-    NDQ1MzhkNmNmMjk4M2U2NmViN2ZkNjk1NWU2YWRkYTNjMWVmYzhiYQ==
+    MjQ0MDk1MTQxMjU0YWRlZThlZTNlODlmYTNlMWQ3ZDJjOWQ5NzBjYw==
 SHA512:
   metadata.gz: !binary |-
-    NTkwOTUxYmI5ZThiMGI4ZmNkNjc2NGUwNWQ4M2RhNzAyYmM0ZTAwMTEwZDk3
-    MGVjZDQxMzk5YjhiNDQ4OTgzMjRlNTZiMzgxOTNmMmM2OGU4MjM2YjMyNDJk
-    ODI4NGI4NmY3Y2I5ZDcwYmI1YzU1NDdkMzEzZjE0YzQyZGMzNzU=
+    M2EyZjgyNWY1Mzk2MmI0MTE2ZTk0NWNmODE0MTlkYWM0OWQyNDgzNTNjZjVi
+    M2M2ZTQ1OTIxZjI3N2Y3NWEzNDA5NDk2MGE1ZmQ0NjhhMjhhYmI2NzY3YTBj
+    YTAzNzVlM2MyNGRmYjFiNjMzNDlkYmUwY2I2Y2U0NmY4YjI0YmM=
   data.tar.gz: !binary |-
-    NDlhN2JkNzY2MmFkZWY5OWI3MWQ5MjBjMzE4Zjg1ZWE4YmJhMjNkOGE3NzBi
-    Zjk0YmQ3OWQ2MmM1YTZhYTFiODQxNTdiMjQ2MDFhNWYzMjM3MzBlZmZhNjg4
-    Mzg5MzY2YTg1ZGU1YzI2MWMzYTJmOTE3YmY2ZGMyNjQxMjA0MmU=
+    M2FjM2U4OGIwMjQ0ZDk3NTdiYWVkYWJhNzQ3YWRiNDg4MzZmOGRjNmZmMDFm
+    NThmMzFlNTk0YTI1MmIyODAzYzFhNTJhNTQ3OWIwMDQ0NTY1ZWJkMjNjOWFl
+    MWEwYjAwOWU2OWRiYTBkOGQ5ZTU4YTA4NTFkOWMwNGVjZDE0NjE=

data/dist/active-model-adapter.js

@@ -5,53 +5,129 @@
  *            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   2.0.3
+ * @version   2.1.0
  */
 
 (function() {
 
-var define, requireModule, require, requirejs;
+var loader, define, requireModule, require, requirejs;
+var global = this;
 
 (function() {
+  'use strict';
+
+  // Save off the original values of these globals, so we can restore them if someone asks us to
+  var oldGlobals = {
+    loader: loader,
+    define: define,
+    requireModule: requireModule,
+    require: require,
+    requirejs: requirejs
+  };
+
+  loader = {
+    noConflict: function(aliases) {
+      var oldName, newName;
+
+      for (oldName in aliases) {
+        if (aliases.hasOwnProperty(oldName)) {
+          if (oldGlobals.hasOwnProperty(oldName)) {
+            newName = aliases[oldName];
+
+            global[newName] = global[oldName];
+            global[oldName] = oldGlobals[oldName];
+          }
+        }
+      }
+    }
+  };
 
   var _isArray;
   if (!Array.isArray) {
     _isArray = function (x) {
-      return Object.prototype.toString.call(x) === "[object Array]";
+      return Object.prototype.toString.call(x) === '[object Array]';
     };
   } else {
     _isArray = Array.isArray;
   }
 
-  var registry = {}, seen = {};
+  var registry = {};
+  var seen = {};
   var FAILED = false;
+  var LOADED = true;
 
   var uuid = 0;
 
-  function tryFinally(tryable, finalizer) {
-    try {
-      return tryable();
-    } finally {
-      finalizer();
-    }
-  }
-
   function unsupportedModule(length) {
-    throw new Error("an unsupported module was defined, expected `define(name, deps, module)` instead got: `" + length + "` arguments to define`");
+    throw new Error('an unsupported module was defined, expected `define(name, deps, module)` instead got: `' +
+                    length + '` arguments to define`');
   }
 
   var defaultDeps = ['require', 'exports', 'module'];
 
-  function Module(name, deps, callback, exports) {
-    this.id       = uuid++;
-    this.name     = name;
-    this.deps     = !deps.length && callback.length ? defaultDeps : deps;
-    this.exports  = exports || { };
-    this.callback = callback;
-    this.state    = undefined;
+  function Module(name, deps, callback) {
+    this.id        = uuid++;
+    this.name      = name;
+    this.deps      = !deps.length && callback.length ? defaultDeps : deps;
+    this.module    = { exports: {} };
+    this.callback  = callback;
+    this.state     = undefined;
     this._require  = undefined;
+    this.finalized = false;
+    this.hasExportsAsDep = false;
   }
 
+  Module.prototype.makeDefaultExport = function() {
+    var exports = this.module.exports;
+    if (exports !== null &&
+        (typeof exports === 'object' || typeof exports === 'function') &&
+          exports['default'] === undefined) {
+      exports['default'] = exports;
+    }
+  };
+
+  Module.prototype.exports = function(reifiedDeps) {
+    if (this.finalized) {
+      return this.module.exports;
+    } else {
+      var result = this.callback.apply(this, reifiedDeps);
+      if (!(this.hasExportsAsDep && result === undefined)) {
+        this.module.exports = result;
+      }
+      this.makeDefaultExport();
+      this.finalized = true;
+      return this.module.exports;
+    }
+  };
+
+  Module.prototype.unsee = function() {
+    this.finalized = false;
+    this.state = undefined;
+    this.module = { exports: {}};
+  };
+
+  Module.prototype.reify = function() {
+    var deps = this.deps;
+    var length = deps.length;
+    var reified = new Array(length);
+    var dep;
+
+    for (var i = 0, l = length; i < l; i++) {
+      dep = deps[i];
+      if (dep === 'exports') {
+        this.hasExportsAsDep = true;
+        reified[i] = this.module.exports;
+      } else if (dep === 'require') {
+        reified[i] = this.makeRequire();
+      } else if (dep === 'module') {
+        reified[i] = this.module;
+      } else {
+        reified[i] = findModule(resolve(dep, this.name), this.name).module.exports;
+      }
+    }
+
+    return reified;
+  };
 
   Module.prototype.makeRequire = function() {
     var name = this.name;
@@ -59,7 +135,14 @@ var define, requireModule, require, requirejs;
     return this._require || (this._require = function(dep) {
       return require(resolve(dep, name));
     });
-  }
+  };
+
+  Module.prototype.build = function() {
+    if (this.state === FAILED) { return; }
+    this.state = FAILED;
+    this.exports(this.reify());
+    this.state = LOADED;
+  };
 
   define = function(name, deps, callback) {
     if (arguments.length < 2) {
@@ -87,92 +170,27 @@ var define, requireModule, require, requirejs;
     return new Alias(path);
   };
 
-  function reify(mod, name, seen) {
-    var deps = mod.deps;
-    var length = deps.length;
-    var reified = new Array(length);
-    var dep;
-    // TODO: new Module
-    // TODO: seen refactor
-    var module = { };
-
-    for (var i = 0, l = length; i < l; i++) {
-      dep = deps[i];
-      if (dep === 'exports') {
-        module.exports = reified[i] = seen;
-      } else if (dep === 'require') {
-        reified[i] = mod.makeRequire();
-      } else if (dep === 'module') {
-        mod.exports = seen;
-        module = reified[i] = mod;
-      } else {
-        reified[i] = requireFrom(resolve(dep, name), name);
-      }
-    }
-
-    return {
-      deps: reified,
-      module: module
-    };
-  }
-
-  function requireFrom(name, origin) {
-    var mod = registry[name];
-    if (!mod) {
-      throw new Error('Could not find module `' + name + '` imported from `' + origin + '`');
-    }
-    return require(name);
+  function missingModule(name, referrer) {
+    throw new Error('Could not find module `' + name + '` imported from `' + referrer + '`');
   }
 
-  function missingModule(name) {
-    throw new Error('Could not find module ' + name);
-  }
   requirejs = require = requireModule = function(name) {
-    var mod = registry[name];
-
-
-    if (mod && mod.callback instanceof Alias) {
-      mod = registry[mod.callback.name];
-    }
-
-    if (!mod) { missingModule(name); }
-
-    if (mod.state !== FAILED &&
-        seen.hasOwnProperty(name)) {
-      return seen[name];
-    }
-
-    var reified;
-    var module;
-    var loaded = false;
-
-    seen[name] = { }; // placeholder for run-time cycles
+    return findModule(name, '(require)').module.exports;
+  };
 
-    tryFinally(function() {
-      reified = reify(mod, name, seen[name]);
-      module = mod.callback.apply(this, reified.deps);
-      loaded = true;
-    }, function() {
-      if (!loaded) {
-        mod.state = FAILED;
-      }
-    });
+  function findModule(name, referrer) {
+    var mod = registry[name] || registry[name + '/index'];
 
-    var obj;
-    if (module === undefined && reified.module.exports) {
-      obj = reified.module.exports;
-    } else {
-      obj = seen[name] = module;
+    while (mod && mod.callback instanceof Alias) {
+      name = mod.callback.name;
+      mod = registry[name];
     }
 
-    if (obj !== null &&
-        (typeof obj === 'object' || typeof obj === 'function') &&
-          obj['default'] === undefined) {
-      obj['default'] = obj;
-    }
+    if (!mod) { missingModule(name, referrer); }
 
-    return (seen[name] = obj);
-  };
+    mod.build();
+    return mod;
+  }
 
   function resolve(child, name) {
     if (child.charAt(0) !== '.') { return child; }
@@ -189,17 +207,22 @@ var define, requireModule, require, requirejs;
           throw new Error('Cannot access parent module of root');
         }
         parentBase.pop();
-      } else if (part === '.') { continue; }
-      else { parentBase.push(part); }
+      } else if (part === '.') {
+        continue;
+      } else { parentBase.push(part); }
     }
 
     return parentBase.join('/');
   }
 
   requirejs.entries = requirejs._eak_seen = registry;
-  requirejs.clear = function(){
+  requirejs.unsee = function(moduleName) {
+    findModule(moduleName, '(unsee)').unsee();
+  };
+
+  requirejs.clear = function() {
     requirejs.entries = requirejs._eak_seen = registry = {};
-    seen = state = {};
+    seen = {};
   };
 })();
 
@@ -341,9 +364,11 @@ 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 ajaxError
-      @param {Object} jqXHR
-      @return error
+       @method handleResponse
+      @param  {Number} status
+      @param  {Object} headers
+      @param  {Object} payload
+      @return {Object | DS.AdapterError} response
     */
     handleResponse: function (status, headers, payload) {
       if (this.isInvalid(status, headers, payload)) {
@@ -368,6 +393,7 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
   var singularize = _Ember$String.singularize;
   var classify = _Ember$String.classify;
   var decamelize = _Ember$String.decamelize;
+  var pluralize = _Ember$String.pluralize;
   var camelize = _Ember$String.camelize;
   var underscore = _Ember$String.underscore;
   var RESTSerializer = _emberData["default"].RESTSerializer;
@@ -592,10 +618,28 @@ define('active-model-serializer', ['exports', 'ember-data', 'ember'], function (
       }
     },
 
+    /**
+     * @private
+    */
+    _keyForIDLessRelationship: function (key, relationshipType, type) {
+      if (relationshipType === 'hasMany') {
+        return underscore(pluralize(key));
+      } else {
+        return underscore(singularize(key));
+      }
+    },
+
     extractRelationships: function (modelClass, resourceHash) {
       modelClass.eachRelationship(function (key, relationshipMeta) {
         var relationshipKey = this.keyForRelationship(key, relationshipMeta.kind, "deserialize");
 
+        var idLessKey = this._keyForIDLessRelationship(key, relationshipMeta.kind, "deserialize");
+
+        // converts post to post_id, posts to post_ids
+        if (resourceHash[idLessKey] && typeof relationshipMeta[relationshipKey] === 'undefined') {
+          resourceHash[relationshipKey] = resourceHash[idLessKey];
+        }
+
         // prefer the format the AMS gem expects, e.g.:
         // relationship: {id: id, type: type}
         if (relationshipMeta.options.polymorphic) {
@@ -640,10 +684,16 @@ define('index', ['exports', './active-model-adapter', './active-model-serializer
 define("initializers/active-model-adapter", ["exports", "active-model-adapter", "active-model-serializer"], function (exports, _activeModelAdapter, _activeModelAdapterActiveModelSerializer) {
   exports["default"] = {
     name: 'active-model-adapter',
-    initialize: function () {
-      var application = arguments[1] || arguments[0];
-      application.register('adapter:-active-model', _activeModelAdapter["default"]);
-      application.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
+    initialize: function (app) {
+      if (arguments.length === 1) {
+        // support the old registration API
+        app.register('adapter:-active-model', _activeModelAdapter["default"]);
+        app.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
+      } else {
+        var registry = app;
+        registry.register('adapter:-active-model', _activeModelAdapter["default"]);
+        registry.register('serializer:-active-model', _activeModelAdapterActiveModelSerializer["default"]);
+      }
     }
   };
 });

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "active-model-adapter",
-  "version": "2.0.3",
+  "version": "2.1.0",
   "repository": "https://github.com/ember-data/active-model-adapter",
   "description": "The default blueprint for ember-cli addons.",
   "directories": {
@@ -18,37 +18,42 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.0.2",
-    "broccoli-babel-transpiler": "^5.1.1",
+    "broccoli-asset-rev": "^2.4.1",
+    "broccoli-babel-transpiler": "^5.5.0",
     "broccoli-concat": "0.0.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": "^1.13.0",
-    "ember-cli-app-version": "0.3.3",
+    "broccoli-funnel": "^1.0.1",
+    "broccoli-merge-trees": "^1.1.0",
+    "broccoli-replace": "^0.11.0",
+    "broccoli-stew": "^1.0.4",
+    "ember-cli": "^2.2.0-beta.1",
+    "ember-cli-app-version": "^1.0.0",
     "ember-cli-content-security-policy": "0.4.0",
-    "ember-cli-dependency-checker": "^1.0.0",
-    "ember-cli-htmlbars": "0.7.6",
-    "ember-cli-inject-live-reload": "^1.3.0",
-    "ember-cli-pretender": "0.4.0",
-    "ember-cli-qunit": "0.3.13",
-    "ember-cli-uglify": "^1.0.1",
-    "ember-data": "^2.0.0",
-    "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.7",
-    "ember-watson": "^0.5.7",
+    "ember-cli-dependency-checker": "^1.2.0",
+    "ember-cli-htmlbars": "^1.0.1",
+    "ember-cli-htmlbars-inline-precompile": "^0.3.1",
+    "ember-cli-inject-live-reload": "^1.4.0",
+    "ember-cli-pretender": "0.5.0",
+    "ember-cli-qunit": "^1.1.0",
+    "ember-cli-release": "0.2.8",
+    "ember-cli-sri": "^1.2.0",
+    "ember-cli-uglify": "^1.2.0",
+    "ember-data": "^2.2.1",
+    "ember-disable-prototype-extensions": "^1.0.1",
+    "ember-disable-proxy-controllers": "^1.0.1",
+    "ember-export-application-global": "^1.0.5",
+    "ember-resolver": "^2.0.3",
+    "ember-try": "~0.0.8",
+    "ember-watson": "^0.7.0",
     "github": "^0.2.4",
+    "loader.js": "4.0.1",
     "rsvp": "^3.1.0"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^5.0.0"
+    "ember-cli-babel": "^5.1.6"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

metadata

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