re2 0.5.0 → 0.6.0.pre

data/lib/re2.rb

@@ -0,0 +1,7 @@
+# re2 (http://github.com/mudge/re2)
+# Ruby bindings to re2, an "efficient, principled regular expression library"
+#
+# Copyright (c) 2010-2013, Paul Mucur (http://mudge.name)
+# Released under the BSD Licence, please see LICENSE.txt
+require "re2.so"
+require "re2/consumer"

data/lib/re2/consumer.rb

@@ -0,0 +1,15 @@
+module RE2
+  class Consumer
+    include Enumerable
+
+    def each
+      if block_given?
+        while matches = consume
+          yield matches
+        end
+      else
+        to_enum(:each)
+      end
+    end
+  end
+end

data/lib/re2/string.rb

@@ -1,7 +1,7 @@
 # re2 (http://github.com/mudge/re2)
 # Ruby bindings to re2, an "efficient, principled regular expression library"
 #
-# Copyright (c) 2010-2012, Paul Mucur (http://mudge.name)
+# Copyright (c) 2010-2013, Paul Mucur (http://mudge.name)
 # Released under the BSD Licence, please see LICENSE.txt
 
 require "re2"

data/spec/re2/consumer_spec.rb

@@ -0,0 +1,90 @@
+require "spec_helper"
+
+describe RE2::Consumer do
+  describe "#regexp" do
+    it "returns the original pattern for the consumer" do
+      re = RE2::Regexp.new('(\w+)')
+      consumer = re.consume("It is a truth")
+
+      consumer.regexp.must_be_same_as(re)
+    end
+  end
+
+  describe "#string" do
+    it "returns the original text for the consumer" do
+      re = RE2::Regexp.new('(\w+)')
+      text = "It is a truth"
+      consumer = re.consume(text)
+
+      consumer.string.must_be_same_as(text)
+    end
+  end
+
+  describe "#consume" do
+    it "returns the next array of matches" do
+      r = RE2::Regexp.new('(\w+)')
+      consumer = r.consume("It is a truth universally acknowledged")
+      consumer.consume.must_equal(["It"])
+      consumer.consume.must_equal(["is"])
+      consumer.consume.must_equal(["a"])
+      consumer.consume.must_equal(["truth"])
+      consumer.consume.must_equal(["universally"])
+      consumer.consume.must_equal(["acknowledged"])
+      consumer.consume.must_be_nil
+    end
+
+    it "returns an empty array if there are no capturing groups" do
+      r = RE2::Regexp.new('\w+')
+      consumer = r.consume("Foo bar")
+      consumer.consume.must_equal([])
+    end
+
+    it "returns nil if there is no match" do
+      r = RE2::Regexp.new('\d+')
+      consumer = r.consume("Foo bar")
+      consumer.consume.must_be_nil
+    end
+  end
+
+  it "is enumerable" do
+    r = RE2::Regexp.new('(\d)')
+    consumer = r.consume("There are 1 some 2 numbers 3")
+    consumer.must_be_kind_of(Enumerable)
+  end
+
+  describe "#each" do
+    it "yields each match" do
+      r = RE2::Regexp.new('(\d)')
+      consumer = r.consume("There are 1 some 2 numbers 3")
+      matches = []
+      consumer.each do |match|
+        matches << match
+      end
+
+      matches.must_equal([["1"], ["2"], ["3"]])
+    end
+
+    it "returns an enumerator when not given a block" do
+      r = RE2::Regexp.new('(\d)')
+      consumer = r.consume("There are 1 some 2 numbers 3")
+
+      # Prior to Ruby 1.9, Enumerator was within Enumerable.
+      if defined?(Enumerator)
+        consumer.each.must_be_kind_of(Enumerator)
+      elsif defined?(Enumerable::Enumerator)
+        consumer.each.must_be_kind_of(Enumerable::Enumerator)
+      end
+    end
+  end
+
+  describe "#rewind" do
+    it "resets any consumption" do
+      r = RE2::Regexp.new('(\d)')
+      consumer = r.consume("There are 1 some 2 numbers 3")
+      consumer.to_enum.first.must_equal(["1"])
+      consumer.to_enum.first.must_equal(["2"])
+      consumer.rewind
+      consumer.to_enum.first.must_equal(["1"])
+    end
+  end
+end

