json_api_client 1.21.1 → 1.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f67e7946b46b9e5f0a0cf9d445d366f990926da3c758a9b86a9d554cdf599e9d
-  data.tar.gz: b331bebea3994b2e3a342eab136d6ac4494b6021f3ba030a6813374179f51489
+  metadata.gz: 15b4315b1e13b217c676e0915ab247724164a6e6debd6c4abf24f881f0fd8285
+  data.tar.gz: 37521318c26c77c27eb76c02e4a1f88c3dd0920cf15a208dd598abe8a23c2c12
 SHA512:
-  metadata.gz: babc0059c16c3386935942264968cccd309b7268b130a2170dd2e78669861659c5844c080750cf54e1314357c9c88798a75a63df32f3e29af8400670a4dba43e
-  data.tar.gz: 4b9e3b6cbaae50653a896d4fdb02364eb9c34456e721ff8dd1b83e9106c11b502d138721f249b334317b015be791b8102dbb867303855bd54304bec229f01a5e
+  metadata.gz: 8332c87747e3f256c73471867b4c361c2d7d5a2990de0aaa2f928092a1d7e063ad083167bf70dfcbc5275bf1bed100547d959b13444e471050995a2504cd69bc
+  data.tar.gz: 784aa84e674c28c2b77fb97959a8fdb0ebb7258741008cc6983050be3d9264f3b61f0e69bccff5996f24bbab1d265737185dc918aecd5f130aa5c74384538468

data/lib/json_api_client/connection.rb

@@ -13,8 +13,8 @@ module JsonApiClient
         builder.request :json
         builder.use Middleware::JsonRequest
         builder.use Middleware::Status, status_middleware_options
-        builder.use Middleware::ParseJson
-        builder.use ::FaradayMiddleware::Gzip
+        builder.response :json
+        builder.use ::Faraday::Gzip::Middleware
         builder.adapter(*adapter_options)
       end
       yield(self) if block_given?
@@ -24,7 +24,7 @@ module JsonApiClient
     #   inserted middleware will run after json parsed
     def use(middleware, *args, &block)
       return if faraday.builder.locked?
-      faraday.builder.insert_before(Middleware::ParseJson, middleware, *args, &block)
+      faraday.builder.insert_before(::Faraday::Response::Json, middleware, *args, &block)
     end
 
     def delete(middleware)

data/lib/json_api_client/middleware.rb

@@ -1,7 +1,6 @@
 module JsonApiClient
   module Middleware
     autoload :JsonRequest, 'json_api_client/middleware/json_request'
-    autoload :ParseJson, 'json_api_client/middleware/parse_json'
     autoload :Status, 'json_api_client/middleware/status'
   end
-end
+end

data/lib/json_api_client/query/builder.rb

@@ -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/resource.rb

@@ -260,10 +260,11 @@ module JsonApiClient
         metaclass = class << self
           self
         end
+        endpoint_name = _name_for_route_format(name)
         metaclass.instance_eval do
           define_method(name) do |*params|
             request_params = params.first || {}
-            requestor.custom(name, options, request_params)
+            requestor.custom(endpoint_name, options, request_params)
           end
         end
       end
@@ -274,10 +275,11 @@ module JsonApiClient
       # @param options [Hash] endpoint options
       # @option options [Symbol] :request_method The request method (:get, :post, etc)
       def member_endpoint(name, options = {})
+        endpoint_name = self._name_for_route_format(name)
         define_method name do |*params|
           request_params = params.first || {}
           request_params[self.class.primary_key] = attributes.fetch(self.class.primary_key)
-          self.class.requestor.custom(name, options, request_params)
+          self.class.requestor.custom(endpoint_name, options, request_params)
         end
       end
 
@@ -348,6 +350,17 @@ module JsonApiClient
           yield(conn) if block_given?
         end
       end
+
+      def _name_for_route_format(name)
+        case self.route_format
+        when :dasherized_route
+          name.to_s.dasherize
+        when :camelized_route
+          name.to_s.camelize(:lower)
+        else
+          name
+        end
+      end
     end
 
     # Instantiate a new resource object

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.1"
+  VERSION = "1.23.0"
 end

data/lib/json_api_client.rb

@@ -1,5 +1,5 @@
 require 'faraday'
-require 'faraday_middleware'
+require 'faraday/gzip'
 require 'json'
 require 'addressable/uri'
 require 'json_api_client/formatter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_client
 version: !ruby/object:Gem::Version
-  version: 1.21.1
+  version: 1.23.0
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2024-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,54 +16,54 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: '1.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: '1.10'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-gzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -84,14 +84,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +134,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Build client libraries compliant with specification defined by jsonapi.org
 email: ching.jeff@gmail.com
 executables: []
@@ -167,7 +181,6 @@ files:
 - lib/json_api_client/meta_data.rb
 - lib/json_api_client/middleware.rb
 - lib/json_api_client/middleware/json_request.rb
-- lib/json_api_client/middleware/parse_json.rb
 - lib/json_api_client/middleware/status.rb
 - lib/json_api_client/paginating.rb
 - lib/json_api_client/paginating/nested_param_paginator.rb
@@ -205,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Build client libraries compliant with specification defined by jsonapi.org

data/lib/json_api_client/middleware/parse_json.rb

@@ -1,31 +0,0 @@
-module JsonApiClient
-  module Middleware
-    class ParseJson < Faraday::Middleware
-
-      def call(environment)
-        @app.call(environment).on_complete do |env|
-          if process_response_type?(response_type(env))
-            env[:raw_body] = env[:body]
-            env[:body] = parse(env[:body])
-          end
-        end
-      end
-
-      private
-
-      def parse(body)
-        ::JSON.parse(body) unless body.strip.empty?
-      end
-
-      def response_type(env)
-        type = env[:response_headers]['Content-Type'].to_s
-        type = type.split(';', 2).first if type.index(';')
-        type
-      end
-
-      def process_response_type?(type)
-        !!type.match(/\bjson$/)
-      end
-    end
-  end
-end