angularjs-rails-resource 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64bc74995e3dbdc9aad130c99d334d924338a198
-  data.tar.gz: 12b2abe8d96b3332d843bb6eaa07b2d917ec955e
+  metadata.gz: 3e4a5ba390211f28af5390dfedb8b0e74a3f57b3
+  data.tar.gz: 9b730394170c778a38f7101b03e76b599dc4e9c6
 SHA512:
-  metadata.gz: 74b693dacca56b514586bf3e6492917fad7b50fedbf791246ca1f0a82951f068e405b11c04c621ff672defdc8bcdceaa44bd69f0e56c81c1a3929dbb35d2561c
-  data.tar.gz: 959b6166d3056f4c851f9fde9d1116d744550988627ea3c9eb144d25cdc76e8f9bda4521e07f4dc4bd06977cfc24dcc8a25487fca931d9f28c267ba20b95179a
+  metadata.gz: 0a699355c35b80febbb396c0908597ccc2426bc340b6396d60638f70ad9aa54e19e243897d5eb829d5909be57c6a8f6ec1e4e4748f5ec38cae963c414f0e1cef
+  data.tar.gz: fcb9f1ecae719beb565e67c85d5dbaf13cb01cf166efa4386d771e287077ca100af3f3a36d30ba615e89557caa61075ff267e2a5c1da377430085649d240f44b

data/CHANGELOG.md

@@ -1,4 +1,9 @@
-<a name="1.2.1"></a>
+<a name="1.2.3"></a>
+# 1.2.3
+## Bug Fixes
+- Apply custom serialization attributes before doing full serialization - #148 (@envek)
+
+<a name="1.2.2"></a>
 # 1.2.2
 ## Bug Fixes
 - Add support for adding custom attributes when serializing arrays - #143 (@shuhei)

data/README.md

@@ -35,7 +35,7 @@ angular.module('app').config(["railsSerializerProvider", function(railsSerialize
 ### Rails Asset Pipeline
 Add this line to your application's Gemfile to use the latest stable version:
 ```ruby
-gem 'angularjs-rails-resource', '~> 1.1.1'
+gem 'angularjs-rails-resource', '~> 1.2.3'
 ```
 
 Include the javascript somewhere in your asset pipeline:

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angularjs-rails-resource",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "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.2'
+      VERSION = '1.2.3'
     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.2",
+  "version": "1.2.3",
   "main" : "dist/angularjs-rails-resource.min.js",
   "homepage" : "https://github.com/FineLinePrototyping/angularjs-rails-resource.git",
   "author" : "",

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

@@ -453,5 +453,67 @@ describe('railsSerializer', function () {
                 expect(result).toEqual({ id: 1, books: [book]});
             });
         });
+
+        describe('nested resource collection serialization', function () {
+            module('rails');
+
+            angular.module('rails').factory('Team', function (railsResourceFactory, railsSerializer) {
+                return railsResourceFactory({
+                    name: 'team',
+                    serializer: railsSerializer(function() {
+                        this.nestedAttribute('members');
+                        this.resource('members', 'Member');
+                        this.add('vehicle_id', function(team) {
+                            return team.vehicle.id;
+                        });
+                        this.exclude('vehicle');
+                    })
+                });
+            });
+            angular.module('rails').factory('Member', function (railsResourceFactory, railsSerializer) {
+                return railsResourceFactory({
+                    name: 'member',
+                    serializer: railsSerializer(function() {
+                        this.resource('user', 'User');
+                        this.resource('slot', 'Slot');
+                        this.add('user_id', function(member) {
+                            return member.user.id;
+                        });
+                        this.add('slot_id', function(member) {
+                            return member.slot.id;
+                        });
+                        this.exclude('user', 'slot');
+                    })
+                });
+            });
+            angular.module('rails').factory('Slot', function (railsResourceFactory) {
+                return railsResourceFactory({name: 'slot'});
+            });
+            angular.module('rails').factory('User', function (railsResourceFactory) {
+                return railsResourceFactory({name: 'user'});
+            });
+            angular.module('rails').factory('Vehicle', function (railsResourceFactory) {
+                return railsResourceFactory({name: 'vehicle'});
+            });
+
+
+            it('should add custom attribute in nested resource', inject(function(Team) {
+                var team1 = new Team({
+                    id: 1,
+                    name: 'Team 1',
+                    vehicle: { id: 123, name: 'Subaru Impreza' },
+                    members: [
+                        { id: 352435, user: { id: 100500, name: 'Andrey' }, slot: { id: 200425, rank_id: 1 } },
+                        { id: 235433, user: { id: 100501, name: 'Anton'  }, slot: { id: 200426, rank_id: 2 } },
+                    ],
+                });
+                var serializedTeam1 = {
+                    id: 1, name: 'Team 1', vehicle_id: 123,
+                    members_attributes: [{id: 352435, user_id: 100500, slot_id: 200425}, {id: 235433, user_id: 100501, slot_id: 200426}],
+                };
+
+                expect(Team.config.serializer.serialize(team1)).toEqual(serializedTeam1);
+            }));
+        });
     });
 });

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

@@ -411,7 +411,7 @@
                  * @returns {*} A new object or array that is ready for JSON serialization
                  */
                 Serializer.prototype.serialize = function (data) {
-                    var result = this.serializeValue(data),
+                    var result = angular.copy(data),
                         self = this;
 
                     if (angular.isObject(result)) {
@@ -435,6 +435,8 @@
                         });
                     }
 
+                    result = this.serializeValue(result);
+
                     return result;
                 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angularjs-rails-resource
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Tommy Odom
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies: []
 description: A small AngularJS add-on for integrating with Rails via JSON more easily.
 email:
@@ -19,8 +19,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - EXAMPLES.md
 - Gemfile
@@ -71,17 +71,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: AngularJS add-on resource add-on for integrating with Rails