Anchor regular expressions by default [skip ci]

Andrew Kane
1 parent bbd7077a
Showing 3 changed files with 11 additions and 28 deletions Show diff stats
CHANGELOG.md
lib/searchkick/query.rb
test/where_test.rb
 ## 5.0.0 (unreleased)
+- Anchor regular expressions by default
 - Raise error when `search` called on relations
 - Raise `ArgumentError` (instead of warning) for invalid regular expression modifiers
 - Dropped support for Ruby < 2.6 and Active Record < 5.2
@@ -1036,24 +1036,18 @@ module Searchkick
         {bool: {must_not: {exists: {field: field}}}}
       elsif value.is_a?(Regexp)
         source = value.source
-        unless source.start_with?("\\A") && source.end_with?("\\z")
-          # https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-regexp-query.html
-          Searchkick.warn("Regular expressions are always anchored in Elasticsearch")
-        end
         # TODO handle other anchor characters, like ^, $, \Z
         if source.start_with?("\\A")
           source = source[2..-1]
         else
-          # TODO uncomment in Searchkick 5
-          # source = ".*#{source}"
+          source = ".*#{source}"
         end
         if source.end_with?("\\z")
           source = source[0..-3]
         else
-          # TODO uncomment in Searchkick 5
-          # source = "#{source}.*"
+          source = "#{source}.*"
         end
         if below710?
@@ -113,31 +113,19 @@ class WhereTest &lt; Minitest::Test
   def test_regexp_not_anchored
     store_names ["abcde"]
-    # regular expressions are always anchored right now
-    # TODO change in future release
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", [], where: {name: /abcd/}
-    end
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", [], where: {name: /bcde/}
-    end
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", ["abcde"], where: {name: /abcde/}
-    end
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", ["abcde"], where: {name: /.*bcd.*/}
-    end
+    assert_search "*", ["abcde"], where: {name: /abcd/}
+    assert_search "*", ["abcde"], where: {name: /bcde/}
+    assert_search "*", ["abcde"], where: {name: /abcde/}
+    assert_search "*", ["abcde"], where: {name: /.*bcd.*/}
   end
   def test_regexp_anchored
     store_names ["abcde"]
     assert_search "*", ["abcde"], where: {name: /\Aabcde\z/}
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", [], where: {name: /\Abcd/}
-    end
-    assert_warns "Regular expressions are always anchored in Elasticsearch" do
-      assert_search "*", [], where: {name: /bcd\z/}
-    end
+    assert_search "*", ["abcde"], where: {name: /\Aabc/}
+    assert_search "*", ["abcde"], where: {name: /cde\z/}
+    assert_search "*", [], where: {name: /\Abcd/}
+    assert_search "*", [], where: {name: /bcd\z/}
   end
   def test_regexp_case
1	## 5.0.0 (unreleased)	1	## 5.0.0 (unreleased)
2		2
		3	+- Anchor regular expressions by default
3	- Raise error when `search` called on relations	4	- Raise error when `search` called on relations
4	- Raise `ArgumentError` (instead of warning) for invalid regular expression modifiers	5	- Raise `ArgumentError` (instead of warning) for invalid regular expression modifiers
5	- Dropped support for Ruby < 2.6 and Active Record < 5.2	6	- Dropped support for Ruby < 2.6 and Active Record < 5.2