jsonapi_compliable 0.11.28 → 0.11.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 663bc3d881ef5e2d4e9df5049f7d1869adf17ca1
-  data.tar.gz: d27c131078dc07d0c5acb4fe39ae6fcd45e4bdbb
+SHA256:
+  metadata.gz: 01f3e608b051cfaa5b57ba3a7fb903efa236bd7cd0133ca51f877e9e1075f520
+  data.tar.gz: 7d22b7ed049c4a2a1102de5dff16f6b7176a3ef101801a26b378432b6b839f6a
 SHA512:
-  metadata.gz: 9632f59f934921ea26ef3d6759ffa21157cdc70d3ecd72995399c7c74c7ac5e13b28eba90d4724de81f81a49f73443440a8fcd1009946d85ba7e88b7fc9a726c
-  data.tar.gz: 43b3f8ceac5b3fdb7dafac79539b3c511767738b8f495e226231b3d2eff755e4be5ce93f05b0ebdd1b68b948812061971fb87b8fefef73e03dc3d8fb479ee44f
+  metadata.gz: ff96d1a22840b5a92d2908c9755e3868cedf74d65946823865a94161e9b3654924db34aed625c2d72a6a297fc2bc2e990ddff567f7c03772c3d665cbb892ec37
+  data.tar.gz: cc56759cd4ba9fe9900ca9295fb46a5683c7fcd2fe03fbd806f7e1d7bb34fe6b7cc865c1c5d427b7b1c24d9ab071f6778dfb614c8feb58f617d76e0957b3432e

data/.ruby-version

@@ -1 +1 @@
-2.3.0
+2.5.2

data/lib/jsonapi_compliable/base.rb

@@ -345,7 +345,7 @@ module JsonapiCompliable
     end
 
     def force_includes?
-      not deserialized_params.data.nil?
+      not (deserialized_params.data.nil? || deserialized_params.data.empty?)
     end
 
     def perform_render_jsonapi(opts)

data/lib/jsonapi_compliable/deserializer.rb

@@ -48,14 +48,23 @@ class JsonapiCompliable::Deserializer
   # @param payload [Hash] The incoming payload with symbolized keys
   # @param env [Hash] the Rack env (e.g. +request.env+).
   def initialize(payload, env)
-    @payload = payload
+    @payload = payload || {}
     @payload = @payload[:_jsonapi] if @payload.has_key?(:_jsonapi)
     @env = env
+    validate_content_type
+  end
+
+  # checks Content-Type header and prints a warning if it doesn't seem correct
+  def validate_content_type
+    content_type = @env['CONTENT_TYPE'] || ""
+    if !(content_type.include?("application/json") || content_type.include?("application/vnd.api+json"))
+      print("WARNING - JSONAPI Compliable :: Content-Type header appears to be set to an invalid value: #{content_type}\n")
+    end
   end
 
   # @return [Hash] the raw :data value of the payload
   def data
-    @payload[:data]
+    @payload[:data] || {}
   end
 
   # @return [String] the raw :id value of the payload

data/lib/jsonapi_compliable/query.rb

@@ -209,8 +209,10 @@ module JsonapiCompliable
           key = key.to_sym
 
           if association?(key)
-            k, v = Hash(value).to_a.first
-            hash[key][:filter][k.to_sym] = v
+            symbolized_hash = value.each_with_object({}) do |(k, v), hash|
+              hash[k.to_sym] = v
+            end
+            hash[key][:filter].merge!(symbolized_hash)
           else
             hash[resource.type][:filter][key] = value
           end

data/lib/jsonapi_compliable/scope.rb

@@ -95,7 +95,13 @@ module JsonapiCompliable
           end
         else
           namespace = Util::Sideload.namespace(@namespace, sideload.name)
-          resolve_sideload = -> { sideload.resolve(results, @query, namespace) }
+          resolve_sideload = -> {
+            begin
+              sideload.resolve(results, @query, namespace)
+            ensure
+              ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord)
+            end
+          }
           if concurrent
             promises << Concurrent::Promise.execute(&resolve_sideload)
           else

data/lib/jsonapi_compliable/util/validation_response.rb

@@ -45,26 +45,28 @@ class JsonapiCompliable::Util::ValidationResponse
   end
 
   def all_valid?(model, deserialized_params)
-    valid = true
-    return false unless valid_object?(model)
+    checks = []
+    checks << valid_object?(model)
     deserialized_params.each_pair do |name, payload|
       if payload.is_a?(Array)
         related_objects = model.send(name)
-        related_objects.each do |r|
+        related_objects.each_with_index do |r, index|
           valid = valid_object?(r)
+          checks << valid
 
           if valid
-            valid = all_valid?(r, deserialized_params[:relationships] || {})
+            checks << all_valid?(r, payload[index][:relationships] || {})
           end
         end
       else
         related_object = model.send(name)
         valid = valid_object?(related_object)
+        checks << valid
         if valid
-          valid = all_valid?(related_object, deserialized_params[:relationships] || {})
+          checks << all_valid?(related_object, payload[:relationships] || {})
         end
       end
     end
-    valid
+    checks.all? { |c| c == true }
   end
 end

data/lib/jsonapi_compliable/version.rb

@@ -1,3 +1,3 @@
 module JsonapiCompliable
-  VERSION = "0.11.28"
+  VERSION = "0.11.33"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.28
+  version: 0.11.33
 platform: ruby
 authors:
 - Lee Richmond
 - Venkata Pasupuleti
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -115,7 +115,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description:
 email:
 - richmolj@gmail.com
 - spasupuleti4@bloomberg.net
@@ -253,11 +253,11 @@ files:
 - lib/jsonapi_compliable/util/sideload.rb
 - lib/jsonapi_compliable/util/validation_response.rb
 - lib/jsonapi_compliable/version.rb
-homepage: 
+homepage:
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,9 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs
 test_files: []