updates gem dependencies

LeFnord · LeFnord · commit 1f8809fad26a · 2016-12-01T20:52:33.000+01:00
- adds changelog entry
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,12 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-09-28 13:52:41 +0200 using RuboCop version 0.39.0.
+# on 2016-12-01 19:41:18 +0100 using RuboCop version 0.46.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 41
+# Offense count: 3
+# this must be removed for preparation of ruby 2.4
+Lint/UnifiedInteger:
+  Exclude:
+    - 'lib/grape/dsl/inside_route.rb'
+    - 'spec/grape/validations/validators/allow_blank_spec.rb'
+
+# Offense count: 44
 Metrics/AbcSize:
   Max: 44
 
@@ -19,27 +26,27 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 279
 
-# Offense count: 28
+# Offense count: 26
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 955
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# Offense count: 964
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 215
 
-# Offense count: 52
+# Offense count: 55
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 33
 
-# Offense count: 8
+# Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 212
 
-# Offense count: 18
+# Offense count: 17
 Metrics/PerceivedComplexity:
   Max: 14
 
@@ -48,6 +55,7 @@ Style/Documentation:
   Enabled: false
 
 # Offense count: 16
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,8 @@ Next Release
 * [#1512](https://github.com/ruby-grape/grape/pull/1512): Fix: deeply nested parameters are included within `#declared(params)` - [@krbs](https://github.com/krbs).
 * [#1510](https://github.com/ruby-grape/grape/pull/1510): Fix: inconsistent validation for multiple parameters - [@dgasper](https://github.com/dgasper).
 * [#1526](https://github.com/ruby-grape/grape/pull/1526): Reduce warnings caused by instance variables not initialized - [@cpetschnig](https://github.com/cpetschnig).
+* [#1531](https://github.com/ruby-grape/grape/pull/1531): Updates gem dependencies - [@LeFnord](https://github.com/LeFnord).
+
 
 0.18.0 (10/7/2016)
 ==================
diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gemspec
 group :development, :test do
   gem 'bundler'
   gem 'rake'
-  gem 'rubocop', '0.39.0'
+  gem 'rubocop', '~> 0.40'
 end
 
 group :development do
@@ -21,7 +21,7 @@ group :development do
 end
 
 group :test do
-  gem 'grape-entity', '0.5.0'
+  gem 'grape-entity', '~> 0.6'
   gem 'maruku'
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
diff --git a/lib/grape/dsl/helpers.rb b/lib/grape/dsl/helpers.rb
@@ -31,9 +31,11 @@ def helpers(new_mod = nil, &block)
             mod = new_mod || Module.new
             define_boolean_in_mod(mod)
             inject_api_helpers_to_mod(mod) if new_mod
-            inject_api_helpers_to_mod(mod) do
-              mod.class_eval(&block)
-            end if block_given?
+            if block_given?
+              inject_api_helpers_to_mod(mod) do
+                mod.class_eval(&block)
+              end
+            end
 
             namespace_stackable(:helpers, mod)
           else
diff --git a/lib/grape/dsl/parameters.rb b/lib/grape/dsl/parameters.rb
@@ -176,8 +176,8 @@ def all_or_none_of(*attrs)
       # @yield a parameter definition DSL
       def given(*attrs, &block)
         attrs.each do |attr|
-          attr_ = attr.is_a?(Hash) ? attr.keys[0] : attr
-          raise Grape::Exceptions::UnknownParameter.new(attr_) unless declared_param?(attr_)
+          proxy_attr = attr.is_a?(Hash) ? attr.keys[0] : attr
+          raise Grape::Exceptions::UnknownParameter.new(proxy_attr) unless declared_param?(proxy_attr)
         end
         new_lateral_scope(dependent_on: attrs, &block)
       end
diff --git a/lib/grape/dsl/request_response.rb b/lib/grape/dsl/request_response.rb
@@ -110,11 +110,10 @@ def rescue_from(*args, &block)
           end
           handler ||= extract_with(options)
 
-          case
-          when args.include?(:all)
+          if args.include?(:all)
             namespace_inheritable(:rescue_all, true)
             namespace_inheritable :all_rescue_handler, handler
-          when args.include?(:grape_exceptions)
+          elsif args.include?(:grape_exceptions)
             namespace_inheritable(:rescue_all, true)
             namespace_inheritable(:rescue_grape_exceptions, true)
           else
diff --git a/lib/grape/dsl/routing.rb b/lib/grape/dsl/routing.rb
@@ -200,13 +200,17 @@ def reset_endpoints!
         # @option options [Regexp] You may supply a regular expression that the declared parameter must meet.
         def route_param(param, options = {}, &block)
           options = options.dup
-          options[:requirements] = {
-            param.to_sym => options[:requirements]
-          } if options[:requirements].is_a?(Regexp)
+          if options[:requirements].is_a?(Regexp)
+            options[:requirements] = {
+              param.to_sym => options[:requirements]
+            }
+          end
 
-          Grape::Validations::ParamsScope.new(api: self) do
-            requires param, type: options[:type]
-          end if options.key?(:type)
+          if options.key?(:type)
+            Grape::Validations::ParamsScope.new(api: self) do
+              requires param, type: options[:type]
+            end
+          end
           namespace(":#{param}", options, &block)
         end
 
diff --git a/lib/grape/error_formatter/base.rb b/lib/grape/error_formatter/base.rb
@@ -15,9 +15,11 @@ def present(message, env)
           # env['api.endpoint'].route does not work when the error occurs within a middleware
           # the Endpoint does not have a valid env at this moment
           http_codes = env[Grape::Env::GRAPE_ROUTING_ARGS][:route_info].http_codes || []
-          found_code = http_codes.find do |http_code|
-            (http_code[0].to_i == env[Grape::Env::API_ENDPOINT].status) && http_code[2].respond_to?(:represent)
-          end if env[Grape::Env::API_ENDPOINT].request
+          if env[Grape::Env::API_ENDPOINT].request
+            found_code = http_codes.find do |http_code|
+              (http_code[0].to_i == env[Grape::Env::API_ENDPOINT].status) && http_code[2].respond_to?(:represent)
+            end
+          end
 
           presenter = found_code[2] if found_code
         end
diff --git a/lib/grape/middleware/base.rb b/lib/grape/middleware/base.rb
@@ -45,14 +45,12 @@ def call!(env)
 
       # @abstract
       # Called before the application is called in the middleware lifecycle.
-      def before
-      end
+      def before; end
 
       # @abstract
       # Called after the application is called in the middleware lifecycle.
       # @return [Response, nil] a Rack SPEC response or nil to call the application afterwards.
-      def after
-      end
+      def after; end
 
       def response
         return @app_response if @app_response.is_a?(Rack::Response)
diff --git a/lib/grape/middleware/error.rb b/lib/grape/middleware/error.rb
@@ -70,7 +70,7 @@ def rescuable_by_grape?(klass)
       end
 
       def exec_handler(e, &handler)
-        if handler.lambda? && handler.arity == 0
+        if handler.lambda? && handler.arity.zero?
           instance_exec(&handler)
         else
           instance_exec(e, &handler)
diff --git a/lib/grape/middleware/versioner/path.rb b/lib/grape/middleware/versioner/path.rb
@@ -26,7 +26,7 @@ def default_options
         def before
           path = env[Grape::Http::Headers::PATH_INFO].dup
 
-          if prefix && path.index(prefix) == 0
+          if prefix && path.index(prefix).zero?
             path.sub!(prefix, '')
             path = Grape::Router.normalize_path(path)
           end
diff --git a/lib/grape/router.rb b/lib/grape/router.rb
@@ -97,19 +97,21 @@ def transaction(env)
 
       # If neighbor exists and request method is OPTIONS,
       # return response by using #call_with_allow_headers.
-      return call_with_allow_headers(
-        env,
-        neighbor.allow_header,
-        neighbor.endpoint
-      ) if neighbor && method == 'OPTIONS' && !cascade
+      if neighbor && method == 'OPTIONS' && !cascade
+        return call_with_allow_headers(
+          env,
+          neighbor.allow_header,
+          neighbor.endpoint
+        )
+      end
 
       route = match?(input, '*')
       if route
         response = process_route(route, env)
         return response if response && !(cascade = cascade?(response))
       end
 
-      (!cascade && neighbor) ? call_with_allow_headers(env, neighbor.allow_header, neighbor.endpoint) : nil
+      !cascade && neighbor ? call_with_allow_headers(env, neighbor.allow_header, neighbor.endpoint) : nil
     end
 
     def process_route(route, env)
diff --git a/lib/grape/router/attribute_translator.rb b/lib/grape/router/attribute_translator.rb
@@ -13,8 +13,10 @@ def to_h
       def method_missing(m, *args)
         if m[-1] == '='
           @attributes[m[0..-1]] = *args
-        else
+        elsif m[-1] != '='
           @attributes[m]
+        else
+          super
         end
       end
 
diff --git a/lib/grape/router/pattern.rb b/lib/grape/router/pattern.rb
@@ -39,9 +39,11 @@ def build_path(pattern, anchor: false, suffix: nil, **_options)
           pattern << '/' unless pattern.end_with?('/')
           pattern << '*path'
         end
-        pattern = pattern.split('/').tap do |parts|
-          parts[parts.length - 1] = '?' + parts.last
-        end.join('/') if pattern.end_with?('*path')
+        if pattern.end_with?('*path')
+          pattern = pattern.split('/').tap do |parts|
+            parts[parts.length - 1] = '?' + parts.last
+          end.join('/')
+        end
         pattern + suffix.to_s
       end
 
diff --git a/lib/grape/router/route.rb b/lib/grape/router/route.rb
@@ -28,6 +28,10 @@ def method_missing(method_id, *arguments)
         end
       end
 
+      def respond_to_missing?(method_id, _)
+        ROUTE_ATTRIBUTE_REGEXP.match(method_id.to_s)
+      end
+
       [
         :prefix,
         :version,
diff --git a/lib/grape/validations/params_scope.rb b/lib/grape/validations/params_scope.rb
@@ -42,27 +42,28 @@ def should_validate?(parameters)
         return false if @optional && (params(parameters).blank? ||
                                        any_element_blank?(parameters))
 
-        @dependent_on.each do |dependency|
-          if dependency.is_a?(Hash)
-            dependency_key = dependency.keys[0]
-            proc = dependency.values[0]
-            return false unless proc.call(params(parameters).try(:[], dependency_key))
-          elsif params(parameters).try(:[], dependency).blank?
-            return false
+        if @dependent_on
+          @dependent_on.each do |dependency|
+            if dependency.is_a?(Hash)
+              dependency_key = dependency.keys[0]
+              proc = dependency.values[0]
+              return false unless proc.call(params(parameters).try(:[], dependency_key))
+            elsif params(parameters).try(:[], dependency).blank?
+              return false
+            end
           end
-        end if @dependent_on
+        end
 
         return true if parent.nil?
         parent.should_validate?(parameters)
       end
 
       # @return [String] the proper attribute name, with nesting considered.
       def full_name(name)
-        case
-        when nested?
+        if nested?
           # Find our containing element's name, and append ours.
           "#{@parent.full_name(@element)}#{array_index}[#{name}]"
-        when lateral?
+        elsif lateral?
           # Find the name of the element as if it was at the
           # same nesting level as our parent.
           @parent.full_name(name)
@@ -171,7 +172,8 @@ def new_scope(attrs, optional = false, &block)
           parent:   self,
           optional: optional,
           type:     opts[:type],
-          &block)
+          &block
+        )
       end
 
       # Returns a new parameter scope, not nested under any current-level param
@@ -189,7 +191,8 @@ def new_lateral_scope(options, &block)
           options:      @optional,
           type:         Hash,
           dependent_on: options[:dependent_on],
-          &block)
+          &block
+        )
       end
 
       # Returns a new parameter scope, subordinate to the current one and nested
@@ -202,7 +205,8 @@ def new_group_scope(attrs, &block)
           api:          @api,
           parent:       self,
           group:        attrs.first,
-          &block)
+          &block
+        )
       end
 
       # Pushes declared params to parent or settings
