Upgraded to RuboCop 0.39.0.

Author: dblock

.rubocop_todo.yml

@@ -1,15 +1,15 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-14 21:22:57 +0300 using RuboCop version 0.35.1.
+# on 2016-04-26 16:12:14 -0400 using RuboCop version 0.39.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: 1
-Lint/NestedMethodDefinition:
+Lint/IneffectiveAccessModifier:
   Exclude:
-    - 'lib/grape/util/strict_hash_configuration.rb'
+    - 'lib/grape/router.rb'
 
 # Offense count: 39
 Metrics/AbcSize:
@@ -19,29 +19,30 @@ Metrics/AbcSize:
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 6
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 281
+  Max: 267
 
 # Offense count: 24
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 853
-# Configuration parameters: AllowURI, URISchemes.
+# Offense count: 871
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
+# URISchemes: http, https
 Metrics/LineLength:
   Max: 215
 
-# Offense count: 48
+# Offense count: 49
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 36
+  Max: 34
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 277
+  Max: 212
 
 # Offense count: 15
 Metrics/PerceivedComplexity:
@@ -50,6 +51,10 @@ Metrics/PerceivedComplexity:
 # Offense count: 44
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
   Exclude:
     - 'spec/grape/api_spec.rb'
@@ -58,7 +63,6 @@ Style/BlockDelimiters:
     - 'spec/grape/request_spec.rb'
 
 # Offense count: 111
-# Configuration parameters: Exclude.
 Style/Documentation:
   Enabled: false
 
@@ -70,7 +74,14 @@ Style/DoubleNegation:
     - 'lib/grape/middleware/versioner/header.rb'
     - 'lib/grape/path.rb'
 
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'lib/grape/endpoint.rb'
+
 # Offense count: 14
 # Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: compact, exploded
 Style/RaiseArgs:
   Enabled: false

Gemfile

@@ -7,7 +7,7 @@ gemspec
 group :development, :test do
   gem 'bundler'
   gem 'rake'
-  gem 'rubocop', '0.35.1'
+  gem 'rubocop', '0.39.0'
 end
 
 group :development do

Rakefile

@@ -25,7 +25,7 @@ task default: [:rubocop, :spec]
 
 begin
   require 'yard'
-  DOC_FILES = ['lib/**/*.rb', 'README.md']
+  DOC_FILES = ['lib/**/*.rb', 'README.md'].freeze
 
   YARD::Rake::YardocTask.new(:doc) do |t|
     t.files = DOC_FILES

lib/grape/dsl/headers.rb

@@ -10,7 +10,7 @@ def header(key = nil, val = nil)
           @header ||= {}
         end
       end
-      alias_method :headers, :header
+      alias headers header
     end
   end
 end

lib/grape/dsl/inside_route.rb

@@ -31,7 +31,7 @@ def declared(params, options = {}, declared_params = nil)
 
           declared_params ||= (!options[:include_parent_namespaces] ? route_setting(:declared_params) : (route_setting(:saved_declared_params) || [])).flatten(1) || []
 
-          fail ArgumentError, 'Tried to filter for declared parameters but none exist.' unless declared_params
+          raise ArgumentError, 'Tried to filter for declared parameters but none exist.' unless declared_params
 
           if params.is_a? Array
             params.map do |param|
@@ -70,7 +70,7 @@ def declared(params, options = {}, declared_params = nil)
       # options. `:include_parent_namespaces` defaults to true, hence must be set to false if
       # you want only to return params declared against the current/target endpoint.
       def declared(*)
-        fail MethodNotYetAvailable, '#declared is not available prior to parameter validation.'
+        raise MethodNotYetAvailable, '#declared is not available prior to parameter validation.'
       end
 
       # The API version as specified in the URL.
@@ -100,14 +100,12 @@ def redirect(url, options = {})
         if permanent
           status 301
           body_message ||= "This resource has been moved permanently to #{url}."
+        elsif env[Grape::Http::Headers::HTTP_VERSION] == 'HTTP/1.1' && request.request_method.to_s.upcase != Grape::Http::Headers::GET
+          status 303
+          body_message ||= "An alternate resource is located at #{url}."
         else
-          if env[Grape::Http::Headers::HTTP_VERSION] == 'HTTP/1.1' && request.request_method.to_s.upcase != Grape::Http::Headers::GET
-            status 303
-            body_message ||= "An alternate resource is located at #{url}."
-          else
-            status 302
-            body_message ||= "This resource has been moved temporarily to #{url}."
-          end
+          status 302
+          body_message ||= "This resource has been moved temporarily to #{url}."
         end
         header 'Location', url
         content_type 'text/plain'
@@ -120,11 +118,8 @@ def redirect(url, options = {})
       def status(status = nil)
         case status
         when Symbol
