lib/grape/exceptions/base.rb in grape-0.13.0 vs lib/grape/exceptions/base.rb in grape-0.14.0

@@ -1,10 +1,10 @@
 module Grape
   module Exceptions
     class Base < StandardError
-      BASE_MESSAGES_KEY = 'grape.errors.messages'
-      BASE_ATTRIBUTES_KEY = 'grape.errors.attributes'
+      BASE_MESSAGES_KEY = 'grape.errors.messages'.freeze
+      BASE_ATTRIBUTES_KEY = 'grape.errors.attributes'.freeze
       FALLBACK_LOCALE = :en
 
       attr_reader :status, :message, :headers
 
       def initialize(args = {})
@@ -49,19 +49,19 @@
         translate_message("#{key}.resolution", attributes)
       end
 
       def translate_attributes(keys, options = {})
         keys.map do |key|
-          translate("#{BASE_ATTRIBUTES_KEY}.#{key}", { default: key }.merge(options))
+          translate("#{BASE_ATTRIBUTES_KEY}.#{key}", options.reverse_merge(default: key))
         end.join(', ')
       end
 
       def translate_attribute(key, options = {})
-        translate("#{BASE_ATTRIBUTES_KEY}.#{key}", { default: key }.merge(options))
+        translate("#{BASE_ATTRIBUTES_KEY}.#{key}", options.reverse_merge(default: key))
       end
 
       def translate_message(key, options = {})
-        translate("#{BASE_MESSAGES_KEY}.#{key}", { default: '' }.merge(options))
+        translate("#{BASE_MESSAGES_KEY}.#{key}", options.reverse_merge(default: ''))
       end
 
       def translate(key, options = {})
         message = ::I18n.translate(key, options)
         message.present? ? message : ::I18n.translate(key, options.merge(locale: FALLBACK_LOCALE))