re2 2.1.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2b7934c7004c1c7cfcd6897ce4cba918afe467e61e0df0e23ead64e3febb503
-  data.tar.gz: a2b8186b86b51e5231f0574d025925c72a8cc99bf4f575430bb72a1334f37449
+  metadata.gz: 5a13971802fb657d7882e4a7d104673ede16481ec279ca791b173278e69e2f16
+  data.tar.gz: c911db8b2c8a10d6c2ead9ee6f6242cb77cccf832ba685927fef9191ba64cb30
 SHA512:
-  metadata.gz: 5158d1533dd6bd27e7414af566870d0b9fb6452a829b0345299e33ce7c5f0e68f4b92b24782c3a622a3b73004e51fbd3ee164c036559a8b25d95e55d4b3a6bea
-  data.tar.gz: f31e13dc904c4a375738a7dccd5a8925360f1df94766f18584a3df19c8f062e61c9f96565ceb4cbf464e8c607b48b99f9f02aed4dc0d3da62a9c5a2be1142aa1
+  metadata.gz: '0516976272847272023485d8830e1ab25e3a30c066ab6268a3d7ce5594a543f5450639fc24f4fdd83952c66b5a20302f06f06d53bd50eb388304763b77cbf364'
+  data.tar.gz: 73917e5ac5721e4dfbd9e4163ff738686ac0da1dda15c2c1bce1919a19627927f61e5e3b1dcdb0926f0fe46dbb84d202a94dba85d926bc8e48893bf50f50f503

data/README.md

@@ -5,9 +5,9 @@ Ruby bindings to [RE2][], a "fast, safe, thread-friendly alternative to
 backtracking regular expression engines like those used in PCRE, Perl, and
 Python".
 
-**Current version:** 2.1.3  
+**Current version:** 2.3.0  
 **Supported Ruby versions:** 2.6, 2.7, 3.0, 3.1, 3.2  
-**Bundled RE2 version:** libre2.11 (2023-09-01)  
+**Bundled RE2 version:** libre2.11 (2023-11-01)  
 **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), libre2.10 (2022-12-01), libre2.11 (2023-07-01)
 
 Installation

data/dependencies.yml

@@ -1,9 +1,7 @@
+---
 libre2:
-  version: "2023-09-01"
-  sha256: "5bb6875ae1cd1e9fedde98018c346db7260655f86fdb8837e3075103acd3649b"
-  # sha-256 hash provided in https://github.com/google/re2/releases/download/2023-09-01/re2-2023-09-01.tar.gz
-
+  version: '2023-11-01'
+  sha256: 4e6593ac3c71de1c0f322735bc8b0492a72f66ffccfad76e259fa21c41d27d8a
 abseil:
-  version: "20230125.3"
-  sha256: 5366d7e7fa7ba0d915014d387b66d0d002c03236448e1ba9ef98122c13b35c36
-  # sha-256 hash provided in https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.3.tar.gz
+  version: '20230802.1'
+  sha256: 987ce98f02eefbaf930d6e38ab16aa05737234d7afbab2d5c4ea7adbe50c28ed

data/ext/re2/extconf.rb

@@ -296,17 +296,18 @@ ABSL_LDFLAGS = %w[
   -labsl_crc32c
   -labsl_crc_internal
   -labsl_crc_cpu_detect
+  -labsl_raw_hash_set
   -labsl_hash
   -labsl_city
   -labsl_bad_variant_access
   -labsl_low_level_hash
-  -labsl_raw_hash_set
   -labsl_hashtablez_sampler
   -labsl_exponential_biased
   -labsl_bad_optional_access
   -labsl_str_format_internal
   -labsl_synchronization
   -labsl_graphcycles_internal
+  -labsl_kernel_timeout_internal
   -labsl_stacktrace
   -labsl_symbolize
   -ldbghelp
@@ -316,9 +317,10 @@ ABSL_LDFLAGS = %w[
   -labsl_time
   -labsl_civil_time
   -labsl_strings
+  -labsl_string_view
   -labsl_strings_internal
-  -ladvapi32
   -labsl_base
+  -ladvapi32
   -labsl_spinlock_wait
   -labsl_int128
   -labsl_throw_delegate
@@ -396,6 +398,8 @@ def build_with_vendored_libraries
 
   process_recipe(abseil_recipe) do |recipe|
     recipe.configure_options += ['-DABSL_PROPAGATE_CXX_STD=ON', '-DCMAKE_CXX_VISIBILITY_PRESET=hidden']
+    # Workaround for https://github.com/abseil/abseil-cpp/issues/1510
+    recipe.configure_options += ['-DCMAKE_CXX_FLAGS=-DABSL_FORCE_WAITER_MODE=4'] if windows?
   end
 
   process_recipe(re2_recipe) do |recipe|

data/ext/re2/recipes.rb

@@ -1,5 +1,5 @@
 PACKAGE_ROOT_DIR = File.expand_path('../..', __dir__)
-REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.4' # keep this version in sync with the one in the gemspec
+REQUIRED_MINI_PORTILE_VERSION = '~> 2.8.5' # keep this version in sync with the one in the gemspec
 
 def build_recipe(name, version)
   require 'rubygems'
@@ -10,7 +10,7 @@ def build_recipe(name, version)
     recipe.target = File.join(PACKAGE_ROOT_DIR, 'ports')
     recipe.configure_options += [
       # abseil needs a C++14 compiler
-      '-DCMAKE_CXX_STANDARD=17',
+      '-DCMAKE_CXX_STANDARD=14',
       # needed for building the C extension shared library with -fPIC
       '-DCMAKE_POSITION_INDEPENDENT_CODE=ON',
       # ensures pkg-config and installed libraries will be in lib, not lib64

data/lib/re2/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RE2
-  VERSION = "2.1.3"
+  VERSION = "2.3.0"
 end

data/re2.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake-compiler", "~> 1.2.1")
   s.add_development_dependency("rake-compiler-dock", "~> 1.3.0")
   s.add_development_dependency("rspec", "~> 3.2")
-  s.add_runtime_dependency("mini_portile2", "~> 2.8.4") # keep version in sync with extconf.rb
+  s.add_runtime_dependency("mini_portile2", "~> 2.8.5") # keep version in sync with extconf.rb
 end

data/spec/kernel_spec.rb

@@ -9,5 +9,21 @@ RSpec.describe Kernel do
 
       expect(re).not_to be_case_sensitive
     end
+
+    it "raises an error if given an inappropriate type" do
+      expect { RE2(nil) }.to raise_error(TypeError)
+    end
+
+    it "allows invalid patterns to be created" do
+      re = RE2('???', :log_errors => false)
+
+      expect(re).to be_a(RE2::Regexp)
+    end
+
+    it "supports passing something that can be coerced to a String as input" do
+      re = RE2(StringLike.new('w(o)(o)'))
+
+      expect(re).to be_a(RE2::Regexp)
+    end
   end
 end

data/spec/re2/regexp_spec.rb

@@ -18,9 +18,15 @@ RSpec.describe RE2::Regexp do
       re = RE2::Regexp.new('???', :log_errors => false)
       expect(re).to be_a(RE2::Regexp)
     end
+
+    it "supports passing something that can be coerced to a String as input" do
+      re = RE2::Regexp.new(StringLike.new('w(o)(o)'))
+
+      expect(re).to be_a(RE2::Regexp)
+    end
   end
 
-  describe "#compile" do
+  describe ".compile" do
     it "returns an instance given only a pattern" do
       re = RE2::Regexp.compile('woo')
       expect(re).to be_a(RE2::Regexp)
@@ -31,10 +37,20 @@ RSpec.describe RE2::Regexp do
       expect(re).to be_a(RE2::Regexp)
     end
 
+    it "raises an error if given an inappropriate type" do
+      expect { RE2::Regexp.compile(nil) }.to raise_error(TypeError)
+    end
+
     it "allows invalid patterns to be created" do
       re = RE2::Regexp.compile('???', :log_errors => false)
       expect(re).to be_a(RE2::Regexp)
     end
+
+    it "supports passing something that can be coerced to a String as input" do
+      re = RE2::Regexp.compile(StringLike.new('w(o)(o)'))
+
+      expect(re).to be_a(RE2::Regexp)
+    end
   end
 
   describe "#options" do
@@ -59,7 +75,7 @@ RSpec.describe RE2::Regexp do
 
     it "is populated with overridden options when specified" do
       options = RE2::Regexp.new('woo', :case_sensitive => false).options
-      expect(options[:case_sensitive]).to eq(false)
+      expect(options).to include(:case_sensitive => false)
     end
   end
 
@@ -82,7 +98,7 @@ RSpec.describe RE2::Regexp do
       expect(error_arg).to be_nil
     end
 
-    it "returns the offending portin of the regexp if there is an error" do
+    it "returns the offending portion of the regexp if there is an error" do
       error_arg = RE2::Regexp.new('wo(o', :log_errors => false).error_arg
       expect(error_arg).to eq("wo(o")
     end

data/spec/re2_spec.rb

@@ -12,11 +12,12 @@ RSpec.describe RE2 do
       expect(RE2.Replace("Good morning", "(?i)gOOD MORNING", "hi")).to eq("hi")
     end
 
-    it "does not perform replacements in-place" do
+    it "does not perform replacements in-place", :aggregate_failures do
       name = "Robert"
       replacement = RE2.Replace(name, "R", "Cr")
 
-      expect(name).not_to equal(replacement)
+      expect(name).to eq("Robert")
+      expect(replacement).to eq("Crobert")
     end
 
     it "supports passing an RE2::Regexp as the pattern" do
@@ -89,11 +90,12 @@ RSpec.describe RE2 do
       expect(RE2.GlobalReplace("Robert", "(?i)r", "w")).to eq("wobewt")
     end
 
-    it "does not perform replacement in-place" do
+    it "does not perform replacement in-place", :aggregate_failures do
       name = "Robert"
       replacement = RE2.GlobalReplace(name, "(?i)R", "w")
 
-      expect(name).not_to equal(replacement)
+      expect(name).to eq("Robert")
+      expect(replacement).to eq("wobewt")
     end
 
     it "supports passing an RE2::Regexp as the pattern" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - Paul Mucur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-23 00:00:00.000000000 Z
+date: 2023-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.4
+        version: 2.8.5
 description: Ruby bindings to RE2, "a fast, safe, thread-friendly alternative to backtracking
   regular expression engines like those used in PCRE, Perl, and Python".
 email: 
@@ -89,8 +89,8 @@ files:
 - lib/re2/scanner.rb
 - lib/re2/string.rb
 - lib/re2/version.rb
-- ports/archives/20230125.3.tar.gz
-- ports/archives/re2-2023-09-01.tar.gz
+- ports/archives/20230802.1.tar.gz
+- ports/archives/re2-2023-11-01.tar.gz
 - re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb