re2 2.4.3 → 2.10.0

data/spec/re2/scanner_spec.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 RSpec.describe RE2::Scanner do
   describe "#regexp" do
@@ -34,6 +34,16 @@ RSpec.describe RE2::Scanner do
       expect(scanner.scan).to be_nil
     end
 
+    it "supports scanning inputs with null bytes", :aggregate_failures do
+      r = RE2::Regexp.new("(\\w\0\\w)")
+      scanner = r.scan("a\0b c\0d e\0f")
+
+      expect(scanner.scan).to eq(["a\0b"])
+      expect(scanner.scan).to eq(["c\0d"])
+      expect(scanner.scan).to eq(["e\0f"])
+      expect(scanner.scan).to be_nil
+    end
+
     it "returns UTF-8 matches if the pattern is UTF-8" do
       r = RE2::Regexp.new('(\w+)')
       scanner = r.scan("It")
@@ -43,7 +53,7 @@ RSpec.describe RE2::Scanner do
     end
 
     it "returns ISO-8859-1 matches if the pattern is not UTF-8" do
-      r = RE2::Regexp.new('(\w+)', :utf8 => false)
+      r = RE2::Regexp.new('(\w+)', utf8: false)
       scanner = r.scan("It")
       matches = scanner.scan
 
@@ -75,7 +85,7 @@ RSpec.describe RE2::Scanner do
     end
 
     it "returns nil if the regexp is invalid" do
-      r = RE2::Regexp.new('???', :log_errors => false)
+      r = RE2::Regexp.new('???', log_errors: false)
       scanner = r.scan("Foo bar")
 
       expect(scanner.scan).to be_nil
@@ -173,12 +183,7 @@ RSpec.describe RE2::Scanner do
       r = RE2::Regexp.new('(\d)')
       scanner = r.scan("There are 1 some 2 numbers 3")
 
-      # Prior to Ruby 1.9, Enumerator was within Enumerable.
-      if defined?(Enumerator)
-        expect(scanner.each).to be_a(Enumerator)
-      elsif defined?(Enumerable::Enumerator)
-        expect(scanner.each).to be_a(Enumerable::Enumerator)
-      end
+      expect(scanner.each).to be_a(Enumerator)
     end
   end
 
@@ -195,6 +200,18 @@ RSpec.describe RE2::Scanner do
       expect(scanner.to_enum.first).to eq(["1"])
     end
 
+    it "supports inputs with null bytes", :aggregate_failures do
+      r = RE2::Regexp.new("(\\w\0\\w)")
+      scanner = r.scan("a\0b c\0d")
+
+      expect(scanner.to_enum.first).to eq(["a\0b"])
+      expect(scanner.to_enum.first).to eq(["c\0d"])
+
+      scanner.rewind
+
+      expect(scanner.to_enum.first).to eq(["a\0b"])
+    end
+
     it "resets the eof? check", :aggregate_failures do
       r = RE2::Regexp.new('(\d)')
       scanner = r.scan("1")

data/spec/re2/set_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.describe RE2::Set do
   describe "#initialize" do
     it "returns an instance given no args" do
@@ -25,7 +27,7 @@ RSpec.describe RE2::Set do
     end
 
     it "returns an instance given an anchor and options" do
-      set = RE2::Set.new(:unanchored, :case_sensitive => false)
+      set = RE2::Set.new(:unanchored, case_sensitive: false)
 
       expect(set).to be_a(RE2::Set)
     end
@@ -42,7 +44,7 @@ RSpec.describe RE2::Set do
     end
 
     it "raises an error if given an invalid anchor and options" do
-      expect { RE2::Set.new(:not_a_valid_anchor, :case_sensitive => false) }.to raise_error(
+      expect { RE2::Set.new(:not_a_valid_anchor, case_sensitive: false) }.to raise_error(
         ArgumentError,
         "anchor should be one of: :unanchored, :anchor_start, :anchor_both"
       )
@@ -59,19 +61,19 @@ RSpec.describe RE2::Set do
     end
 
     it "rejects invalid patterns when added" do
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       expect { set.add("???") }.to raise_error(ArgumentError, /str rejected by RE2::Set->Add\(\)/)
     end
 
     it "truncates error messages to 100 characters" do
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       expect { set.add("(?P<#{'o' * 200}") }.to raise_error(ArgumentError, "str rejected by RE2::Set->Add(): invalid named capture group: (?P<oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo")
     end
 
     it "raises an error if called after #compile" do
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
       set.add("abc")
       set.compile
 
@@ -81,7 +83,7 @@ RSpec.describe RE2::Set do
     end
 
     it "raises an error if given a pattern that can't be coerced to a String" do
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       expect { set.add(0) }.to raise_error(TypeError)
     end
@@ -112,7 +114,7 @@ RSpec.describe RE2::Set do
       set.add("ghi")
       set.compile
 
-      expect(set.match("abcdefghi", :exception => false)).to eq([0, 1, 2])
+      expect(set.match("abcdefghi", exception: false)).to eq([0, 1, 2])
     end
 
     it "returns an empty array if there is no match" do
@@ -120,7 +122,15 @@ RSpec.describe RE2::Set do
       set.add("abc")
       set.compile
 
-      expect(set.match("def", :exception => false)).to be_empty
+      expect(set.match("def", exception: false)).to be_empty
+    end
+
+    it "supports matching null bytes", :aggregate_failures do
+      set = RE2::Set.new
+      set.add("a\0b")
+      set.compile
+
+      expect(set.match("a\0b", exception: false)).to eq([0])
     end
 
     it "returns an empty array if there is no match when :exception is true" do
@@ -136,7 +146,7 @@ RSpec.describe RE2::Set do
     it "raises an error if called before #compile by default" do
       skip "Underlying RE2::Set::Match does not output error information" unless RE2::Set.match_raises_errors?
 
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       silence_stderr do
         expect { set.match("") }.to raise_error(RE2::Set::MatchError)
@@ -146,28 +156,28 @@ RSpec.describe RE2::Set do
     it "raises an error if called before #compile when :exception is true" do
       skip "Underlying RE2::Set::Match does not output error information" unless RE2::Set.match_raises_errors?
 
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       silence_stderr do
-        expect { set.match("", :exception => true) }.to raise_error(RE2::Set::MatchError)
+        expect { set.match("", exception: true) }.to raise_error(RE2::Set::MatchError)
       end
     end
 
     it "returns an empty array if called before #compile when :exception is false" do
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       silence_stderr do
-        expect(set.match("", :exception => false)).to be_empty
+        expect(set.match("", exception: false)).to be_empty
       end
     end
 
-    it "raises an error if :exception is true and re2 does not support it" do
+    it "raises an error if :exception is true and RE2 does not support it" do
       skip "Underlying RE2::Set::Match outputs error information" if RE2::Set.match_raises_errors?
 
-      set = RE2::Set.new(:unanchored, :log_errors => false)
+      set = RE2::Set.new(:unanchored, log_errors: false)
 
       silence_stderr do
-        expect { set.match("", :exception => true) }.to raise_error(RE2::Set::UnsupportedError)
+        expect { set.match("", exception: true) }.to raise_error(RE2::Set::UnsupportedError)
       end
     end
 
@@ -182,7 +192,7 @@ RSpec.describe RE2::Set do
       set.add("abc")
       set.compile
 
-      expect { set.match(0, :exception => false) }.to raise_error(TypeError)
+      expect { set.match(0, exception: false) }.to raise_error(TypeError)
     end
 
     it "accepts input if it can be coerced to a String" do
@@ -190,7 +200,7 @@ RSpec.describe RE2::Set do
       set.add("abc")
       set.compile
 
-      expect(set.match(StringLike.new("abcdef"), :exception => false)).to contain_exactly(0)
+      expect(set.match(StringLike.new("abcdef"), exception: false)).to contain_exactly(0)
     end
   end
 

data/spec/re2/string_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "re2/string"
 
 class String

data/spec/re2_spec.rb

@@ -1,9 +1,23 @@
+# frozen_string_literal: true
+
 RSpec.describe RE2 do
   describe ".Replace" do
     it "only replaces the first occurrence of the pattern" do
       expect(RE2.Replace("woo", "o", "a")).to eq("wao")
     end
 
+    it "supports inputs with null bytes" do
+      expect(RE2.Replace("w\0oo", "o", "a")).to eq("w\0ao")
+    end
+
+    it "supports patterns with null bytes" do
+      expect(RE2.Replace("w\0oo", "\0", "o")).to eq("wooo")
+    end
+
+    it "supports replacements with null bytes" do
+      expect(RE2.Replace("woo", "o", "\0")).to eq("w\0o")
+    end
+
     it "performs replacement based on regular expressions" do
       expect(RE2.Replace("woo", "o+", "e")).to eq("we")
     end
@@ -27,7 +41,7 @@ RSpec.describe RE2 do
     end
 
     it "respects any passed RE2::Regexp's flags" do
-      re = RE2::Regexp.new('gOOD MORNING', :case_sensitive => false)
+      re = RE2::Regexp.new('gOOD MORNING', case_sensitive: false)
 
       expect(RE2.Replace("Good morning", re, "hi")).to eq("hi")
     end
@@ -53,7 +67,7 @@ RSpec.describe RE2 do
 
     it "returns ISO-8859-1 strings if the pattern is not UTF-8" do
       original = "Foo"
-      replacement = RE2.Replace(original, RE2("oo", :utf8 => false), "ah")
+      replacement = RE2.Replace(original, RE2("oo", utf8: false), "ah")
 
       expect(replacement.encoding).to eq(Encoding::ISO_8859_1)
     end
@@ -82,6 +96,18 @@ RSpec.describe RE2 do
       expect(RE2.GlobalReplace("woo", "o", "a")).to eq("waa")
     end
 
+    it "supports inputs with null bytes" do
+      expect(RE2.GlobalReplace("w\0oo", "o", "a")).to eq("w\0aa")
+    end
+
+    it "supports patterns with null bytes" do
+      expect(RE2.GlobalReplace("w\0\0oo", "\0", "a")).to eq("waaoo")
+    end
+
+    it "supports replacements with null bytes" do
+      expect(RE2.GlobalReplace("woo", "o", "\0")).to eq("w\0\0")
+    end
+
     it "performs replacement based on regular expressions" do
       expect(RE2.GlobalReplace("woohoo", "o+", "e")).to eq("wehe")
     end
@@ -105,7 +131,7 @@ RSpec.describe RE2 do
     end
 
     it "respects any passed RE2::Regexp's flags" do
-      re = RE2::Regexp.new('gOOD MORNING', :case_sensitive => false)
+      re = RE2::Regexp.new('gOOD MORNING', case_sensitive: false)
 
       expect(RE2.GlobalReplace("Good morning Good morning", re, "hi")).to eq("hi hi")
     end
@@ -131,7 +157,7 @@ RSpec.describe RE2 do
 
     it "returns ISO-8859-1 strings if the pattern is not UTF-8" do
       original = "Foo"
-      replacement = RE2.GlobalReplace(original, RE2("oo", :utf8 => false), "ah")
+      replacement = RE2.GlobalReplace(original, RE2("oo", utf8: false), "ah")
 
       expect(replacement.encoding).to eq(Encoding::ISO_8859_1)
     end
@@ -167,5 +193,9 @@ RSpec.describe RE2 do
     it "supports passing something that can be coerced to a String as input" do
       expect(RE2.QuoteMeta(StringLike.new("1.5"))).to eq('1\.5')
     end
+
+    it "supports strings containing null bytes" do
+      expect(RE2.QuoteMeta("abc\0def")).to eq('abc\x00def')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "re2"
 
 # To test passing objects that can be coerced to a String.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.4.3
+  version: 2.10.0
 platform: ruby
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -86,11 +86,12 @@ files:
 - ext/re2/re2.cc
 - ext/re2/recipes.rb
 - lib/re2.rb
+- lib/re2/regexp.rb
 - lib/re2/scanner.rb
 - lib/re2/string.rb
 - lib/re2/version.rb
-- ports/archives/20230802.1.tar.gz
-- ports/archives/re2-2023-11-01.tar.gz
+- ports/archives/20240116.1.tar.gz
+- ports/archives/re2-2024-04-01.tar.gz
 - re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
@@ -119,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to RE2.