rack-mount 0.3.1 → 0.3.2

data/lib/rack/mount/analysis/frequency.rb

@@ -35,8 +35,8 @@ module Rack::Mount
 
       def process_key(requirements, method, requirement)
         if requirement.is_a?(Regexp)
-          expression = Utils.parse_regexp(requirement)
-          expression.reject! { |e| e.is_a?(Reginald::Anchor) }
+          expression = parse_regexp(requirement)
+          expression = expression.reject { |e| e.is_a?(Reginald::Anchor) }
 
           if expression.is_a?(Reginald::Expression) && expression.literal?
             return requirements[method] = expression.to_s
@@ -53,6 +53,12 @@ module Rack::Mount
           @key_frequency.select_upper
         end
       end
+
+      private
+        def parse_regexp(regexp)
+          @parse_regexp_cache ||= {}
+          @parse_regexp_cache[regexp] ||= Utils.parse_regexp(regexp).freeze
+        end
     end
   end
 end

data/lib/rack/mount/analysis/splitting.rb

@@ -57,7 +57,7 @@ module Rack::Mount
         def analyze_capture_boundaries(regexp, boundaries) #:nodoc:
           return boundaries unless regexp.is_a?(Regexp)
 
-          parts = Utils.parse_regexp(regexp)
+          parts = parse_regexp(regexp)
           parts.each_with_index do |part, index|
             if part.is_a?(Reginald::Group)
               if index > 0
@@ -88,8 +88,7 @@ module Rack::Mount
         def generate_split_keys(regexp, separators) #:nodoc:
           segments = []
           buf = nil
-          casefold = regexp.casefold?
-          parts = Utils.parse_regexp(regexp)
+          parts = parse_regexp(regexp)
           parts.each_with_index do |part, index|
             case part
             when Reginald::Anchor
@@ -151,7 +150,7 @@ module Rack::Mount
         end
 
         def join_buffer(parts, regexp)
-          if parts.literal? && !regexp.casefold?
+          if parts.literal?
             parts.to_s
           else
             parts.to_regexp

data/lib/rack/mount/regexp_with_named_groups.rb

@@ -1,13 +1,7 @@
 module Rack::Mount
-  begin
-    eval('/(?<foo>.*)/').named_captures
-
-    class RegexpWithNamedGroups < Regexp
-      def self.supports_named_captures?
-        true
-      end
-    end
-  rescue SyntaxError, NoMethodError
+  if Reginald.regexp_supports_named_captures?
+    RegexpWithNamedGroups = Regexp
+  else
     require 'strscan'
 
     # A wrapper that adds shim named capture support to older
@@ -24,10 +18,6 @@ module Rack::Mount
     #
     #   /(?:<foo>[a-z]+)/
     class RegexpWithNamedGroups < Regexp
-      def self.supports_named_captures?
-        false
-      end
-
       def self.new(regexp) #:nodoc:
         if regexp.is_a?(RegexpWithNamedGroups)
           regexp

data/lib/rack/mount/strexp/parser.rb

@@ -13,7 +13,7 @@ module Rack
     class StrexpParser < Racc::Parser
 
 
-if RegexpWithNamedGroups.supports_named_captures?
+if Reginald.regexp_supports_named_captures?
   REGEXP_NAMED_CAPTURE = '(?<%s>%s)'.freeze
 else
   REGEXP_NAMED_CAPTURE = '(?:<%s>%s)'.freeze
@@ -23,32 +23,32 @@ attr_accessor :requirements
 ##### State transition tables begin ###
 
 racc_action_table = [
-     4,     5,     6,    11,     7,     4,     5,     6,    12,     7,
-     4,     5,     6,     8,     7,     4,     5,     6,   nil,     7 ]
+     1,     2,     3,     9,     4,     1,     2,     3,    12,     4,
+     1,     2,     3,    11,     4,     1,     2,     3,   nil,     4 ]
 
 racc_action_check = [
-     0,     0,     0,     8,     0,    10,    10,    10,    10,    10,
-     2,     2,     2,     1,     2,     6,     6,     6,   nil,     6 ]
+     0,     0,     0,     5,     0,     3,     3,     3,     9,     3,
+     8,     8,     8,     8,     8,     6,     6,     6,   nil,     6 ]
 
 racc_action_pointer = [
-    -2,    13,     8,   nil,   nil,   nil,    13,   nil,     3,   nil,
-     3,   nil,   nil ]
+    -2,   nil,   nil,     3,   nil,     3,    13,   nil,     8,     8,
+   nil,   nil,   nil ]
 
 racc_action_default = [
-    -8,    -8,    -1,    -3,    -4,    -5,    -8,    -7,    -8,    -2,
-    -8,    13,    -6 ]
+    -8,    -4,    -5,    -8,    -7,    -8,    -1,    -3,    -8,    -8,
+    -2,    -6,    13 ]
 
 racc_goto_table = [
-     9,     2,     1,   nil,   nil,   nil,   nil,    10,     9 ]
+     6,     5,    10,     8,    10 ]
 
 racc_goto_check = [
-     3,     2,     1,   nil,   nil,   nil,   nil,     2,     3 ]
+     2,     1,     3,     2,     3 ]
 
 racc_goto_pointer = [
-   nil,     2,     1,    -2 ]
+   nil,     1,     0,    -4 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,     3 ]
+   nil,   nil,   nil,     7 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,

data/lib/rack/mount/utils.rb

