media_types-serialization 1.3.6 → 1.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d53689a0c81861b7305fc606a2b73b7866e4b46915284a716951735926b5bb73
-  data.tar.gz: 29add50810aa2bf8b3792d38eebd50eca96570c716a33be6ef58a2f64813be81
+  metadata.gz: 159a20aec1547f40a318c666acc8616e3b3396317b552f0a8cf7501fae609b5f
+  data.tar.gz: 485188d6f57ec55c684952fe9c00051ac1dbcbdd93dbc8136f26dd5e8ce351d3
 SHA512:
-  metadata.gz: 56db0c8b8f39b108e80d028459b0fc7e788bc9cbfd3b7a1e26dfbab993883d7b19735f2d638e8f17edfbcfb9837f610f30ea46ec61bf84c4c141f45000ae0c36
-  data.tar.gz: 2985c51bc0f5b59df56d11fe665dc5be479fa5cf494dbd8edf5e57961464bb5e413f82af8e9e867557bb15dd715542aa5f6f10cd9cd9fb12028899fa00d11bf8
+  metadata.gz: 932707eb3baa03f83ea24d7a70cdc3750b41122ab62446d5d4a1956d6eb1b13a2bec4e86b3ed4e2f4689608f2589bc40aae92add3e4a81a016fa7ef5684e944a
+  data.tar.gz: e083a0e056227b9fe46c0a380c37cf5af8cdd3a9835b216f6b5aa2248669987be6b4ad8ff533f855f064cad59bc052e60a8201cebf738389b8c462cc7e1ae732

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.3.7
+
+- 🐛 Fix execution context for `output_error`
+
 ## 1.3.6
 
 - 🐛 Fix issue with `override_detail` of `Problem`

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    media_types-serialization (1.3.6)
+    media_types-serialization (1.3.7)
       actionpack (>= 4.0.0)
       activesupport (>= 4.0.0)
       media_types (>= 2.1.1, < 3.0.0)

data/lib/media_types/serialization/version.rb

@@ -1,5 +1,5 @@
 module MediaTypes
   module Serialization
-    VERSION = '1.3.6'.freeze
+    VERSION = '1.3.7'.freeze
   end
 end

data/lib/media_types/serialization.rb

@@ -100,7 +100,6 @@ module MediaTypes
 
     # rubocop:disable Metrics/BlockLength
     class_methods do
-
       def not_acceptable_serializer(serializer, **filter_opts)
         before_action(**filter_opts) do
           raise SerializersAlreadyFrozenError if defined? @serialization_frozen
@@ -315,22 +314,26 @@ module MediaTypes
       def freeze_io!(**filter_opts)
         before_action :serializer_freeze_io_internal, **filter_opts
 
-        output_error MediaTypes::Serialization::NoInputReceivedError do |p, error|
+        output_error MediaTypes::Serialization::NoInputReceivedError do |p, _error|
           p.title 'Providing input is mandatory. Please set a Content-Type', lang: 'en'
 
           p.status_code :bad_request
         end
       end
 
-      def output_error(klazz, &block)
+      def output_error(klazz, additional_serializers: [])
         rescue_from klazz do |error|
           problem = Problem.new(error)
-          block.call(problem, error) unless block.nil?
+          instance_exec { yield problem, error, self } if block_given?
 
           serializer = MediaTypes::Serialization::Serializers::ProblemSerializer
           registrations = serializer.outputs_for(views: [:html, nil])
 
-          render_media(problem, serializers: [registrations], status: problem.response_status_code)
+          render_media(
+            problem,
+            serializers: additional_serializers.concat([registrations]),
+            status: problem.response_status_code
+          )
         end
       end
     end
@@ -363,7 +366,9 @@ module MediaTypes
 
       raise SerializersNotFrozenError unless defined? @serialization_frozen
 
-      not_acceptable_serializer ||= @serialization_not_acceptable_serializer if defined? @serialization_not_acceptable_serializer
+      if defined? @serialization_not_acceptable_serializer
+        not_acceptable_serializer ||= @serialization_not_acceptable_serializer
+      end
 
       @serialization_output_registrations ||= SerializationRegistration.new(:output)
       registration = @serialization_output_registrations
@@ -469,7 +474,14 @@ module MediaTypes
       obj = { request: request, registrations: registrations }
       new_registrations = serializer.outputs_for(views: [nil])
 
