active_model_serializers 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f42ff2b93cdc399b58c219efd12add5e5757612a
-  data.tar.gz: 624cba1a3b71a9aa668f7612b1937a889b98d22e
+  metadata.gz: 824c53b8e015242b747a646eb8d39e6f5bfb6828
+  data.tar.gz: c57b340d57742eda89976c6eff76f79c630615ce
 SHA512:
-  metadata.gz: 4abbf3c69e8de7d29b24aab129229e5bfa6c94eb46c73212016d02592ea8fb3d3fbba6eb0effef1f8b0b3a03ca359f71933678fe98da58db21590f76f1c02dd3
-  data.tar.gz: b5730a2a45db222ee3b331e1ef3a1ba68efc86c17dc7d2c8172c59d4bb4273624031085d331b96078f861d764cb7b8a58d8405ffd9c081af5268b7b319688e94
+  metadata.gz: 1d102aafb1713dd3010bde0cfc29e84626f9dd56d02a0d63807fed04a05d519a4d11ee35ee19e6c0a1e15714a460bdc8280e0d491421bc9fc8dc49fe84dce3fc
+  data.tar.gz: 3135135c42d6533232266a5d7f8b7efba43c83b2fc9017a2867172afeb2c459fc9b335d1322dd625eb916729891902357898785f51b981590ff5cc20671c1d34

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 ### [0-9-stable](https://github.com/rails-api/active_model_serializers/compare/v0.9.4...0-9-stable)
 
-### [v0.9.4 (2015-01-05)](https://github.com/rails-api/active_model_serializers/compare/v0.9.3...v0.9.4)
+### [v0.9.5 (2016-03-30)](https://github.com/rails-api/active_model_serializers/compare/v0.9.4...v0.9.5)
+
+- [#1607](https://github.com/rails-api/active_model_serializers/pull/1607) Merge multiple nested associations. (@Hirtenknogger)
+
+### [v0.9.4 (2016-01-05)](https://github.com/rails-api/active_model_serializers/compare/v0.9.3...v0.9.4)
 
 - [#752](https://github.com/rails-api/active_model_serializers/pull/752) Tiny improvement of README 0-9-stable (@basiam)
 - [#749](https://github.com/rails-api/active_model_serializers/pull/749) remove trailing whitespace (@shwoodard)

data/lib/active_model/serializer.rb

@@ -205,7 +205,11 @@ end
           # we must do this always because even if the current association is not
           # embeded in root, it might have its own associations that are embeded in root
           hash.merge!(association_serializer.embedded_in_root_associations) do |key, oldval, newval|
-            oldval.merge(newval) { |_, oldval, newval| [oldval, newval].flatten.uniq }
+            if oldval.respond_to?(:to_ary)
+              [oldval, newval].flatten.uniq
+            else
+              oldval.merge(newval) { |_, oldval, newval| [oldval, newval].flatten.uniq }
+            end
           end
 
           if association.embed_in_root?

data/lib/active_model/serializer/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

data/test/fixtures/poro.rb

@@ -53,6 +53,26 @@ class SpecialPost < Post
   end
 end
 
+class Type < Model
+end
+
+class SelfReferencingUser < Model
+  def type
+    @type ||= Type.new(name: 'N1')
+  end
+  def parent
+    @parent ||= SelfReferencingUserParent.new(name: 'N1')
+  end
+end
+
+class SelfReferencingUserParent < Model
+  def type
+    @type ||= Type.new(name: 'N2')
+  end
+  def parent
+  end
+end
+
 class Comment < Model
 end
 
@@ -87,6 +107,22 @@ class UserSerializer < ActiveModel::Serializer
   has_one :profile
 end
 
+class TypeSerializer < ActiveModel::Serializer
+  attributes :name
+end
+
+class SelfReferencingUserParentSerializer < ActiveModel::Serializer
+  attributes :name
+  has_one :type, serializer: TypeSerializer, embed: :ids, include: true
+end
+
+class SelfReferencingUserSerializer < ActiveModel::Serializer
+  attributes :name
+
+  has_one :type, serializer: TypeSerializer, embed: :ids, include: true
+  has_one :parent, serializer: SelfReferencingUserSerializer, embed: :ids, include: true
+end
+
 class UserInfoSerializer < ActiveModel::Serializer
   has_one :user, serializer: UserSerializer
 end
@@ -176,7 +212,7 @@ end
 
 class NameKeyPostSerializer < ActiveModel::Serializer
   attributes :title, :body
-  
+
   has_many :comments
 end
 

data/test/tmp/app/serializers/account_serializer.rb

@@ -0,0 +1,3 @@
+class AccountSerializer < MySerializer
+  attributes :id
+end

data/test/unit/active_model/serializer/associations_test.rb

@@ -14,6 +14,36 @@ module ActiveModel
         assert_equal([:comments],
                      another_inherited_serializer_klass._associations.keys)
       end
+      def test_multiple_nested_associations
+        parent = SelfReferencingUserParent.new(name: "The Parent")
+        child = SelfReferencingUser.new(name: "The child", parent: parent)
+        self_referencing_user_serializer = SelfReferencingUserSerializer.new(child)
+        result = self_referencing_user_serializer.as_json
+        expected_result = {
+          "self_referencing_user"=>{
+            :name=>"The child",
+            "type_id"=>child.type.object_id,
+            "parent_id"=>child.parent.object_id
+
+          },
+          "types"=>[
+            {
+              :name=>"N1",
+            },
+            {
+              :name=>"N2",
+            }
+          ],
+          "parents"=>[
+            {
+              :name=>"N1",
+              "type_id"=>child.parent.type.object_id,
+              "parent_id"=>nil
+            }
+          ]
+        }
+        assert_equal(expected_result, result)
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - José Valim
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -75,7 +75,6 @@ files:
 - lib/active_model/serializer/version.rb
 - lib/active_model/serializer_support.rb
 - lib/active_model_serializers.rb
-- lib/active_model_serializers/mime_types.rb
 - test/fixtures/active_record.rb
 - test/fixtures/poro.rb
 - test/fixtures/template.html.erb
@@ -88,6 +87,7 @@ files:
 - test/integration/generators/serializer_generator_test.rb
 - test/test_app.rb
 - test/test_helper.rb
+- test/tmp/app/serializers/account_serializer.rb
 - test/unit/active_model/array_serializer/except_test.rb
 - test/unit/active_model/array_serializer/key_format_test.rb
 - test/unit/active_model/array_serializer/meta_test.rb
@@ -151,6 +151,7 @@ test_files:
 - test/integration/generators/serializer_generator_test.rb
 - test/test_app.rb
 - test/test_helper.rb
+- test/tmp/app/serializers/account_serializer.rb
 - test/unit/active_model/array_serializer/except_test.rb
 - test/unit/active_model/array_serializer/key_format_test.rb
 - test/unit/active_model/array_serializer/meta_test.rb
@@ -176,4 +177,3 @@ test_files:
 - test/unit/active_model/serializer/root_test.rb
 - test/unit/active_model/serializer/scope_test.rb
 - test/unit/active_model/serializer/url_helpers_test.rb
-has_rdoc: 

data/lib/active_model_serializers/mime_types.rb

@@ -1,14 +0,0 @@
-# module ActiveModelSerializers::JSONAPI
-#   HEADERS = {
-#     content_type: { "CONTENT_TYPE" => JSONAPI::MEDIA_TYPE }
-#   }
-#   MEDIA_TYPE = 'application/vnd.api+json'
-# end
-#
-# Mime::Type.register ActiveModelSerializers::JSONAPI::MEDIA_TYPE, :api_json
-#
-# ActionDispatch::ParamsParser::DEFAULT_PARSERS[Mime::Type.lookup(ActiveModelSerializers::JSONAPI::MEDIA_TYPE)] = lambda do |body|
-#   data = JSON.parse(body)
-#   data = {:_json => data} unless data.is_a?(Hash)
-#   data.with_indifferent_access
-# end