re2 0.4.0 → 0.5.0

data/ext/re2/re2.cc

@@ -177,12 +177,17 @@ extern "C" {
     re2::StringPiece match;
 
     Data_Get_Struct(self, re2_matchdata, m);
-    match = m->matches[nth];
 
-    if (nth >= m->number_of_matches || match.empty()) {
+    if (nth < 0 || nth >= m->number_of_matches) {
       return Qnil;
     } else {
-      return rb_str_new(match.data(), match.size());
+      match = m->matches[nth];
+
+      if (match.empty()) {
+        return Qnil;
+      } else {
+        return rb_str_new(match.data(), match.size());
+      }
     }
   }
 

data/lib/re2/string.rb

@@ -14,14 +14,30 @@ module RE2
     # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
     # @param [String] rewrite the string to replace with
     # @example
+    #   "hello there".re2_sub!("hello", "howdy") #=> "howdy there"
+    #   re2 = RE2.new("hel+o")
+    #   "hello there".re2_sub!(re2, "yo")        #=> "yo there"
+    #   text = "Good morning"
+    #   text.re2_sub!("morn", "even")            #=> "Good evening"
+    #   text                                     #=> "Good evening"
+    def re2_sub!(*args)
+      RE2.Replace(self, *args)
+    end
+
+    # Replaces the first occurrence +pattern+ with +rewrite+ and returns a new
+    # string.
+    #
+    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
+    # @param [String] rewrite the string to replace with
+    # @example
     #   "hello there".re2_sub("hello", "howdy") #=> "howdy there"
     #   re2 = RE2.new("hel+o")
     #   "hello there".re2_sub(re2, "yo")        #=> "yo there"
     #   text = "Good morning"
     #   text.re2_sub("morn", "even")            #=> "Good evening"
-    #   text                                    #=> "Good evening"
+    #   text                                    #=> "Good morning"
     def re2_sub(*args)
-      RE2.Replace(self, *args)
+      dup.re2_sub!(*args)
     end
 
     # Replaces every occurrence of +pattern+ with +rewrite+ <i>in place</i>.
@@ -29,14 +45,29 @@ module RE2
     # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
     # @param [String] rewrite the string to replace with
     # @example
+    #   "hello there".re2_gsub!("e", "i")   #=> "hillo thiri"
+    #   re2 = RE2.new("oo?")
+    #   "whoops-doops".re2_gsub!(re2, "e")  #=> "wheps-deps"
+    #   text = "Good morning"
+    #   text.re2_gsub!("o", "ee")           #=> "Geeeed meerning"
+    #   text                                #=> "Geeeed meerning"
+    def re2_gsub!(*args)
+      RE2.GlobalReplace(self, *args)
+    end
+
+    # Replaces every occurrence of +pattern+ with +rewrite+ and return a new string.
+    #
+    # @param [String, RE2::Regexp] pattern a regexp matching text to be replaced
+    # @param [String] rewrite the string to replace with
+    # @example
     #   "hello there".re2_gsub("e", "i")   #=> "hillo thiri"
     #   re2 = RE2.new("oo?")
     #   "whoops-doops".re2_gsub(re2, "e")  #=> "wheps-deps"
     #   text = "Good morning"
     #   text.re2_gsub("o", "ee")           #=> "Geeeed meerning"
-    #   text                               #=> "Geeeed meerning"
+    #   text                               #=> "Good morning"
     def re2_gsub(*args)
-      RE2.GlobalReplace(self, *args)
+      dup.re2_gsub!(*args)
     end
 
     # Match the pattern and return either a boolean (if no submatches are required)

data/spec/re2/string_spec.rb

@@ -6,16 +6,48 @@ class String
 end
 
 describe RE2::String do
+  describe "#re2_sub!" do
+    it "delegates to RE2.Replace to perform replacement" do
+      "My name is Robert Paulson".re2_sub!('Robert', 'Crobert').must_equal("My name is Crobert Paulson")
+    end
+
+    it "doe perform an in-place replacement" do
+      string = "My name is Robert Paulson"
+      string.re2_sub!('Robert', 'Crobert').must_be_same_as(string)
+    end
+  end
+
+  describe "#re2_gsub!" do
+    it "delegates to RE2.GlobalReplace to perform replacement" do
+      "My name is Robert Paulson".re2_gsub!('a', 'e').must_equal("My neme is Robert Peulson")
+    end
+
+    it "doe perform an in-place replacement" do
+      string = "My name is Robert Paulson"
+      string.re2_gsub!('a', 'e').must_be_same_as(string)
+    end
+  end
+
   describe "#re2_sub" do
     it "delegates to RE2.Replace to perform replacement" do
       "My name is Robert Paulson".re2_sub('Robert', 'Crobert').must_equal("My name is Crobert Paulson")
     end
+
+    it "doesn't perform an in-place replacement" do
+      string = "My name is Robert Paulson"
+      string.re2_sub('Robert', 'Crobert').wont_be_same_as(string)
+    end
   end
 
   describe "#re2_gsub" do
     it "delegates to RE2.GlobalReplace to perform replacement" do
       "My name is Robert Paulson".re2_gsub('a', 'e').must_equal("My neme is Robert Peulson")
     end
+
+    it "doesn't perform an in-place replacement" do
+      string = "My name is Robert Paulson"
+      string.re2_gsub('a', 'e').wont_be_same_as(string)
+    end
   end
 
   describe "#re2_match" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-06 00:00:00.000000000 Z
+date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70129597606260 !ruby/object:Gem::Requirement
+  requirement: &70127849363640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129597606260
+  version_requirements: *70127849363640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70129597605760 !ruby/object:Gem::Requirement
+  requirement: &70127849363160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70129597605760
+  version_requirements: *70127849363160
 description: Ruby bindings to re2, "an efficient, principled regular expression library".
 email: ruby.re2@librelist.com
 executables: []