apia 3.7.0 → 3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3488b6d92d65ff71eff5ec22b944622042981311d6a7505fc09578093a9e4402
-  data.tar.gz: aff3ff29a9674a4eb622e91a89e74d380e11728e683407e3e9bc1546641ea483
+  metadata.gz: 5516f53625b231f86ae297b41c2b3939058685ec3ab69ce6cd210c2fc25c277a
+  data.tar.gz: 051c427ba4ba188b61a14071f2c36ca4c90509a109126c8336e43b4a3c59b435
 SHA512:
-  metadata.gz: 749d596efa11efc2965952a4ae2fc6af4c62fb9189e1839675ca3e00040fb4c4a99ab888d2e1589b546b002434e019735c1896398d494404d8cc7bd8a7e6f944
-  data.tar.gz: 682ff1cf40fe2399ae2754ef9e78388282cfe8c28b38b7153425565ab568084826d7d49fccdbaf5a539e80bd4b4cfa79e1b968258ebb5e23525f14b4d3051c58
+  metadata.gz: 43a29e0260f50c640a34c88d3224f446911dc5defdb4e21e5a617e80af27b1c87d1495f8d8a5a164d49ab747836f5d19dc6303bff916e0f7c4eae24c1f704209
+  data.tar.gz: ed2d4c4f0c69b0455f16948f811e82dfc1f2867a1edaef9850151c693d3642c9bcbf5c7e9eb6a4df2c4334a2dd16e324e44ee7adc30a1685c301a2a832aa6d6f

data/lib/apia/definitions/error.rb

@@ -37,7 +37,7 @@ module Apia
       # API.
       #
       # @param errors [Apia::ManifestErrors]
-      # @reeturn [void]
+      # @return [void]
       def validate(errors)
         unless code.is_a?(Symbol)
           errors.add self, 'InvalidCode', 'Code must be a symbol'

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

data/lib/apia/response.rb

@@ -70,11 +70,14 @@ module Apia
     #
     # @return [Array]
     def rack_triplet
-      case @type
-      when JSON
-        Rack.json_triplet(body, headers: headers, status: status)
-      when PLAIN
+      # Errors will always be sent as a hash intended for JSON encoding,
+      # even if the endpoint specifies a plain text response, so only
+      # send a pain response if the type is plaintext _and_ the body is
+      # a string
+      if @type == PLAIN && body.is_a?(String)
         Rack.plain_triplet(body, headers: headers, status: status)
+      else
+        Rack.json_triplet(body, headers: headers, status: status)
       end
     end
 

data/lib/apia/version.rb

@@ -2,6 +2,6 @@
 
 module Apia
 
-  VERSION = '3.7.0'
+  VERSION = '3.7.2'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apia
 version: !ruby/object:Gem::Version
-  version: 3.7.0
+  version: 3.7.2
 platform: ruby
 authors:
 - Adam Cooke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-15 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json