ember-rest-rails 0.0.1 → 0.0.2

data/README.md

@@ -1,10 +1,10 @@
 # Ember::Rest::Rails
 
 Allows you to include
-[Ember-REST](https://github.com/cerebris/ember-rest) in your Rails 3.x
+[Ember-REST](https://github.com/cerebris/ember-rest) in your Rails 3
 Application.
 
-Ember-REST version is from commit [b4abc4e1e213a0be3cb4ecf4aae2b877b21013c7](https://github.com/cerebris/ember-rest/commit/b4abc4e1e213a0be3cb4ecf4aae2b877b21013c7).
+Ember-REST version is 0.1.1 (works with Ember.js 0.9.6).
 
 ## Installation
 

data/lib/ember_rest_rails/version.rb

@@ -1,7 +1,7 @@
 module Ember
   module Rest
     module Rails
-      VERSION = "0.0.1"
+      VERSION = "0.0.2"
     end
   end
 end

data/vendor/assets/javascripts/ember-rest.js

@@ -1,5 +1,5 @@
 /**
- Ember-REST.js
+ Ember-REST.js 0.1.1
 
  A simple library for RESTful resources in Ember.js
 
@@ -65,7 +65,7 @@ if (Ember.ResourceAdapter === undefined) {
   * `deserializeProperty(prop, value)`
   * `validate()`
 */
-Ember.Resource = Ember.Object.extend({
+Ember.Resource = Ember.Object.extend(Ember.ResourceAdapter, Ember.Copyable, {
   resourceIdField: 'id',
   resourceUrl:     Ember.required(),
 
@@ -87,6 +87,20 @@ Ember.Resource = Ember.Object.extend({
     }
   },
 
+  /**
+    Create a copy of this resource
+
+    Needed to implement Ember.Copyable
+
+    REQUIRED: `resourceProperties`
+  */
+  copy: function(deep) {
+    var c = this.constructor.create();
+    c.duplicateProperties(this);
+    c.set(this.resourceIdField, this.get(this.resourceIdField));
+    return c;
+  },
+
   /**
     Generate this resource's JSON representation
 
@@ -224,7 +238,7 @@ Ember.Resource = Ember.Object.extend({
   _resourceId: function() {
     return this.get(this.resourceIdField);
   }
-}, Ember.ResourceAdapter);
+});
 
 /**
   A controller for RESTful resources
@@ -236,7 +250,7 @@ Ember.Resource = Ember.Object.extend({
   * `resourceUrl` -- (optional) the base url of the resource (e.g. '/contacts/active');
        will default to the `resourceUrl` for `resourceType`
 */
-Ember.ResourceController = Ember.ArrayController.extend({
+Ember.ResourceController = Ember.ArrayController.extend(Ember.ResourceAdapter, {
   resourceType: Ember.required(),
 
   /**
@@ -292,9 +306,24 @@ Ember.ResourceController = Ember.ArrayController.extend({
     the `resourceUrl` specified for `resourceType`.
   */
   _resourceUrl: function() {
-    if (this.resourceUrl === undefined)
-      return this.get('resourceType').prototype.resourceUrl;
-    else
-      return this.resourceUrl;
+    if (this.resourceUrl === undefined) {
+      // If `resourceUrl` is not defined for this controller, there are a couple
+      // ways to retrieve it from the resource. If a resource has been instantiated,
+      // then it can be retrieved from the resource's prototype. Otherwise, we need
+      // to loop through the mixins for the prototype to get the resourceUrl.
+      var rt = this.get('resourceType');
+      if (rt.prototype.resourceUrl === undefined) {
+        for (var i = rt.PrototypeMixin.mixins.length - 1; i >= 0; i--) {
+          var m = rt.PrototypeMixin.mixins[i];
+          if (m.properties !== undefined && m.properties.resourceUrl !== undefined) {
+            return m.properties.resourceUrl;
+          }
+        }
+      }
+      else {
+        return rt.prototype.resourceUrl;
+      }
+    }
+    return this.resourceUrl;
   }
-}, Ember.ResourceAdapter);
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-rest-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties