re2 1.7.0 → 2.1.3

data/spec/re2_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe RE2 do
-  describe "#Replace" do
+  describe ".Replace" do
     it "only replaces the first occurrence of the pattern" do
       expect(RE2.Replace("woo", "o", "a")).to eq("wao")
     end
@@ -15,29 +15,68 @@ RSpec.describe RE2 do
     it "does not perform replacements in-place" do
       name = "Robert"
       replacement = RE2.Replace(name, "R", "Cr")
-      expect(name).to_not equal(replacement)
+
+      expect(name).not_to equal(replacement)
     end
 
     it "supports passing an RE2::Regexp as the pattern" do
       re = RE2::Regexp.new('wo{2}')
+
       expect(RE2.Replace("woo", re, "miaow")).to eq("miaow")
     end
 
     it "respects any passed RE2::Regexp's flags" do
       re = RE2::Regexp.new('gOOD MORNING', :case_sensitive => false)
+
       expect(RE2.Replace("Good morning", re, "hi")).to eq("hi")
     end
 
-    if String.method_defined?(:encoding)
-      it "preserves the original string's encoding" do
-        original = "Foo"
-        replacement = RE2.Replace(original, "oo", "ah")
-        expect(original.encoding).to eq(replacement.encoding)
-      end
+    it "supports passing something that can be coerced to a String as input" do
+      expect(RE2.Replace(StringLike.new("woo"), "oo", "ah")).to eq("wah")
+    end
+
+    it "supports passing something that can be coerced to a String as a pattern" do
+      expect(RE2.Replace("woo", StringLike.new("oo"), "ah")).to eq("wah")
+    end
+
+    it "supports passing something that can be coerced to a String as a replacement" do
+      expect(RE2.Replace("woo", "oo", StringLike.new("ah"))).to eq("wah")
+    end
+
+    it "returns UTF-8 strings if the pattern is UTF-8" do
+      original = "Foo".encode("ISO-8859-1")
+      replacement = RE2.Replace(original, "oo", "ah")
+
+      expect(replacement.encoding).to eq(Encoding::UTF_8)
+    end
+
+    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")
+
+      expect(replacement.encoding).to eq(Encoding::ISO_8859_1)
+    end
+
+    it "returns UTF-8 strings when given a String pattern" do
+      replacement = RE2.Replace("Foo", "oo".encode("ISO-8859-1"), "ah")
+
+      expect(replacement.encoding).to eq(Encoding::UTF_8)
+    end
+
+    it "raises a Type Error for input that can't be converted to String" do
+      expect { RE2.Replace(0, "oo", "ah") }.to raise_error(TypeError)
+    end
+
+    it "raises a Type Error for a non-RE2::Regexp pattern that can't be converted to String" do
+      expect { RE2.Replace("woo", 0, "ah") }.to raise_error(TypeError)
+    end
+
+    it "raises a Type Error for a replacement that can't be converted to String" do
+      expect { RE2.Replace("woo", "oo", 0) }.to raise_error(TypeError)
     end
   end
 
-  describe "#GlobalReplace" do
+  describe ".GlobalReplace" do
     it "replaces every occurrence of a pattern" do
       expect(RE2.GlobalReplace("woo", "o", "a")).to eq("waa")
     end
@@ -53,23 +92,78 @@ RSpec.describe RE2 do
     it "does not perform replacement in-place" do
       name = "Robert"
       replacement = RE2.GlobalReplace(name, "(?i)R", "w")
-      expect(name).to_not equal(replacement)
+
+      expect(name).not_to equal(replacement)
     end
 
     it "supports passing an RE2::Regexp as the pattern" do
       re = RE2::Regexp.new('wo{2,}')
+
       expect(RE2.GlobalReplace("woowooo", re, "miaow")).to eq("miaowmiaow")
     end
 
     it "respects any passed RE2::Regexp's flags" do
       re = RE2::Regexp.new('gOOD MORNING', :case_sensitive => false)
+
       expect(RE2.GlobalReplace("Good morning Good morning", re, "hi")).to eq("hi hi")
     end
+
+    it "supports passing something that can be coerced to a String as input" do
+      expect(RE2.GlobalReplace(StringLike.new("woo"), "o", "a")).to eq("waa")
+    end
+
+    it "supports passing something that can be coerced to a String as a pattern" do
+      expect(RE2.GlobalReplace("woo", StringLike.new("o"), "a")).to eq("waa")
+    end
+
+    it "supports passing something that can be coerced to a String as a replacement" do
+      expect(RE2.GlobalReplace("woo", "o", StringLike.new("a"))).to eq("waa")
+    end
+
+    it "returns UTF-8 strings if the pattern is UTF-8" do
+      original = "Foo".encode("ISO-8859-1")
+      replacement = RE2.GlobalReplace(original, "oo", "ah")
+
+      expect(replacement.encoding).to eq(Encoding::UTF_8)
+    end
+
+    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")
+
+      expect(replacement.encoding).to eq(Encoding::ISO_8859_1)
+    end
+
+    it "returns UTF-8 strings when given a String pattern" do
+      replacement = RE2.GlobalReplace("Foo", "oo".encode("ISO-8859-1"), "ah")
+
+      expect(replacement.encoding).to eq(Encoding::UTF_8)
+    end
+
+    it "raises a Type Error for input that can't be converted to String" do
+      expect { RE2.GlobalReplace(0, "o", "a") }.to raise_error(TypeError)
+    end
+
+    it "raises a Type Error for a non-RE2::Regexp pattern that can't be converted to String" do
+      expect { RE2.GlobalReplace("woo", 0, "a") }.to raise_error(TypeError)
+    end
+
+    it "raises a Type Error for a replacement that can't be converted to String" do
+      expect { RE2.GlobalReplace("woo", "o", 0) }.to raise_error(TypeError)
+    end
   end
 
   describe "#QuoteMeta" do
     it "escapes a string so it can be used as a regular expression" do
       expect(RE2.QuoteMeta("1.5-2.0?")).to eq('1\.5\-2\.0\?')
     end
+
+    it "raises a Type Error for input that can't be converted to String" do
+      expect { RE2.QuoteMeta(0) }.to raise_error(TypeError)
+    end
+
+    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
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,15 @@
 require "re2"
 
+# To test passing objects that can be coerced to a String.
+class StringLike
+  attr_reader :str
+  alias_method :to_str, :str
+
+  def initialize(str)
+    @str = str
+  end
+end
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 2.1.3
 platform: ruby
 authors:
 - Paul Mucur
-autorequire:
+- Stan Hu
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-04 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -16,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -38,21 +53,45 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-description: Ruby bindings to re2, "an efficient, principled regular expression library".
-email:
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.4
+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: 
 executables: []
 extensions:
 - ext/re2/extconf.rb
 extra_rdoc_files: []
 files:
+- ".rspec"
+- Gemfile
+- LICENSE-DEPENDENCIES.txt
 - LICENSE.txt
 - README.md
 - Rakefile
+- dependencies.yml
 - ext/re2/extconf.rb
 - ext/re2/re2.cc
+- ext/re2/recipes.rb
 - lib/re2.rb
 - 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
+- re2.gemspec
 - spec/kernel_spec.rb
 - spec/re2/match_data_spec.rb
 - spec/re2/regexp_spec.rb
@@ -65,7 +104,7 @@ homepage: https://github.com/mudge/re2
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -73,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -81,9 +120,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key:
+signing_key: 
 specification_version: 4
-summary: Ruby bindings to re2.
+summary: Ruby bindings to RE2.
 test_files:
 - spec/spec_helper.rb
 - spec/re2_spec.rb