modalsupport 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/modalsupport/regexp.rb

@@ -6,7 +6,7 @@ class Regexp
     def match(str, i=0)
       str = str[i..-1] if i>0
       m = self.match_old(str)
-      if block_given?
+      if m && block_given?
         yield m
       else
         m

data/lib/modalsupport/string.rb

@@ -6,7 +6,7 @@ class String
     def match(re, i=0)
       str = i>0 ? self[i..-1] : self
       m = str.match_old(re)
-      if block_given?
+      if m && block_given?
         yield m
       else
         m

data/modalsupport.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{modalsupport}
-  s.version = "0.1.0"
+  s.version = "0.1.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

@@ -2,11 +2,18 @@ require 'helper'
 
 class TestGsub < Test::Unit::TestCase
 
-  should "pass match info to a block" do
+  should "pass match info to a block and return the block result" do
     assert_equal "axa", "xxx axa yue asx aya aza".match_one(/a.a/){|match| match.to_s}
     assert_equal "axa", /a.a/.match_one("xxx axa yue asx aya aza"){|match| match.to_s}
   end
 
+  should "return nil if no match" do
+    assert_equal "axa", "xxx axa yue asx aya aza".match_one(/a.a/){|match| match.to_s}
+    assert_equal "axa", /a.a/.match_one("xxx axa yue asx aya aza"){|match| match.to_s}
+    assert_nil "xxx axa yue asx aya aza".match_one(/b.b/){|match| match.to_s}
+    assert_nil /b.b/.match_one("xxx axa yue asx aya aza"){|match| match.to_s}
+  end
+
   should "map all matches to an array" do
     assert_equal ["axa", "aya", "aza"], "xxx axa yue asx aya aza".match_all(/a.a/){|match| match.to_s}
     assert_equal ["axa", "aya", "aza"], /a.a/.match_all("xxx axa yue asx aya aza"){|match| match.to_s}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: modalsupport
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Javier Goizueta