From e15b76bcabfd7edd9cfb3103e9c15fbb85bad3f5 Mon Sep 17 00:00:00 2001 From: IvanCarbajal95 <69525552+IvanCarbajal95@users.noreply.github.com> Date: Fri, 30 Jul 2021 10:46:03 -0500 Subject: [PATCH 1/2] Fix .map for rails >= 5.1 --- lib/jsonapi/deserializable/resource.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/jsonapi/deserializable/resource.rb b/lib/jsonapi/deserializable/resource.rb index c46e4ad..b5aea01 100644 --- a/lib/jsonapi/deserializable/resource.rb +++ b/lib/jsonapi/deserializable/resource.rb @@ -88,9 +88,9 @@ def deserialize_id end def deserialize_attrs - @attributes - .map { |key, val| deserialize_attr(key, val) } - .reduce({}, :merge) + attrs = [] + @attributes.each { |key, val| attrs << deserialize_attr(key, val) } + attrs.reduce({}, :merge) end def deserialize_attr(key, val) @@ -103,9 +103,9 @@ def deserialize_attr(key, val) end def deserialize_rels - @relationships - .map { |key, val| deserialize_rel(key, val) } - .reduce({}, :merge) + rels = [] + @relationships.each { |key, val| rels << deserialize_rel(key, val) } + rels.reduce({}, :merge) end def deserialize_rel(key, val) From e0dd7a3bc7e04c714aad3f405b47085a31caa4f8 Mon Sep 17 00:00:00 2001 From: Patricio de Villa Date: Tue, 19 Oct 2021 20:44:00 -0500 Subject: [PATCH 2/2] fix --- VERSION | 2 +- lib/jsonapi/deserializable/resource.rb | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/VERSION b/VERSION index 0ea3a94..0d91a54 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.2.0 +0.3.0 diff --git a/lib/jsonapi/deserializable/resource.rb b/lib/jsonapi/deserializable/resource.rb index b5aea01..9878ee0 100644 --- a/lib/jsonapi/deserializable/resource.rb +++ b/lib/jsonapi/deserializable/resource.rb @@ -88,9 +88,9 @@ def deserialize_id end def deserialize_attrs - attrs = [] - @attributes.each { |key, val| attrs << deserialize_attr(key, val) } - attrs.reduce({}, :merge) + obj = {} + @attributes.each { |key, val| obj.merge!(deserialize_attr(key, val)) } + obj end def deserialize_attr(key, val) @@ -103,9 +103,9 @@ def deserialize_attr(key, val) end def deserialize_rels - rels = [] - @relationships.each { |key, val| rels << deserialize_rel(key, val) } - rels.reduce({}, :merge) + obj = {} + @relationships.each { |key, val| obj.merge!(deserialize_rel(key, val)) } + obj end def deserialize_rel(key, val)