Merge pull request #1030 from dblock/rubocop-0.31.0

Upgraded RuboCop 0.31.0.

Author: dblock

.rubocop_todo.yml

@@ -1,20 +1,10 @@
 # This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-06-03 09:20:43 -0400 using RuboCop version 0.29.1.
+# on 2015-06-04 09:15:17 -0400 using RuboCop version 0.31.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: 33
-# Cop supports --auto-correct.
-Lint/UnusedBlockArgument:
-  Enabled: false
-
-# Offense count: 27
-# Cop supports --auto-correct.
-Lint/UnusedMethodArgument:
-  Enabled: false
-
 # Offense count: 37
 Metrics/AbcSize:
   Max: 48
@@ -32,7 +22,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 20
 
-# Offense count: 676
+# Offense count: 675
 # Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
   Max: 198
@@ -42,19 +32,19 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 35
 
+# Offense count: 8
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 243
+
 # Offense count: 17
 Metrics/PerceivedComplexity:
   Max: 22
 
-# Offense count: 46
-# Cop supports --auto-correct.
-Style/Blocks:
-  Enabled: false
-
-# Offense count: 6
+# Offense count: 26
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassCheck:
+# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+Style/BlockDelimiters:
   Enabled: false
 
 # Offense count: 174
@@ -69,40 +59,18 @@ Style/DoubleNegation:
 Style/EachWithObject:
   Enabled: false
 
-# Offense count: 1
-Style/EmptyElse:
-  Enabled: false
-
 # Offense count: 15
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
   Enabled: false
 
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 15
-# Cop supports --auto-correct.
-Style/IndentArray:
-  Enabled: false
-
-# Offense count: 20
+# Offense count: 4
 # Cop supports --auto-correct.
 Style/Lambda:
   Enabled: false
 
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
-
 # Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
+Style/MultilineTernaryOperator:
   Enabled: false
 
 # Offense count: 3
@@ -114,29 +82,3 @@ Style/PredicateName:
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/RaiseArgs:
   Enabled: false
-
-# Offense count: 4
-# Configuration parameters: MaxSlashes.
-Style/RegexpLiteral:
-  Enabled: false
-
-# Offense count: 11
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SpaceBeforeBlockBraces:
-  Enabled: false
-
-# Offense count: 12
-# Cop supports --auto-correct.
-Style/SpaceBeforeSemicolon:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/UnneededPercentQ:
-  Enabled: false

Gemfile

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

Guardfile

@@ -5,6 +5,6 @@ guard :rspec, all_on_start: true, cmd: 'bundle exec rspec' do
 end
 
 guard :rubocop do
-  watch(%r{.+\.rb$})
+  watch(/.+\.rb$/)
   watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
 end

Rakefile

@@ -52,7 +52,7 @@ begin
       end
 
       desc 'Generate and publish YARD docs to GitHub pages.'
-      task :publish => ['doc:pages:checkout', 'doc:pages'] do
+      task publish: ['doc:pages:checkout', 'doc:pages'] do
         Dir.chdir(File.dirname(__FILE__) + '/../grape.doc') do
           system('git checkout gh-pages')
           system('git add .')

gemfiles/rails_3.gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gem 'rails', '3.2.19'
 
 group :development, :test do
-  gem 'rubocop', '~> 0.29.1'
+  gem 'rubocop', '~> 0.31.0'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'

gemfiles/rails_4.gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gem 'rails', '4.1.6'
 
 group :development, :test do
-  gem 'rubocop', '~> 0.29.1'
+  gem 'rubocop', '~> 0.31.0'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'

grape.gemspec

@@ -1,4 +1,4 @@
-$:.push File.expand_path('../lib', __FILE__)
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'grape/version'
 
 Gem::Specification.new do |s|
@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Michael Bleigh']
   s.email       = ['[email protected]']
   s.homepage    = 'https://github.com/intridea/grape'
-  s.summary     = %q{A simple Ruby framework for building REST-like APIs.}
-  s.description = %q{A Ruby framework for rapid API development with great conventions.}
+  s.summary     = 'A simple Ruby framework for building REST-like APIs.'
+  s.description = 'A Ruby framework for rapid API development with great conventions.'
   s.license     = 'MIT'
 
   s.rubyforge_project = 'grape'

lib/grape/api.rb

@@ -36,7 +36,7 @@ def call!(env)
       # Create a scope without affecting the URL.
       #
       # @param name [Symbol] Purely placebo, just allows to name the scope to make the code more readable.
-      def scope(name = nil, &block)
+      def scope(_name = nil, &block)
         within_namespace do
           nest(block)
         end
@@ -168,7 +168,7 @@ def add_head_not_allowed_methods_and_options_methods
       end
     end
 
-    def without_versioning(&block)
+    def without_versioning(&_block)
       old_version = self.class.namespace_inheritable(:version)
       old_version_options = self.class.namespace_inheritable(:version_options)
 
@@ -181,7 +181,7 @@ def without_versioning(&block)
       self.class.namespace_inheritable(:version_options, old_version_options)
     end
 
-    def without_root_prefix(&block)
+    def without_root_prefix(&_block)
       old_prefix = self.class.namespace_inheritable(:root_prefix)
 
       self.class.namespace_inheritable_to_nil(:root_prefix)

lib/grape/cookies.rb

@@ -12,7 +12,7 @@ def read(request)
     end
 
     def write(header)
-      @cookies.select { |key, value| @send_cookies[key] == true }.each do |name, value|
+      @cookies.select { |key, _value| @send_cookies[key] == true }.each do |name, value|
         cookie_value = value.is_a?(Hash) ? value : { value: value }
         Rack::Utils.set_cookie_header! header, name, cookie_value
       end

lib/grape/dsl/helpers.rb

@@ -51,7 +51,7 @@ def helpers(new_mod = nil, &block)
 
         protected
 
-        def inject_api_helpers_to_mod(mod, &block)
+        def inject_api_helpers_to_mod(mod, &_block)
           mod.extend(BaseHelper)
           yield if block_given?
           mod.api_changed(self)