apia 3.7.1 → 3.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca83d2cf83582c065e6af3a0ee926956ef3be223c0855103ee3df4a1bb5cd06
-  data.tar.gz: b6c384351af2236c7755c64e4b6c138594967079d6cb67587420f7773d64666f
+  metadata.gz: c3045cadda1c5b6cdbfd059d7ac5e6ad90f890f73b72ba7b9807370b4034ffc1
+  data.tar.gz: 4d542e092f2b7bc81ed416c31b320a04546e4fa8d7151cdb89a2b616dfd7e004
 SHA512:
-  metadata.gz: 6ec614a5e14c0b146f1deb03e9193b3aad0a9f3e093f8b4fef298bc4e258308396c7d7ace3a3518b71b299b69ca202518ccd4edc957ab0014628643d46fc2740
-  data.tar.gz: 994a2a935d9c78da37e88f983b4e2e2466f229fba9801615a07f87a52ea3196fe49405311a56e481810c812efee6f342e7d92d133c6a9c292843af6a674f34f9
+  metadata.gz: fef0a20ce38cab8ed6a341004285188d8a06b1bc90612f5c96b622a11c734bb84fcd276fceff8424c178fed1b9d1f8d0c518f7a0ca29d988f8984b647a684edc
+  data.tar.gz: 5f6f244da3f572641b203a9f4bb3d0728472694c7eeb67b58fd668d97727b1f8300aacb6a63e7446864abcea18759e43a7df4aa9a5e42211039def1dd7bd3a8c

data/lib/apia/dsls/endpoint.rb

@@ -69,7 +69,7 @@ module Apia
 
           field :pagination, type: PaginationObject
         end
-        super(name, *args, type: type, **options, &block)
+        super
       end
 
       def fields(fieldset)

data/lib/apia/endpoint.rb

@@ -47,7 +47,7 @@ module Apia
         response = Response.new(request, self)
         environment = RequestEnvironment.new(request, response)
 
-        catch_errors(response) do
+        catch_errors(response, environment) do
           # Determine an authenticator for this endpoint
           request.authenticator = definition.authenticator || request.controller&.definition&.authenticator || request.api&.definition&.authenticator
 
@@ -92,10 +92,14 @@ module Apia
       #
       # @param response [Apia::Response]
       # @return [void]
-      def catch_errors(response)
+      def catch_errors(response, environment)
         yield
       rescue Apia::RuntimeError => e
-        catch_errors(response) do
+        # If the error was triggered by the authenticator, the cors headers wont yet have been merged
+        # so ensure cors headers are merged here
+        response.headers.merge!(environment.cors.to_headers)
+
+        catch_errors(response, environment) do
           response.body = { error: e.hash }
           response.status = e.http_status
           response.headers['x-api-schema'] = 'json-error'

data/lib/apia/request.rb

@@ -36,7 +36,7 @@ module Apia
     end
 
     def body?
-      has_header?('rack.input')
+      has_header?(::Rack::RACK_INPUT)
     end
 
     def params
@@ -58,7 +58,9 @@ module Apia
     end
 
     def get_json_body_from_body
-      return unless content_type =~ /\Aapplication\/json/
+      # Allow for either standard json content type (ie: application/json)
+      # or a vendor specific type with a json suffix (eg: application/vnd.docker.distribution.events.v2+json)
+      return unless content_type =~ /\Aapplication\/(|.*\+)json/
       return unless body?
 
       parse_json_from_string(body.read)

data/lib/apia/version.rb

@@ -2,6 +2,6 @@
 
 module Apia
 
-  VERSION = '3.7.1'
+  VERSION = '3.8.0'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.8.0
 platform: ruby
 authors:
 - Adam Cooke
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-21 00:00:00.000000000 Z
+date: 2025-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -170,7 +170,7 @@ homepage: https://github.com/krystal/apia
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: This gem provides a friendly DSL for constructing HTTP APIs.
 test_files: []