data/spec/re2/match_data_spec.rb

@@ -68,6 +68,22 @@ describe RE2::MatchData do
       md["missing"].must_be_nil
       md[:missing].must_be_nil
     end
+
+    if String.method_defined?(:encoding)
+      it "returns UTF-8 encoded strings by default" do
+        md = RE2::Regexp.new('(?P<name>\S+)').match("bob")
+        md[0].encoding.name.must_equal("UTF-8")
+        md["name"].encoding.name.must_equal("UTF-8")
+        md[:name].encoding.name.must_equal("UTF-8")
+      end
+
+      it "returns Latin 1 strings encoding when utf-8 is false" do
+        md = RE2::Regexp.new('(?P<name>\S+)', :utf8 => false).match('bob')
+        md[0].encoding.name.must_equal("ISO-8859-1")
+        md["name"].encoding.name.must_equal("ISO-8859-1")
+        md[:name].encoding.name.must_equal("ISO-8859-1")
+      end
+    end
   end
 
   describe "#string" do

data/spec/re2/regexp_spec.rb

@@ -391,4 +391,13 @@ describe RE2::Regexp do
       groups["rob"].must_equal(3)
     end
   end
+
+  describe "#consume" do
+    it "returns a consumer" do
+      r = RE2::Regexp.new('(\w+)')
+      consumer = r.consume("It is a truth universally acknowledged")
+
+      consumer.must_be_instance_of(RE2::Consumer)
+    end
+  end
 end

data/spec/re2/string_spec.rb

@@ -11,7 +11,7 @@ describe RE2::String 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
+    it "does perform an in-place replacement" do
       string = "My name is Robert Paulson"
       string.re2_sub!('Robert', 'Crobert').must_be_same_as(string)
     end
@@ -22,7 +22,7 @@ describe RE2::String 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
+    it "does perform an in-place replacement" do
       string = "My name is Robert Paulson"
       string.re2_gsub!('a', 'e').must_be_same_as(string)
     end

data/spec/re2_spec.rb

@@ -36,6 +36,14 @@ describe RE2 do
 
       proc { RE2.Replace(frozen_name, "o", "a") }.must_raise(TypeError, RuntimeError)
     end
+
+    if String.method_defined?(:encoding)
+      it "preserves the original string's encoding" do
+        original = "Foo"
+        replacement = RE2.Replace(original, "oo", "ah")
+        original.encoding.must_equal(replacement.encoding)
+      end
+    end
   end
 
   describe "#GlobalReplace" do

metadata

@@ -1,38 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: re2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
-  prerelease: 
+  version: 0.6.0.pre
 platform: ruby
 authors:
 - Paul Mucur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70127849363640 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127849363640
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70127849363160 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70127849363160
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby bindings to re2, "an efficient, principled regular expression library".
 email: ruby.re2@librelist.com
 executables: []
@@ -42,6 +47,8 @@ extra_rdoc_files: []
 files:
 - ext/re2/extconf.rb
 - ext/re2/re2.cc
+- lib/re2.rb
+- lib/re2/consumer.rb
 - lib/re2/string.rb
 - LICENSE.txt
 - README.md
@@ -52,29 +59,29 @@ files:
 - spec/re2/regexp_spec.rb
 - spec/re2/match_data_spec.rb
 - spec/re2/string_spec.rb
+- spec/re2/consumer_spec.rb
 homepage: http://github.com/mudge/re2
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby bindings to re2.
 test_files:
 - spec/spec_helper.rb
@@ -83,4 +90,4 @@ test_files:
 - spec/re2/regexp_spec.rb
 - spec/re2/match_data_spec.rb
 - spec/re2/string_spec.rb
-has_rdoc: 
+- spec/re2/consumer_spec.rb