-          if Rack::Utils::SYMBOL_TO_STATUS_CODE.keys.include?(status)
-            @status = Rack::Utils.status_code(status)
-          else
-            fail ArgumentError, "Status code :#{status} is invalid."
-          end
+          raise ArgumentError, "Status code :#{status} is invalid." unless Rack::Utils::SYMBOL_TO_STATUS_CODE.keys.include?(status)
+          @status = Rack::Utils.status_code(status)
         when Fixnum
           @status = status
         when nil
@@ -136,7 +131,7 @@ def status(status = nil)
             200
           end
         else
-          fail ArgumentError, 'Status code must be Fixnum or Symbol.'
+          raise ArgumentError, 'Status code must be Fixnum or Symbol.'
         end
       end
 
@@ -260,7 +255,7 @@ def present(*args)
         if key
           representation = (@body || {}).merge(key => representation)
         elsif entity_class.present? && @body
-          fail ArgumentError, "Representation of type #{representation.class} cannot be merged." unless representation.respond_to?(:merge)
+          raise ArgumentError, "Representation of type #{representation.class} cannot be merged." unless representation.respond_to?(:merge)
           representation = @body.merge(representation)
         end
 

lib/grape/dsl/parameters.rb

@@ -34,13 +34,13 @@ def use(*names)
         options = names.extract_options!
         names.each do |name|
           params_block = named_params.fetch(name) do
-            fail "Params :#{name} not found!"
+            raise "Params :#{name} not found!"
           end
           instance_exec(options, &params_block)
         end
       end
-      alias_method :use_scope, :use
-      alias_method :includes, :use
+      alias use_scope use
+      alias includes use
 
       # Require one or more parameters for the current endpoint.
       #
@@ -121,8 +121,8 @@ def optional(*attrs, &block)
 
         # check type for optional parameter group
         if attrs && block_given?
-          fail Grape::Exceptions::MissingGroupTypeError.new if type.nil?
-          fail Grape::Exceptions::UnsupportedGroupTypeError.new unless Grape::Validations::Types.group?(type)
+          raise Grape::Exceptions::MissingGroupTypeError.new if type.nil?
+          raise Grape::Exceptions::UnsupportedGroupTypeError.new unless Grape::Validations::Types.group?(type)
         end
 
         if opts[:using]
@@ -167,7 +167,7 @@ def all_or_none_of(*attrs)
       # @yield a parameter definition DSL
       def given(*attrs, &block)
         attrs.each do |attr|
-          fail Grape::Exceptions::UnknownParameter.new(attr) unless declared_param?(attr)
+          raise Grape::Exceptions::UnknownParameter.new(attr) unless declared_param?(attr)
         end
         new_lateral_scope(dependent_on: attrs, &block)
       end
@@ -181,21 +181,21 @@ def declared_param?(param)
         @declared_params.flatten.include?(param)
       end
 
-      alias_method :group, :requires
+      alias group requires
 
       # @param params [Hash] initial hash of parameters
       # @return hash of parameters relevant for the current scope
       # @api private
       def params(params)
         params = @parent.params(params) if @parent
         if @element
-          if params.is_a?(Array)
-            params = params.flat_map { |el| el[@element] || {} }
-          elsif params.is_a?(Hash)
-            params = params[@element] || {}
-          else
-            params = {}
-          end
+          params = if params.is_a?(Array)
+                     params.flat_map { |el| el[@element] || {} }
+                   elsif params.is_a?(Hash)
+                     params[@element] || {}
+                   else
+                     {}
+                   end
         end
         params
       end

lib/grape/dsl/request_response.rb

@@ -23,7 +23,7 @@ def format(new_format = nil)
             namespace_inheritable(:default_error_formatter, Grape::ErrorFormatter.formatter_for(new_format, {}))
             # define a single mime type
             mime_type = content_types[new_format.to_sym]
-            fail Grape::Exceptions::MissingMimeType.new(new_format) unless mime_type
+            raise Grape::Exceptions::MissingMimeType.new(new_format) unless mime_type
             namespace_stackable(:content_types, new_format.to_sym => mime_type)
           else
             namespace_inheritable(:format)
@@ -51,11 +51,11 @@ def default_error_formatter(new_formatter_name = nil)
         end
 
         def error_formatter(format, options)
-          if options.is_a?(Hash) && options.key?(:with)
-            formatter = options[:with]
-          else
-            formatter = options
-          end
+          formatter = if options.is_a?(Hash) && options.key?(:with)
+                        options[:with]
+                      else
+                        options
+                      end
 
           namespace_stackable(:error_formatters, format.to_sym => formatter)
         end
