Upgraded RuboCop to 0.33.0.

Author: dblock

.rubocop_todo.yml

@@ -1,33 +1,39 @@
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-04 09:15:17 -0400 using RuboCop version 0.31.0.
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-08-19 13:28:59 -0400 using RuboCop version 0.33.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:
+  Exclude:
+    - 'lib/grape/util/strict_hash_configuration.rb'
+
 # Offense count: 37
 Metrics/AbcSize:
-  Max: 48
+  Max: 46
 
-# Offense count: 2
+# Offense count: 1
 Metrics/BlockNesting:
   Max: 4
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 252
+  Max: 249
 
 # Offense count: 23
 Metrics/CyclomaticComplexity:
-  Max: 20
+  Max: 16
 
-# Offense count: 675
+# Offense count: 717
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 198
+  Max: 215
 
-# Offense count: 44
+# Offense count: 42
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 35
@@ -39,46 +45,34 @@ Metrics/ModuleLength:
 
 # Offense count: 17
 Metrics/PerceivedComplexity:
-  Max: 22
+  Max: 18
 
-# Offense count: 26
+# Offense count: 30
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
 Style/BlockDelimiters:
   Enabled: false
 
-# Offense count: 174
+# Offense count: 167
 Style/Documentation:
   Enabled: false
 
 # Offense count: 7
 Style/DoubleNegation:
-  Enabled: false
-
-# Offense count: 5
-Style/EachWithObject:
-  Enabled: false
-
-# Offense count: 15
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/Lambda:
-  Enabled: false
-
-# Offense count: 3
-Style/MultilineTernaryOperator:
-  Enabled: false
+  Exclude:
+    - 'lib/grape/api.rb'
+    - 'lib/grape/middleware/versioner/accept_version_header.rb'
+    - 'lib/grape/middleware/versioner/header.rb'
+    - 'lib/grape/path.rb'
 
 # Offense count: 3
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
-Style/PredicateName:
-  Enabled: false
+Style/EachWithObject:
+  Exclude:
+    - 'lib/grape/dsl/inside_route.rb'
+    - 'lib/grape/exceptions/base.rb'
+    - 'lib/grape/formatter/serializable_hash.rb'
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/RaiseArgs:
   Enabled: false

Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'rubocop', '~> 0.31.0'
+  gem 'rubocop', '0.33.0'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'

README.md

@@ -1504,7 +1504,7 @@ Custom error formatters for existing and additional types can be defined with a
 
 ```ruby
 class Twitter::API < Grape::API
-  error_formatter :txt, lambda { |message, backtrace, options, env|
+  error_formatter :txt, ->(message, backtrace, options, env) {
     "error: #{message} from #{backtrace}"
   }
 end
@@ -1818,7 +1818,7 @@ Custom formatters for existing and additional types can be defined with a proc.
 ```ruby
 class Twitter::API < Grape::API
   content_type :xls, "application/vnd.ms-excel"
-  formatter :xls, lambda { |object, env| object.to_xls }
+  formatter :xls, ->(object, env) { object.to_xls }
 end
 ```
 
@@ -1956,7 +1956,7 @@ module API
       expose :user_name
       expose :text, documentation: { type: "string", desc: "Status update text." }
       expose :ip, if: { type: :full }
-      expose :user_type, :user_id, if: lambda { |status, options| status.user.public? }
+      expose :user_type, :user_id, if: ->(status, options) { status.user.public? }
       expose :digest { |status, options| Digest::MD5.hexdigest(status.txt) }
       expose :replies, using: API::Status, as: :replies
     end

Rakefile

@@ -27,7 +27,7 @@ begin
   DOC_FILES = ['lib/**/*.rb', 'README.md']
 
   YARD::Rake::YardocTask.new(:doc) do |t|
-    t.files   = DOC_FILES
+    t.files = DOC_FILES
   end
 
   namespace :doc do

lib/grape/dsl/helpers.rb

@@ -75,9 +75,8 @@ def api_changed(new_api)
         protected
 
         def process_named_params
-          if @named_params && @named_params.any?
-            api.namespace_stackable(:named_params, @named_params)
-          end
+          return unless @named_params && @named_params.any?
+          api.namespace_stackable(:named_params, @named_params)
         end
       end
     end

lib/grape/dsl/inside_route.rb

@@ -19,14 +19,9 @@ def declared(params, options = {}, declared_params = nil)
         options[:include_missing] = true unless options.key?(:include_missing)
         options[:include_parent_namespaces] = true unless options.key?(:include_parent_namespaces)
 
-        if declared_params.nil?
-          declared_params = (!options[:include_parent_namespaces] ? route_setting(:declared_params) :
-              (route_setting(:saved_declared_params) || [])).flatten(1) || []
-        end
+        declared_params ||= (!options[:include_parent_namespaces] ? route_setting(:declared_params) : (route_setting(:saved_declared_params) || [])).flatten(1) || []
 
-        unless declared_params
-          fail ArgumentError, 'Tried to filter for declared parameters but none exist.'
-        end
+        fail ArgumentError, 'Tried to filter for declared parameters but none exist.' unless declared_params
 
         if params.is_a? Array
           params.map do |param|

lib/grape/dsl/parameters.rb

@@ -94,8 +94,7 @@ def requires(*attrs, &block)
         else
           validate_attributes(attrs, opts, &block)
 
-          block_given? ? new_scope(orig_attrs, &block) :
-              push_declared_params(attrs)
+          block_given? ? new_scope(orig_attrs, &block) : push_declared_params(attrs)
         end
       end
 
@@ -120,8 +119,7 @@ def optional(*attrs, &block)
         else
           validate_attributes(attrs, opts, &block)
 
-          block_given? ? new_scope(orig_attrs, true, &block) :
-              push_declared_params(attrs)
+          block_given? ? new_scope(orig_attrs, true, &block) : push_declared_params(attrs)
         end
       end
 

lib/grape/dsl/routing.rb

@@ -76,7 +76,7 @@ def mount(mounts)
 
             if app.respond_to?(:inheritable_setting, true)
               mount_path = Rack::Mount::Utils.normalize_path(path)
-              app.top_level_setting.namespace_stackable[:mount_path] =  mount_path
+              app.top_level_setting.namespace_stackable[:mount_path] = mount_path
 
               app.inherit_settings(inheritable_setting)
 

lib/grape/endpoint.rb

@@ -74,10 +74,10 @@ def initialize(new_settings, options = {}, &block)
       @options[:method] = Array(options[:method])
       @options[:route_options] ||= {}
 
-      if block_given?
-        @source = block
-        @block = self.class.generate_api_method(method_name, &block)
-      end
+      return unless block_given?
+
+      @source = block
+      @block = self.class.generate_api_method(method_name, &block)
     end
 
     def require_option(options, key)
@@ -119,7 +119,7 @@ def mount_in(route_set)
             route_set.add_route(self, {
                                   path_info: route.route_compiled,
                                   request_method: method
-                                },  route_info: route)
+                                }, route_info: route)
           end
         end
       end

lib/grape/middleware/auth/base.rb

@@ -26,7 +26,7 @@ def _call(env)
             auth_proc         = options[:proc]
             auth_proc_context = context
 
-            strategy_info   = Grape::Middleware::Auth::Strategies[options[:type]]
+            strategy_info = Grape::Middleware::Auth::Strategies[options[:type]]
 
             throw(:error, status: 401, message: 'API Authorization Failed.') unless strategy_info.present?