Fix WhereRange to correctly handle template strings with extra spaces

rubocop · Jun 6, 2024 · 107d960 · 107d960
1 parent 07bec34
commit 107d960
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/changelog/fix_where_range_spaces.md b/changelog/fix_where_range_spaces.md
@@ -0,0 +1 @@
+* [#1282](https://github.com/rubocop/rubocop-rails/issues/1282): Fix `WhereRange` to correctly handle template strings with extra spaces. ([@fatkodima][])
diff --git a/lib/rubocop/cop/rails/where_range.rb b/lib/rubocop/cop/rails/where_range.rb
@@ -37,17 +37,17 @@ class WhereRange < Base
         RESTRICT_ON_SEND = %i[where not].freeze
 
         # column >= ?
-        GTEQ_ANONYMOUS_RE   = /\A([\w.]+)\s+>=\s+\?\z/.freeze
+        GTEQ_ANONYMOUS_RE   = /\A\s*([\w.]+)\s+>=\s+\?\s*\z/.freeze
         # column <[=] ?
-        LTEQ_ANONYMOUS_RE   = /\A([\w.]+)\s+(<=?)\s+\?\z/.freeze
+        LTEQ_ANONYMOUS_RE   = /\A\s*([\w.]+)\s+(<=?)\s+\?\s*\z/.freeze
         # column >= ? AND column <[=] ?
-        RANGE_ANONYMOUS_RE  = /\A([\w.]+)\s+>=\s+\?\s+AND\s+\1\s+(<=?)\s+\?\z/i.freeze
+        RANGE_ANONYMOUS_RE  = /\A\s*([\w.]+)\s+>=\s+\?\s+AND\s+\1\s+(<=?)\s+\?\s*\z/i.freeze
         # column >= :value
-        GTEQ_NAMED_RE       = /\A([\w.]+)\s+>=\s+:(\w+)\z/.freeze
+        GTEQ_NAMED_RE       = /\A\s*([\w.]+)\s+>=\s+:(\w+)\s*\z/.freeze
         # column <[=] :value
-        LTEQ_NAMED_RE       = /\A([\w.]+)\s+(<=?)\s+:(\w+)\z/.freeze
+        LTEQ_NAMED_RE       = /\A\s*([\w.]+)\s+(<=?)\s+:(\w+)\s*\z/.freeze
         # column >= :value1 AND column <[=] :value2
-        RANGE_NAMED_RE      = /\A([\w.]+)\s+>=\s+:(\w+)\s+AND\s+\1\s+(<=?)\s+:(\w+)\z/i.freeze
+        RANGE_NAMED_RE      = /\A\s*([\w.]+)\s+>=\s+:(\w+)\s+AND\s+\1\s+(<=?)\s+:(\w+)\s*\z/i.freeze
 
         minimum_target_ruby_version 2.6
         minimum_target_rails_version 6.0

diff --git a/spec/rubocop/cop/rails/where_range_spec.rb b/spec/rubocop/cop/rails/where_range_spec.rb
@@ -142,6 +142,19 @@
         RUBY
       end
 
+      it 'correctly handles spaces in the template string' do
+        expect_offense(<<~RUBY)
+          Model.where('  column  >= ?   ', value)
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `where(column: value..)` instead of manually constructing SQL.
+          Model.where(' column >=     :min    ', min: value)
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `where(column: value..)` instead of manually constructing SQL.
+          Model.where(' column   >=    ?   AND   column  <   ? ', value1, value2)
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `where(column: value1...value2)` instead of manually constructing SQL.
+          Model.where(' column   >=  :min  AND column   <   :max    ', min: value1, max: value2)
+                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Use `where(column: value1...value2)` instead of manually constructing SQL.
+        RUBY
+      end
+
       it 'does not register an offense when using ranges' do
         expect_no_offenses(<<~RUBY)
           Model.where(column: value..)