angularjs-rails-resource 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45894ff519ef50bed5feda97630ad148e15bfe3a
-  data.tar.gz: 9b757277985bf87c0b5d67ad8daade45965ed9a8
+  metadata.gz: 64bc74995e3dbdc9aad130c99d334d924338a198
+  data.tar.gz: 12b2abe8d96b3332d843bb6eaa07b2d917ec955e
 SHA512:
-  metadata.gz: 3807f841e481d2125c3a7dbaa7202604ec2691d8c7244d127311bcf2fa8b40c498d46bd74fea8a63a5f4c42865eb22ad83f717afe2c66b4ba51a81b34e0794f4
-  data.tar.gz: db60cbf3f22a5552a5e60b4f7c769cfb6094e05fd646ccfb27c6a10456a0043e7b99b1a35029d64e3b4905cd6abf0ab82dc2f5ae42dbcdfdc800309404f54b30
+  metadata.gz: 74b693dacca56b514586bf3e6492917fad7b50fedbf791246ca1f0a82951f068e405b11c04c621ff672defdc8bcdceaa44bd69f0e56c81c1a3929dbb35d2561c
+  data.tar.gz: 959b6166d3056f4c851f9fde9d1116d744550988627ea3c9eb144d25cdc76e8f9bda4521e07f4dc4bd06977cfc24dcc8a25487fca931d9f28c267ba20b95179a

data/CHANGELOG.md

@@ -1,7 +1,13 @@
+<a name="1.2.1"></a>
+# 1.2.2
+## Bug Fixes
+- Add support for adding custom attributes when serializing arrays - #143 (@shuhei)
+- Force constructor to unwrap as an object - #134 (@tuvistavie)
+
 <a name="1.2.1"></a>
 # 1.2.1
 ## Bug Fixes
-- Call beforeResponse interceptor only once - #139 (@shuhei) 
+- Call beforeResponse interceptor only once - #139 (@shuhei)
 
 <a name="1.2.0"></a>
 # 1.2.0
@@ -9,7 +15,7 @@
 
 ## Features
 - Added <code>unsnappedChanges()</code> function to snapshots mixin to check whether or not there have been any changes since the last snapshot was taken. - #125 (@StevenClontz)
-- Added <code>skipRequestProcessing</code> override configuration option to $http, $post, $put, $patch to bypass request processing (root wrapping, serialization) and request interceptor chains - #123 (@mayhewluke) 
+- Added <code>skipRequestProcessing</code> override configuration option to $http, $post, $put, $patch to bypass request processing (root wrapping, serialization) and request interceptor chains - #123 (@mayhewluke)
 
 <a name="1.1.0"></a>
 # 1.1.0
@@ -18,12 +24,12 @@
 ## Features
 - Added <code>idAttribute</code> configuration option to allow customizing the unique id field on resources. - #114 (@inlineblock)
 - Added <code>get</code> instance method to refresh resources from the server. - #115 (@wwilkins)
- 
+
 <a name="1.0.1"></a>
 # 1.0.1
 ## Bug Fixes
 - <code>response.originalData</code> was not being saved off before the root unwrapping so it didn't match the original response data as intended. @Ditchou
- 
+
 
 <a name="1.0.0"></a>
 # 1.0.0

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angularjs-rails-resource",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "angularjs-rails-resource.js",
   "description": "A resource factory inspired by $resource from AngularJS",
   "repository": {

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

@@ -1,7 +1,7 @@
 module Angularjs
   module Rails
     module Resource
-      VERSION = '1.2.1'
+      VERSION = '1.2.2'
     end
   end
 end

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "angularjs-rails-resource",
   "description" : "A resource factory inspired by $resource from AngularJS",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main" : "dist/angularjs-rails-resource.min.js",
   "homepage" : "https://github.com/FineLinePrototyping/angularjs-rails-resource.git",
   "author" : "",

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

@@ -24,6 +24,11 @@ describe('root wrapping', function () {
         testTransform({test: {abc: 'xyz', def: 'abc'}}, {abc: 'xyz', def: 'abc'});
     });
 
+    it('should not unwrap pluralName when object is expected', function() {
+        var data = {tests: [1, 2, 3], id: 4};
+        expect(railsRootWrapper.unwrap({data: data}, Resource, true)).toEqualData({data: data});
+    });
+
     function testTransform(wrappedData, unwrappedData) {
         expect(railsRootWrapper.wrap(unwrappedData, Resource)).toEqualData(wrappedData);
         expect(railsRootWrapper.unwrap({data: wrappedData}, Resource)).toEqualData({data: unwrappedData});

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

@@ -343,6 +343,52 @@ describe('railsSerializer', function () {
                 expect(result['num_books']).toBe(2);
             });
 
+            it('should add custom attribute to collection from function', function() {
+                var result, authorWithPublisher, serializedBooks,
+                    serializer = createSerializer(function () {
+                        this.serializeWith('books', factory(function() {
+                            this.add('publisherId', function(book) {
+                                return book.publisher.id;
+                            });
+                        }));
+                    });
+                authorWithPublisher = {
+                    books: [
+                        {id: 1, publisher: {id: 3}},
+                        {id: 2, publisher: {id: 4}}
+                    ]
+                };
+                serializedBooks = [
+                    {id: 1, publisher_id: 3, publisher: {id:3}},
+                    {id: 2, publisher_id: 4, publisher: {id:4}}
+                ];
+
+                result = serializer.serialize(authorWithPublisher);
+                expect(result['books']).toEqual(serializedBooks);
+            });
+
+            it('should add custom attribute to collection from constant value', function() {
+                var result, authorWithPublisher, serializedBooks,
+                    serializer = createSerializer(function () {
+                        this.serializeWith('books', factory(function() {
+                            this.add('publisherId', 3);
+                        }));
+                    });
+                authorWithPublisher = {
+                    books: [
+                        {id: 1, publisher: {id: 3}},
+                        {id: 2, publisher: {id: 4}}
+                    ]
+                };
+                serializedBooks = [
+                    {id: 1, publisher_id: 3, publisher: {id:3}},
+                    {id: 2, publisher_id: 3, publisher: {id:4}}
+                ];
+
+                result = serializer.serialize(authorWithPublisher);
+                expect(result['books']).toEqual(serializedBooks);
+            });
+
             it('should use custom serializer for books', function () {
                 var result, serializedBooks, underscored,
                     serializer = createSerializer(function () {

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

@@ -6,10 +6,10 @@
                 result[angular.isArray(data) ? resource.config.pluralName : resource.config.name] = data;
                 return result;
             },
-            unwrap: function (response, resource) {
+            unwrap: function (response, resource, isObject) {
                 if (response.data && response.data.hasOwnProperty(resource.config.name)) {
                     response.data = response.data[resource.config.name];
-                } else if (response.data && response.data.hasOwnProperty(resource.config.pluralName)) {
+                } else if (response.data && response.data.hasOwnProperty(resource.config.pluralName) && !isObject) {
                     response.data = response.data[resource.config.pluralName];
                 }
 
@@ -114,7 +114,7 @@
                     if (value) {
                         var response = this.constructor.deserialize({data: value});
                         if (this.constructor.config.rootWrapping) {
-                            response = railsRootWrapper.unwrap(response, this.constructor);
+                            response = railsRootWrapper.unwrap(response, this.constructor, true);
                         }
                         angular.extend(this, response.data);
                     }
@@ -582,7 +582,7 @@
 
                     if (config.rootWrapping) {
                         promise = promise.then(function (response) {
-                            return railsRootWrapper.unwrap(response, config.resourceConstructor);
+                            return railsRootWrapper.unwrap(response, config.resourceConstructor, false);
                         });
                     }
 

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

@@ -416,11 +416,22 @@
 
                     if (angular.isObject(result)) {
                         angular.forEach(this.customSerializedAttributes, function (value, key) {
-                            if (angular.isFunction(value)) {
-                                value = value.call(data, data);
-                            }
+                            if (angular.isArray(result)) {
+                                angular.forEach(result, function (item, index) {
+                                    var itemValue = value;
+                                    if (angular.isFunction(value)) {
+                                        itemValue = itemValue.call(item, item);
+                                    }
+
+                                    self.serializeAttribute(item, key, itemValue);
+                                });
+                            } else {
+                                if (angular.isFunction(value)) {
+                                    value = value.call(data, data);
+                                }
 
-                            self.serializeAttribute(result, key, value);
+                                self.serializeAttribute(result, key, value);
+                            }
                         });
                     }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-rails-resource
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Tommy Odom
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-02-07 00:00:00.000000000 Z
 dependencies: []
 description: A small AngularJS add-on for integrating with Rails via JSON more easily.
 email: