Merge pull request #1949 from nbulaj/add-support-for-ruby-2.7

dblock · web-flow · commit cf57d250c3d7 · 2019-12-28T09:31:28.000-05:00
Add support for Ruby 2.7
diff --git a/.travis.yml b/.travis.yml
@@ -8,27 +8,31 @@ gemfile:
 
 matrix:
   include:
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       script:
         - bundle exec danger
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: Gemfile
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: gemfiles/rack_edge.gemfile
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_edge.gemfile
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: gemfiles/rails_5.gemfile
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: gemfiles/multi_json.gemfile
       script:
         - bundle exec rake
         - bundle exec rspec spec/integration/multi_json
-    - rvm: 2.6.5
+    - rvm: 2.7.0
       gemfile: gemfiles/multi_xml.gemfile
       script:
         - bundle exec rake
         - bundle exec rspec spec/integration/multi_xml
+    - rvm: 2.6.5
+      gemfile: Gemfile
+    - rvm: 2.6.5
+      gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.5.7
       gemfile: Gemfile
     - rvm: 2.5.7
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 #### Features
 
 * Your contribution here.
+* [#1948](https://github.com/ruby-grape/grape/pull/1949): Add support for Ruby 2.7 - [@nbulaj](https://github.com/nbulaj).
 * [#1948](https://github.com/ruby-grape/grape/pull/1948): Relax `dry-types` dependency version - [@nbulaj](https://github.com/nbulaj).
 * [#1944](https://github.com/ruby-grape/grape/pull/1944): Reduces `attribute_translator` string allocations - [@ericproulx](https://github.com/ericproulx).
 * [#1943](https://github.com/ruby-grape/grape/pull/1943): Reduces number of regex string allocations - [@ericproulx](https://github.com/ericproulx).
diff --git a/lib/grape/api/instance.rb b/lib/grape/api/instance.rb
@@ -234,7 +234,7 @@ def add_head_not_allowed_methods_and_options_methods
               end
 
               attributes = config.merge(allowed_methods: allowed_methods, allow_header: allow_header)
-              generate_not_allowed_method(config[:pattern], attributes)
+              generate_not_allowed_method(config[:pattern], **attributes)
             end
           end
         end
diff --git a/lib/grape/dsl/inside_route.rb b/lib/grape/dsl/inside_route.rb
@@ -30,7 +30,7 @@ def self.post_filter_methods(type)
       module PostBeforeFilter
         def declared(passed_params, options = {}, declared_params = nil)
           options = options.reverse_merge(include_missing: true, include_parent_namespaces: true)
-          declared_params ||= optioned_declared_params(options)
+          declared_params ||= optioned_declared_params(**options)
 
           if passed_params.is_a?(Array)
             declared_array(passed_params, options, declared_params)
@@ -98,7 +98,7 @@ def optioned_param_key(declared_param, options)
           options[:stringify] ? declared_param.to_s : declared_param.to_sym
         end
 
-        def optioned_declared_params(options)
+        def optioned_declared_params(**options)
           declared_params = if options[:include_parent_namespaces]
                               # Declared params including parent namespaces
                               route_setting(:saved_declared_params).flatten | Array(route_setting(:declared_params))
@@ -387,7 +387,7 @@ def entity_class_for_obj(object, options)
       def entity_representation_for(entity_class, object, options)
         embeds = { env: env }
         embeds[:version] = env[Grape::Env::API_VERSION] if env[Grape::Env::API_VERSION]
-        entity_class.represent(object, embeds.merge(options))
+        entity_class.represent(object, **embeds.merge(options))
       end
     end
   end
diff --git a/lib/grape/dsl/parameters.rb b/lib/grape/dsl/parameters.rb
@@ -133,7 +133,7 @@ def requires(*attrs, &block)
           require_required_and_optional_fields(attrs.first, opts)
         else
           validate_attributes(attrs, opts, &block)
-          block_given? ? new_scope(orig_attrs, &block) : push_declared_params(attrs, opts.slice(:as))
+          block_given? ? new_scope(orig_attrs, &block) : push_declared_params(attrs, **opts.slice(:as))
         end
       end
 
@@ -159,7 +159,7 @@ def optional(*attrs, &block)
         else
           validate_attributes(attrs, opts, &block)
 
-          block_given? ? new_scope(orig_attrs, true, &block) : push_declared_params(attrs, opts.slice(:as))
+          block_given? ? new_scope(orig_attrs, true, &block) : push_declared_params(attrs, **opts.slice(:as))
         end
       end
 
diff --git a/lib/grape/dsl/request_response.rb b/lib/grape/dsl/request_response.rb
@@ -22,7 +22,7 @@ def format(new_format = nil)
           if new_format
             namespace_inheritable(:format, new_format.to_sym)
             # define the default error formatters
-            namespace_inheritable(:default_error_formatter, Grape::ErrorFormatter.formatter_for(new_format, {}))
+            namespace_inheritable(:default_error_formatter, Grape::ErrorFormatter.formatter_for(new_format, **{}))
             # define a single mime type
             mime_type = content_types[new_format.to_sym]
             raise Grape::Exceptions::MissingMimeType.new(new_format) unless mime_type
@@ -45,7 +45,7 @@ def parser(content_type, new_parser)
         # Specify a default error formatter.
         def default_error_formatter(new_formatter_name = nil)
           if new_formatter_name
-            new_formatter = Grape::ErrorFormatter.formatter_for(new_formatter_name, {})
+            new_formatter = Grape::ErrorFormatter.formatter_for(new_formatter_name, **{})
             namespace_inheritable(:default_error_formatter, new_formatter)
           else
             namespace_inheritable(:default_error_formatter)
diff --git a/lib/grape/dsl/routing.rb b/lib/grape/dsl/routing.rb
@@ -169,7 +169,7 @@ def namespace(space = nil, options = {}, &block)
               @namespace_description = (@namespace_description || {}).deep_merge(namespace_setting(:description) || {})
               nest(block) do
                 if space
-                  namespace_stackable(:namespace, Namespace.new(space, options))
+                  namespace_stackable(:namespace, Namespace.new(space, **options))
                 end
               end
               @namespace_description = previous_namespace_description
diff --git a/lib/grape/endpoint.rb b/lib/grape/endpoint.rb
@@ -157,7 +157,7 @@ def mount_in(router)
           end
           methods.each do |method|
             unless route.request_method == method
-              route = Grape::Router::Route.new(method, route.origin, route.attributes.to_h)
+              route = Grape::Router::Route.new(method, route.origin, **route.attributes.to_h)
             end
             router.append(route.apply(self))
           end
@@ -169,8 +169,8 @@ def to_routes
       route_options = prepare_default_route_attributes
       map_routes do |method, path|
         path = prepare_path(path)
-        params = merge_route_options(route_options.merge(suffix: path.suffix))
-        route = Router::Route.new(method, path.path, params)
+        params = merge_route_options(**route_options.merge(suffix: path.suffix))
+        route = Router::Route.new(method, path.path, **params)
         route.apply(self)
       end.flatten
     end
@@ -359,7 +359,7 @@ def lazy_initialize!
     def run_validators(validator_factories, request)
       validation_errors = []
 
-      validators = validator_factories.map { |options| Grape::Validations::ValidatorFactory.create_validator(options) }
+      validators = validator_factories.map { |options| Grape::Validations::ValidatorFactory.create_validator(**options) }
 
       ActiveSupport::Notifications.instrument('endpoint_run_validators.grape', endpoint: self, validators: validators, request: request) do
         validators.each do |validator|
@@ -375,7 +375,7 @@ def run_validators(validator_factories, request)
         end
       end
 
-      validation_errors.any? && raise(Grape::Exceptions::ValidationErrors, errors: validation_errors, headers: header)
+      validation_errors.any? && raise(Grape::Exceptions::ValidationErrors.new(errors: validation_errors, headers: header))
     end
 
     def run_filters(filters, type = :other)
diff --git a/lib/grape/error_formatter.rb b/lib/grape/error_formatter.rb
@@ -15,7 +15,7 @@ def builtin_formatters
         }
       end
 
-      def formatters(options)
+      def formatters(**options)
         builtin_formatters.merge(default_elements).merge!(options[:error_formatters] || {})
       end
 
diff --git a/lib/grape/exceptions/base.rb b/lib/grape/exceptions/base.rb
@@ -39,16 +39,16 @@ def compose_message(key, **attributes)
         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)
diff --git a/lib/grape/formatter.rb b/lib/grape/formatter.rb
@@ -5,7 +5,7 @@ module Formatter
     extend Util::Registrable
 
     class << self
-      def builtin_formmaters
+      def builtin_formatters
         @builtin_formatters ||= {
           json: Grape::Formatter::Json,
           jsonapi: Grape::Formatter::Json,
@@ -15,8 +15,8 @@ def builtin_formmaters
         }
       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)
diff --git a/lib/grape/middleware/error.rb b/lib/grape/middleware/error.rb
@@ -79,7 +79,7 @@ def rack_response(message, status = options[:default_status], headers = { 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.",
diff --git a/lib/grape/middleware/formatter.rb b/lib/grape/middleware/formatter.rb
@@ -54,7 +54,7 @@ def build_formatted_response(status, headers, bodies)
 
       def fetch_formatter(headers, options)
         api_format = mime_types[headers[Grape::Http::Headers::CONTENT_TYPE]] || env[Grape::Env::API_FORMAT]
-        Grape::Formatter.formatter_for(api_format, options)
+        Grape::Formatter.formatter_for(api_format, **options)
       end
 
       # Set the content type header for the API format if it is not already present.
@@ -99,7 +99,7 @@ def read_rack_input(body)
         unless content_type_for(fmt)
           throw :error, status: 415, message: "The provided content-type '#{request.media_type}' is not supported."
         end
-        parser = Grape::Parser.parser_for fmt, options
+        parser = Grape::Parser.parser_for fmt, **options
         if parser
           begin
             body = (env[Grape::Env::API_REQUEST_BODY] = parser.call(body, env))
diff --git a/lib/grape/parser.rb b/lib/grape/parser.rb
@@ -13,7 +13,7 @@ def builtin_parsers
         }
       end
 
-      def parsers(options)
+      def parsers(**options)
         builtin_parsers.merge(default_elements).merge!(options[:parsers] || {})
       end
 
diff --git a/lib/grape/router/pattern.rb b/lib/grape/router/pattern.rb
@@ -19,8 +19,8 @@ class Pattern
       def initialize(pattern, **options)
         @origin  = pattern
         @path    = build_path(pattern, **options)
-        @capture = extract_capture(options)
-        @pattern = Mustermann.new(@path, pattern_options)
+        @capture = extract_capture(**options)
+        @pattern = Mustermann.new(@path, **pattern_options)
         @regexp  = to_regexp
       end
 
diff --git a/lib/grape/validations/params_scope.rb b/lib/grape/validations/params_scope.rb
@@ -123,7 +123,7 @@ def required?
       # @param attrs [Array] (see Grape::DSL::Parameters#requires)
       def push_declared_params(attrs, **opts)
         if lateral?
-          @parent.push_declared_params(attrs, opts)
+          @parent.push_declared_params(attrs, **opts)
         else
           if opts && opts[:as]
             @api.route_setting(:renamed_params, @api.route_setting(:renamed_params) || [])
diff --git a/lib/grape/validations/validators/all_or_none.rb b/lib/grape/validations/validators/all_or_none.rb
@@ -8,7 +8,7 @@ class AllOrNoneOfValidator < MultipleParamsBase
       def validate_params!(params)
         keys = keys_in_common(params)
         return if keys.empty? || keys.length == all_keys.length
-        raise Grape::Exceptions::Validation, params: all_keys, message: message(:all_or_none)
+        raise Grape::Exceptions::Validation.new(params: all_keys, message: message(:all_or_none))
       end
     end
   end
diff --git a/lib/grape/validations/validators/allow_blank.rb b/lib/grape/validations/validators/allow_blank.rb
@@ -11,7 +11,7 @@ def validate_param!(attr_name, params)
 
         return if value == false || value.present?
 
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:blank)
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:blank))
       end
     end
   end
diff --git a/lib/grape/validations/validators/at_least_one_of.rb b/lib/grape/validations/validators/at_least_one_of.rb
@@ -7,7 +7,7 @@ module Validations
     class AtLeastOneOfValidator < MultipleParamsBase
       def validate_params!(params)
         return unless keys_in_common(params).empty?
-        raise Grape::Exceptions::Validation, params: all_keys, message: message(:at_least_one)
+        raise Grape::Exceptions::Validation.new(params: all_keys, message: message(:at_least_one))
       end
     end
   end
diff --git a/lib/grape/validations/validators/exactly_one_of.rb b/lib/grape/validations/validators/exactly_one_of.rb
@@ -7,7 +7,7 @@ module Validations
     class ExactlyOneOfValidator < MultipleParamsBase
       def validate_params!(params)
         return if keys_in_common(params).length == 1
-        raise Grape::Exceptions::Validation, params: all_keys, message: message(:exactly_one)
+        raise Grape::Exceptions::Validation.new(params: all_keys, message: message(:exactly_one))
       end
     end
   end
diff --git a/lib/grape/validations/validators/except_values.rb b/lib/grape/validations/validators/except_values.rb
@@ -15,7 +15,7 @@ def validate_param!(attr_name, params)
         return if excepts.nil?
 
         param_array = params[attr_name].nil? ? [nil] : Array.wrap(params[attr_name])
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:except_values) if param_array.any? { |param| excepts.include?(param) }
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:except_values)) if param_array.any? { |param| excepts.include?(param) }
       end
     end
   end
diff --git a/lib/grape/validations/validators/mutual_exclusion.rb b/lib/grape/validations/validators/mutual_exclusion.rb
@@ -8,7 +8,7 @@ class MutualExclusionValidator < MultipleParamsBase
       def validate_params!(params)
         keys = keys_in_common(params)
         return if keys.length <= 1
-        raise Grape::Exceptions::Validation, params: keys, message: message(:mutual_exclusion)
+        raise Grape::Exceptions::Validation.new(params: keys, message: message(:mutual_exclusion))
       end
     end
   end
diff --git a/lib/grape/validations/validators/presence.rb b/lib/grape/validations/validators/presence.rb
@@ -5,7 +5,7 @@ module Validations
     class PresenceValidator < Base
       def validate_param!(attr_name, params)
         return if params.respond_to?(:key?) && params.key?(attr_name)
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:presence)
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:presence))
       end
     end
   end
diff --git a/lib/grape/validations/validators/regexp.rb b/lib/grape/validations/validators/regexp.rb
@@ -6,7 +6,7 @@ class RegexpValidator < Base
       def validate_param!(attr_name, params)
         return unless params.respond_to?(:key?) && params.key?(attr_name)
         return if Array.wrap(params[attr_name]).all? { |param| param.nil? || (param.to_s =~ (options_key?(:value) ? @option[:value] : @option)) }
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:regexp)
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:regexp))
       end
     end
   end