@@ -385,7 +389,7 @@ def validate_value_coercion(coerce_type, values)
       def extract_message_option(attrs)
         return nil unless attrs.is_a?(Array)
         opts = attrs.last.is_a?(Hash) ? attrs.pop : {}
-        (opts.key?(:message) && !opts[:message].nil?) ? opts.delete(:message) : nil
+        opts.key?(:message) && !opts[:message].nil? ? opts.delete(:message) : nil
       end
 
       def options_key?(type, key, validations)
diff --git a/spec/grape/api/patch_method_helpers_spec.rb b/spec/grape/api/patch_method_helpers_spec.rb
@@ -12,8 +12,7 @@ class PatchPublic < Grape::API
     end
 
     module AuthMethods
-      def authenticate!
-      end
+      def authenticate!; end
     end
 
     class PatchPrivate < Grape::API
diff --git a/spec/grape/dsl/desc_spec.rb b/spec/grape/dsl/desc_spec.rb
@@ -34,8 +34,7 @@ class Dummy
                       XOptionalHeader: {
                         description: 'Not really needed',
                         required: false
-                      }
-                     ]
+                      }]
           }
 
           subject.desc 'The description' do
@@ -51,8 +50,7 @@ class Dummy
                      XOptionalHeader: {
                        description: 'Not really needed',
                        required: false
-                     }
-                    ]
+                     }]
           end
 
           expect(subject.namespace_setting(:description)).to eq(expected_options)
diff --git a/spec/grape/dsl/inside_route_spec.rb b/spec/grape/dsl/inside_route_spec.rb
diff --git a/spec/grape/dsl/parameters_spec.rb b/spec/grape/dsl/parameters_spec.rb
diff --git a/spec/grape/endpoint_spec.rb b/spec/grape/endpoint_spec.rb
diff --git a/spec/grape/util/inheritable_setting_spec.rb b/spec/grape/util/inheritable_setting_spec.rb
diff --git a/spec/grape/util/strict_hash_configuration_spec.rb b/spec/grape/util/strict_hash_configuration_spec.rb
diff --git a/spec/grape/validations/validators/default_spec.rb b/spec/grape/validations/validators/default_spec.rb
