backbone-relational-hal-rails 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTg0NWU1NDg4N2RiYTk1MTdmNDU0NjM4YTI2NmE3ODY0NTJiNjMwNA==
+    Y2Y4OTA2MmEwMjUzMzA3M2UzMTIwMDg0MmU5ZDQ4MmNhNTNlY2E2Mw==
   data.tar.gz: !binary |-
-    OTQ1Y2Q5MWI4ZTFjYzY1ZGFmNTQyNmYxZDExZGI0Yjc0ZWQzMDliYw==
+    MGM1MTQ5YjRiYzk5MDU4ODhmMzQzNzY1MjUwZTAzZGM5ZTFmMGY0ZA==
 SHA512:
   metadata.gz: !binary |-
-    NzMxODExOTg2ZmNhM2VhNjU4NTIzMjU0Njc1ZTI4YWViMjIzMTM1YzgwOWY1
-    MTkwNjQxMjg4NWIyMGVmN2ExYTRhNjRjMGU4MWZiNGJlNzM4ZjY3NjI4Y2Iw
-    ODVjMTgxM2VjNzhmOTU3NmE4Mzc2Mzk4YjIzMzNmNWZiZGRhM2M=
+    ZTJkMjc4MDM0N2VjN2E1ZTE2MTkyYzEzZWRlNGI1ZGJiOGU5MjFiZjJlYmJm
+    MjQ0ZjE1NTRjMDVjODAyZmYzOGVkN2E3MWQxMGU2NDNkNDM5YTYyNDkxNTU0
+    OGYyZTMzMGE2YWNlZTM2MzhmM2VkNTVkYmU4YWUxODU3MDY0ZjE=
   data.tar.gz: !binary |-
-    ZDU5ZWE5N2ViOTQxZTMyY2U2NDhhZTM2NzEzMjhkYjhlNTdiM2NhZTIxOWRh
-    ZDBhNDkzZTYwMjI0MTMwMTMxZWE4NjA0MzI5ODlmZjcyZWM0YjIyNGNlZDg2
-    MjllN2M1YzYyYzg3MTUwNGY2MzJhNTQ2YjI0ZTY0ODkxODQyNzg=
+    MDA4ZWE3ZTFhZTBiYjk5M2IwMTA2YmFlYTViY2RhYjdiNDY2YWEwMGQ2OGZj
+    NmZhNzZhMzU2ODVlYzA2MzA0ODY2ZGIxZDFlYTZiY2IyZjljNzUxZDI2ZTBh
+    NWJjODExZDZiNGY3OTg0ZWJjZjJiZGEwNDFkZDI0ZmE1Y2IxYmY=

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/backbone-relational-hal-rails/version.rb

@@ -1,6 +1,6 @@
 module BackboneRelationalHal
   module Rails
-    VERSION = "0.1.1"
-    BACKBONE_RELATIONAL_HAL_VERSION = "0.1.1"
+    VERSION = "0.1.2"
+    BACKBONE_RELATIONAL_HAL_VERSION = "0.1.2"
   end
 end

data/vendor/assets/javascripts/backbone-relational-hal/backbone-relational-hal.js

@@ -1,5 +1,5 @@
 /*!
- * backbone-relational-hal v0.1.1
+ * backbone-relational-hal v0.1.2
  * Copyright (c) 2014 Simon Oulevay
  * Distributed under MIT license
  * https://github.com/AlphaHydrae/backbone-relational-hal
@@ -24,6 +24,11 @@ var HalLink = RelationalModel.extend({
     return href;
   },
 
+  tag: function(contents, options) {
+    options = options || {};
+    return $('<a />').attr('href', this.href(options.href))[options.html ? 'html' : 'text'](contents);
+  },
+
   model: function(options) {
     options = _.extend({}, options);
 
@@ -70,17 +75,53 @@ var HalResourceLinks = RelationalModel.extend({
 
 var HalModelEmbedded = RelationalModel.extend({
 
+  toJSON: function() {
+    return _.omit(RelationalModel.prototype.toJSON.apply(this, arguments), 'id');
+  },
+
   embedded: function(rel) {
-    return this.get(rel);
+    return this.get(rel) || null;
   }
 });
 
+var n = 1;
+
 var HalResource = Backbone.RelationalHalResource = RelationalModel.extend({
 
+  initialize: function(attrs, options) {
+
+    this.halEmbeddedId = n++;
+
+    if (this.has('_embedded') && !this.get('_embedded').id) {
+      this.get('_embedded').set({ id: this.halEmbeddedId }, { silent: true });
+    }
+
+    _.extend(this, _.pick(options || {}, 'halUrlTemplate'));
+
+    this.initializeResource.apply(this, arguments);
+  },
+
+  initializeResource: function() {},
+
+  parse: function(response) {
+
+    if (response._embedded) {
+      response._embedded.id = this.halEmbeddedId;
+    }
+
+    return response;
+  },
+
   url: function() {
 
     if (this.hasLink('self')) {
-      return this.link('self').href();
+
+      var options = {};
+      if (this.halUrlTemplate) {
+        options.template = _.result(this, 'halUrlTemplate');
+      }
+
+      return this.link('self').href(options);
     } else if (this._cachedHalUrl) {
       return this._cachedHalUrl;
     }
@@ -161,18 +202,34 @@ var HalResource = Backbone.RelationalHalResource = RelationalModel.extend({
 
 var relationalHalResourceExtend = HalResource.extend;
 
-HalResource.extend = function(options) {
+var customExtend = function(options) {
 
   options = _.defaults({}, options, {
-    relations: [],
-    halEmbedded: []
+    relations: []
   });
 
-  var embedded = HalModelEmbedded.extend({
+  var embeddedRelations;
+  if (_.isArray(options.halEmbedded)) {
+    embeddedRelations = _.map(options.halEmbedded, function(rel) {
+      return _.clone(rel);
+    });
+  } else if (_.isObject(options.halEmbedded)) {
+    embeddedRelations = _.reduce(options.halEmbedded, function(memo, rel, key) {
+      memo.push(_.extend({}, rel, { key: key }));
+      return memo;
+    }, []);
+  } else if (typeof(options.halEmbedded) != 'undefined') {
+    throw new Error('halEmbedded must be an array or object');
+  } else {
+
+    var previousEmbedded = _.findWhere(this.prototype.relations, { key: '_embedded' });
+    if (previousEmbedded && previousEmbedded.relatedModel) {
+      embeddedRelations = (previousEmbedded.relatedModel.prototype.relations || []).slice();
+    }
+  }
 
-    relations: _.map(options.halEmbedded, function(halEmbedded) {
-      return _.clone(halEmbedded);
-    })
+  var EmbeddedModel = HalModelEmbedded.extend({
+    relations: embeddedRelations
   });
 
   options.relations.push({
@@ -186,13 +243,18 @@ HalResource.extend = function(options) {
   options.relations.push({
     type: Backbone.HasOne,
     key: '_embedded',
-    relatedModel: embedded,
+    relatedModel: EmbeddedModel,
     includeInJSON: false
   });
 
-  return relationalHalResourceExtend.call(HalResource, options);
+  var res = relationalHalResourceExtend.call(this, options);
+  res.extend = customExtend;
+
+  return res;
 };
 
+HalResource.extend = customExtend;
+
 Backbone.originalSync = Backbone.sync;
 
 Backbone.sync = function(method, model, options) {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backbone-relational-hal-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Simon Oulevay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -64,7 +64,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Backbone-relational-hal assets for Ruby on Rails.