diff --git a/lib/grape/validations/validators/same_as.rb b/lib/grape/validations/validators/same_as.rb
@@ -6,9 +6,10 @@ class SameAsValidator < Base
       def validate_param!(attr_name, params)
         confirmation = options_key?(:value) ? @option[:value] : @option
         return if params[attr_name] == params[confirmation]
-        raise Grape::Exceptions::Validation,
-              params: [@scope.full_name(attr_name)],
-              message: build_message
+        raise Grape::Exceptions::Validation.new(
+          params: [@scope.full_name(attr_name)],
+          message: build_message
+        )
       end
 
       private
diff --git a/lib/grape/validations/validators/values.rb b/lib/grape/validations/validators/values.rb
@@ -30,13 +30,13 @@ def validate_param!(attr_name, params)
 
         param_array = params[attr_name].nil? ? [nil] : Array.wrap(params[attr_name])
 
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: except_message \
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: except_message) \
           unless check_excepts(param_array)
 
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:values) \
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:values)) \
           unless check_values(param_array, attr_name)
 
-        raise Grape::Exceptions::Validation, params: [@scope.full_name(attr_name)], message: message(:values) \
+        raise Grape::Exceptions::Validation.new(params: [@scope.full_name(attr_name)], message: message(:values)) \
           if @proc && !param_array.all? { |param| @proc.call(param) }
       end
 
diff --git a/spec/grape/api/custom_validations_spec.rb b/spec/grape/api/custom_validations_spec.rb
diff --git a/spec/grape/api_spec.rb b/spec/grape/api_spec.rb
diff --git a/spec/grape/exceptions/base_spec.rb b/spec/grape/exceptions/base_spec.rb
diff --git a/spec/grape/exceptions/validation_spec.rb b/spec/grape/exceptions/validation_spec.rb
diff --git a/spec/grape/middleware/exception_spec.rb b/spec/grape/middleware/exception_spec.rb
diff --git a/spec/grape/middleware/versioner/accept_version_header_spec.rb b/spec/grape/middleware/versioner/accept_version_header_spec.rb
diff --git a/spec/grape/middleware/versioner/header_spec.rb b/spec/grape/middleware/versioner/header_spec.rb
diff --git a/spec/grape/middleware/versioner/param_spec.rb b/spec/grape/middleware/versioner/param_spec.rb
diff --git a/spec/grape/middleware/versioner/path_spec.rb b/spec/grape/middleware/versioner/path_spec.rb
diff --git a/spec/grape/parser_spec.rb b/spec/grape/parser_spec.rb
diff --git a/spec/grape/validations/instance_behaivour_spec.rb b/spec/grape/validations/instance_behaivour_spec.rb
diff --git a/spec/grape/validations_spec.rb b/spec/grape/validations_spec.rb
diff --git a/spec/support/versioned_helpers.rb b/spec/support/versioned_helpers.rb

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ def builtin_formatters`
`15`	`15`	`}`
`16`	`16`	`end`
`17`	`17`
`18`		`- def formatters(options)`
	`18`	`+ def formatters(**options)`
`19`	`19`	`builtin_formatters.merge(default_elements).merge!(options[:error_formatters] \|\| {})`
`20`	`20`	`end`
`21`	`21`