Merge a35f9e0 into 1541bd7

.rubocop_todo.yml

@@ -1,54 +1,117 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-07-11 00:59:31 +0100 using RuboCop version 0.47.0.
+# on 2017-12-10 01:00:44 +0900 using RuboCop version 0.51.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: 45
+# Offense count: 7
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
+  Exclude:
+    - 'lib/grape/router/route.rb'
+    - 'spec/grape/api_spec.rb'
+    - 'spec/grape/entity_spec.rb'
+
+# Offense count: 2
+Lint/AmbiguousBlockAssociation:
+  Exclude:
+    - 'lib/grape/middleware/stack.rb'
+    - 'spec/grape/dsl/routing_spec.rb'
+
+# Offense count: 1
+Lint/RescueWithoutErrorClass:
+  Exclude:
+    - 'lib/grape/validations/validators/coerce.rb'
+
+# Offense count: 49
 Metrics/AbcSize:
   Max: 44
 
-# Offense count: 279
+# Offense count: 285
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
   Max: 3117
 
-# Offense count: 8
+# Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
   Max: 288
 
-# Offense count: 28
+# Offense count: 32
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 1114
+# Offense count: 1160
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 215
 
-# Offense count: 56
+# Offense count: 57
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 33
 
-# Offense count: 10
+# Offense count: 11
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
   Max: 212
 
-# Offense count: 17
+# Offense count: 21
 Metrics/PerceivedComplexity:
   Max: 14
 
-# Offense count: 2
+# Offense count: 4
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'Appraisals'
+    - 'Gemfile'
+    - 'Guardfile'
+    - 'Rakefile'
+
+# Offense count: 1
+# Configuration parameters: Blacklist.
+# Blacklist: END, (?-mix:EO[A-Z]{1})
+Naming/HeredocDelimiterNaming:
+  Exclude:
+    - 'lib/grape/router/route.rb'
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect.
+Performance/HashEachMethods:
+  Exclude:
+    - 'lib/grape/api.rb'
+    - 'lib/grape/middleware/versioner/header.rb'
+
+# Offense count: 1
+# 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/middleware/formatter_spec.rb'
 
+# Offense count: 1
+Style/CommentedKeyword:
+  Exclude:
+    - 'spec/grape/validations_spec.rb'
+
+# Offense count: 2
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: annotated, template
+Style/FormatStringToken:
+  EnforcedStyle: template
+
 # Offense count: 2
 Style/IdenticalConditionalBranches:
   Exclude:
@@ -58,3 +121,8 @@ Style/IdenticalConditionalBranches:
 Style/MethodMissing:
   Exclude:
     - 'lib/grape/router/attribute_translator.rb'
+
+# Offense count: 1
+Style/MultipleComparison:
+  Exclude:
+    - 'lib/grape/validations/types/custom_type_coercer.rb'

Appraisals

@@ -1,6 +1,6 @@
 appraise 'rails-3' do
   gem 'rails', '3.2.19'
-  gem 'rack-cache', '<= 1.2'  # Pin as next rack-cache version (1.3) removes Ruby1.9 support
+  gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
 end
 
 appraise 'rails-4' do

Gemfile

@@ -6,28 +6,28 @@ gemspec
 
 group :development, :test do
   gem 'bundler'
-  gem 'rake'
-  gem 'rubocop', '0.47.0'
   gem 'hashie'
+  gem 'rake'
+  gem 'rubocop', '0.51.0'
 end
 
 group :development do
+  gem 'appraisal'
+  gem 'benchmark-ips'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-rubocop'
-  gem 'appraisal'
-  gem 'benchmark-ips'
 end
 
 group :test do
+  gem 'cookiejar'
+  gem 'coveralls', '~> 0.8.17', require: false
+  gem 'danger-toc', '~> 0.1.0'
   gem 'grape-entity', '~> 0.6'
   gem 'maruku'
+  gem 'mime-types'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'rack-test', '~> 0.6.3'
   gem 'rspec', '~> 3.0'
-  gem 'cookiejar'
-  gem 'rack-jsonp', require: 'rack/jsonp'
-  gem 'mime-types'
   gem 'ruby-grape-danger', '~> 0.1.0', require: false
-  gem 'coveralls', '~> 0.8.17', require: false
-  gem 'danger-toc', '~> 0.1.0'
 end

Rakefile

@@ -22,5 +22,4 @@ require 'rainbow/ext/string' unless String.respond_to?(:color)
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
-
+task default: %i[rubocop spec]

gemfiles/multi_json.gemfile

@@ -1,34 +1,35 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'multi_json', require: 'multi_json'
+gem "multi_json", :require => "multi_json"
 
 group :development, :test do
-  gem 'bundler'
-  gem 'rake'
-  gem 'rubocop', '0.47.0'
-  gem 'hashie'
+  gem "bundler"
+  gem "hashie"
+  gem "rake"
+  gem "rubocop", "0.51.0"
 end
 
 group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'appraisal'
-  gem 'benchmark-ips'
+  gem "appraisal"
+  gem "benchmark-ips"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
 end
 
 group :test do
-  gem 'grape-entity', '~> 0.6'
-  gem 'maruku'
-  gem 'rack-test', '~> 0.6.3'
-  gem 'rspec', '~> 3.0'
-  gem 'cookiejar'
-  gem 'rack-jsonp', require: 'rack/jsonp'
-  gem 'mime-types'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
-  gem 'coveralls', '~> 0.8.17', require: false
+  gem "cookiejar"
+  gem "coveralls", "~> 0.8.17", :require => false
+  gem "danger-toc", "~> 0.1.0"
+  gem "grape-entity", "~> 0.6"
+  gem "maruku"
+  gem "mime-types"
+  gem "rack-jsonp", :require => "rack/jsonp"
+  gem "rack-test", "~> 0.6.3"
+  gem "rspec", "~> 3.0"
+  gem "ruby-grape-danger", "~> 0.1.0", :require => false
 end
 
-gemspec path: '../'
+gemspec :path => "../"

gemfiles/multi_xml.gemfile

@@ -1,34 +1,35 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'multi_xml', require: 'multi_xml'
+gem "multi_xml", :require => "multi_xml"
 
 group :development, :test do
-  gem 'bundler'
-  gem 'rake'
-  gem 'rubocop', '0.47.0'
-  gem 'hashie'
+  gem "bundler"
+  gem "hashie"
+  gem "rake"
+  gem "rubocop", "0.51.0"
 end
 
 group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'appraisal'
-  gem 'benchmark-ips'
+  gem "appraisal"
+  gem "benchmark-ips"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
 end
 
 group :test do
-  gem 'grape-entity', '~> 0.6'
-  gem 'maruku'
-  gem 'rack-test', '~> 0.6.3'
-  gem 'rspec', '~> 3.0'
-  gem 'cookiejar'
-  gem 'rack-jsonp', require: 'rack/jsonp'
-  gem 'mime-types'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
-  gem 'coveralls', '~> 0.8.17', require: false
+  gem "cookiejar"
+  gem "coveralls", "~> 0.8.17", :require => false
+  gem "danger-toc", "~> 0.1.0"
+  gem "grape-entity", "~> 0.6"
+  gem "maruku"
+  gem "mime-types"
+  gem "rack-jsonp", :require => "rack/jsonp"
+  gem "rack-test", "~> 0.6.3"
+  gem "rspec", "~> 3.0"
+  gem "ruby-grape-danger", "~> 0.1.0", :require => false
 end
 
-gemspec path: '../'
+gemspec :path => "../"

gemfiles/rack_1.5.2.gemfile

@@ -1,34 +1,35 @@
 # This file was generated by Appraisal
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'rack', '1.5.2'
+gem "rack", "1.5.2"
 
 group :development, :test do
-  gem 'bundler'
-  gem 'rake'
-  gem 'rubocop', '0.47.0'
-  gem 'hashie'
+  gem "bundler"
+  gem "hashie"
+  gem "rake"
+  gem "rubocop", "0.51.0"
 end
 
 group :development do
-  gem 'guard'
-  gem 'guard-rspec'
-  gem 'guard-rubocop'
-  gem 'appraisal'
-  gem 'benchmark-ips'
+  gem "appraisal"
+  gem "benchmark-ips"
+  gem "guard"
+  gem "guard-rspec"
+  gem "guard-rubocop"
 end
 
 group :test do
-  gem 'grape-entity', '~> 0.6'
-  gem 'maruku'
-  gem 'rack-test', '~> 0.6.3'
-  gem 'rspec', '~> 3.0'
-  gem 'cookiejar'
-  gem 'rack-jsonp', require: 'rack/jsonp'
-  gem 'mime-types'
-  gem 'ruby-grape-danger', '~> 0.1.0', require: false
-  gem 'coveralls', '~> 0.8.17', require: false
+  gem "cookiejar"
+  gem "coveralls", "~> 0.8.17", :require => false
+  gem "danger-toc", "~> 0.1.0"
+  gem "grape-entity", "~> 0.6"
+  gem "maruku"
+  gem "mime-types"
+  gem "rack-jsonp", :require => "rack/jsonp"
+  gem "rack-test", "~> 0.6.3"
+  gem "rspec", "~> 3.0"
+  gem "ruby-grape-danger", "~> 0.1.0", :require => false
 end
 
-gemspec path: '../'
+gemspec :path => "../"