rubocop-rails 2.35.4 → 2.35.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b000a9e63ce4154fb6b1acbb97c84253448ead8bac7539aa773dbc1a7e3f8b
-  data.tar.gz: 26646956ab4da49c53a4d9105771e83658b07c65912799e5eea7f4d88e5f399f
+  metadata.gz: 5620166bbbdcac74d58be7dec4ea307fc841d7cd31ffd9684f422009d00b8754
+  data.tar.gz: 7c156916d1a363419097086b305baf6010361473443602ea477ff03894c5e350
 SHA512:
-  metadata.gz: f8e1594a6edae31940c736c45a37966d09d02ada59afad3146b8941c4668b500c288e30da7293ae34d6ee38d1e2fc47b69900c8afa8f7e598da92e91d55f4d46
-  data.tar.gz: 15994ecea386276d46a19c17ec5bc962138a1476b4508f36353a9fb10e20f6fb30a1b1d78f837d9beef9980103a9786160d50b1fc610f06a092bc874b9621050
+  metadata.gz: fccc029e306ebaf72e1809005110005d18416b9d314c347b24b2381bdd84fa70c9e2d175633501618881c883e205ae0e79ed9aef3dcee4d4b16f6b02fce51818
+  data.tar.gz: 704f46a2a6c8b53eeeb8ac8ac60bfb25c39aa096e3b99516b132405f604729f48a877066b0531697e6ab8f1f65a9638435013c6610c5be5767e0b955d7d17300

data/lib/rubocop/cop/rails/env.rb

@@ -5,22 +5,34 @@ module RuboCop
     module Rails
       # Checks for usage of `Rails.env` which can be replaced with Feature Flags
       #
+      # The cop does not flag `Rails.env.local?`, the built-in alias for
+      # "development or test" introduced in Rails 7.1. Unlike per-environment
+      # predicates such as `development?` or `production?`, `local?` expresses
+      # the intent of guarding code that must only ever run in development or
+      # test (sanity checks, devtools, seed data) rather than gating an
+      # environment rollout, so a Feature Flag is not a suitable replacement.
+      #
       # @example
       #
       #   # bad
-      #   Rails.env.production? || Rails.env.local?
+      #   Rails.env.production? || Rails.env.development?
       #
       #   # good
       #   if FeatureFlag.enabled?(:new_feature)
       #     # new feature code
       #   end
       #
+      #   # good
+      #   raise 'This should never run in production' unless Rails.env.local?
+      #
       class Env < Base
         MSG = 'Use Feature Flags or config instead of `Rails.env`.'
         RESTRICT_ON_SEND = %i[env].freeze
         # This allow list is derived from:
         # (Rails.env.methods - Object.instance_methods).select { |m| m.to_s.end_with?('?') }
-        # and then removing the environment specific methods like development?, test?, production?, local?
+        # and then removing the environment specific methods like development?, test?, and production?.
+        # `local?` is kept on the allow list because it intentionally expresses
+        # "development or test" rather than a single environment rollout.
         ALLOWED_LIST = Set.new(
           %i[
             unicode_normalized?
@@ -38,6 +50,7 @@ module RuboCop
             valid_encoding?
             ascii_only?
             between?
+            local?
           ]
         ).freeze
 

data/lib/rubocop/cop/rails/save_bang.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+# rubocop:disable Metrics/ClassLength
 module RuboCop
   module Cop
     module Rails
@@ -303,13 +304,20 @@ module RuboCop
         def implicit_return?(node)
           return false unless cop_config['AllowImplicitReturn']
 
-          node = assignable_node(node)
+          node = last_expression_in_begin(assignable_node(node))
           method, sibling_index = find_method_with_sibling_index(node.parent)
           return false unless method&.type?(:def, :any_block)
 
           method.children.size == node.sibling_index + sibling_index
         end
 
+        # A multiline method or block body is wrapped in a `begin` node, so climb
+        # to it when the node is the last expression, to detect the implicit return.
+        def last_expression_in_begin(node)
+          node = node.parent while node.parent&.begin_type? && node.right_sibling.nil?
+          node
+        end
+
         def find_method_with_sibling_index(node, sibling_index = 1)
           return node, sibling_index unless node&.or_type?
 
@@ -348,3 +356,4 @@ module RuboCop
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/rubocop/rails/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Rails
     # This module holds the RuboCop Rails version information.
     module Version
-      STRING = '2.35.4'
+      STRING = '2.35.5'
 
       def self.document_version
         STRING.match('\d+\.\d+').to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails
 version: !ruby/object:Gem::Version
-  version: 2.35.4
+  version: 2.35.5
 platform: ruby
 authors:
 - Bozhidar Batsov
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Automatic Rails code style checking tool.
 test_files: []