to_regexp 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODk4NmY5MWJhN2E3ZGNjNDg4ZTU1ZGM3NzFmYjBhODQzZmQ1MjkzOA==
+  data.tar.gz: !binary |-
+    ZmU5MTg2MGFjMWY4MjljMGYxMWVhZjkwN2RjNjc5ZDU0M2QwNjU5Mg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    YTU0OGZiMmMyNjdjNjk1YjI2ZDRjYmRlMDNhYjA5MWQ0OGI0MDdjMDNlMWI5
+    MTBmMDgwNzFlY2U5ZDEzYmZlYWZjMjZiNjgwYTg2ODRjNzg2ODgzMjAwZWJj
+    NjlmNDIzODAzYTdiMjBlYmUwMGUyYmRkMDU4NGJkOTAzMWY0ZmM=
+  data.tar.gz: !binary |-
+    MzkwZGEyYTFlMzJkYjkzOTRkNDc5MjAzMzVlMmMyODRkODU3MDMzNjFmYTkx
+    YWVhNmM3MDAzY2ZhNTljYzFhNzE2ZWI1NWIzNTkzZjY5ODhkOTlhNmYzN2M4
+    Mjc5OWY2YTRkYjk2ZDY1YzNiM2ZjMTBiNDE3NTNjOWFhMmI0Yzg=

data/CHANGELOG

@@ -1,3 +1,9 @@
+0.2.1 / 2013-05-21
+
+* Bug fixes
+
+  * Make sure (for example) '/foo/imn'.to_regexp(detect: true) is detected as a case-insensitive, multiline, no-encoding regexp
+
 0.2.0 / 2013-02-13
 
 * Breaking changes

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2013 Seamus Abshere
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/to_regexp.rb

@@ -7,6 +7,13 @@ module ToRegexp
   end
   
   module String
