to_regexp 0.0.3 → 0.1.1

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in to_regexp.gemspec
 gemspec
+
+# development dependencies
+gem 'ensure-encoding'

data/History.txt

@@ -0,0 +1,20 @@
+== 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
+
+  * New :literal option. For example, 'foo'.to_regexp(:literal => true, :ignore_case => true)
+  * Allow setting :ignore_case, :multiline, :extended as options passed to #to_regexp.
+
+== 0.0.3 / 2011-04-27
+
+* first production ready version!
+
+== 0.0.2 / yanked!
+
+== 0.0.1 / yanked!

data/README.rdoc

@@ -7,9 +7,18 @@ Basically a safe way to convert strings to regexps (with options).
     new_way = str.to_regexp # provided by this gem
     old_way == new_way      # true
 
-You can get the options passed to <tt>Regexp.new</tt> with
+You can also treat strings as literal regexps. These two are equivalent:
 
-    str.as_regexp                              # a hash of options passed to Regexp.new
-    str.to_regexp == Regexp.new(str.as_regexp) # true
+    '/foo/'.to_regexp                                       #=> /foo/
+    'foo'.to_regexp(:literal => true)                       #=> /foo/
+    
+If you need case insensitivity and you're using <tt>:literal</tt>, pass options like <tt>:ignore_case</tt>. These two are equivalent:
 
-Copyright 2011 Seamus Abshere
+    '/foo/i'.to_regexp                                      #=> /foo/i
+    'foo'.to_regexp(:literal => true, :ignore_case => true) #=> /foo/i
+
+You can get the options passed to <tt>Regexp.new</tt> with <tt>#as_regexp</tt>:
+
+    '/foo/'.to_regexp == Regexp.new('/foo/'.as_regexp) # true
+
+Copyright 2012 Seamus Abshere

data/lib/to_regexp.rb

@@ -12,35 +12,46 @@ module ToRegexp
       '/' => '/',
     }
 
-    def to_regexp
-      if args = as_regexp
+    def to_regexp(options = {})
+      if args = as_regexp(options)
         ::Regexp.new *args
       end
     end
     
-    def as_regexp
-      str = self.dup
-      unless delim_set = REGEXP_DELIMITERS.detect { |k, v| str.start_with? k }
-        # no starting delimiter found
-        return
+    def as_regexp(options = {})
+      unless options.is_a?(::Hash)
+        raise ::ArgumentError, "[to_regexp] Options must be a Hash"
       end
-      delim_start, delim_end = delim_set.map { |delim| ::Regexp.escape delim }
-      /\A#{delim_start}(.*)#{delim_end}([^#{delim_end}]*)\z/u =~ str.strip
-      content = $1
-      options = $2
-      unless content.is_a?(::String) and options.is_a?(::String)
-        # maybe a missing end delimiter?
+      str = self.strip
+      
+      if options[:literal] == true
+        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
+        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
+      else
         return
       end
-      content.gsub! '\\/', '/'
-      ignore_case = options.include?('i') ? ::Regexp::IGNORECASE : 0
-      multiline = options.include?('m') ? ::Regexp::MULTILINE : 0
-      extended = options.include?('x') ? ::Regexp::EXTENDED : 0
-      # 'n', 'N' = none, 'e', 'E' = EUC, 's', 'S' = SJIS, 'u', 'U' = UTF-8
-      lang = options.scan(/[nesu]/i).join.downcase
+      
+      ignore_case = options[:ignore_case] ? ::Regexp::IGNORECASE : 0
+      multiline = options[:multiline] ? ::Regexp::MULTILINE : 0
+      extended = options[:extended] ? ::Regexp::EXTENDED : 0
+      lang = options[:lang] || ''
       if ::RUBY_VERSION > '1.9' and lang.include?('u')
-        lang.gsub! 'u', ''
+        lang = lang.delete 'u'
       end
+      
       if lang.empty?
         [ content, (ignore_case|multiline|extended) ]
       else

data/lib/to_regexp/version.rb

@@ -1,3 +1,3 @@
 module ToRegexp
-  VERSION = "0.0.3"
+  VERSION = "0.1.1"
 end

data/test/test_to_regexp.rb

@@ -77,4 +77,48 @@ class TestToRegexp < Test::Unit::TestCase
     a = /foo/
     assert_equal a, a.to_regexp
   end
+  
+  def test_011_ignore_case_option
+    assert_equal nil, '/(FOO)/'.to_regexp(:ignore_case => false).match('foo')
+    assert_equal nil, '/(FOO)/'.to_regexp(:ignore_case => false).match('foo')
+    assert_equal 'foo', '/(FOO)/'.to_regexp(:ignore_case => true).match('foo').captures[0]
+    assert_equal 'foo', '/(FOO)/i'.to_regexp(:ignore_case => true).match('foo').captures[0]
+  end
+  
+  def test_012_literal_option
+    assert '/(FOO)/'.to_regexp(:literal => true).match('hello/(FOO)/there')
+  end
+  
+  def test_013_combine_literal_and_ignore_case
+    assert '/(FOO)/'.to_regexp(:literal => true, :ignore_case => true).match('hello/(foo)/there')
+
+    # can't use inline options obviously
+    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

data/to_regexp.gemspec

@@ -18,6 +18,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
-  s.add_development_dependency 'ensure-encoding'
 end

metadata

@@ -1,48 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: to_regexp
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ensure-encoding
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: Provides String#to_regexp, for example if you want to make regexps out of a CSV you just imported.
-email: 
+date: 2012-02-22 00:00:00.000000000 Z
+dependencies: []
+description: Provides String#to_regexp, for example if you want to make regexps out
+  of a CSV you just imported.
+email:
 - seamus@abshere.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
+- History.txt
 - README.rdoc
 - Rakefile
 - lib/to_regexp.rb
@@ -52,37 +31,29 @@ files:
 - to_regexp.gemspec
 homepage: https://github.com/seamusabshere/to_regexp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: to_regexp
-rubygems_version: 1.7.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Provides String#to_regexp
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_to_regexp.rb
+has_rdoc: