From 7670d9aed7d71f2dce4afd512bfbaed58e8c1d6c Mon Sep 17 00:00:00 2001 From: dblock Date: Wed, 14 Mar 2018 14:58:08 -0400 Subject: [PATCH] Upgraded RuboCop to 0.53.0. --- .rubocop_todo.yml | 49 +++++++++++++------ Gemfile | 4 +- Rakefile | 2 +- grape-active_model_serializers.gemspec | 2 +- .../endpoint_extension.rb | 6 +-- .../options_builder.rb | 4 +- .../error_formatter_spec.rb | 2 +- 7 files changed, 43 insertions(+), 26 deletions(-) mode change 100644 => 100755 Rakefile diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 9f0f14e..6674ec9 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,33 +1,47 @@ # This configuration was generated by # `rubocop --auto-gen-config` -# on 2017-10-09 10:22:52 -0500 using RuboCop version 0.41.2. +# on 2018-03-14 14:57:44 -0400 using RuboCop version 0.53.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 +# Configuration parameters: Include. +# Include: **/*.gemfile, **/Gemfile, **/gems.rb +Bundler/DuplicatedGem: + Exclude: + - 'Gemfile' + # Offense count: 1 Metrics/AbcSize: - Max: 18 + Max: 17 + +# Offense count: 23 +# Configuration parameters: CountComments, ExcludedMethods. +Metrics/BlockLength: + Max: 133 # Offense count: 1 Metrics/CyclomaticComplexity: Max: 9 -# Offense count: 1 -# Configuration parameters: AllowHeredoc, AllowURI, URISchemes. -# URISchemes: http, https -Metrics/LineLength: - Max: 87 - # Offense count: 1 # Configuration parameters: CountComments. Metrics/MethodLength: - Max: 18 + Max: 15 # Offense count: 1 Metrics/PerceivedComplexity: - Max: 11 + Max: 10 + +# Offense count: 2 +# 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: + - 'lib/grape-active_model_serializers.rb' + - 'spec/grape-active_model_serializers_spec.rb' # Offense count: 5 Style/Documentation: @@ -40,9 +54,14 @@ Style/Documentation: - 'lib/grape-active_model_serializers/options_builder.rb' - 'lib/grape-active_model_serializers/serializer_resolver.rb' -# Offense count: 2 -# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts. -Style/FileName: +# Offense count: 1 +# Configuration parameters: MinBodyLength. +Style/GuardClause: Exclude: - - 'lib/grape-active_model_serializers.rb' - - 'spec/grape-active_model_serializers_spec.rb' + - 'lib/grape-active_model_serializers/serializer_resolver.rb' + +# Offense count: 2 +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https +Metrics/LineLength: + Max: 87 diff --git a/Gemfile b/Gemfile index 9572bc4..7c95f65 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ else end group :test do - gem 'sqlite3' - gem 'sequel', '~> 4.37', require: false gem 'ruby-grape-danger', '~> 0.1.0', require: false + gem 'sequel', '~> 4.37', require: false + gem 'sqlite3' end diff --git a/Rakefile b/Rakefile old mode 100644 new mode 100755 index a0298c6..1dd0ac7 --- a/Rakefile +++ b/Rakefile @@ -11,4 +11,4 @@ end require 'rubocop/rake_task' RuboCop::RakeTask.new(:rubocop) -task default: [:rubocop, :spec] +task default: %i[rubocop spec] diff --git a/grape-active_model_serializers.gemspec b/grape-active_model_serializers.gemspec index 4ab59fe..9d68460 100644 --- a/grape-active_model_serializers.gemspec +++ b/grape-active_model_serializers.gemspec @@ -24,5 +24,5 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rack-test' gem.add_development_dependency 'rake' gem.add_development_dependency 'guard-rspec' - gem.add_development_dependency 'rubocop', '0.41.2' + gem.add_development_dependency 'rubocop', '0.53.0' end diff --git a/lib/grape-active_model_serializers/endpoint_extension.rb b/lib/grape-active_model_serializers/endpoint_extension.rb index 4965d00..f575513 100644 --- a/lib/grape-active_model_serializers/endpoint_extension.rb +++ b/lib/grape-active_model_serializers/endpoint_extension.rb @@ -50,11 +50,9 @@ module Grape resources end - def default_serializer_options - end + def default_serializer_options; end - def url_options - end + def url_options; end end Endpoint.send(:include, EndpointExtension) diff --git a/lib/grape-active_model_serializers/options_builder.rb b/lib/grape-active_model_serializers/options_builder.rb index 7221746..9b6fb86 100644 --- a/lib/grape-active_model_serializers/options_builder.rb +++ b/lib/grape-active_model_serializers/options_builder.rb @@ -7,7 +7,7 @@ module Grape end def options - @options ||= ( + @options ||= begin options = endpoint_options options[:scope] = endpoint unless options.key?(:scope) options.merge!(default_root_options) unless options.key?(:root) @@ -15,7 +15,7 @@ module Grape options.merge!(adapter_options) options.merge!(extra_options) options - ) + end end private diff --git a/spec/grape-active_model_serializers/error_formatter_spec.rb b/spec/grape-active_model_serializers/error_formatter_spec.rb index 47972f2..28b5e84 100644 --- a/spec/grape-active_model_serializers/error_formatter_spec.rb +++ b/spec/grape-active_model_serializers/error_formatter_spec.rb @@ -4,7 +4,7 @@ require 'grape-active_model_serializers/error_formatter' describe Grape::ErrorFormatter::ActiveModelSerializers do subject { Grape::ErrorFormatter::ActiveModelSerializers } let(:backtrace) { ['Line:1'] } - let(:options) { Hash.new } + let(:options) { {} } let(:env) { { 'api.endpoint' => app.endpoints.first } } let(:original_exception) { StandardError.new('oh noes!') }