modalsupport 0.7.0 → 0.7.1

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/modalsupport/regexp.rb

@@ -1,19 +1,5 @@
 class Regexp
  
-  if_ruby_version :<, "1.9.0" do
-    alias match_old match
-    # Modify String#match to work as in Ruby 1.9
-    def match(str, i=0)
-      str = str[i..-1] if i>0
-      m = self.match_old(str)
-      if m && block_given?
-        yield m
-      else
-        m
-      end
-    end    
-  end
- 
   # Pass each match to a block: string.match_all{|match_data| ...}
   def match_all(str)
     result = []
@@ -27,8 +13,15 @@ class Regexp
   end
 
   # Pass the first match to a block: string.match_one{|match_data| ...}
-  def match_one(str, i=0, &blk)
-    match str, i, &blk
+  # Similar to Ruby 1.9 match, but does not set the special varialbes $~, $1, etc. in the caller's space.
+  def match_one(str, i=0)
+    str = str[i..-1] if i>0
+    m = self.match(str)
+    if m && block_given?
+      yield m
+    else
+      m
+    end
   end
 
 end

data/lib/modalsupport/string.rb

@@ -1,19 +1,5 @@
 class String
 
-  if_ruby_version :<, "1.9" do
-    alias match_old match
-    # Modify String#match to work as in Ruby 1.9
-    def match(re, i=0)
-      str = i>0 ? self[i..-1] : self
-      m = str.match_old(re)
-      if m && block_given?
-        yield m
-      else
-        m
-      end
-    end    
-  end
-
   # Pass each match to a block: string.match_all{|match_data| ...}; returns array of block results
   def match_all(re, i=0)
     result = []
@@ -26,8 +12,15 @@ class String
   end
  
   # Pass the first match to a block: string.match_one{|match_data| ...}; returns the block result
-  def match_one(re, i=0, &blk)
-    match re, i, &blk
+  # Similar to Ruby 1.9 match, but does not set the special varialbes $~, $1, etc. in the caller's space.
+  def match_one(re, i=0)
+    str = i>0 ? self[i..-1] : self
+    m = str.match(re)
+    if m && block_given?
+      yield m
+    else
+      m
+    end
   end
 
   # For each substitution, pass the match data to a block that should return substitution value

data/modalsupport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]

data/test/test_match.rb

@@ -27,4 +27,15 @@ class TestMatch < Test::Unit::TestCase
   
   end
   
+  context "Using the stdlib match method" do
+    
+    should "not be altered by this library" do
+      /a(x+)b/.match("axxxb")
+      assert_equal "xxx", $1
+      "axxxxb".match(/a(x+)b/)
+      assert_equal "xxxx", $1
+    end
+    
+  end
+  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Javier Goizueta