error_response 1.2.1 → 1.3.1.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6564cacc538f7f8e2a619e6ebd8adf8db461207efb98dd8e4ac14d9e0d9b85d3
-  data.tar.gz: 41d570d6177d09de90ef3623feb08defbe51ca0b6d74dc89d3cb8ba7e6e3c7a4
+  metadata.gz: a0008fe0a0e444282b979cb11d4d160fec60f6b37fbcce02d5300c85bf68bcbc
+  data.tar.gz: 1b709a6ba9a264b0aa71ade485ae28c21c569bd4a82e754ed52d8880655c3073
 SHA512:
-  metadata.gz: b31916fb084528913610380ff58926ee4c59e527e0b2343085cf4042590f49c66ff53e935c1892446a5123d595f37db8897a35c951214ffbea497c3247969637
-  data.tar.gz: 323b3445c8e320a837165eae9328038c30e93a7b5fad36b6e15a0eed33f25d9b36ba1652688f1268ebb89648565499ce38b4381e3993d689d12cb593abc8488f
+  metadata.gz: d17561a8354d0228b2b07b9971bcd8c241097161045d1d7272aab4d6bf7ffc8875e7dc1c2296d259d85ef9904a9980111807fe97b88379d527e937479634c185
+  data.tar.gz: 8dd4a106e1a12e27cb594a079fdc715c99d4f47c65143e3901b7abc5e575fbd1eecddee4f3a6c20f579582a370cf9ca28ce75d1d4d94252b9c2f35d5c9b0e37d

data/lib/error_response/configuration.rb

@@ -2,10 +2,11 @@
 
 module ErrorResponse
   class Configuration
-    attr_accessor :yaml_config_path
+    attr_accessor :yaml_config_path, :error_message_resolver
 
     def initialize
       @yaml_config_path = ENV["YAML_CONFIG_PATH"] || "config/error_response.yml"
+      @error_message_resolver = nil
     end
   end
 end

data/lib/error_response/helper.rb

@@ -6,10 +6,15 @@ module ErrorResponse
   module Helper
     extend ActiveSupport::Concern
 
-    included do
-      rescue_from RequestError do |e|
-        error_response(e.key, e.error_message, e.error_data)
+    # Ensure RequestError is always handled by this helper, even when
+    # controllers define broad handlers like rescue_from Exception later.
+    def rescue_with_handler(exception, *args, **kwargs, &)
+      if exception.is_a?(RequestError)
+        error_response(exception.key, exception.error_message, exception.error_data)
+        return exception
       end
+
+      super
     end
 
     def success_response(data = {})
@@ -17,7 +22,13 @@ module ErrorResponse
     end
 
     def error_response(key, error_message = nil, error_data = {})
-      render_content = ErrorResponse.to_api(key, error_message).deep_dup
+      resolved_message = ErrorResponse.resolve_error_message(
+        key: key,
+        error_message: error_message,
+        error_data: error_data,
+        context: self
+      )
+      render_content = ErrorResponse.to_api(key, resolved_message).deep_dup
       if error_data.is_a?(Hash) && !error_data.empty?
         render_content[:json] = render_content[:json].merge(error_data)
       elsif error_data.is_a?(Array) && !error_data.empty?

data/lib/error_response.rb

@@ -9,6 +9,8 @@ require "error_response/helper"
 require "error_response/request_error"
 
 module ErrorResponse
+  RESOLVER_KEYWORD_PARAMETER_TYPES = %i[key keyreq keyrest].freeze
+
   class << self
     attr_writer :configuration
 
@@ -41,8 +43,25 @@ module ErrorResponse
       }
     end
 
+    def resolve_error_message(key:, error_message: nil, error_data: {}, context: nil)
+      resolver = configuration.error_message_resolver
+      return error_message unless resolver.respond_to?(:call)
+
+      call_resolver(resolver, key, error_message, error_data, context)
+    rescue StandardError
+      error_message
+    end
+
     private
 
+    def call_resolver(resolver, key, error_message, error_data, context)
+      if resolver_parameters(resolver).any? { |parameter| RESOLVER_KEYWORD_PARAMETER_TYPES.include?(parameter[0]) }
+        resolver.call(key: key, error_message: error_message, error_data: error_data, context: context)
+      else
+        resolver.call(key, error_message, error_data, context)
+      end
+    end
+
     def yaml_hash
       return @hash unless @hash.nil?
 
@@ -101,5 +120,11 @@ module ErrorResponse
         NilClass
       ]
     end
+
+    def resolver_parameters(resolver)
+      resolver.parameters
+    rescue StandardError
+      resolver.method(:call).parameters
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: error_response
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1.beta
 platform: ruby
 authors:
 - Kdan Mobile Software Developer
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 7.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.2.3.1
+        version: 7.1.6
 description: use for error_response
 email: dev@kdanmobile.com
 executables: []