+    class << self
+      def literal?(str)
+        REGEXP_DELIMITERS.none? { |s, e| str.start_with?(s) and str =~ /#{e}#{INLINE_OPTIONS}\z/ }
+      end
+    end
+
+    INLINE_OPTIONS = /[imxnesu]*/
     REGEXP_DELIMITERS = {
       '%r{' => '}',
       '/' => '/',
@@ -39,11 +46,11 @@ module ToRegexp
 
       return if options[:detect] and str == ''
 
-      if options[:literal] or (options[:detect] and REGEXP_DELIMITERS.none? { |k, v| str.start_with?(k) and str.end_with?(v) })
+      if options[:literal] or (options[:detect] and ToRegexp::String.literal?(str))
         content = ::Regexp.escape str
-      elsif delim_set = REGEXP_DELIMITERS.detect { |k, v| str.start_with?(k) }
-        delim_start, delim_end = delim_set.map { |delim| ::Regexp.escape delim }
-        /\A#{delim_start}(.*)#{delim_end}([^#{delim_end}]*)\z/u =~ str
+      elsif delim_set = REGEXP_DELIMITERS.detect { |k, _| str.start_with?(k) }
+        delim_start, delim_end = delim_set
+        /\A#{delim_start}(.*)#{delim_end}(#{INLINE_OPTIONS})\z/u =~ str
         content = $1
         inline_options = $2
         return unless content.is_a?(::String)

data/lib/to_regexp/version.rb

@@ -1,3 +1,3 @@
 module ToRegexp
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'
 end

data/test/test_to_regexp.rb

@@ -35,7 +35,7 @@ class TestToRegexp < Test::Unit::TestCase
   end
   
   def test_005_multiline_and_ignore_case
-    assert_equal 'bar', '/foo.*(bar)/mi'.to_regexp.match("foo\n\nbar").captures[0]
+    assert_equal 'bar', '/FOO.*(BAR)/mi'.to_regexp.match("foo\n\nbar").captures[0]
   end
   
   def test_006_cant_fix_garbled_input
@@ -116,6 +116,7 @@ class TestToRegexp < Test::Unit::TestCase
   def test_015_union
     assert_equal /penzance/, Regexp.union('penzance')
     assert_equal /skiing|sledding/, Regexp.union('skiing', 'sledding')
+    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')
@@ -129,5 +130,62 @@ class TestToRegexp < Test::Unit::TestCase
     assert_equal %r{foo\\b}, 'foo\b'.to_regexp(detect: true)
     assert_equal %r{foo\b}, '/foo\b/'.to_regexp(detect: true)
     assert_equal %r{foo\\b/}, 'foo\b/'.to_regexp(detect: true)
+    assert_equal %r{foo\b}i, '/foo\b/i'.to_regexp(detect: true)
+    assert_equal %r{foo\\b/i}, 'foo\b/i'.to_regexp(detect: true)
+    assert_equal /FOO.*(BAR)/mi, '/FOO.*(BAR)/mi'.to_regexp(detect: true)
   end
+
+  # https://github.com/ruby/ruby/blob/trunk/test/ruby/test_regexp.rb#L474 "test_union2"
+  def test_mri_union2
+    assert_equal(/(?!)/, Regexp.union)
+    assert_equal(/foo/, Regexp.union(/foo/))
+    assert_equal(/foo/, Regexp.union([/foo/]))
+    assert_equal(/\t/, Regexp.union("\t"))
+    assert_equal(/(?-mix:\u3042)|(?-mix:\u3042)/, Regexp.union(/\u3042/, /\u3042/))
+    assert_equal("\u3041", "\u3041"[Regexp.union(/\u3042/, "\u3041")])
+  end
+
+  # https://github.com/ruby/ruby/blob/trunk/test/ruby/test_regexp.rb#L464 "test_try_convert"
+  def test_mri_try_convert
+    assert_equal(/re/, Regexp.try_convert(/re/))
+    assert_nil(Regexp.try_convert("re"))
+
+    o = Object.new
+    assert_nil(Regexp.try_convert(o))
+    def o.to_regexp() /foo/ end
+    assert_equal(/foo/, Regexp.try_convert(o))
+  end
+
+  # https://github.com/jruby/jruby/blob/master/spec/ruby/core/regexp/try_convert_spec.rb#L5
+  def test_jruby_returns_argument_if_given_regexp
+    assert_equal /foo/s, Regexp.try_convert(/foo/s)
+  end
+
+  # https://github.com/jruby/jruby/blob/master/spec/ruby/core/regexp/try_convert_spec.rb#L9
+  def test_jruby_returns_nil_if_given_arg_cant_be_converted
+    ['', 'glark', [], Object.new, :pat].each do |arg|
+      assert_equal nil, Regexp.try_convert(arg)
+    end
+  end
+
+  # https://github.com/jruby/jruby/blob/master/test/externals/ruby1.9/uri/test_common.rb#L32
+  def test_jruby_uri_common_regexp
+    assert_instance_of Regexp, URI.regexp
+    assert_instance_of Regexp, URI.regexp(['http'])
+    assert_equal URI.regexp, URI.regexp
+    assert_equal 'http://', 'x http:// x'.slice(URI.regexp)
+    assert_equal 'http://', 'x http:// x'.slice(URI.regexp(['http']))
+    assert_equal 'http://', 'x http:// x ftp://'.slice(URI.regexp(['http']))
+    assert_equal nil, 'http://'.slice(URI.regexp([]))
+    assert_equal nil, ''.slice(URI.regexp)
+    assert_equal nil, 'xxxx'.slice(URI.regexp)
+    assert_equal nil, ':'.slice(URI.regexp)
+    assert_equal 'From:', 'From:'.slice(URI.regexp)
+  end
+
+  # https://github.com/jruby/jruby/blob/master/spec/ruby/core/regexp/union_spec.rb#L14
+  def test_jruby_quotes_string_arguments
+    assert_equal /n|\./, Regexp.union("n", ".")
+  end
+
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: to_regexp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.2.1
 platform: ruby
 authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-13 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ensure-encoding
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +50,7 @@ files:
 - CHANGELOG
 - Gemfile
 - History.txt
+- LICENSE
 - README.rdoc
 - Rakefile
 - lib/to_regexp.rb
@@ -64,27 +60,26 @@ files:
 - to_regexp.gemspec
 homepage: https://github.com/seamusabshere/to_regexp
 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'
 requirements: []
 rubyforge_project: to_regexp
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Provides String#to_regexp
 test_files:
 - test/helper.rb