Merge pull request #1126 from marshall-lee/use_reverse_merge

Use reverse_merge

Author: dblock

lib/grape.rb

@@ -13,6 +13,7 @@
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/except'
 require 'active_support/dependencies/autoload'
 require 'active_support/notifications'

lib/grape/dsl/inside_route.rb

@@ -68,7 +68,7 @@ def error!(message, status = nil, headers = nil)
       # @param options [Hash] The options used when redirect.
       #                       :permanent, default false.
       def redirect(url, options = {})
-        merged_options = { permanent: false }.merge(options)
+        merged_options = options.reverse_merge(permanent: false)
         if merged_options[:permanent]
           status 301
         else

lib/grape/dsl/routing.rb

@@ -29,7 +29,7 @@ module ClassMethods
         def version(*args, &block)
           if args.any?
             options = args.extract_options!
-            options = { using: :path }.merge(options)
+            options = options.reverse_merge(using: :path)
 
             fail Grape::Exceptions::MissingVendorOption.new if options[:using] == :header && !options.key?(:vendor)
 

lib/grape/exceptions/base.rb

@@ -51,16 +51,16 @@ def resolution(key, attributes)
 
       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 = {})

lib/grape/middleware/auth/dsl.rb

@@ -12,7 +12,7 @@ module ClassMethods
           # only `:http_basic`, `:http_digest` are supported.
           def auth(type = nil, options = {}, &block)
             if type
-              namespace_inheritable(:auth, { type: type.to_sym, proc: block }.merge(options))
+              namespace_inheritable(:auth, options.reverse_merge(type: type.to_sym, proc: block))
               use Grape::Middleware::Auth::Base, namespace_inheritable(:auth)
             else
               namespace_inheritable(:auth)

lib/grape/middleware/error.rb

@@ -60,7 +60,7 @@ def exec_handler(e, &handler)
       end
 
       def error!(message, status = options[:default_status], headers = {}, backtrace = [])
-        headers = { Grape::Http::Headers::CONTENT_TYPE => content_type }.merge(headers)
+        headers = headers.reverse_merge(Grape::Http::Headers::CONTENT_TYPE => content_type)
         rack_response(format_message(message, backtrace), status, headers)
       end