jsonapi_compliable 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc2ca5a3781405bc32a96e5c3b4eaec16191c5cf
-  data.tar.gz: 3d27bc6e53dd40faa3097c5b9a86bb7c52b58a3f
+  metadata.gz: b7d9f768e68387c9ad4d1631a0e9ca9fb962a944
+  data.tar.gz: 3d04f2113cb2a752ed7e5d9ff20e12aa883a7e68
 SHA512:
-  metadata.gz: bc1e4b62b63fc12c1b47fbda2dad76c342d59b56cf8a811a9a6c1b1b28a186443676c668ab8df62f45ec9b75d8cdf12a2ed74d4ca1916514caac0090f6976cf0
-  data.tar.gz: 1cd3d205a104c17959f65cbbbb7e208ce056f41c72535a2c4e478f0abb751b0d016e7c3610b97e9150918ba7d4f1d96aaa2b27c8c49ddfa2809db39d659fd6ed
+  metadata.gz: 21be2e3895bdc99f2d9be9dafa6683b5a0b17a0cd5b443b0e249633fe58737d87c2b16789cad33757048d1b5401d650296d91f185758192c74c67705ef69b919
+  data.tar.gz: 2c8bf62f1b65ebca3e1ac64faebc917acc5f66d3f7ade5cebad9a79e3fa5181e9530e321cd176ffcb5b903558c9bb0f572eee526293815b39cc808f9ffe0f1f1

data/lib/jsonapi_compliable/util/render_options.rb

@@ -12,15 +12,22 @@ module JsonapiCompliable
           h[k] = [*names, "Serializable#{klass}"].join('::').safe_constantize
         end
 
+        fields = query_hash[:fields].dup
+        extra_fields = query_hash[:extra_fields]
+
+        if extra_fields.any? && fields.any?
+          extra_fields.each { |k,v| fields[k] = fields[k].to_a + v }
+        end
+
         options            = {}
         options[:class]    = inferrer
         options[:include]  = query_hash[:include]
         options[:jsonapi]  = resolved
-        options[:fields]   = query_hash[:fields]
+        options[:fields]   = fields
         options.merge!(overrides)
         options[:meta]   ||= {}
         options[:expose] ||= {}
-        options[:expose][:extra_fields] = query_hash[:extra_fields]
+        options[:expose][:extra_fields] = extra_fields
 
         if object.respond_to?(:resolve_stats)
           stats = object.resolve_stats

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.5"
+  VERSION = "0.11.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Lee Richmond
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable