rubocop-betterment 1.8.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dad4b799b42ff956d077416311a5bcbe8ccf9bde1d80199650591afc5bf4e769
-  data.tar.gz: f194b9cd4100956e414069fa722d06f299bfa76615a2f4a3bc80ca15f8aac3ee
+  metadata.gz: cc4eabc0685d064150b4545175e96ee1c848ad32f53bf35f83b5125a7c309b82
+  data.tar.gz: 258718477b39bb37af975daae5f1d4db1ea7e4adb55d7b8ee6b3757aee5dbfbd
 SHA512:
-  metadata.gz: 35d0c88facf8eb1e9a41c32a8a000caf3b97fd250f237fe5dd13b043df7af3f80fc7acf9b1eefddeceda946c8b0f0f33c3ca8c13b961a4c69f49224fdf594f52
-  data.tar.gz: a98a6b5f06d19cb8754d3b7b1ed998f79a7259821796c26e61142671f9e73ead325c5e780b1ffe11f15140b88fcb3bc68f3bc318a0d0ad15afb6b505b6a48541
+  metadata.gz: 692eb066b0e6b45d0c7049f90acc66c600d1a6b24793ba691975112ccd5a7ddcfc01b3674dc180fecf9eb75dd4445c826d30864b4fbea1768e53df1fceb1c2e4
+  data.tar.gz: 7cee25dc098dbabbdac9ae42a10ada567047e211c445cb6ecef7405ae6da89a03927c044f3fb9781a2bb6e48b7fb3fa1f608f820076d4828159477cee8864914

data/config/default.yml

@@ -8,7 +8,6 @@ AllCops:
   Exclude:
     - 'bin/**/*'
     - 'db/**/*'
-    - 'config/**/*'
     - 'vendor/**/*'
     - 'frontend/**/*'
     - 'build/**/*'
@@ -44,6 +43,10 @@ Layout/MultilineMethodCallIndentation:
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
+# Disabling because of a bug in rubocop: https://github.com/rubocop-hq/rubocop/issues/6918
+Layout/RescueEnsureAlignment:
+  Enabled: false
+
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - 'spec/**/*'
@@ -63,27 +66,32 @@ Lint/BooleanSymbol:
 Metrics/AbcSize:
   Exclude:
     - 'spec/**/*'
+    - 'webvalve/**/*'
 
 Metrics/BlockLength:
   Enabled: false
 
 Metrics/ClassLength:
   Max: 250
+  Exclude:
+    - 'webvalve/**/*'
 
 Metrics/CyclomaticComplexity:
   Max: 10
   Exclude:
     - 'spec/**/*'
+    - 'webvalve/**/*'
 
 Metrics/LineLength:
   Max: 140
 
 Metrics/MethodLength:
-  Exclude:
-    - 'spec/**/*'
+  Enabled: false
 
 Metrics/ModuleLength:
   Max: 250
+  Exclude:
+    - 'webvalve/**/*'
 
 Metrics/ParameterLists:
   Max: 5
@@ -92,6 +100,7 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Exclude:
     - 'spec/**/*'
+    - 'webvalve/**/*'
 
 Naming/HeredocDelimiterNaming:
   Enabled: false
@@ -248,5 +257,15 @@ Style/StringLiterals:
 Style/SymbolProc:
   Enabled: false
 
+# Use a trailing comma to keep diffs clean when elements are inserted or removed
+Style/TrailingCommaInArguments:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
 Style/YodaCondition:
   Enabled: false

data/lib/rubocop/cop/betterment.rb

@@ -2,3 +2,5 @@ require 'rubocop'
 require 'rubocop/cop/betterment/timeout'
 require 'rubocop/cop/betterment/memoization_with_arguments'
 require 'rubocop/cop/betterment/site_prism_loaded'
+require 'rubocop/cop/betterment/spec_helper_required_outside_spec_dir'
+require 'rubocop/cop/betterment/implicit_redirect_type'

data/lib/rubocop/cop/betterment/implicit_redirect_type.rb

@@ -0,0 +1,70 @@
+module RuboCop
+  module Cop
+    module Betterment
+      # Require explicit redirect statuses in routes.rb. Refer to the book for more details:
+      # https://github.com/Betterment/the-book/blob/master/platform-specific/ruby.markdown#use-temporary-redirects-eg-redirectstatus-302
+      #
+      # @example
+      #   # bad
+      #   get '/', redirect('/dashboard')
+      #   get { |params, request| '/dashboard' }
+      #
+      #   # good
+      #   get '/', redirect('/dashboard', status: 301)
+      #   get(status: 302) { |params, request| '/dashboard' }
+      class ImplicitRedirectType < Cop
+        ROUTES_FILE_NAME = 'routes.rb'.freeze
+        MSG =
+          'Rails will create a permanent (301) redirect, which is dangerous. ' \
+          'Please specify your desired status, e.g. redirect(..., status: 302)'.freeze
+
+        # redirect('/')
+        def_node_matcher :arg_form_without_options?, <<-PATTERN
+          (send nil? :redirect (str _))
+        PATTERN
+
+        # redirect { |_params, _request| '/' }
+        def_node_matcher :block_form_without_options?, <<-PATTERN
+          (block (send nil? :redirect) ...)
+        PATTERN
+
+        # redirect('/', foo: 'bar')
+        def_node_matcher :arg_form_with_options, <<-PATTERN
+          (send nil? :redirect (str _) (hash $...))
+        PATTERN
+
+        # redirect(foo: 'bar') { |_params, _request| '/' }
+        def_node_matcher :block_form_with_options, <<-PATTERN
+          (block (send nil? :redirect (hash $...)) ...)
+        PATTERN
+
+        # status: anything
+        def_node_matcher :valid_status_option?, <<-PATTERN
+          (pair (sym :status) _)
+        PATTERN
+
+        def on_block(node)
+          return unless routes_file?
+
+          if block_form_with_options(node) { |options| options.none?(&method(:valid_status_option?)) } || block_form_without_options?(node)
+            add_offense(node, message: MSG)
+          end
+        end
+
+        def on_send(node)
+          return unless routes_file?
+
+          if arg_form_with_options(node) { |options| options.none?(&method(:valid_status_option?)) } || arg_form_without_options?(node)
+            add_offense(node, message: MSG)
+          end
+        end
+
+        private
+
+        def routes_file?
+          Pathname.new(processed_source.buffer.name).basename.to_s == ROUTES_FILE_NAME
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/betterment/spec_helper_required_outside_spec_dir.rb

@@ -0,0 +1,38 @@
+module RuboCop
+  module Cop
+    module Betterment
+      # If a file requires spec_helper or rails_helper, make sure
+      # it is located in a spec/ directory.
+      #
+      # @example
+      #   # bad
+      #   app/models/whatever_spec.rb
+      #   require 'rails_helper'
+      #
+      #   # good
+      #   spec/models/my_class_spec.rb
+      #   require 'rails_helper'
+      class SpecHelperRequiredOutsideSpecDir < Cop
+        MSG = 'Spec helper required outside of a spec/ directory.'.freeze
+
+        def_node_matcher :requires_spec_helper?, <<-PATTERN
+          (send nil? :require
+            (str {"rails_helper" "spec_helper"}))
+        PATTERN
+
+        def on_send(node)
+          add_offense(node, message: MSG) if requires_spec_helper?(node) && !spec_directory?
+        end
+
+        private
+
+        def spec_directory?
+          Pathname.new(processed_source.buffer.name)
+            .relative_path_from(Pathname.pwd)
+            .to_s
+            .start_with?("spec#{File::SEPARATOR}")
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-betterment
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.13.0
 platform: ruby
 authors:
 - Development
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2020-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -91,8 +91,10 @@ files:
 - STYLEGUIDE.md
 - config/default.yml
 - lib/rubocop/cop/betterment.rb
+- lib/rubocop/cop/betterment/implicit_redirect_type.rb
 - lib/rubocop/cop/betterment/memoization_with_arguments.rb
 - lib/rubocop/cop/betterment/site_prism_loaded.rb
+- lib/rubocop/cop/betterment/spec_helper_required_outside_spec_dir.rb
 - lib/rubocop/cop/betterment/timeout.rb
 homepage: 
 licenses:
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Betterment rubocop configuration