@@ -106,7 +106,7 @@ def rescue_from(*args, &block)
 
           options = args.extract_options!
           if block_given? && options.key?(:with)
-            fail ArgumentError, 'both :with option and block cannot be passed'
+            raise ArgumentError, 'both :with option and block cannot be passed'
           end
           handler ||= extract_with(options)
 
@@ -115,12 +115,12 @@ def rescue_from(*args, &block)
             namespace_inheritable :all_rescue_handler, handler
           else
             handler_type =
-                case options[:rescue_subclasses]
-                when nil, true
-                  :rescue_handlers
-                else
-                  :base_only_rescue_handlers
-                end
+              case options[:rescue_subclasses]
+              when nil, true
+                :rescue_handlers
+              else
+                :base_only_rescue_handlers
+              end
 
             namespace_stackable handler_type, Hash[args.map { |arg| [arg, handler] }]
           end
@@ -149,7 +149,7 @@ def rescue_from(*args, &block)
         # @param model_class [Class] The model class that will be represented.
         # @option options [Class] :with The entity class that will represent the model.
         def represent(model_class, options)
-          fail Grape::Exceptions::InvalidWithOptionForRepresent.new unless options[:with] && options[:with].is_a?(Class)
+          raise Grape::Exceptions::InvalidWithOptionForRepresent.new unless options[:with] && options[:with].is_a?(Class)
           namespace_stackable(:representations, model_class => options[:with])
         end
 
@@ -160,7 +160,7 @@ def extract_with(options)
           with_option = options.delete(:with)
           return with_option if with_option.instance_of?(Proc)
           return with_option.to_sym if with_option.instance_of?(Symbol) || with_option.instance_of?(String)
-          fail ArgumentError, "with: #{with_option.class}, expected Symbol, String or Proc"
+          raise ArgumentError, "with: #{with_option.class}, expected Symbol, String or Proc"
         end
       end
     end

lib/grape/dsl/routing.rb

@@ -31,7 +31,7 @@ def version(*args, &block)
             options = args.extract_options!
             options = options.reverse_merge(using: :path)
 
-            fail Grape::Exceptions::MissingVendorOption.new if options[:using] == :header && !options.key?(:vendor)
+            raise Grape::Exceptions::MissingVendorOption.new if options[:using] == :header && !options.key?(:vendor)
 
             @versions = versions | args
 
@@ -121,9 +121,9 @@ def route(methods, paths = ['/'], route_options = {}, &block)
             method: methods,
             path: paths,
             for: self,
-            route_options: ({
+            route_options: {
               params: namespace_stackable_with_hash(:params) || {}
-            }).deep_merge(route_setting(:description) || {}).deep_merge(route_options || {})
+            }.deep_merge(route_setting(:description) || {}).deep_merge(route_options || {})
           }
 
           new_endpoint = Grape::Endpoint.new(inheritable_setting, endpoint_options, &block)
@@ -170,10 +170,10 @@ def namespace(space = nil, options = {}, &block)
           end
         end
 
-        alias_method :group, :namespace
-        alias_method :resource, :namespace
-        alias_method :resources, :namespace
-        alias_method :segment, :namespace
+        alias group namespace
+        alias resource namespace
+        alias resources namespace
+        alias segment namespace
 
         # An array of API routes.
         def routes

lib/grape/endpoint.rb

@@ -54,7 +54,7 @@ def run_before_each(endpoint)
       # @raise [NameError] an instance method with the same name already exists
       def generate_api_method(method_name, &block)
         if instance_methods.include?(method_name.to_sym) || instance_methods.include?(method_name.to_s)
-          fail NameError.new("method #{method_name.inspect} already exists and cannot be used as an unbound method name")
+          raise NameError.new("method #{method_name.inspect} already exists and cannot be used as an unbound method name")
         end
 
         define_method(method_name, &block)
@@ -98,7 +98,7 @@ def initialize(new_settings, options = {}, &block)
     end
 
     def require_option(options, key)
-      fail Grape::Exceptions::MissingOption.new(key) unless options.key?(key)
+      raise Grape::Exceptions::MissingOption.new(key) unless options.key?(key)
     end
 
     def method_name
@@ -171,7 +171,7 @@ def prepare_default_route_attributes
 
     def prepare_version
       version = namespace_inheritable(:version) || []
-      return if version.length == 0
+      return if version.empty?
       version.length == 1 ? version.first.to_s : version
     end
 
@@ -326,7 +326,7 @@ def run_validators(validators, request)
         end
       end
 
-      validation_errors.any? && fail(Grape::Exceptions::ValidationErrors, errors: validation_errors, headers: header)
+      validation_errors.any? && raise(Grape::Exceptions::ValidationErrors, errors: validation_errors, headers: header)
     end
 
     def run_filters(filters, type = :other)