@@ -105,7 +105,7 @@ module Rack::Mount
 
       expression = Reginald.parse(regexp)
 
-      unless RegexpWithNamedGroups.supports_named_captures?
+      unless Reginald.regexp_supports_named_captures?
         tag_captures = Proc.new do |group|
           group.each do |child|
             if child.is_a?(Reginald::Group)

data/lib/rack/mount/vendor/reginald/reginald/alternation.rb

@@ -1,5 +1,5 @@
 module Reginald
-  class Alternation < Array
+  class Alternation < Collection
     def self.reduce(alternation_or_expression, expression)
       if alternation_or_expression.first.is_a?(Alternation)
         alternation_or_expression = alternation_or_expression.first
@@ -22,29 +22,16 @@ module Reginald
       false
     end
 
-    def to_s
-      map { |e| e.to_s }.join('|')
+    def options
+      0
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s}\\Z")
+    def to_s(parent = false)
+      map { |e| e.to_s(parent) }.join('|')
     end
 
     def inspect
       to_s.inspect
     end
-
-    def match(char)
-      to_regexp.match(char)
-    end
-
-    def include?(char)
-      any? { |e| e.include?(char) }
-    end
-
-    def freeze
-      each { |e| e.freeze }
-      super
-    end
   end
 end

data/lib/rack/mount/vendor/reginald/reginald/atom.rb

@@ -1,10 +1,21 @@
 module Reginald
   class Atom < Struct.new(:value)
+    attr_accessor :ignorecase
+
+    def initialize(*args)
+      @ignorecase = nil
+      super
+    end
+
     def literal?
       false
     end
 
-    def to_s
+    def casefold?
+      ignorecase ? true : false
+    end
+
+    def to_s(parent = false)
       "#{value}"
     end
 
@@ -12,6 +23,21 @@ module Reginald
       "#<#{self.class.to_s.sub('Reginald::', '')} #{to_s.inspect}>"
     end
 
+    def ==(other)
+      case other
+      when String
+        other == to_s
+      else
+        eql?(other)
+      end
+    end
+
+    def eql?(other)
+      other.instance_of?(self.class) &&
+        self.value.eql?(other.value) &&
+        (!!self.ignorecase).eql?(!!other.ignorecase)
+    end
+
     def freeze
       value.freeze
       super

data/lib/rack/mount/vendor/reginald/reginald/character.rb

@@ -3,15 +3,19 @@ module Reginald
     attr_accessor :quantifier
 
     def literal?
-      quantifier.nil?
+      quantifier.nil? && !ignorecase
     end
 
-    def to_s
-      "#{value}#{quantifier}"
+    def to_s(parent = false)
+      if !parent && ignorecase
+        "(?i-mx:#{value})#{quantifier}"
+      else
+        "#{value}#{quantifier}"
+      end
     end
 
     def to_regexp
-      Regexp.compile("\\A#{to_s}\\Z")
+      Regexp.compile("\\A#{to_s(true)}\\Z", ignorecase)
     end
 
     def match(char)
@@ -19,22 +23,15 @@ module Reginald
     end
 
     def include?(char)
-      value == char
-    end
-
-    def ==(other)
-      case other
-      when String
-        other == to_s
+      if ignorecase
+        value.downcase == char.downcase
       else
-        eql?(other)
+        value == char
       end
     end
 
     def eql?(other)
-      other.is_a?(self.class) &&
-        value.eql?(other.value) &&
-        quantifier.eql?(other.quantifier)
+      super && quantifier.eql?(other.quantifier)
     end
 
     def freeze

data/lib/rack/mount/vendor/reginald/reginald/character_class.rb

@@ -15,6 +15,12 @@ module Reginald
     WORD = new(':word:').freeze
     XDIGIT = new(':xdigit:').freeze
 
+    def ignorecase=(ignorecase)
+      if to_s !~ /\A\[:.*:\]\Z/
+        super
+      end
+    end
+
     attr_accessor :negate
 
     def negated?
@@ -25,11 +31,19 @@ module Reginald
       false
     end
 
-    def to_s
-      if value == '.' || value =~ /^\\[dDsSwW]$/
-        super
+    def bracketed?
+      value != '.' && value !~ /^\\[dDsSwW]$/
+    end
+
+    def to_s(parent = false)
+      if bracketed?
+        if !parent && ignorecase
+          "(?i-mx:[#{negate && '^'}#{value}])#{quantifier}"
+        else
+          "[#{negate && '^'}#{value}]#{quantifier}"
+        end
       else
-        "[#{negate && '^'}#{value}]#{quantifier}"
+        super
       end
     end
 
@@ -39,9 +53,7 @@ module Reginald
     end
 
     def eql?(other)
-      other.is_a?(self.class) &&
-        negate == other.negate &&
-        super
+      super && negate == other.negate
     end
 
     def freeze

data/lib/rack/mount/vendor/reginald/reginald/collection.rb

@@ -0,0 +1,40 @@
+module Reginald
+  class Collection < Array
+    def ignorecase=(ignorecase)
+      each { |e| e.ignorecase = ignorecase }
+      ignorecase
+    end
+
+    def to_regexp
+      Regexp.compile("\\A#{to_s(true)}\\Z", options)
+    end
+
+    def match(char)
+      to_regexp.match(char)
+    end
+
+    def include?(char)
+      any? { |e| e.include?(char) }
+    end
+
+    def ==(other)
+      case other
+      when String
+        other == to_s
+      when Array
+        super
+      else
+        eql?(other)
+      end
+    end
+
+    def eql?(other)
+      other.instance_of?(self.class) && super
+    end
+
+    def freeze
+      each { |e| e.freeze }
+      super
+    end
+  end
+end

data/lib/rack/mount/vendor/reginald/reginald/expression.rb

@@ -1,6 +1,7 @@
 module Reginald
-  class Expression < Array
-    attr_accessor :multiline, :ignorecase, :extended
+  class Expression < Collection
+    attr_reader :ignorecase
+    attr_accessor :multiline, :extended
 
     def self.reduce(expression_or_atom, atom = nil)
       if expression_or_atom.is_a?(Expression)
@@ -14,7 +15,7 @@ module Reginald
     end
 
     def initialize(*args)
-      @multiline = @ignorecase = @extended = false
+      @multiline = @ignorecase = @extended = nil
 
       if args.length == 1 && args.first.instance_of?(Array)
         super(args.first)
@@ -24,8 +25,17 @@ module Reginald
       end
     end
 
+    def ignorecase=(ignorecase)
+      if @ignorecase.nil?
+        super
+        @ignorecase = ignorecase
+      else
+        false
+      end
+    end
+
     def literal?
-      ignorecase == false && all? { |e| e.literal? }
+      !ignorecase && all? { |e| e.literal? }
     end
 
     def options
@@ -36,13 +46,16 @@ module Reginald
       flag
     end
 
-    def to_s_without_options
-      map { |e| e.to_s }.join
+    def options=(flag)
+      self.multiline  = flag & Regexp::MULTILINE != 0
+      self.ignorecase = flag & Regexp::IGNORECASE != 0
+      self.extended   = flag & Regexp::EXTENDED != 0
+      nil
     end
 
-    def to_s
-      if options == 0
-        to_s_without_options
+    def to_s(parent = false)
+      if parent || options == 0
+        map { |e| e.to_s(parent) }.join
       else
         with, without = [], []
         multiline ? (with << 'm') : (without << 'm')
@@ -52,51 +65,23 @@ module Reginald
         with = with.join
         without = without.any? ? "-#{without.join}" : ''
 
-        "(?#{with}#{without}:#{to_s_without_options})"
+        "(?#{with}#{without}:#{map { |e| e.to_s(true) }.join})"
       end
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s_without_options}\\Z", options)
-    end
-
     def inspect
       "#<Expression #{to_s.inspect}>"
     end
 
-    def match(char)
-      to_regexp.match(char)
-    end
-
-    def include?(char)
-      any? { |e| e.include?(char) }
-    end
-
     def casefold?
       ignorecase
     end
 
-    def ==(other)
-      case other
-      when String
-        other == to_s
-      when Array
-        super
-      else
-        eql?(other)
-      end
-    end
-
     def eql?(other)
-      other.is_a?(self.class) && super &&
-        self.multiline == other.multiline &&
-        self.ignorecase == other.ignorecase &&
-        self.extended == other.extended
-    end
-
-    def freeze
-      each { |e| e.freeze }
-      super
+      super &&
+        !!self.multiline == !!other.multiline &&
+        !!self.ignorecase == !!other.ignorecase &&
+        !!self.extended == !!other.extended
     end
   end
 end

data/lib/rack/mount/vendor/reginald/reginald/group.rb

@@ -7,13 +7,17 @@ module Reginald
       super
     end
 
+    def ignorecase=(ignorecase)
+      expression.ignorecase = ignorecase
+    end
+
     def literal?
       quantifier.nil? && expression.literal?
     end
 
-    def to_s
+    def to_s(parent = false)
       if expression.options == 0
-        "(#{capture ? '' : '?:'}#{expression.to_s_without_options})#{quantifier}"
+        "(#{capture ? '' : '?:'}#{expression.to_s(parent)})#{quantifier}"
       elsif capture == false
         "#{expression.to_s}#{quantifier}"
       else

data/lib/rack/mount/vendor/reginald/reginald/parser.rb

@@ -8,150 +8,207 @@ require 'racc/parser.rb'
 module Reginald
   class Parser < Racc::Parser
 
-attr_accessor :capture_index
-attr_accessor :capture_index_stack
+def self.parse_regexp(regexp)
+  parser = new
+  parser.options_stack << {
+    :multiline => (regexp.options & Regexp::MULTILINE != 0),
+    :ignorecase => (regexp.options & Regexp::IGNORECASE != 0),
+    :extended => (regexp.options & Regexp::EXTENDED != 0)
+  }
+
+  expression = parser.scan_str(regexp.source)
+  expression.options = regexp.options
+  expression
+end
+
+attr_accessor :options_stack
+
+def initialize
+  @capture_index = 0
+  @capture_index_stack = []
+  @options_stack = []
+end
 
 ##### State transition tables begin ###
 
 racc_action_table = [
-     1,    17,    18,    18,     7,     8,    10,    11,    46,    18,
-     1,    43,     2,     4,     7,     8,    10,    11,    58,    45,
-     1,    53,     2,     4,     7,     8,    10,    11,    47,    18,
-     1,    61,     2,     4,     7,     8,    10,    11,    59,    18,
-     1,    27,     2,     4,     7,     8,    10,    11,    62,    15,
-     1,    34,     2,     4,     7,     8,    10,    11,    31,    25,
-     1,   nil,     2,     4,     7,     8,    10,    11,   nil,   nil,
-     1,   nil,     2,     4,     7,     8,    10,    11,    40,    41,
-    29,   nil,     2,     4,    30,    20,    42,    35,    37,    39,
-    21,    22,    24,    20,    49,    35,    37,    39,    21,    22,
-    24,    13,   nil,    14,    44,   nil,    15,   nil,    30,    56,
-    35,    37,    39,    35,    37,    39,    35,    37,    39,    35,
-    37,    39,    35,    37,    39,    35,    37,    39,    35,    37,
-    39 ]
+    22,    62,    32,    26,    66,    32,    32,    52,    54,    31,
+    71,    32,    61,    72,    59,    28,    30,    14,    16,    18,
+    19,    20,    21,    23,    24,    25,    27,    29,    13,    51,
+    53,    55,    57,     3,    32,    77,     5,     7,     9,    11,
+    41,    39,    79,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    53,    55,    57,     3,     2,     4,     5,     7,     9,    11,
+    46,    34,    47,    26,     2,     4,    35,    36,    37,    34,
+    67,    53,    55,    57,    35,    36,    37,    42,    43,    60,
+    43,    44,    50,    44,    75,    53,    55,    57,    69 ]
 
 racc_action_check = [
-     0,     3,    26,     3,     0,     0,     0,     0,    34,    50,
-    47,    26,     0,     0,    47,    47,    47,    47,    50,    34,
-    41,    46,    47,    47,    41,    41,    41,    41,    36,    51,
-     5,    53,    41,    41,     5,     5,     5,     5,    51,    54,
-    32,    13,     5,     5,    32,    32,    32,    32,    54,    14,
-    11,    24,    32,    32,    11,    11,    11,    11,    17,    11,
-    18,   nil,    11,    11,    18,    18,    18,    18,   nil,   nil,
-    40,   nil,    18,    18,    40,    40,    40,    40,    25,    25,
-    16,   nil,    40,    40,    16,    19,    25,    25,    25,    25,
-    19,    19,    19,     6,    38,    38,    38,    38,     6,     6,
-     6,     1,   nil,     1,    28,   nil,     1,   nil,    28,    48,
-    48,    48,    48,    52,    52,    52,    56,    56,    56,    57,
-    57,    57,    60,    60,    60,    49,    49,    49,    42,    42,
-    42 ]
+     3,    50,    64,     3,    56,    65,    40,    39,    39,     6,
+    64,     6,    50,    65,    40,     3,     3,     3,     3,     3,
+     3,     3,     3,     3,     3,     3,     3,     3,     3,    39,
+    39,    39,    39,    11,    73,    69,    11,    11,    11,    11,
+    15,    11,    73,     8,    11,    11,     8,     8,     8,     8,
+    70,    70,    70,    54,     8,     8,    54,    54,    54,    54,
+    67,    67,    67,    66,    54,    54,    66,    66,    66,    66,
+    63,    63,    63,    52,    66,    66,    52,    52,    52,    52,
+    51,    51,    51,    32,    52,    52,    32,    32,    32,    32,
+    74,    74,    74,    48,    32,    32,    48,    48,    48,    48,
+    75,    75,    75,     0,    48,    48,     0,     0,     0,     0,
+    22,    10,    31,    22,     0,     0,    10,    10,    10,    33,
+    58,    58,    58,    58,    33,    33,    33,    17,    17,    45,
+    45,    17,    37,    45,    68,    68,    68,    68,    62 ]
 
 racc_action_pointer = [
-    -3,    97,   nil,     1,   nil,    27,    81,   nil,   nil,   nil,
-   nil,    47,   nil,    36,    40,   nil,    75,    58,    57,    73,
-   nil,   nil,   nil,   nil,    42,    65,     0,   nil,    99,   nil,
-   nil,   nil,    37,   nil,    -1,   nil,    15,   nil,    73,   nil,
-    67,    17,   106,   nil,   nil,   nil,    12,     7,    88,   103,
-     7,    27,    91,    11,    37,   nil,    94,    97,   nil,   nil,
-   100,   nil,   nil,   nil,   nil,   nil ]
+   100,   nil,   nil,    -5,   nil,   nil,     9,   nil,    40,   nil,
+   100,    30,   nil,   nil,   nil,    36,   nil,   123,   nil,   nil,
+   nil,   nil,   105,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   112,    80,   108,   nil,   nil,   nil,   124,   nil,    -5,
+     4,   nil,   nil,   nil,   nil,   125,   nil,   nil,    90,   nil,
+    -7,    45,    70,   nil,    50,   nil,    -8,   nil,    86,   nil,
+   nil,   nil,   130,    35,     0,     3,    60,    25,   100,    16,
+    15,   nil,   nil,    32,    55,    65,   nil,   nil,   nil,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-   -35,   -35,   -21,   -35,   -22,    -2,    -6,   -11,   -12,    -7,
-   -14,   -35,   -13,   -35,   -35,   -16,   -35,   -35,   -35,    -4,
-   -25,   -23,   -24,    -5,   -35,   -35,   -35,    -8,   -35,    -9,
-   -15,    66,    -1,    -3,   -35,   -32,   -35,   -33,   -35,   -34,
-   -35,   -35,   -35,   -17,   -10,   -27,   -35,   -35,   -35,   -35,
-   -35,   -35,   -35,   -35,   -35,   -31,   -35,   -35,   -19,   -20,
-   -35,   -26,   -18,   -30,   -29,   -28 ]
+   -51,   -13,   -19,   -51,   -20,   -11,   -51,   -12,    -2,   -14,
+    -6,   -51,    -7,   -43,   -32,   -51,   -33,   -51,   -34,   -35,
+   -36,   -37,   -29,   -38,   -39,   -40,   -28,   -41,   -30,   -42,
+   -31,   -51,   -51,    -4,   -23,   -21,   -22,   -51,    -5,   -51,
+   -51,    -8,    -9,   -27,   -26,   -51,   -29,    82,    -1,    -3,
+   -51,   -51,   -51,   -48,   -51,   -49,   -51,   -50,   -51,   -15,
+   -10,   -25,   -51,   -51,   -51,   -51,   -51,   -51,   -51,   -51,
+   -51,   -17,   -18,   -51,   -51,   -51,   -47,   -24,   -44,   -16,
+   -45,   -46 ]
 
 racc_goto_table = [
-     3,    38,    19,    16,    23,    36,    32,   nil,   nil,   nil,
-   nil,    26,   nil,   nil,    48,   nil,    28,    33,    52,   nil,
-   nil,   nil,   nil,   nil,    55,    57,   nil,   nil,    60,    19,
-   nil,   nil,    63,    64,   nil,   nil,    65,   nil,   nil,   nil,
-    50,    51,   nil,   nil,   nil,   nil,   nil,    54 ]
+     6,    33,    58,    17,    38,    48,    56,    15,   nil,   nil,
+   nil,    40,   nil,   nil,    63,   nil,   nil,   nil,   nil,   nil,
+   nil,    68,    45,   nil,   nil,   nil,    70,    49,   nil,   nil,
+    74,    76,   nil,    78,   nil,   nil,   nil,    80,    81,   nil,
+   nil,    33,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    64,   nil,    65,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,    73 ]
 
 racc_goto_check = [
-     1,     9,     3,     6,     4,     8,     2,   nil,   nil,   nil,
-   nil,     1,   nil,   nil,     9,   nil,     6,     4,     9,   nil,
-   nil,   nil,   nil,   nil,     9,     9,   nil,   nil,     9,     3,
-   nil,   nil,     9,     9,   nil,   nil,     9,   nil,   nil,   nil,
-     1,     1,   nil,   nil,   nil,   nil,   nil,     1 ]
+     1,     3,    10,     7,     4,     2,     9,     6,   nil,   nil,
+   nil,     1,   nil,   nil,    10,   nil,   nil,   nil,   nil,   nil,
+   nil,    10,     7,   nil,   nil,   nil,    10,     4,   nil,   nil,
+    10,    10,   nil,    10,   nil,   nil,   nil,    10,    10,   nil,
+   nil,     3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,     1,   nil,     1,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     0,   -12,    -3,    -2,   nil,     2,   nil,   -20,   -24 ]
+   nil,     0,   -27,    -7,    -6,   nil,     4,     0,   nil,   -33,
+   -37 ]
 
 racc_goto_default = [
-   nil,   nil,     5,     6,   nil,     9,   nil,    12,   nil,   nil ]
+   nil,   nil,     8,    10,   nil,    12,   nil,   nil,     1,   nil,
+   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 26, :_reduce_1,
-  1, 26, :_reduce_2,
-  3, 27, :_reduce_3,
-  2, 27, :_reduce_4,
-  2, 27, :_reduce_5,
-  1, 27, :_reduce_none,
-  1, 28, :_reduce_none,
-  3, 28, :_reduce_8,
-  3, 28, :_reduce_9,
-  4, 28, :_reduce_10,
-  1, 28, :_reduce_11,
-  1, 28, :_reduce_12,
-  1, 28, :_reduce_13,
-  1, 28, :_reduce_14,
-  2, 31, :_reduce_15,
-  1, 31, :_reduce_none,
-  3, 30, :_reduce_17,
-  6, 30, :_reduce_18,
-  5, 30, :_reduce_19,
-  5, 30, :_reduce_20,
-  1, 32, :_reduce_none,
-  1, 32, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  5, 29, :_reduce_26,
-  3, 29, :_reduce_27,
-  4, 33, :_reduce_28,
-  4, 33, :_reduce_29,
-  4, 33, :_reduce_30,
-  3, 33, :_reduce_31,
-  1, 34, :_reduce_32,
-  1, 34, :_reduce_33,
-  1, 34, :_reduce_34 ]
-
-racc_reduce_n = 35
-
-racc_shift_n = 66
+  3, 39, :_reduce_1,
+  1, 39, :_reduce_2,
+  3, 40, :_reduce_3,
+  2, 40, :_reduce_4,
+  2, 40, :_reduce_5,
+  1, 40, :_reduce_none,
+  1, 41, :_reduce_none,
+  3, 41, :_reduce_8,
+  3, 41, :_reduce_9,
+  4, 41, :_reduce_10,
+  1, 41, :_reduce_11,
+  1, 41, :_reduce_12,
+  1, 41, :_reduce_13,
+  1, 41, :_reduce_14,
+  3, 43, :_reduce_15,
+  6, 43, :_reduce_16,
+  5, 43, :_reduce_17,
+  5, 43, :_reduce_18,
+  1, 46, :_reduce_none,
+  1, 46, :_reduce_none,
+  1, 42, :_reduce_none,
+  1, 42, :_reduce_none,
+  1, 42, :_reduce_none,
+  5, 42, :_reduce_24,
+  3, 42, :_reduce_25,
+  2, 45, :_reduce_26,
+  2, 45, :_reduce_27,
+  1, 45, :_reduce_none,
+  1, 45, :_reduce_none,
+  1, 44, :_reduce_30,
+  1, 44, :_reduce_31,
+  1, 44, :_reduce_32,
+  1, 44, :_reduce_33,
+  1, 44, :_reduce_34,
+  1, 44, :_reduce_35,
+  1, 44, :_reduce_36,
+  1, 44, :_reduce_37,
+  1, 44, :_reduce_38,
+  1, 44, :_reduce_39,
+  1, 44, :_reduce_40,
+  1, 44, :_reduce_41,
+  1, 44, :_reduce_42,
+  1, 44, :_reduce_43,
+  4, 47, :_reduce_44,
+  4, 47, :_reduce_45,
+  4, 47, :_reduce_46,
+  3, 47, :_reduce_47,
+  1, 48, :_reduce_48,
+  1, 48, :_reduce_49,
+  1, 48, :_reduce_50 ]
+
+racc_reduce_n = 51
+
+racc_shift_n = 82
 
 racc_token_table = {
   false => 0,
   :error => 1,
   :BAR => 2,
   :LBRACK => 3,
-  :LC_CTYPE => 4,
-  :RBRACK => 5,
-  :NEGATE => 6,
-  :CCLASS => 7,
-  :DOT => 8,
-  :CHAR => 9,
-  :LPAREN => 10,
-  :RPAREN => 11,
-  :QMARK => 12,
-  :COLON => 13,
-  :NAME => 14,
-  :L_ANCHOR => 15,
-  :R_ANCHOR => 16,
-  :STAR => 17,
-  :PLUS => 18,
-  :LCURLY => 19,
-  :RCURLY => 20,
-  :MINUS => 21,
-  :MULTILINE => 22,
-  :IGNORECASE => 23,
-  :EXTENDED => 24 }
-
-racc_nt_base = 25
+  :RBRACK => 4,
+  :NEGATE => 5,
+  :CCLASS => 6,
+  :DOT => 7,
+  :CHAR => 8,
+  :LPAREN => 9,
+  :RPAREN => 10,
+  :QMARK => 11,
+  :COLON => 12,
+  :NAME => 13,
+  :L_ANCHOR => 14,
+  :R_ANCHOR => 15,
+  :STAR => 16,
+  :PLUS => 17,
+  :LCURLY => 18,
+  :RCURLY => 19,
+  "alnum" => 20,
+  "alpha" => 21,
+  "ascii" => 22,
+  "blank" => 23,
+  "cntrl" => 24,
+  "digit" => 25,
+  "graph" => 26,
+  "lower" => 27,
+  "print" => 28,
+  "punct" => 29,
+  "space" => 30,
+  "upper" => 31,
+  "word" => 32,
+  "xdigit" => 33,
+  :MINUS => 34,
+  :MULTILINE => 35,
+  :IGNORECASE => 36,
+  :EXTENDED => 37 }
+
+racc_nt_base = 38
 
 racc_use_result_var = true
 
@@ -176,7 +233,6 @@ Racc_token_to_s_table = [
   "error",
   "BAR",
   "LBRACK",
-  "LC_CTYPE",
   "RBRACK",
   "NEGATE",
   "CCLASS",
@@ -193,6 +249,20 @@ Racc_token_to_s_table = [
   "PLUS",
   "LCURLY",
   "RCURLY",
+  "\"alnum\"",
+  "\"alpha\"",
+  "\"ascii\"",
+  "\"blank\"",
+  "\"cntrl\"",
+  "\"digit\"",
+  "\"graph\"",
+  "\"lower\"",
+  "\"print\"",
+  "\"punct\"",
+  "\"space\"",
+  "\"upper\"",
+  "\"word\"",
+  "\"xdigit\"",
   "MINUS",
   "MULTILINE",
   "IGNORECASE",
@@ -203,6 +273,7 @@ Racc_token_to_s_table = [
   "atom",
   "quantifier",
   "group",
+  "ctype",
   "bracket_expression",
   "anchor",
   "options",
@@ -263,7 +334,7 @@ def _reduce_10(val, _values, result)
 end
 
 def _reduce_11(val, _values, result)
- result = val[0] 
+ result = CharacterClass.new(val[0]) 
     result
 end
 
@@ -283,38 +354,32 @@ def _reduce_14(val, _values, result)
 end
 
 def _reduce_15(val, _values, result)
- result = val.join 
-    result
-end
-
-# reduce 16 omitted
-
-def _reduce_17(val, _values, result)
           result = Group.new(val[1])
           result.index = @capture_index_stack.pop
         
     result
 end
 
-def _reduce_18(val, _values, result)
+def _reduce_16(val, _values, result)
           result = Group.new(val[4]);
           result.capture = false;
           options = val[2];
-          result.expression.multiline = options[:multiline];
+          result.expression.multiline  = options[:multiline];
           result.expression.ignorecase = options[:ignorecase];
-          result.expression.extended = options[:extended];
+          result.expression.extended   = options[:extended];
+          @options_stack.pop
         
     result
 end
 
-def _reduce_19(val, _values, result)
+def _reduce_17(val, _values, result)
           result = Group.new(val[3]);
           result.capture = false;
         
     result
 end
 
-def _reduce_20(val, _values, result)
+def _reduce_18(val, _values, result)
           result = Group.new(val[3]);
           result.name = val[2];
           result.index = @capture_index_stack.pop
@@ -322,15 +387,25 @@ def _reduce_20(val, _values, result)
     result
 end
 
+# reduce 19 omitted
+
+# reduce 20 omitted
+
 # reduce 21 omitted
 
 # reduce 22 omitted
 
 # reduce 23 omitted
 
-# reduce 24 omitted
+def _reduce_24(val, _values, result)
+ result = val.join 
+    result
+end
 
-# reduce 25 omitted
+def _reduce_25(val, _values, result)
+ result = val.join 
+    result
+end
 
 def _reduce_26(val, _values, result)
  result = val.join 
@@ -342,37 +417,115 @@ def _reduce_27(val, _values, result)
     result
 end
 
-def _reduce_28(val, _values, result)
- result = { val[1] => false, val[2] => false, val[3] => false } 
+# reduce 28 omitted
+
+# reduce 29 omitted
+
+def _reduce_30(val, _values, result)
+ result = CharacterClass::ALNUM 
     result
 end
 
-def _reduce_29(val, _values, result)
- result = { val[0] => true, val[2] => false, val[3] => false } 
+def _reduce_31(val, _values, result)
+ result = CharacterClass::ALPHA 
     result
 end
 
-def _reduce_30(val, _values, result)
- result = { val[0] => true, val[1] => true, val[3] => false } 
+def _reduce_32(val, _values, result)
+ result = CharacterClass::ASCII 
     result
 end
 
-def _reduce_31(val, _values, result)
- result = { val[0] => true, val[1] => true, val[2] => true } 
+def _reduce_33(val, _values, result)
+ result = CharacterClass::BLANK 
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_34(val, _values, result)
+ result = CharacterClass::CNTRL 
+    result
+end
+
+def _reduce_35(val, _values, result)
+ result = CharacterClass::DIGIT 
+    result
+end
+
+def _reduce_36(val, _values, result)
+ result = CharacterClass::GRAPH 
+    result
+end
+
+def _reduce_37(val, _values, result)
+ result = CharacterClass::LOWER 
+    result
+end
+
+def _reduce_38(val, _values, result)
+ result = CharacterClass::PRINT 
+    result
+end
+
+def _reduce_39(val, _values, result)
+ result = CharacterClass::PUNCT 
+    result
+end
+
+def _reduce_40(val, _values, result)
+ result = CharacterClass::SPACE 
+    result
+end
+
+def _reduce_41(val, _values, result)
+ result = CharacterClass::UPPER 
+    result
+end
+
+def _reduce_42(val, _values, result)
+ result = CharacterClass::WORD  
+    result
+end
+
+def _reduce_43(val, _values, result)
+ result = CharacterClass::XDIGIT 
+    result
+end
+
+def _reduce_44(val, _values, result)
+            @options_stack << result = { val[1] => false, val[2] => false, val[3] => false }
+          
+    result
+end
+
+def _reduce_45(val, _values, result)
+            @options_stack << result = { val[0] => true, val[2] => false, val[3] => false }
+          
+    result
+end
+
+def _reduce_46(val, _values, result)
+            @options_stack << result = { val[0] => true, val[1] => true, val[3] => false }
+          
+    result
+end
+
+def _reduce_47(val, _values, result)
+            @options_stack << result = { val[0] => true, val[1] => true, val[2] => true }
+          
+    result
+end
+
+def _reduce_48(val, _values, result)
  result = :multiline 
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_49(val, _values, result)
  result = :ignorecase 
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_50(val, _values, result)
  result = :extended 
     result
 end

data/lib/rack/mount/vendor/reginald/reginald/tokenizer.rb

@@ -51,23 +51,8 @@ class Parser < Racc::Parser
     token = case @state
     when nil
       case
-      when (text = @ss.scan(/\\d/))
-         action { [:CCLASS, CharacterClass.new('\d')] }
-
-      when (text = @ss.scan(/\\D/))
-         action { [:CCLASS, CharacterClass.new('\D')] }
-
-      when (text = @ss.scan(/\\s/))
-         action { [:CCLASS, CharacterClass.new('\s')] }
-
-      when (text = @ss.scan(/\\S/))
-         action { [:CCLASS, CharacterClass.new('\S')] }
-
-      when (text = @ss.scan(/\\w/))
-         action { [:CCLASS, CharacterClass.new('\w')] }
-
-      when (text = @ss.scan(/\\W/))
-         action { [:CCLASS, CharacterClass.new('\W')] }
+      when (text = @ss.scan(/\\[dDsSwW]/))
+         action { [:CCLASS, text] }
 
       when (text = @ss.scan(/\^/))
          action { [:L_ANCHOR, text] }
@@ -120,6 +105,27 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\*/))
          action { [:STAR,  text] }
 
+      when (text = @ss.scan(/\#/))
+         action {
+    if @options_stack[-1][:extended]
+      @state = :COMMENT;
+      next_token
+    else
+      [:CHAR, text]
+    end
+  }
+
+
+      when (text = @ss.scan(/\s|\n/))
+         action {
+    if @options_stack[-1][:extended]
+      next_token
+    else
+      [:CHAR, text]
+    end
+  }
+
+
       when (text = @ss.scan(/\\(.)/))
          action { [:CHAR, @ss[1]] }
 
@@ -139,53 +145,14 @@ class Parser < Racc::Parser
       when (text = @ss.scan(/\^/))
          action { [:NEGATE, text] }
 
-      when (text = @ss.scan(/:alnum:/))
-         action { [:LC_CTYPE, CharacterClass::ALNUM] }
-
-      when (text = @ss.scan(/:alpha:/))
-         action { [:LC_CTYPE, CharacterClass::ALPHA] }
-
-      when (text = @ss.scan(/:ascii:/))
-         action { [:LC_CTYPE, CharacterClass::ASCII] }
-
-      when (text = @ss.scan(/:blank:/))
-         action { [:LC_CTYPE, CharacterClass::BLANK] }
-
-      when (text = @ss.scan(/:cntrl:/))
-         action { [:LC_CTYPE, CharacterClass::CNTRL] }
-
-      when (text = @ss.scan(/:digit:/))
-         action { [:LC_CTYPE, CharacterClass::DIGIT] }
-
-      when (text = @ss.scan(/:graph:/))
-         action { [:LC_CTYPE, CharacterClass::GRAPH] }
-
-      when (text = @ss.scan(/:lower:/))
-         action { [:LC_CTYPE, CharacterClass::LOWER] }
-
-      when (text = @ss.scan(/:print:/))
-         action { [:LC_CTYPE, CharacterClass::PRINT] }
-
-      when (text = @ss.scan(/:punct:/))
-         action { [:LC_CTYPE, CharacterClass::PUNCT] }
-
-      when (text = @ss.scan(/:space:/))
-         action { [:LC_CTYPE, CharacterClass::SPACE] }
-
-      when (text = @ss.scan(/:upper:/))
-         action { [:LC_CTYPE, CharacterClass::UPPER] }
-
-      when (text = @ss.scan(/:word;/))
-         action { [:LC_CTYPE, CharacterClass::WORD] }
-
-      when (text = @ss.scan(/:xdigit:/))
-         action { [:LC_CTYPE, CharacterClass::XDIGIT] }
+      when (text = @ss.scan(/:(alnum|alpha|ascii|blank|cntrl|digit|graph|lower|print|punct|space|upper|word|xdigit):/))
+         action { [@ss[1], text] }
 
       when (text = @ss.scan(/\\(.)/))
          action { [:CHAR, @ss[1]] }
 
       when (text = @ss.scan(/./))
-         action { [:CHAR,     text] }
+         action { [:CHAR, text] }
 
       else
         text = @ss.string[@ss.pos .. -1]
@@ -227,6 +194,19 @@ class Parser < Racc::Parser
         raise  ScanError, "can not match: '" + text + "'"
       end  # if
 
+    when :COMMENT
+      case
+      when (text = @ss.scan(/\n/))
+         action { @state = nil; next_token }
+
+      when (text = @ss.scan(/./))
+         action { next_token }
+
+      else
+        text = @ss.string[@ss.pos .. -1]
+        raise  ScanError, "can not match: '" + text + "'"
+      end  # if
+
     else
       raise  ScanError, "undefined state: '" + state.to_s + "'"
     end  # case state

data/lib/rack/mount/vendor/reginald/reginald.rb

@@ -4,6 +4,7 @@ module Reginald
   autoload :Atom, 'reginald/atom'
   autoload :Character, 'reginald/character'
   autoload :CharacterClass, 'reginald/character_class'
+  autoload :Collection, 'reginald/collection'
   autoload :Expression, 'reginald/expression'
   autoload :Group, 'reginald/group'
   autoload :Parser, 'reginald/parser'
@@ -22,37 +23,13 @@ module Reginald
     end
 
     def parse(regexp)
-      regexp = strip_extended_whitespace_and_comments(regexp)
-
-      parser = Parser.new
-      parser.capture_index = 0
-      parser.capture_index_stack = []
-      expression = parser.scan_str(regexp.source)
-
-      expression.ignorecase = regexp.casefold?
-
-      expression
+      Parser.parse_regexp(regexp)
     end
 
     def compile(source)
       regexp = Regexp.compile(source)
       expression = parse(regexp)
-      Regexp.compile(expression.to_s_without_options, expression.options)
+      Regexp.compile(expression.to_s(true), expression.options)
     end
-
-    private
-      # TODO: The parser should be aware of extended expressions
-      # instead of having to sanitize them before.
-      def strip_extended_whitespace_and_comments(regexp)
-        if regexp.options & Regexp::EXTENDED != 0
-          source = regexp.source
-          source.gsub!(/#.+$/, '')
-          source.gsub!(/\s+/, '')
-          source.gsub!(/\\\//, '/')
-          regexp = Regexp.compile(source)
-        else
-          regexp
-        end
-      end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-03 00:00:00 -06:00
+date: 2009-12-05 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/rack/mount/vendor/reginald/reginald/atom.rb
 - lib/rack/mount/vendor/reginald/reginald/character.rb
 - lib/rack/mount/vendor/reginald/reginald/character_class.rb
+- lib/rack/mount/vendor/reginald/reginald/collection.rb
 - lib/rack/mount/vendor/reginald/reginald/expression.rb
 - lib/rack/mount/vendor/reginald/reginald/group.rb
 - lib/rack/mount/vendor/reginald/reginald/parser.rb