jsonapi_compliable 0.11.29 → 0.11.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b35655eb99b786bb32bb69e4affa3ded9eb818c7
-  data.tar.gz: bb8d020c20f9e05dd2c879e4e0a2b47a3ace67c9
+SHA256:
+  metadata.gz: 2b577a79ded38bd4613b559334071632b188d2b78f14cc0cb882b5375a37b5a4
+  data.tar.gz: 49f8349533f4dcd5be4344b4bf54997eaef316cd279611ca830e323ee421f9e0
 SHA512:
-  metadata.gz: 9e7aabdf515d0767372fe5e5a8a68ee70a56196479a7ad6fab8adda3750ff38a67ce3d27a4217e0a6ab4bc8f8f392cb051cb7a2b4858a7ce8d77816ed7234436
-  data.tar.gz: 58137447b8674f20f6a25a61c4840ae176aef22377b96238b989adb2c5d561e69fb3c034e6777c5f5d8d58957cba2a7bfb77c03a0c3ea7c0f25e7e26bba8e1e1
+  metadata.gz: 5fb80bd50abadabaab56dabc4fb9f20bd2638e2da29cea7b51e5040a388d15f0ce02c2df0dbcd70d7d01b428d4de15fdfd7134a872f45da197e5a39f55776829
+  data.tar.gz: 00f3c45f9deb647c227d575d17589b6354025b415e7012c96722f3069eccebd2829cebcfd37987f4180e433826835039aaf3b1b82dabd5634bd760a20c7bafef

data/.ruby-version

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

data/.travis.yml

@@ -1,7 +1,8 @@
-sudo: false
 language: ruby
 rvm:
   - 2.3.3
+dist: xenial
+os: linux
 
 script: "bundle exec rake"
 

data/jsonapi_compliable.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "activerecord", ['>= 4.1', '< 6']
   spec.add_development_dependency "kaminari", '~> 0.17'
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.1.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"

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.to_h.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

@@ -99,7 +99,7 @@ module JsonapiCompliable
             begin
               sideload.resolve(results, @query, namespace)
             ensure
-              ActiveRecord::Base.clear_active_connections!
+              ActiveRecord::Base.clear_active_connections! if defined?(ActiveRecord)
             end
           }
           if concurrent

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.29"
+  VERSION = "0.11.34"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi_compliable
 version: !ruby/object:Gem::Version
-  version: 0.11.29
+  version: 0.11.34
 platform: ruby
 authors:
 - Lee Richmond
 - Venkata Pasupuleti
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-04 00:00:00.000000000 Z
+date: 2020-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.1.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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: []