-      serialization_render_resolved(obj: obj, serializer: serializer, identifier: identifier, registrations: new_registrations, options: {})
+      serialization_render_resolved(
+        obj: obj,
+        serializer: serializer,
+        identifier: identifier,
+        registrations: new_registrations,
+        options: {}
+      )
+
       response.status = :not_acceptable
     end
 
@@ -518,7 +530,11 @@ module MediaTypes
       if input_is_allowed && !request.content_type.blank?
         begin
           input_data = request.body.read
-          @serialization_decoded_input = @serialization_input_registrations.decode(input_data, request.content_type, self)
+          @serialization_decoded_input = @serialization_input_registrations.decode(
+            input_data,
+            request.content_type,
+            self
+          )
         rescue InputValidationFailedError => e
           serializers = @serialization_input_validation_failed_serializer || [
             MediaTypes::Serialization::Serializers::ProblemSerializer,
@@ -532,7 +548,7 @@ module MediaTypes
           input = {
             identifier: request.content_type,
             input: input_data,
-            error: e,
+            error: e
           }
 
           render_media nil, serializers: [registrations], status: :unprocessable_entity do
@@ -554,9 +570,17 @@ module MediaTypes
 
       # All endpoints have endpoint description.
       # Placed in front of the list to make sure the api viewer doesn't pick it.
-      @serialization_output_registrations = description_serializer.outputs_for(views: [nil]).merge(@serialization_output_registrations)
+      @serialization_output_registrations =
+        description_serializer
+        .outputs_for(views: [nil])
+        .merge(@serialization_output_registrations)
+
+      endpoint_matched_identifier = resolve_media_type(
+        request,
+        description_serializer.serializer_output_registration,
+        allow_last: false
+      )
 
-      endpoint_matched_identifier = resolve_media_type(request, description_serializer.serializer_output_registration, allow_last: false)
       if endpoint_matched_identifier
         # We picked an endpoint description media type
         #
@@ -566,7 +590,7 @@ module MediaTypes
 
         input = {
           api_viewer: @serialization_api_viewer_enabled,
-          actions: @serialization_available_serializers,
+          actions: @serialization_available_serializers
         }
 
         serialization_render_resolved(
@@ -583,13 +607,19 @@ module MediaTypes
       resolved_identifier = resolve_media_type(request, @serialization_output_registrations)
 
       not_acceptable_serializer = nil
-      not_acceptable_serializer = @serialization_not_acceptable_serializer if defined? @serialization_not_acceptable_serializer
+
+      if defined? @serialization_not_acceptable_serializer
+        not_acceptable_serializer = @serialization_not_acceptable_serializer
+      end
+
       not_acceptable_serializer ||= MediaTypes::Serialization::Serializers::FallbackNotAcceptableSerializer
 
       can_satisfy_allow = !resolved_identifier.nil?
       can_satisfy_allow ||= @serialization_output_allow_all if defined?(@serialization_output_allow_all)
 
-      serialization_render_not_acceptable(@serialization_output_registrations, not_acceptable_serializer) unless can_satisfy_allow
+      unless can_satisfy_allow
+        serialization_render_not_acceptable(@serialization_output_registrations, not_acceptable_serializer)
+      end
     end
 
     def serialization_render_resolved(obj:, identifier:, serializer:, registrations:, options:)
@@ -601,14 +631,19 @@ module MediaTypes
       if links.any?
         items = links.map do |l|
           href_part = "<#{l[:href]}>"
-          tags = l.to_a.select { |k,_| k != :href }.map { |k,v| "#{k}=#{v}" }
+          tags = l.to_a.reject { |k, _| k == :href }.map { |k, v| "#{k}=#{v}" }
           ([href_part] + tags).join('; ')
         end
         response.set_header('Link', items.join(', '))
       end
 
       if vary.any?
-        current_vary = (response.headers['Vary'] || "").split(',').map { |v| v.strip }.reject { |v| v.empty? }.sort
+        current_vary =
+          (response.headers['Vary'] || '')
+          .split(',')
+          .map(&:strip)
+          .reject(&:empty?)
+          .sort
         merged_vary = (vary.sort + current_vary).uniq
 
         response.set_header('Vary', merged_vary.join(', '))
@@ -619,7 +654,7 @@ module MediaTypes
           identifier: identifier,
           registrations: registrations,
           output: result,
-          links: links,
+          links: links
         }
         wrapped = @serialization_wrapping_renderer.serialize input, '*/*', context: self
         render body: wrapped

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types-serialization
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld