re2 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7a33f3c27224496ec131c261c7c66172f21474bce66cdf1cc1631c83040b3ca
-  data.tar.gz: 4d4a5448aa271bbce4cf37ffadfaadfa0797691fad5cc13f2f722e281116d66f
+  metadata.gz: ce0e303b87738a767776165216cbbd8cf0f63ec9dba3ef4389f657cbb5da8dc3
+  data.tar.gz: 61983a9e93dc64334d43a41f3f978ff71de020bd9d6f27bc409431a313ea58e0
 SHA512:
-  metadata.gz: f080eccb20bb599b374485981f4c23fd8a49e84903ebe32e99e00b458c8b6334430cef41cbb1227fcba057f81d2fed4ead67648e506348fa6c2f975b7e6fea7f
-  data.tar.gz: bbd0ca07b287ca7e212175b4f5eaafd2698b7be94aefa432e81c4ff108b4b4c660e47d03d48d6affb82c0cee5f98fcb37bdcd97651bf309cebb148ac5e654518
+  metadata.gz: 229f667e12094ae2d42ae3d72a08aa0567cf17e1d666d9677b6b0bdfccc549f241870085ac918789fbbcd0fcb538a942a31f6922f32d88cc7b54043b553f35e3
+  data.tar.gz: 850d6dc79bcfbfe96a913ac93ddc2c8d4e1b79ddd8aa50eb951bfaae99e3a1688ff31fd2e55c2e497946b9ea4913bcca4938070b6fa37f2ca77d88721652ca66

data/README.md

@@ -4,7 +4,7 @@ re2 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/ba
 A Ruby binding to [re2][], an "efficient, principled regular expression
 library".
 
-**Current version:** 1.3.0  
+**Current version:** 1.4.0  
 **Supported Ruby versions:** 1.8.7, 1.9.3, 2.0, 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0  
 **Supported re2 versions:** libre2.0 (< 2020-03-02), libre2.1 (2020-03-02), libre2.6 (2020-03-03), libre2.7 (2020-05-01), libre2.8 (2020-07-06), libre2.9 (2020-11-01)
 
@@ -175,7 +175,9 @@ Contributions
 * Thanks to [Stefano Rivera](https://github.com/stefanor) who first contributed C++11 support;
 * Thanks to [Stan Hu](https://github.com/stanhu) for reporting a bug with empty patterns and `RE2::Regexp#scan`;
 * Thanks to [Sebastian Reitenbach](https://github.com/buzzdeee) for reporting
-  the deprecation and removal of the `utf8` encoding option in re2.
+  the deprecation and removal of the `utf8` encoding option in re2;
+* Thanks to [Sergio Medina](https://github.com/serch) for reporting a bug when
+  using `RE2::Scanner#scan` with an invalid regular expression.
 
 Contact
 -------

data/ext/re2/re2.cc

@@ -1158,6 +1158,7 @@ static VALUE re2_regexp_named_capturing_groups(VALUE self) {
  *   @param [String] text the text to search
  *   @param [Fixnum] number_of_matches the number of matches to return
  *   @return [RE2::MatchData] the matches
+ *   @raise [ArgumentError] if given a negative number of matches
  *   @raise [NoMemoryError] if there was not enough memory to allocate the matches
  *   @example
  *     r = RE2::Regexp.new('w(o)(o)')
@@ -1180,7 +1181,15 @@ static VALUE re2_regexp_match(int argc, VALUE *argv, VALUE self) {
 
   if (RTEST(number_of_matches)) {
     n = NUM2INT(number_of_matches);
+
+    if (n < 0) {
+      rb_raise(rb_eArgError, "number of matches should be >= 0");
+    }
   } else {
+    if (!p->pattern->ok()) {
+      return Qnil;
+    }
+
     n = p->pattern->NumberOfCapturingGroups();
   }
 
@@ -1251,7 +1260,13 @@ static VALUE re2_regexp_scan(VALUE self, VALUE text) {
   c->input = new(nothrow) re2::StringPiece(StringValuePtr(text));
   c->regexp = self;
   c->text = text;
-  c->number_of_capturing_groups = p->pattern->NumberOfCapturingGroups();
+
+  if (p->pattern->ok()) {
+    c->number_of_capturing_groups = p->pattern->NumberOfCapturingGroups();
+  } else {
+    c->number_of_capturing_groups = 0;
+  }
+
   c->eof = false;
 
   return scanner;

data/spec/re2/regexp_spec.rb

@@ -13,6 +13,11 @@ RSpec.describe RE2::Regexp do
     it "raises an error if given an inappropriate type" do
       expect { RE2::Regexp.new(nil) }.to raise_error(TypeError)
     end
+
+    it "allows invalid patterns to be created" do
+      re = RE2::Regexp.new('???', :log_errors => false)
+      expect(re).to be_a(RE2::Regexp)
+    end
   end
 
   describe "#compile" do
@@ -25,6 +30,11 @@ RSpec.describe RE2::Regexp do
       re = RE2::Regexp.compile('woo', :case_sensitive => false)
       expect(re).to be_a(RE2::Regexp)
     end
+
+    it "allows invalid patterns to be created" do
+      re = RE2::Regexp.compile('???', :log_errors => false)
+      expect(re).to be_a(RE2::Regexp)
+    end
   end
 
   describe "#options" do
@@ -83,6 +93,11 @@ RSpec.describe RE2::Regexp do
       program_size = RE2::Regexp.new('w(o)(o)').program_size
       expect(program_size).to be_a(Fixnum)
     end
+
+    it "returns -1 for an invalid pattern" do
+      program_size = RE2::Regexp.new('???', :log_errors => false).program_size
+      expect(program_size).to eq(-1)
+    end
   end
 
   describe "#to_str" do
@@ -97,6 +112,11 @@ RSpec.describe RE2::Regexp do
       pattern = RE2::Regexp.new('w(o)(o)').pattern
       expect(pattern).to eq("w(o)(o)")
     end
+
+    it "returns the pattern even if invalid" do
+      pattern = RE2::Regexp.new('???', :log_errors => false).pattern
+      expect(pattern).to eq("???")
+    end
   end
 
   describe "#inspect" do
@@ -274,6 +294,15 @@ RSpec.describe RE2::Regexp do
       expect { re.match("My name is Robert Paulson", {}) }.to raise_error(TypeError)
     end
 
+    it "raises an exception when given a negative number of matches" do
+      expect { re.match("My name is Robert Paulson", -1) }.to raise_error(ArgumentError, "number of matches should be >= 0")
+    end
+
+    it "returns nil with an invalid pattern" do
+      re = RE2::Regexp.new('???', :log_errors => false)
+      expect(re.match('My name is Robert Paulson')).to be_nil
+    end
+
     describe "with a specific number of matches under the total in the pattern" do
       subject { re.match("My name is Robert Paulson", 1) }
 
@@ -325,6 +354,11 @@ RSpec.describe RE2::Regexp do
       expect(re.match?("My name is Robert Paulson")).to eq(true)
       expect(re.match?("My age is 99")).to eq(false)
     end
+
+    it "returns false if the pattern is invalid" do
+      re = RE2::Regexp.new('???', :log_errors => false)
+      expect(re.match?("My name is Robert Paulson")).to eq(false)
+    end
   end
 
   describe "#=~" do
@@ -365,13 +399,13 @@ RSpec.describe RE2::Regexp do
     end
   end
 
-  describe "#escape" do
+  describe ".escape" do
     it "transforms a string into a regexp" do
       expect(RE2::Regexp.escape("1.5-2.0?")).to eq('1\.5\-2\.0\?')
     end
   end
 
-  describe "#quote" do
+  describe ".quote" do
     it "transforms a string into a regexp" do
       expect(RE2::Regexp.quote("1.5-2.0?")).to eq('1\.5\-2\.0\?')
     end
@@ -383,6 +417,10 @@ RSpec.describe RE2::Regexp do
       expect(RE2::Regexp.new('abc').number_of_capturing_groups).to eq(0)
       expect(RE2::Regexp.new('a((b)c)').number_of_capturing_groups).to eq(2)
     end
+
+    it "returns -1 for an invalid regexp" do
+      expect(RE2::Regexp.new('???', :log_errors => false).number_of_capturing_groups).to eq(-1)
+    end
   end
 
   describe "#named_capturing_groups" do
@@ -400,6 +438,10 @@ RSpec.describe RE2::Regexp do
       expect(groups["bob"]).to eq(1)
       expect(groups["rob"]).to eq(3)
     end
+
+    it "returns an empty hash for an invalid regexp" do
+      expect(RE2::Regexp.new('???', :log_errors => false).named_capturing_groups).to be_empty
+    end
   end
 
   describe "#scan" do

data/spec/re2/scanner_spec.rb

@@ -45,6 +45,12 @@ RSpec.describe RE2::Scanner do
       expect(scanner.scan).to be_nil
     end
 
+    it "returns nil if the regexp is invalid" do
+      r = RE2::Regexp.new('???', :log_errors => false)
+      scanner = r.scan("Foo bar")
+      expect(scanner.scan).to be_nil
+    end
+
     it "returns an empty array if the input is empty" do
       r = RE2::Regexp.new("")
       scanner = r.scan("")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Paul Mucur
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Ruby bindings to re2.