grape 1.2.5 → 1.3.0

data/lib/grape/error_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module ErrorFormatter
     extend Util::Registrable
@@ -13,7 +15,7 @@ module Grape
         }
       end
 
-      def formatters(options)
+      def formatters(**options)
         builtin_formatters.merge(default_elements).merge!(options[:error_formatters] || {})
       end
 

data/lib/grape/error_formatter/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module ErrorFormatter
     module Base

data/lib/grape/error_formatter/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module ErrorFormatter
     module Json

data/lib/grape/error_formatter/txt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module ErrorFormatter
     module Txt

data/lib/grape/error_formatter/xml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module ErrorFormatter
     module Xml

data/lib/grape/exceptions/base.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class Base < StandardError
-      BASE_MESSAGES_KEY = 'grape.errors.messages'.freeze
-      BASE_ATTRIBUTES_KEY = 'grape.errors.attributes'.freeze
+      BASE_MESSAGES_KEY = 'grape.errors.messages'
+      BASE_ATTRIBUTES_KEY = 'grape.errors.attributes'
       FALLBACK_LOCALE = :en
 
       attr_reader :status, :message, :headers
@@ -28,7 +30,7 @@ module Grape
           @problem = problem(key, **attributes)
           @summary = summary(key, **attributes)
           @resolution = resolution(key, **attributes)
-          [['Problem', @problem], ['Summary', @summary], ['Resolution', @resolution]].reduce('') do |message, detail_array|
+          [['Problem', @problem], ['Summary', @summary], ['Resolution', @resolution]].each_with_object(+'') do |detail_array, message|
             message << "\n#{detail_array[0]}:\n  #{detail_array[1]}" unless detail_array[1].blank?
             message
           end
@@ -37,16 +39,16 @@ module Grape
         end
       end
 
-      def problem(key, attributes)
-        translate_message("#{key}.problem".to_sym, attributes)
+      def problem(key, **attributes)
+        translate_message("#{key}.problem".to_sym, **attributes)
       end
 
-      def summary(key, attributes)
-        translate_message("#{key}.summary".to_sym, attributes)
+      def summary(key, **attributes)
+        translate_message("#{key}.summary".to_sym, **attributes)
       end
 
-      def resolution(key, attributes)
-        translate_message("#{key}.resolution".to_sym, attributes)
+      def resolution(key, **attributes)
+        translate_message("#{key}.resolution".to_sym, **attributes)
       end
 
       def translate_attributes(keys, **options)

data/lib/grape/exceptions/incompatible_option_values.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class IncompatibleOptionValues < Base

data/lib/grape/exceptions/invalid_accept_header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidAcceptHeader < Base

data/lib/grape/exceptions/invalid_formatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidFormatter < Base

data/lib/grape/exceptions/invalid_message_body.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidMessageBody < Base

data/lib/grape/exceptions/invalid_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidResponse < Base

data/lib/grape/exceptions/invalid_version_header.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidVersionHeader < Base

data/lib/grape/exceptions/invalid_versioner_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidVersionerOption < Base

data/lib/grape/exceptions/invalid_with_option_for_represent.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class InvalidWithOptionForRepresent < Base

data/lib/grape/exceptions/method_not_allowed.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class MethodNotAllowed < Base

data/lib/grape/exceptions/missing_group_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class MissingGroupTypeError < Base

data/lib/grape/exceptions/missing_mime_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class MissingMimeType < Base

data/lib/grape/exceptions/missing_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class MissingOption < Base

data/lib/grape/exceptions/missing_vendor_option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class MissingVendorOption < Base

data/lib/grape/exceptions/unknown_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class UnknownOptions < Base

data/lib/grape/exceptions/unknown_parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class UnknownParameter < Base

data/lib/grape/exceptions/unknown_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class UnknownValidator < Base

data/lib/grape/exceptions/unsupported_group_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class UnsupportedGroupTypeError < Base

data/lib/grape/exceptions/validation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape/exceptions/base'
 
 module Grape
@@ -12,7 +14,7 @@ module Grape
           @message_key = message if message.is_a?(Symbol)
           args[:message] = translate_message(message)
         end
-        super(args)
+        super(**args)
       end
 
       # remove all the unnecessary stuff from Grape::Exceptions::Base like status

data/lib/grape/exceptions/validation_array_errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Exceptions
     class ValidationArrayErrors < Base

data/lib/grape/exceptions/validation_errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape/exceptions/base'
 
 module Grape

data/lib/grape/extensions/active_support/hash_with_indifferent_access.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Extensions
     module ActiveSupport
@@ -14,10 +16,9 @@ module Grape
           end
 
           def build_params
-            params = ::ActiveSupport::HashWithIndifferentAccess[rack_params]
+            params = ::ActiveSupport::HashWithIndifferentAccess.new(rack_params)
             params.deep_merge!(grape_routing_args) if env[Grape::Env::GRAPE_ROUTING_ARGS]
-            # TODO: remove, in Rails 4 or later ::ActiveSupport::HashWithIndifferentAccess converts nested Hashes into indifferent access ones
-            DeepHashWithIndifferentAccess.deep_hash_with_indifferent_access(params)
+            params
           end
         end
       end

data/lib/grape/extensions/deep_mergeable_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Extensions
     class DeepMergeableHash < ::Hash

data/lib/grape/extensions/deep_symbolize_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Extensions
     module DeepSymbolizeHash

data/lib/grape/extensions/hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Extensions
     module Hash

data/lib/grape/extensions/hashie/mash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Extensions
     module Hashie

data/lib/grape/formatter.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Grape
   module Formatter
     extend Util::Registrable
 
     class << self
-      def builtin_formmaters
+      def builtin_formatters
         @builtin_formatters ||= {
           json: Grape::Formatter::Json,
           jsonapi: Grape::Formatter::Json,
@@ -13,8 +15,8 @@ module Grape
         }
       end
 
-      def formatters(options)
-        builtin_formmaters.merge(default_elements).merge!(options[:formatters] || {})
+      def formatters(**options)
+        builtin_formatters.merge(default_elements).merge!(options[:formatters] || {})
       end
 
       def formatter_for(api_format, **options)

data/lib/grape/formatter/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Formatter
     module Json

data/lib/grape/formatter/serializable_hash.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Formatter
     module SerializableHash

data/lib/grape/formatter/txt.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Formatter
     module Txt

data/lib/grape/formatter/xml.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Formatter
     module Xml

data/lib/grape/http/headers.rb

@@ -1,29 +1,35 @@
+# frozen_string_literal: true
+
 module Grape
   module Http
     module Headers
       # https://github.com/rack/rack/blob/master/lib/rack.rb
-      HTTP_VERSION    = 'HTTP_VERSION'.freeze
-      PATH_INFO       = 'PATH_INFO'.freeze
-      REQUEST_METHOD  = 'REQUEST_METHOD'.freeze
-      QUERY_STRING    = 'QUERY_STRING'.freeze
-      CONTENT_TYPE    = 'Content-Type'.freeze
+      HTTP_VERSION    = 'HTTP_VERSION'
+      PATH_INFO       = 'PATH_INFO'
+      REQUEST_METHOD  = 'REQUEST_METHOD'
+      QUERY_STRING    = 'QUERY_STRING'
+      CONTENT_TYPE    = 'Content-Type'
 
-      GET     = 'GET'.freeze
-      POST    = 'POST'.freeze
-      PUT     = 'PUT'.freeze
-      PATCH   = 'PATCH'.freeze
-      DELETE  = 'DELETE'.freeze
-      HEAD    = 'HEAD'.freeze
-      OPTIONS = 'OPTIONS'.freeze
+      GET     = 'GET'
+      POST    = 'POST'
+      PUT     = 'PUT'
+      PATCH   = 'PATCH'
+      DELETE  = 'DELETE'
+      HEAD    = 'HEAD'
+      OPTIONS = 'OPTIONS'
 
       SUPPORTED_METHODS = [GET, POST, PUT, PATCH, DELETE, HEAD, OPTIONS].freeze
 
-      HTTP_ACCEPT_VERSION    = 'HTTP_ACCEPT_VERSION'.freeze
-      X_CASCADE              = 'X-Cascade'.freeze
-      HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'.freeze
-      HTTP_ACCEPT            = 'HTTP_ACCEPT'.freeze
+      HTTP_ACCEPT_VERSION    = 'HTTP_ACCEPT_VERSION'
+      X_CASCADE              = 'X-Cascade'
+      HTTP_TRANSFER_ENCODING = 'HTTP_TRANSFER_ENCODING'
+      HTTP_ACCEPT            = 'HTTP_ACCEPT'
+
+      FORMAT                 = 'format'
 
-      FORMAT                 = 'format'.freeze
+      def self.find_supported_method(route_method)
+        Grape::Http::Headers::SUPPORTED_METHODS.detect { |supported_method| supported_method.casecmp(route_method).zero? }
+      end
     end
   end
 end

data/lib/grape/middleware/auth/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/auth/basic'
 
 module Grape

data/lib/grape/middleware/auth/dsl.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/auth/basic'
 require 'active_support/concern'
 

data/lib/grape/middleware/auth/strategies.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Middleware
     module Auth

data/lib/grape/middleware/auth/strategy_info.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Grape
   module Middleware
     module Auth

data/lib/grape/middleware/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape/dsl/headers'
 
 module Grape
@@ -6,7 +8,7 @@ module Grape
       include Helpers
 
       attr_reader :app, :env, :options
-      TEXT_HTML = 'text/html'.freeze
+      TEXT_HTML = 'text/html'
 
       include Grape::DSL::Headers
 
@@ -23,7 +25,7 @@ module Grape
       end
 
       def call(env)
-        dup.call!(env)
+        dup.call!(env).to_a
       end
 
       def call!(env)

data/lib/grape/middleware/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'grape/middleware/base'
 require 'active_support/core_ext/string/output_safety'
 
@@ -77,7 +79,7 @@ module Grape
 
       def format_message(message, backtrace, original_exception = nil)
         format = env[Grape::Env::API_FORMAT] || options[:format]
-        formatter = Grape::ErrorFormatter.formatter_for(format, options)
+        formatter = Grape::ErrorFormatter.formatter_for(format, **options)
         throw :error,
               status: 406,
               message: "The requested format '#{format}' is not supported.",