ember-resource 0.0.5 → 0.0.6

data/README.md

@@ -4,7 +4,7 @@ A version of the ember-resource javascript library packaged for the asset pipeli
 
 Original project is https://github.com/staugaard/ember-resource 
 
-Version taken at commit c34fa3bfadfe82481f5a97329734ed4394bb1dc0
+Version taken at commit fb701564a4212eaa0ce3e975190d0d274c553187
 
 
 ## Installation

data/lib/ember-resource/version.rb

@@ -1,5 +1,5 @@
 module Ember
   module Resource
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

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

@@ -1,8 +1,10 @@
-(function(undefined) {
+(function(exports) {
 
   var expandSchema, expandSchemaItem, createSchemaProperties,
       mergeSchemas;
 
+  var Ember = exports.Ember;
+
   function isString(obj) {
     return !!(obj === '' || (obj && obj !== String && obj.charCodeAt && obj.substr));
   }
@@ -561,13 +563,12 @@
   };
 
   Ember.Resource.ajax = function(options) {
-    if(window.stopHere) { debugger }
     options.dataType = options.dataType || 'json';
     options.type     = options.type     || 'GET';
 
     if(options.error) {
       options.error = errorHandlerWithContext(options.error, options);
-    } else if(Em.Resource.errorHandler) {
+    } else if(Ember.Resource.errorHandler) {
       options.error = errorHandlerWithContext(Ember.Resource.errorHandler, options);
     }
 
@@ -646,6 +647,11 @@
           updateExpiry();
         });
 
+        Ember.addListener(this, 'didFail', this, function() {
+          Ember.set(self, 'resourceState', Ember.Resource.Lifecycle.UNFETCHED);
+          updateExpiry();
+        });
+
         var resourceStateBeforeSave;
         Ember.addListener(this, 'willSave', this, function() {
           resourceStateBeforeSave = Ember.get(self, 'resourceState');
@@ -742,6 +748,7 @@
     didFetch: function() {},
     willSave: function() {},
     didSave: function() {},
+    didFail: function() {},
 
     fetched: function() {
       if(!this._fetchDfd) {
@@ -773,12 +780,22 @@
         }
       });
 
-      this.deferedFetch.always(function() {
+      this.deferedFetch.fail(function() {
+        self.didFail.call(self);
+        Ember.sendEvent(self, 'didFail');
+        self.fetched().reject();
+      });
+
+      this.deferedFetch.success(function() {
         self.didFetch.call(self);
         Ember.sendEvent(self, 'didFetch');
         self.fetched().resolve();
       });
 
+      this.deferedFetch.always(function() {
+        self.deferedFetch = null;
+      });
+
       return this.deferedFetch;
     },
 
@@ -865,7 +882,6 @@
       Ember.set(this, 'resourceState', Ember.Resource.Lifecycle.DESTROYING);
       return Ember.Resource.ajax({
         type: 'DELETE',
-        resource: this,
         operation: 'destroy',
         url:  this.resourceURL(),
         resource: this
@@ -954,6 +970,8 @@
             this.identityMap.put(id, instance);
           } else {
             instance.updateWithApiData(data);
+            // ignore incoming resourceState argument
+            delete options.resourceState;
           }
         } else {
           instance = this._super.call(this, { data: data });
@@ -1095,6 +1113,7 @@
       this.deferedFetch.always(function() {
         Ember.sendEvent(self, 'didFetch');
         self.fetched().resolve();
+        self.deferredFetch = null;
       });
       return this.deferedFetch;
     },
@@ -1156,7 +1175,7 @@
     toJSON: function() {
       return this.map(function(item) {
         return item.toJSON();
-      })
+      });
     }
   }, Ember.Resource.Lifecycle.prototypeMixin);
 
@@ -1190,4 +1209,4 @@
       return instance;
     }
   }, Ember.Resource.Lifecycle.classMixin);
-}());
+}(this));

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ember-resource
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
+date: 2012-06-12 00:00:00.000000000 Z
 dependencies: []
 description: Ember resource asset pipeline
 email: