angularjs-rails-resource 0.1.1 → 0.1.2

data/lib/angularjs-rails-resource/version.rb

@@ -1,7 +1,7 @@
 module Angularjs
   module Rails
     module Resource
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/test/lib/angular/angular-mocks.js

@@ -1262,7 +1262,7 @@ function MockHttpExpectation(method, url, data, headers) {
   };
 
   this.matchData = function(d) {
-    if (angular.isUndefined(data)) return true;
+    if (angular.isUndefined(data) && angular.isUndefined(d)) return true;
     if (data && angular.isFunction(data.test)) return data.test(d);
     if (data && !angular.isString(data)) return angular.toJson(data) == d;
     return data == d;

data/test/unit/angularjs/rails/resourceSpec.js

@@ -329,7 +329,7 @@ describe("js.rails", function () {
         it('should be able to create new instance and save it', inject(function($httpBackend) {
             var data = new Test({abcDef: 'xyz'});
 
-            $httpBackend.expectPOST('/test').respond(200, {test: {id: 123, abc_def: 'xyz'}});
+            $httpBackend.expectPOST('/test', {test: {abc_def: 'xyz'}}).respond(200, {test: {id: 123, abc_def: 'xyz'}});
             data.create();
             $httpBackend.flush();
 
@@ -339,13 +339,13 @@ describe("js.rails", function () {
         it('should be able to create new instance and update it', inject(function($httpBackend) {
             var data = new Test({abcDef: 'xyz'});
 
-            $httpBackend.expectPOST('/test').respond(200, {test: {id: 123, abc_def: 'xyz'}});
+            $httpBackend.expectPOST('/test', {test: {abc_def: 'xyz'}}).respond(200, {test: {id: 123, abc_def: 'xyz'}});
             data.create();
             $httpBackend.flush(1);
 
             expect(data).toEqualData({id: 123, abcDef: 'xyz'});
 
-            $httpBackend.expectPUT('/test/123').respond(200, {test: {id: 123, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, xyz: 'abc', abc_def: 'xyz'}}).respond(200, {test: {id: 123, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
             data.xyz = 'abc';
             data.update();
             $httpBackend.flush();
@@ -356,7 +356,7 @@ describe("js.rails", function () {
         it('create with default params should add parameter abc=1', inject(function($httpBackend) {
             var promise, Resource, data, defaultParamsConfig = {};
 
-            $httpBackend.expectPOST('/test?abc=1').respond(200, {test: {abc: 'xyz'}});
+            $httpBackend.expectPOST('/test?abc=1', {test: {}}).respond(200, {test: {abc: 'xyz'}});
 
             angular.copy(config, defaultParamsConfig);
             defaultParamsConfig.defaultParams = {abc: '1'};
@@ -371,7 +371,7 @@ describe("js.rails", function () {
         it('should be able to get resource and update it', inject(function($httpBackend) {
             var promise, result;
 
-            $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz'}});
+            $httpBackend.expectGET('/test/123').respond(200, {test: {id: 123, abc: 'xyz', xyz: 'abcd'}});
 
             expect(promise = Test.get(123)).toBeDefined();
 
@@ -382,15 +382,15 @@ describe("js.rails", function () {
             $httpBackend.flush();
 
             expect(result).toBeInstanceOf(Test);
-            expect(result).toEqualData({id: 123, abc: 'xyz'});
+            expect(result).toEqualData({id: 123, abc: 'xyz', xyz: 'abcd'});
 
-            $httpBackend.expectPUT('/test/123').respond(200, {test: {id: 123, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, abc: 'xyz', xyz: 'abc'}}).respond(200, {test: {id: 123, abc: 'xyz', xyz: 'abc', extra: 'test'}});
             result.xyz = 'abc';
             result.update();
             $httpBackend.flush();
 
             // abc was originally set on the object so it should still be there after the update
-            expect(result).toEqualData({id: 123, abc: 'xyz', abcDef: 'xyz', xyz: 'abc', extra: 'test'});
+            expect(result).toEqualData({id: 123, abc: 'xyz', xyz: 'abc', extra: 'test'});
         }));
 
         it('update should handle 204 response', inject(function($httpBackend) {
@@ -409,7 +409,7 @@ describe("js.rails", function () {
             expect(result).toBeInstanceOf(Test);
             expect(result).toEqualData({id: 123, abc: 'xyz'});
 
-            $httpBackend.expectPUT('/test/123').respond(204);
+            $httpBackend.expectPUT('/test/123', {test: {id: 123, abc: 'xyz', xyz: 'abc'}}).respond(204);
             result.xyz = 'abc';
             result.update();
             $httpBackend.flush();
@@ -693,7 +693,7 @@ describe("js.rails", function () {
         it('should be able to create new instance and save it', inject(function($httpBackend) {
             var data = new NestedTest({nestedId: 1234, abcDef: 'xyz'});
 
-            $httpBackend.expectPOST('/nested/1234/test').respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz'}});
+            $httpBackend.expectPOST('/nested/1234/test', {nested_test: {nested_id: 1234, abc_def: 'xyz'}}).respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz'}});
             data.nestedId = 1234;
             data.create();
             $httpBackend.flush();
@@ -704,14 +704,14 @@ describe("js.rails", function () {
         it('should be able to create new instance and update it', inject(function($httpBackend) {
             var data = new NestedTest({abcDef: 'xyz'});
 
-            $httpBackend.expectPOST('/nested/1234/test').respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz'}});
+            $httpBackend.expectPOST('/nested/1234/test', {nested_test: {abc_def: 'xyz', nested_id: 1234}}).respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz'}});
             data.nestedId = 1234;
             data.create();
             $httpBackend.flush(1);
 
             expect(data).toEqualData({id: 123, nestedId: 1234, abcDef: 'xyz'});
 
-            $httpBackend.expectPUT('/nested/1234/test/123').respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
+            $httpBackend.expectPUT('/nested/1234/test/123', {nested_test: {id: 123, xyz: 'abc', abc_def: 'xyz', nested_id: 1234}}).respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
             data.xyz = 'abc';
             data.update();
             $httpBackend.flush();
@@ -722,7 +722,7 @@ describe("js.rails", function () {
         it('create with default params should add parameter abc=1', inject(function($httpBackend) {
             var promise, Resource, data, defaultParamsConfig = {};
 
-            $httpBackend.expectPOST('/nested/1234/test?abc=1').respond(200, {nested_test: {abc: 'xyz'}});
+            $httpBackend.expectPOST('/nested/1234/test?abc=1', {nested_test: {nested_id: 1234}}).respond(200, {nested_test: {id: 123, nested_id: 1234}});
 
             angular.copy(nestedConfig, defaultParamsConfig);
             defaultParamsConfig.defaultParams = {abc: '1'};
@@ -751,7 +751,7 @@ describe("js.rails", function () {
             expect(result).toBeInstanceOf(NestedTest);
             expect(result).toEqualData({id: 123, nestedId: 1234, abc: 'xyz'});
 
-            $httpBackend.expectPUT('/nested/1234/test/123').respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
+            $httpBackend.expectPUT('/nested/1234/test/123', {nested_test: {id: 123, abc: 'xyz', xyz: 'abc', nested_id: 1234}}).respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz', xyz: 'abc', extra: 'test'}});
             result.xyz = 'abc';
             result.update();
             $httpBackend.flush();
@@ -776,7 +776,7 @@ describe("js.rails", function () {
             expect(result).toBeInstanceOf(NestedTest);
             expect(result).toEqualData({id: 123, nestedId: 1234, abc: 'xyz'});
 
-            $httpBackend.expectPUT('/nested/1234/test/123').respond(204);
+            $httpBackend.expectPUT('/nested/1234/test/123', {nested_test: {id: 123, abc: 'xyz', xyz: 'abc', nested_id: 1234}}).respond(204);
             result.xyz = 'abc';
             result.update();
             $httpBackend.flush();
@@ -805,6 +805,22 @@ describe("js.rails", function () {
             $httpBackend.flush();
         }));
 
+        it('should be able to create new instance and update it', inject(function($httpBackend) {
+            var data = new NestedTest({abcDef: 'xyz'});
+
+            $httpBackend.expectPOST('/nested/1234/test', {nested_test: {abc_def: 'xyz', nested_id: 1234}}).respond(200, {nested_test: {id: 123, nested_id: 1234, abc_def: 'xyz'}});
+            data.nestedId = 1234;
+            data.create();
+            $httpBackend.flush(1);
+
+            expect(data).toEqualData({id: 123, nestedId: 1234, abcDef: 'xyz'});
+            expect(data).toBeInstanceOf(NestedTest);
+
+            $httpBackend.expectDELETE('/nested/1234/test/123').respond(204);
+            data.remove();
+            $httpBackend.flush();
+        }));
+
         it('delete with default params should add parameter abc=1', inject(function($httpBackend) {
             var Resource, data, defaultParamsConfig = {};
 

data/vendor/assets/javascripts/angularjs/rails/resource.js

@@ -267,8 +267,9 @@
                 return this.processResponse($http.put(RailsResource.resourceUrl(this), data, RailsResource.getHttpConfig()));
             };
 
-            RailsResource.prototype.remove = RailsResource.prototype.delete = function () {
-                return this.processResponse($http.delete(RailsResource.resourceUrl(this), RailsResource.getHttpConfig()));
+            //using ['delete'] instead of .delete for IE7/8 compatibility
+            RailsResource.prototype.remove = RailsResource.prototype['delete'] = function () {
+                return this.processResponse($http['delete'](RailsResource.resourceUrl(this), RailsResource.getHttpConfig()));
             };
 
             return RailsResource;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-rails-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-01 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies: []
 description: A small AngularJS add-on for integrating with Rails via JSON more easily.
 email: