re2 2.15.0 → 2.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92d0c12dc899d22cf74c00bbda8f89f29665b32d10fcc9a8eb9ca01f671c62f5
-  data.tar.gz: 1aea6bbc6cc7168a5a16fbb52b244535ed422707f63ebac59c2a0d1ae81bfbaf
+  metadata.gz: 5dda47249dece471c693d3947867757b29d48f654833de543d4d4bfb53cda23b
+  data.tar.gz: 171046cf40fbd75522368fa4107919d343fdfead96b97f532c9d69bf863c48c7
 SHA512:
-  metadata.gz: ff0c9014a05c741b9bc7f3b9961c9e36a97cc4e48f7546779a4ceca60ff225c84a3930acd7daf5d58225aa051b0d6ee475ce778c66ecd3f3643d522bd105b72b
-  data.tar.gz: ea0b6da27aa3e568821dc48a452fcd3e4e16600fe66e3964702d37c56e2f9247d16130e95a60c83684530633937b810539cf45d5c0f842f88d4ccc5b35dafa53
+  metadata.gz: e08a30136b82117f1b367afcdd18a16cc979772f9dc5913c80fa0822a891b2af9c975b36aee54d1d874af6ca4c395de9e9b1e9373cd45588f6ef35b8b83d4e34
+  data.tar.gz: 860c87853862bffb37405d6d878ccb407caa21db65ae4e3ef40ffb5689573b8f43a4a83a19cb905ed9b36c42f9c4003aa487a998076defaf06bf521583e96f83

data/README.md

@@ -6,8 +6,8 @@ Python".
 
 [![Build Status](https://github.com/mudge/re2/actions/workflows/tests.yml/badge.svg?branch=main)](https://github.com/mudge/re2/actions)
 
-**Current version:** 2.15.0  
-**Bundled RE2 version:** libre2.11 (2024-07-02)  
+**Current version:** 2.16.0  
+**Bundled RE2 version:** libre2.11 (2025-06-26b)  
 
 ```ruby
 RE2('h.*o').full_match?("hello")    #=> true
@@ -224,12 +224,15 @@ the set. After all patterns have been added, the set can be compiled using
 and then
 [`RE2::Set#match`](https://mudge.name/re2/RE2/Set.html#match-instance_method)
 will return an array containing the indices of all the patterns that matched.
+[`RE2::Set#size`](https://mudge.name/re2/RE2/Set.html#size-instance_method)
+will return the number of patterns in the set.
 
 ```ruby
 set = RE2::Set.new
 set.add("abc")         #=> 0
 set.add("def")         #=> 1
 set.add("ghi")         #=> 2
+set.size               #=> 3
 set.compile            #=> true
 set.match("abcdefghi") #=> [0, 1, 2]
 set.match("ghidefabc") #=> [2, 1, 0]
@@ -261,7 +264,7 @@ This gem requires the following to run:
 
 It supports the following RE2 ABI versions:
 
-* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2024-07-02)
+* libre2.0 (prior to release 2020-03-02) to libre2.11 (2023-07-01 to 2025-06-26b)
 
 ### Native gems
 

data/Rakefile

@@ -33,7 +33,7 @@ cross_platforms = %w[
   x86_64-linux-musl
 ].freeze
 
-ENV['RUBY_CC_VERSION'] = '3.4.1:3.3.5:3.2.6:3.1.6:3.0.7:2.7.8:2.6.10'
+RakeCompilerDock.set_ruby_cc_version("~> 2.6", "~> 3.0")
 
 Gem::PackageTask.new(re2_gemspec).define
 
@@ -70,6 +70,7 @@ namespace :gem do
     desc "Compile and build native gem for #{platform} platform"
     task platform do
       RakeCompilerDock.sh <<~SCRIPT, platform: platform, verbose: true
+        rbenv shell 3.1.6 &&
         gem install bundler --no-document &&
         bundle &&
         bundle exec rake native:#{platform} pkg/#{re2_gemspec.full_name}-#{Gem::Platform.new(platform)}.gem PATH="/usr/local/bin:$PATH"

data/dependencies.yml

@@ -1,7 +1,7 @@
 ---
 libre2:
-  version: '2024-07-02'
-  sha256: eb2df807c781601c14a260a507a5bb4509be1ee626024cb45acbd57cb9d4032b
+  version: 2025-06-26b
+  sha256: 641a3ca337814a6c3676a389ea065812e00ff796f31a427038bc010bae0b86e3
 abseil:
-  version: '20240722.0'
-  sha256: f50e5ac311a81382da7fa75b97310e4b9006474f9560ac46f54a9967f07d4ae3
+  version: '20250127.1'
+  sha256: b396401fd29e2e679cace77867481d388c807671dc2acc602a0259eeb79b7811

data/ext/re2/extconf.rb

@@ -217,6 +217,24 @@ module RE2
           $defs.push("-DHAVE_ERROR_INFO_ARGUMENT")
         end
       end
+
+      checking_for("RE2::Set::Size()") do
+        test_re2_set_size = <<~SRC
+          #include <re2/re2.h>
+          #include <re2/set.h>
+
+          int main() {
+            RE2::Set s(RE2::DefaultOptions, RE2::UNANCHORED);
+            s.Size();
+
+            return 0;
+          }
+        SRC
+
+        if try_compile(test_re2_set_size, compile_options)
+          $defs.push("-DHAVE_SET_SIZE")
+        end
+      end
     end
 
     def static_pkg_config(pc_file, pkg_config_paths)

data/ext/re2/re2.cc

@@ -1962,6 +1962,26 @@ static VALUE re2_set_compile(VALUE self) {
   return BOOL2RUBY(s->set->Compile());
 }
 
+/*
+ * Returns the size of the {RE2::Set}.
+ *
+ * @return [Integer] the number of patterns in the set
+ * @example
+ *   set = RE2::Set.new
+ *   set.add("abc")
+ *   set.size #=> 1
+ */
+static VALUE re2_set_size(VALUE self) {
+#ifdef HAVE_SET_SIZE
+  re2_set *s;
+  TypedData_Get_Struct(self, re2_set, &re2_set_data_type, s);
+
+  return INT2FIX(s->set->Size());
+#else
+  rb_raise(re2_eSetUnsupportedError, "current version of RE2::Set does not have Size method");
+#endif
+}
+
 /*
  * Returns whether the underlying RE2 version outputs error information from
  * {https://github.com/google/re2/blob/bc0faab533e2b27b85b8ad312abf061e33ed6b5d/re2/set.h#L62-L65
@@ -1978,6 +1998,19 @@ static VALUE re2_set_match_raises_errors_p(VALUE) {
 #endif
 }
 
+/*
+ * Returns whether the underlying RE2 version has a Set::Size method.
+ *
+ * @return [Boolean] whether the underlying RE2 has a Set::Size method
+ */
+static VALUE re2_set_size_p(VALUE) {
+#ifdef HAVE_SET_SIZE
+  return Qtrue;
+#else
+  return Qfalse;
+#endif
+}
+
 /*
  * Matches the given text against patterns in the set, returning an array of
  * integer indices of the matching patterns if matched or an empty array if
@@ -2208,11 +2241,15 @@ extern "C" void Init_re2(void) {
 
   rb_define_singleton_method(re2_cSet, "match_raises_errors?",
       RUBY_METHOD_FUNC(re2_set_match_raises_errors_p), 0);
+  rb_define_singleton_method(re2_cSet, "size?",
+      RUBY_METHOD_FUNC(re2_set_size_p), 0);
   rb_define_method(re2_cSet, "initialize",
       RUBY_METHOD_FUNC(re2_set_initialize), -1);
   rb_define_method(re2_cSet, "add", RUBY_METHOD_FUNC(re2_set_add), 1);
   rb_define_method(re2_cSet, "compile", RUBY_METHOD_FUNC(re2_set_compile), 0);
   rb_define_method(re2_cSet, "match", RUBY_METHOD_FUNC(re2_set_match), -1);
+  rb_define_method(re2_cSet, "size", RUBY_METHOD_FUNC(re2_set_size), 0);
+  rb_define_method(re2_cSet, "length", RUBY_METHOD_FUNC(re2_set_size), 0);
 
   rb_define_module_function(re2_mRE2, "Replace",
       RUBY_METHOD_FUNC(re2_Replace), 3);

data/lib/re2/version.rb

@@ -10,5 +10,5 @@
 
 
 module RE2
-  VERSION = "2.15.0"
+  VERSION = "2.16.0"
 end

data/re2.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
     "spec/re2/scanner_spec.rb"
   ]
   s.add_development_dependency("rake-compiler", "~> 1.2.7")
-  s.add_development_dependency("rake-compiler-dock", "~> 1.8.0")
+  s.add_development_dependency("rake-compiler-dock", "~> 1.9.1")
   s.add_development_dependency("rspec", "~> 3.2")
   s.add_runtime_dependency("mini_portile2", "~> 2.8.7") # keep version in sync with extconf.rb
 end

data/spec/re2/set_spec.rb

@@ -204,6 +204,50 @@ RSpec.describe RE2::Set do
     end
   end
 
+  describe "#size" do
+    it "returns the number of patterns added to the set", :aggregate_failures do
+      skip "Underlying RE2::Set has no Size method" unless RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect(set.size).to eq(0)
+
+      set.add("abc")
+
+      expect(set.size).to eq(1)
+
+      set.add("def")
+
+      expect(set.size).to eq(2)
+    end
+
+    it "raises an error if RE2 does not support Set::Size" do
+      skip "Underlying RE2::Set has a Size method" if RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect { set.size }.to raise_error(RE2::Set::UnsupportedError)
+    end
+  end
+
+  describe "#length" do
+    it "is an alias for size" do
+      skip "Underlying RE2::Set has no Size method" unless RE2::Set.size?
+
+      set = RE2::Set.new
+
+      expect(set.length).to eq(0)
+
+      set.add("abc")
+
+      expect(set.length).to eq(1)
+
+      set.add("def")
+
+      expect(set.length).to eq(2)
+    end
+  end
+
   def silence_stderr
     original_stream = STDERR
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.16.0
 platform: ruby
 authors:
 - Paul Mucur
 - Stan Hu
 bindir: bin
 cert_chain: []
-date: 2025-01-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -88,8 +88,8 @@ files:
 - lib/re2/scanner.rb
 - lib/re2/string.rb
 - lib/re2/version.rb
-- ports/archives/20240722.0.tar.gz
-- ports/archives/re2-2024-07-02.tar.gz
+- ports/archives/20250127.1.tar.gz
+- ports/archives/re2-2025-06-26b.tar.gz
 - re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
@@ -117,16 +117,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Ruby bindings to RE2.
 test_files:
 - ".rspec"
-- spec/spec_helper.rb
-- spec/re2_spec.rb
 - spec/kernel_spec.rb
-- spec/re2/regexp_spec.rb
 - spec/re2/match_data_spec.rb
-- spec/re2/string_spec.rb
-- spec/re2/set_spec.rb
+- spec/re2/regexp_spec.rb
 - spec/re2/scanner_spec.rb
+- spec/re2/set_spec.rb
+- spec/re2/string_spec.rb
+- spec/re2_spec.rb
+- spec/spec_helper.rb