re2 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7ea4e358300d9edcb5f29af82092725e89c47bea
-  data.tar.gz: 9fcb5fb53e8eb0b1f1e6c57d58df9accb3d49af5
+SHA256:
+  metadata.gz: 63b9158e45d56ed6977fe6eb9b897039291faeaeeb310dd980a2e88e5e05778d
+  data.tar.gz: ddb04bf5ee1b4e2f4335d816a967c2cc46ae1c39c96d97c6e25c80e4579f8ea4
 SHA512:
-  metadata.gz: d8bd5df6de150998c4fc6d8c3d61bc60a6c08170d54defdf3d3b10e70667400948b2c3b0b2c593c3a5fcff6f8e9a1e1da5a6965554eed446ad9ab02bb7065d96
-  data.tar.gz: bfb6559f5e96a4643001b018ee43c777b12e8a3577cfead518dfc08e496819a31150af9810beb49d75584f320e4bd2c9effefe0ddc3149d255fca56eda94121e
+  metadata.gz: 9537a2f75f3e36fd71967ca23a4b2e5bf54847407a6a55b87474403ca2bf3ca5adb93695d445e10d34ba37339eee0d4bbf94914835b6a05b5463a42ae255fde7
+  data.tar.gz: 3c3bf9b84398ea8803377fb3224cedb36a185038c74fecb60165a731766a3bffc15893012fe812ebb719c5133d7217f1ec7cbed364dd6281be281b72db3466be

data/README.md

@@ -4,7 +4,7 @@ re2 [![Build Status](https://travis-ci.org/mudge/re2.svg?branch=master)](http://
 A Ruby binding to [re2][], an "efficient, principled regular expression
 library".
 
-**Current version:** 1.1.1  
+**Current version:** 1.2.0  
 **Supported Ruby versions:** 1.8.7, 1.9.2, 1.9.3, 2.0.0, 2.1.0, 2.2, 2.3, Rubinius 3.8
 
 Installation
@@ -166,14 +166,16 @@ Contributions
 -------------
 
 * Thanks to [Jason Woods](https://github.com/driskell) who contributed the
-original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
+  original implementations of `RE2::MatchData#begin` and `RE2::MatchData#end`;
 * 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 [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.
 
 Contact
 -------
 
-All feedback should go to the mailing list: <mailto:ruby.re2@librelist.com>
+All issues and suggestions should go to [GitHub Issues](https://github.com/mudge/re2/issues).
 
   [re2]: https://github.com/google/re2
   [gcc]: http://gcc.gnu.org/

data/ext/re2/re2.cc

@@ -258,7 +258,7 @@ static VALUE re2_scanner_scan(VALUE self) {
       } else {
         rb_ary_push(result, ENCODED_STR_NEW(matches[i].data(),
               matches[i].size(),
-              p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1"));
+              p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1"));
       }
     }
 
@@ -361,7 +361,7 @@ static VALUE re2_matchdata_begin(VALUE self, VALUE n) {
     offset = reinterpret_cast<uintptr_t>(match->data()) - reinterpret_cast<uintptr_t>(StringValuePtr(m->text));
 
     return ENCODED_STR_SUBLEN(StringValue(m->text), offset,
-           p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+           p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
   }
 }
 
@@ -392,7 +392,7 @@ static VALUE re2_matchdata_end(VALUE self, VALUE n) {
     offset = reinterpret_cast<uintptr_t>(match->data()) - reinterpret_cast<uintptr_t>(StringValuePtr(m->text)) + match->size();
 
     return ENCODED_STR_SUBLEN(StringValue(m->text), offset,
-           p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+           p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
   }
 }
 
@@ -456,7 +456,7 @@ static VALUE re2_matchdata_to_a(VALUE self) {
       rb_ary_push(array, Qnil);
     } else {
       rb_ary_push(array, ENCODED_STR_NEW(match->data(), match->size(),
-            p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1"));
+            p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1"));
     }
   }
 
@@ -480,7 +480,7 @@ static VALUE re2_matchdata_nth_match(int nth, VALUE self) {
       return Qnil;
     } else {
       return ENCODED_STR_NEW(match->data(), match->size(),
-          p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+          p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
     }
   }
 }
@@ -611,7 +611,7 @@ static VALUE re2_matchdata_inspect(VALUE self) {
   output << ">";
 
   result = ENCODED_STR_NEW(output.str().data(), output.str().length(),
-      p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+      p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
 
   return result;
 }
@@ -684,7 +684,7 @@ static VALUE re2_regexp_initialize(int argc, VALUE *argv, VALUE self) {
 
     utf8 = rb_hash_aref(options, ID2SYM(id_utf8));
     if (!NIL_P(utf8)) {
-      re2_options.set_utf8(RTEST(utf8));
+      re2_options.set_encoding(RTEST(utf8) ? RE2::Options::EncodingUTF8 : RE2::Options::EncodingLatin1);
     }
 
     posix_syntax = rb_hash_aref(options, ID2SYM(id_posix_syntax));
@@ -767,7 +767,7 @@ static VALUE re2_regexp_inspect(VALUE self) {
   output << "#<RE2::Regexp /" << p->pattern->pattern() << "/>";
 
   result = ENCODED_STR_NEW(output.str().data(), output.str().length(),
-      p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+      p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
 
   return result;
 }
@@ -785,7 +785,7 @@ static VALUE re2_regexp_to_s(VALUE self) {
   Data_Get_Struct(self, re2_pattern, p);
   return ENCODED_STR_NEW(p->pattern->pattern().data(),
       p->pattern->pattern().size(),
-      p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+      p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
 }
 
 /*
@@ -815,7 +815,7 @@ static VALUE re2_regexp_ok(VALUE self) {
 static VALUE re2_regexp_utf8(VALUE self) {
   re2_pattern *p;
   Data_Get_Struct(self, re2_pattern, p);
-  return BOOL2RUBY(p->pattern->options().utf8());
+  return BOOL2RUBY(p->pattern->options().encoding() == RE2::Options::EncodingUTF8);
 }
 
 /*
@@ -1012,7 +1012,7 @@ static VALUE re2_regexp_error_arg(VALUE self) {
   } else {
     return ENCODED_STR_NEW(p->pattern->error_arg().data(),
         p->pattern->error_arg().size(),
-        p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+        p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
   }
 }
 
@@ -1043,7 +1043,7 @@ static VALUE re2_regexp_options(VALUE self) {
   options = rb_hash_new();
 
   rb_hash_aset(options, ID2SYM(id_utf8),
-      BOOL2RUBY(p->pattern->options().utf8()));
+      BOOL2RUBY(p->pattern->options().encoding() == RE2::Options::EncodingUTF8));
 
   rb_hash_aset(options, ID2SYM(id_posix_syntax),
       BOOL2RUBY(p->pattern->options().posix_syntax()));
@@ -1113,7 +1113,7 @@ static VALUE re2_regexp_named_capturing_groups(VALUE self) {
   for (iterator = groups.begin(); iterator != groups.end(); iterator++) {
     rb_hash_aset(capturing_groups,
         ENCODED_STR_NEW(iterator->first.data(), iterator->first.size(),
-          p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1"),
+          p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1"),
         INT2FIX(iterator->second));
   }
 
@@ -1284,7 +1284,7 @@ static VALUE re2_Replace(VALUE self, VALUE str, VALUE pattern,
     RE2::Replace(&str_as_string, *p->pattern, StringValuePtr(rewrite));
 
     return ENCODED_STR_NEW(str_as_string.data(), str_as_string.size(),
-        p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+        p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
   } else {
     RE2::Replace(&str_as_string, StringValuePtr(pattern),
         StringValuePtr(rewrite));
@@ -1321,7 +1321,7 @@ static VALUE re2_GlobalReplace(VALUE self, VALUE str, VALUE pattern,
     RE2::GlobalReplace(&str_as_string, *p->pattern, StringValuePtr(rewrite));
 
     return ENCODED_STR_NEW(str_as_string.data(), str_as_string.size(),
-        p->pattern->options().utf8() ? "UTF-8" : "ISO-8859-1");
+        p->pattern->options().encoding() == RE2::Options::EncodingUTF8 ? "UTF-8" : "ISO-8859-1");
   } else {
     RE2::GlobalReplace(&str_as_string, StringValuePtr(pattern),
                        StringValuePtr(rewrite));

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Paul Mucur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2020-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.2'
 description: Ruby bindings to re2, "an efficient, principled regular expression library".
-email: ruby.re2@librelist.com
+email: 
 executables: []
 extensions:
 - ext/re2/extconf.rb
@@ -79,8 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to re2.