angularjs-rails-resource 0.1.4 → 0.1.5

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

@@ -0,0 +1,46 @@
+describe("root wrapping", function () {
+    'use strict';
+
+    beforeEach(module('rails'));
+
+    var q, rootScope,
+        transformer, interceptor,
+        config = {rootName: 'test', rootPluralName: 'tests'};
+
+
+    function testTransform(wrappedData, unwrappedData) {
+        var result, resultPromise,
+            deferred = q.defer();
+
+        expect(transformer(unwrappedData, config)).toEqualData(wrappedData);
+        deferred.promise.resource = config;
+        expect(resultPromise = interceptor(deferred.promise)).toBeDefined();
+
+        resultPromise.then(function (response) {
+            result = response;
+        });
+
+        deferred.resolve({data: wrappedData});
+        rootScope.$digest(); // needed for $q to actually run callbacks
+        expect(result).toEqualData({data: unwrappedData});
+    }
+
+    beforeEach(inject(function ($rootScope, $q, railsRootWrappingTransformer, railsRootWrappingInterceptor) {
+        q = $q;
+        rootScope = $rootScope;
+        transformer = railsRootWrappingTransformer;
+        interceptor = railsRootWrappingInterceptor;
+    }));
+
+    it('should handle null root', function() {
+        testTransform({test: null}, null);
+    });
+
+    it('should transform arrays', function() {
+        testTransform({tests: [1, 2, 3]}, [1, 2, 3]);
+    });
+
+    it('should transform object', function() {
+        testTransform({test: {abc: 'xyz', def: 'abc'}}, {abc: 'xyz', def: 'abc'});
+    });
+});

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

@@ -85,6 +85,7 @@
     });
 
     angular.module('rails').factory('railsResourceFactory', ['$http', '$q', '$injector', '$interpolate', function ($http, $q, $injector, $interpolate) {
+        // urlBuilder("/path/{{someId}}")(someId: 5) == "/path/5"
         function urlBuilder(url) {
             var expression;
 
@@ -114,14 +115,27 @@
                 interceptors = config.responseInterceptors || ['railsFieldRenamingInterceptor', 'railsRootWrappingInterceptor'];
 
             function RailsResource(value) {
-                angular.extend(this, value || {});
+                var immediatePromise = function(data) {
+                  return {
+                      response: data,
+                      then: function(callback) {
+                        this.response = callback(this.response);
+                        return immediatePromise(this.response);
+                      }
+                    }
+                };
+                var data = RailsResource.callInterceptors(immediatePromise({data: value || {}})).response.data;
+                angular.extend(this, data);
             }
 
-            RailsResource.url = urlBuilder(config.url);
+            RailsResource.setUrl = function(url) {
+              RailsResource.url = urlBuilder(url);
+            };
+            RailsResource.setUrl(config.url);
             RailsResource.rootName = config.name;
             RailsResource.rootPluralName = config.pluralName || config.name + 's';
             RailsResource.httpConfig = config.httpConfig || {};
-            RailsResource.httpConfig.headers = angular.extend({'Accept': 'application/json'}, RailsResource.httpConfig.headers || {});
+            RailsResource.httpConfig.headers = angular.extend({'Accept': 'application/json', 'Content-Type': 'application/json'}, RailsResource.httpConfig.headers || {});
             RailsResource.requestTransformers = [];
             RailsResource.responseInterceptors = [];
             RailsResource.defaultParams = config.defaultParams;
@@ -171,10 +185,11 @@
                         result = [];
 
                         angular.forEach(response.data, function (value) {
-                            result.push(new RailsResource(value));
+                            result.push(angular.extend(new RailsResource(), value));
                         });
                     } else if (angular.isObject(response.data)) {
-                        result = new RailsResource(response.data);
+                        result = angular.extend(new RailsResource(), response.data);
+
                     } else {
                         result = response.data;
                     }
@@ -221,7 +236,7 @@
              * @param context
              * @return {string}
              */
-            RailsResource.resourceUrl = function (context) {
+            RailsResource.$url = RailsResource.resourceUrl = function (context) {
                 if (!angular.isObject(context)) {
                     context = {id: context};
                 }
@@ -229,12 +244,20 @@
                 return RailsResource.url(context || {});
             };
 
+            RailsResource.$get = function (url, queryParams) {
+                return RailsResource.processResponse($http.get(url, RailsResource.getHttpConfig(queryParams)));
+            };
+
             RailsResource.query = function (queryParams, context) {
-                return RailsResource.processResponse($http.get(RailsResource.resourceUrl(context), RailsResource.getHttpConfig(queryParams)));
+                return RailsResource.$get(RailsResource.resourceUrl(context), queryParams);
             };
 
             RailsResource.get = function (context, queryParams) {
-                return RailsResource.processResponse($http.get(RailsResource.resourceUrl(context), RailsResource.getHttpConfig(queryParams)));
+                return RailsResource.$get(RailsResource.resourceUrl(context), queryParams);
+            };
+
+            RailsResource.prototype.$url = function() {
+                return RailsResource.resourceUrl(this);
             };
 
             RailsResource.prototype.processResponse = function (promise) {
@@ -256,21 +279,44 @@
                 }));
             };
 
+            angular.forEach(['post', 'put', 'patch'], function (method) {
+                RailsResource['$' + method] = function (url, data) {
+                    var config;
+                    // clone so we can manipulate w/o modifying the actual instance
+                    data = RailsResource.transformData(angular.copy(data, {}));
+                    config = angular.extend({method: method, url: url, data: data}, RailsResource.getHttpConfig());
+                    return RailsResource.processResponse($http(config));
+                };
+
+                RailsResource.prototype['$' + method] = function (url) {
+                    var data, config;
+                    // clone so we can manipulate w/o modifying the actual instance
+                    data = RailsResource.transformData(angular.copy(this, {}));
+                    config = angular.extend({method: method, url: url, data: data}, RailsResource.getHttpConfig());
+                    return this.processResponse($http(config));
+
+                };
+            });
+
             RailsResource.prototype.create = function () {
-                // clone so we can manipulate w/o modifying our instance
-                var data = RailsResource.transformData(angular.copy(this, {}));
-                return this.processResponse($http.post(RailsResource.resourceUrl(this), data, RailsResource.getHttpConfig()));
+                return this.$post(this.$url(), this);
             };
 
             RailsResource.prototype.update = function () {
-                // clone so we can manipulate w/o modifying our instance
-                var data = RailsResource.transformData(angular.copy(this, {}));
-                return this.processResponse($http.put(RailsResource.resourceUrl(this), data, RailsResource.getHttpConfig()));
+                return this.$put(this.$url(), this);
+            };
+
+            RailsResource['$delete'] = function (url) {
+                return RailsResource.processResponse($http['delete'](url, RailsResource.getHttpConfig()));
+            };
+
+            RailsResource.prototype['$delete'] = function (url) {
+                return this.processResponse($http['delete'](url, 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 this.$delete(this.$url());
             };
 
             return RailsResource;
@@ -278,4 +324,4 @@
 
         return railsResourceFactory;
     }]);
-}());
+}());

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-rails-resource
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-10 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies: []
 description: A small AngularJS add-on for integrating with Rails via JSON more easily.
 email:
@@ -35,11 +35,18 @@ files:
 - test/lib/angular/angular-bootstrap.js
 - test/lib/angular/angular-cookies.js
 - test/lib/angular/angular-loader.js
+- test/lib/angular/angular-locale_en-us.js
+- test/lib/angular/angular-mobile.js
 - test/lib/angular/angular-mocks.js
 - test/lib/angular/angular-resource.js
 - test/lib/angular/angular-sanitize.js
+- test/lib/angular/angular-scenario.js
 - test/lib/angular/angular.js
+- test/unit/angularjs/rails/fieldRenamingSpec.js
+- test/unit/angularjs/rails/httpSettingsSpec.js
+- test/unit/angularjs/rails/nestedUrlsSpec.js
 - test/unit/angularjs/rails/resourceSpec.js
+- test/unit/angularjs/rails/rootWrappingSpec.js
 - test/unit/helpers/spec_helper.js
 - vendor/assets/javascripts/angularjs/rails/resource.js
 homepage: https://github.com/finelineprototyping/angularjs-rails-resource
@@ -71,9 +78,16 @@ test_files:
 - test/lib/angular/angular-bootstrap.js
 - test/lib/angular/angular-cookies.js
 - test/lib/angular/angular-loader.js
+- test/lib/angular/angular-locale_en-us.js
+- test/lib/angular/angular-mobile.js
 - test/lib/angular/angular-mocks.js
 - test/lib/angular/angular-resource.js
 - test/lib/angular/angular-sanitize.js
+- test/lib/angular/angular-scenario.js
 - test/lib/angular/angular.js
+- test/unit/angularjs/rails/fieldRenamingSpec.js
+- test/unit/angularjs/rails/httpSettingsSpec.js
+- test/unit/angularjs/rails/nestedUrlsSpec.js
 - test/unit/angularjs/rails/resourceSpec.js
+- test/unit/angularjs/rails/rootWrappingSpec.js
 - test/unit/helpers/spec_helper.js