json_api_client 1.12.0 → 1.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3cfb32875fc8446747a7d25e363af32fcd2b7667
-  data.tar.gz: '0178c432e6547f8d542d05f138b0b80642cdb724'
+SHA256:
+  metadata.gz: e2ec83cd51f34ee34e32551913d01f9e9c9aa7d115ef475f75900aac7fceee2c
+  data.tar.gz: '0193065a70ff9f0b9f05f4c3205f702ebdc559e6fd3de48296a50d2c069261e1'
 SHA512:
-  metadata.gz: 60f9e5bb268999432abfb9253384dcc75d2fa8ba7321324ec2a55a8003f94c7241ffd08c8cfbe3ca6120f8a7a78c059e5a95fb3d15b7823cbb60686a52729259
-  data.tar.gz: 5c7540a4f1d9d43be2c55864d5483155c1b89ff543ab005a8ecea749b5c9cd591755f5d795ad9e1bcee7e0454eabdb377b1f6298605ba628b7c3aee14a8cc6a2
+  metadata.gz: 7f72be97a49f8a922350f048147791696e333aa9e970d98a5640604843af3c5b6b500994db80ba47e9f968f51be80398585408c5802f984346531e455dbd8fb9
+  data.tar.gz: 04cbe2ac54b543c0fb22f3fdfc59cf838bcec1dbc5fb4f927399f308dba57f1a907a6992a1329e4d6bb72eaaaab8ae629714c497cab5d323e3425197ddb663f5

data/lib/json_api_client/included_data.rb

@@ -4,20 +4,30 @@ module JsonApiClient
 
     def initialize(result_set, data)
       record_class = result_set.record_class
-      included_set = data.map do |datum|
-        type = datum["type"]
+      grouped_data = data.group_by{|datum| datum["type"]}
+      grouped_included_set = grouped_data.each_with_object({}) do |(type, records), h|
         klass = Utils.compute_type(record_class, record_class.key_formatter.unformat(type).singularize.classify)
-        params = klass.parser.parameters_from_resource(datum)
-        resource = klass.load(params)
-        resource.last_result_set = result_set
-        resource
+        h[type] = records.map do |record|
+          params = klass.parser.parameters_from_resource(record)
+          klass.load(params).tap do |resource|
+            resource.last_result_set = result_set
+          end
+        end
       end
 
-      included_set.concat(result_set) if record_class.search_included_in_result_set
-      @data = included_set.group_by(&:type).inject({}) do |h, (type, resources)|
-        h[type] = resources.index_by(&:id)
-        h
+      if record_class.search_included_in_result_set
+        # deep_merge overrides the nested Arrays o_O
+        # {a: [1,2]}.deep_merge(a: [3,4]) # => {a: [3,4]}
+        grouped_included_set.merge!(result_set.group_by(&:type)) do |_, resources1, resources2|
+          resources1 + resources2
+        end
       end
+
+      grouped_included_set.each do |type, resources|
+        grouped_included_set[type] = resources.index_by(&:id)
+      end
+
+      @data = grouped_included_set
     end
 
     def data_for(method_name, definition)

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.12.0"
+  VERSION = "1.12.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.12.1
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -198,8 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org