json_api_client 1.21.0 → 1.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4a758332e3d5a88f73ad623771ea645a6c68c4329b6c0f8616fa0a4760e72c
-  data.tar.gz: 8ad725ee77c0aebdbae7020d37b02e155e272a7e6a33fc475bb80a19f6b23eb2
+  metadata.gz: 50ee381b7fb9cdebf8538c162a5dab717e8e2e23fffdc293ef7738728f45f9c3
+  data.tar.gz: 1be6e62baf09fc3bc78c7c65a5a7b567b0c4a875d1e6bbe06411774ee34d059a
 SHA512:
-  metadata.gz: 208619a74a51642c54c6793194ff2178f6c07aa1e4e54b78b0d8a176f55319dbc114900aa09acd536a90d5679538b57bccc825e24fe48e03c67077b7f2b18798
-  data.tar.gz: 1521db737a029e3b1cdadf22e044c1a7d8ebdbc7171792e7c291df3db7c991a5df7aba786fa593aea6523c6fa2d26231e1cf6e1d87c86c1020fde42f960aaea9
+  metadata.gz: 60b1b657a5b30630f03e461bc4d29f5c0127417c53d63da146059d7a4bfef97e294d48d3bea842811dc72366e18cca7b1ddb1f68a573d42f1571a30dc199a9f6
+  data.tar.gz: a99ff29dd85edb6e036538c61d9ae84359a62bd8464e4f9839c09e2d8c1859d30ee58182a962503b00134fcb20c473520157bbe52b0dba5819dfc70402054d4b

data/lib/json_api_client/errors.rb

@@ -46,11 +46,18 @@ module JsonApiClient
 
     class NotFound < ClientError
       attr_reader :uri
-      def initialize(uri)
-        @uri = uri
+      def initialize(env_or_uri, msg = nil)
+        env = nil
+
+        if env_or_uri.kind_of?(Faraday::Env)
+          env = env_or_uri
+          @uri = env[:url]
+        else
+          @uri = env_or_uri
+        end
 
-        msg = "Resource not found: #{uri.to_s}"
-        super nil, msg
+        msg ||= "Resource not found: #{uri.to_s}"
+        super env, msg
       end
     end
 

data/lib/json_api_client/included_data.rb

@@ -24,7 +24,7 @@ module JsonApiClient
       end
 
       grouped_included_set.each do |type, resources|
-        grouped_included_set[type] = resources.index_by(&:id)
+        grouped_included_set[type] = resources.index_by { |resource| resource.attributes[:id] }
       end
 
       @data = grouped_included_set

data/lib/json_api_client/middleware/status.rb

@@ -37,7 +37,7 @@ module JsonApiClient
         when 403
           raise Errors::AccessDenied, env
         when 404
-          raise Errors::NotFound, env[:url]
+          raise Errors::NotFound, env
         when 408
           raise Errors::RequestTimeout, env
         when 409

data/lib/json_api_client/query/builder.rb

@@ -92,7 +92,7 @@ module JsonApiClient
 
       def find(args = {})
         if klass.raise_on_blank_find_param && args.blank?
-          raise Errors::NotFound, 'blank .find param'
+          raise Errors::NotFound, nil, 'blank .find param'
         end
 
         case args
@@ -136,7 +136,7 @@ module JsonApiClient
              primary_key:       opts.fetch( :primary_key, @primary_key ),
              pagination_params: @pagination_params.merge( opts.fetch( :pagination_params, {} ) ),
              path_params:       @path_params.merge( opts.fetch( :path_params, {} ) ),
-             additional_params: @additional_params.merge( opts.fetch( :additional_params, {} ) ),
+             additional_params: @additional_params.deep_merge( opts.fetch( :additional_params, {} ) ),
              filters:           @filters.merge( opts.fetch( :filters, {} ) ),
              includes:          @includes + opts.fetch( :includes, [] ),
              orders:            @orders + opts.fetch( :orders, [] ),

data/lib/json_api_client/utils.rb

@@ -7,6 +7,11 @@ module JsonApiClient
       # the type_name is an absolute reference.
       return type_name.constantize if type_name.match(/^::/)
 
+      # Check the klass association definitions
+      association_klass_match = klass.associations.find { |a| a.attr_name.to_s.singularize == type_name.underscore }
+      association_klass = association_klass_match.options[:class] if association_klass_match
+      return association_klass if association_klass
+
       # Build a list of candidates to search for
       candidates = []
       klass.name.scan(/::|$/) { candidates.unshift "#{$`}::#{type_name}" }

data/lib/json_api_client/version.rb

@@ -1,3 +1,3 @@
 module JsonApiClient
-  VERSION = "1.21.0"
+  VERSION = "1.22.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.21.0
+  version: 1.22.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-21 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -205,7 +205,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org