fix weird Regexp.union issue seen in the wild

seamusabshere · Feb 22, 2012 · 0c24a7d · 0c24a7d
1 parent c36bdd7
commit 0c24a7d
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/History.txt b/History.txt
@@ -1,4 +1,10 @@
-== 0.1.0 / 2012-02-22
+== 0.1.1 / 2012-02-22
+
+* Bug fixes
+
+  * Fix edge case with Regexp.union(*ESCAPE_HTML.keys) seen in the wild with rack-1.2.5/lib/rack/utils.rb
+
+== 0.1.0 / yanked!
 
 * Enhancements
 

diff --git a/lib/to_regexp.rb b/lib/to_regexp.rb
@@ -31,14 +31,15 @@ def as_regexp(options = {})
         /\A#{delim_start}(.*)#{delim_end}([^#{delim_end}]*)\z/u =~ str
         content = $1
         inline_options = $2
+        return unless content.is_a?(::String)
+        content.gsub! '\\/', '/'
         if inline_options
           options[:ignore_case] = true if inline_options.include?('i')
           options[:multiline] = true if inline_options.include?('m')
           options[:extended] = true if inline_options.include?('x')
           # 'n', 'N' = none, 'e', 'E' = EUC, 's', 'S' = SJIS, 'u', 'U' = UTF-8
           options[:lang] = inline_options.scan(/[nesu]/i).join.downcase
         end
-        content.gsub! '\\/', '/'
       else
         return
       end

diff --git a/lib/to_regexp/version.rb b/lib/to_regexp/version.rb
@@ -1,3 +1,3 @@
 module ToRegexp
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end
diff --git a/test/test_to_regexp.rb b/test/test_to_regexp.rb
@@ -96,4 +96,29 @@ def test_013_combine_literal_and_ignore_case
     assert_equal nil, '/(FOO)/i'.to_regexp(:literal => true).match('hello/(foo)/there')
     assert '/(FOO)/i'.to_regexp(:literal => true).match('hello/(FOO)/ithere')
   end
+
+  def test_014_try_convert
+    if RUBY_VERSION >= '1.9'
+      assert_equal /foo/i, Regexp.try_convert('/foo/i')
+      assert_equal //, Regexp.try_convert('//')
+    end
+  end
+
+  # seen in the wild - from rack-1.2.5/lib/rack/utils.rb - converted to array to preserve order in 1.8.7
+  ESCAPE_HTML_KEYS = [
+    "&",
+    "<",
+    ">",
+    "'",
+    '"',
+    "/"
+  ]
+  def test_015_union
+    assert_equal /penzance/, Regexp.union('penzance')
+    assert_equal /skiing|sledding/, Regexp.union('skiing', 'sledding')
+    assert_equal /(?-mix:dogs)|(?i-mx:cats)/, Regexp.union(/dogs/, /cats/i)
+    assert_equal /(?-mix:dogs)|(?i-mx:cats)/, Regexp.union('/dogs/', /cats/i)
+    assert_equal /(?-mix:dogs)|(?i-mx:cats)/, Regexp.union(/dogs/, '/cats/i')
+    assert_equal %r{&|<|>|'|"|\/}.inspect, Regexp.union(*ESCAPE_HTML_KEYS).inspect
+  end
 end