rack-mount 0.6.6 → 0.6.7

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

@@ -101,7 +101,7 @@ module Rack::Mount
             when Regin::CharacterClass
               break if separators.any? { |s| part.include?(s) }
               buf = nil
-              segments << part.to_regexp
+              segments << part.to_regexp(true)
             when Regin::Character
               if separators.any? { |s| part.include?(s) }
                 segments << join_buffer(buf, regexp) if buf
@@ -125,7 +125,7 @@ module Rack::Mount
               elsif part.quantifier == nil
                 break if separators.any? { |s| part.include?(s) }
                 buf = nil
-                segments << part.to_regexp
+                segments << part.to_regexp(true)
               else
                 break
               end
@@ -151,7 +151,7 @@ module Rack::Mount
           if parts.literal?
             parts.to_s
           else
-            parts.to_regexp
+            parts.to_regexp(true)
           end
         end
     end

data/lib/rack/mount/generatable_regexp.rb

@@ -119,7 +119,7 @@ module Rack::Mount
               end
             when Regin::Group
               if part.name
-                s << DynamicSegment.new(part.name, part.expression.to_regexp)
+                s << DynamicSegment.new(part.name, part.expression.to_regexp(true))
               else
                 s << parse_segments(part.expression)
               end

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

@@ -12,7 +12,8 @@ rule
          }
        | GLOB {
            name = val[0].to_sym
-           result = REGEXP_NAMED_CAPTURE % [name, '.+']
+           requirement = requirements[name]
+           result = REGEXP_NAMED_CAPTURE % [name, '.+' || requirement]
          }
        | LPAREN expr RPAREN { result = "(?:#{val[1]})?" }
        | CHAR { result = Regexp.escape(val[0]) }

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

@@ -1,15 +1,5 @@
 module Regin
   class Alternation < Collection
-    def self.reduce(alternation_or_expression, expression) #:nodoc:
-      if alternation_or_expression.first.is_a?(Alternation)
-        alternation_or_expression = alternation_or_expression.first
-        alternation_or_expression += [expression]
-        new(*alternation_or_expression)
-      else
-        new(alternation_or_expression, expression)
-      end
-    end
-
     def initialize(*args)
       args, options = extract_options(args)
 

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

@@ -50,10 +50,5 @@ module Regin
         self.value.eql?(other.value) &&
         (!!self.ignorecase).eql?(!!other.ignorecase)
     end
-
-    def freeze #:nodoc:
-      value.freeze
-      super
-    end
   end
 end

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

@@ -26,12 +26,14 @@ module Regin
       end
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s(true)}\\Z", ignorecase)
+    def to_regexp(anchored = false)
+      re = to_s(true)
+      re = "\\A#{re}\\Z" if anchored
+      Regexp.compile(re, ignorecase)
     end
 
     def match(char)
-      to_regexp.match(char)
+      to_regexp(true).match(char)
     end
 
     def include?(char)
@@ -45,10 +47,5 @@ module Regin
     def eql?(other) #:nodoc:
       super && quantifier.eql?(other.quantifier)
     end
-
-    def freeze #:nodoc:
-      quantifier.freeze if quantifier
-      super
-    end
   end
 end

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

@@ -46,10 +46,5 @@ module Regin
     def eql?(other) #:nodoc:
       super && negate == other.negate
     end
-
-    def freeze #:nodoc:
-      negate.freeze if negate
-      super
-    end
   end
 end

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

@@ -6,8 +6,8 @@ module Regin
       @array = Array.new(*args)
     end
 
-    def each(&block)
-      @array.each(&block)
+    def each
+      @array.each{ |item| yield item }
     end
 
     def [](i)
@@ -28,12 +28,14 @@ module Regin
     end
 
     def +(other)
-      ary = other.is_a?(Collection) ? other.internal_array : other
+      ary = other.is_a?(self.class) ? other.internal_array : other
       self.class.new(@array + ary)
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s(true)}\\Z", flags)
+    def to_regexp(anchored = false)
+      re = to_s(true)
+      re = "\\A#{re}\\Z" if anchored
+      Regexp.compile(re, flags)
     end
 
     def match(char)
@@ -59,12 +61,6 @@ module Regin
       other.instance_of?(self.class) && @array.eql?(other.internal_array)
     end
 
-    def freeze #:nodoc:
-      each { |e| e.freeze }
-      @array.freeze
-      super
-    end
-
     protected
       def internal_array #:nodoc:
         @array

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

@@ -1,18 +1,6 @@
 module Regin
   class Expression < Collection
-    attr_reader :ignorecase
-    attr_accessor :multiline, :extended
-
-    def self.reduce(expression_or_atom, atom = nil) #:nodoc:
-      if expression_or_atom.is_a?(Expression)
-        expression_or_atom += [atom] if atom
-        new(*expression_or_atom)
-      elsif atom.nil?
-        new(expression_or_atom)
-      else
-        new(expression_or_atom, atom)
-      end
-    end
+    attr_reader :ignorecase, :multiline, :extended
 
     def initialize(*args)
       args, options = extract_options(args)
@@ -70,6 +58,12 @@ module Regin
       options.to_i
     end
 
+    def +(other)
+      ary = other.is_a?(self.class) ? other.internal_array : other
+      ary = @array + ary + [options.to_h(true)]
+      self.class.new(*ary)
+    end
+
     def dup(options = {})
       expression = super()
       expression.multiline  = options[:multiline] if options.key?(:multiline)
@@ -114,11 +108,19 @@ module Regin
         Options.new(multiline, ignorecase, extended)
       end
 
+      def multiline=(multiline)
+        @multiline = multiline
+      end
+
       def ignorecase=(ignorecase)
         if @ignorecase.nil?
           @array.map! { |e| e.dup(:ignorecase => ignorecase) }
           @ignorecase = ignorecase
         end
       end
+
+      def extended=(extended)
+        @extended = extended
+      end
   end
 end

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

@@ -34,8 +34,10 @@ module Regin
       end
     end
 
-    def to_regexp
-      Regexp.compile("\\A#{to_s}\\Z")
+    def to_regexp(anchored = false)
+      re = to_s
+      re = "\\A#{re}\\Z" if anchored
+      Regexp.compile(re)
     end
 
     def dup(options = {})
@@ -79,10 +81,5 @@ module Regin
         self.index == other.index &&
         self.name == other.name
     end
-
-    def freeze #:nodoc:
-      expression.freeze if expression
-      super
-    end
   end
 end

data/lib/rack/mount/vendor/regin/regin/options.rb

@@ -30,10 +30,18 @@ module Regin
       end
     end
 
-    def to_h
-      { :multiline => multiline,
-        :ignorecase => ignorecase,
-        :extended => extended }
+    def to_h(explicit = false)
+      if explicit
+        options = {}
+        options[:multiline]  = multiline  unless multiline.nil?
+        options[:ignorecase] = ignorecase unless ignorecase.nil?
+        options[:extended]   = extended   unless extended.nil?
+        options
+      else
+        { :multiline => multiline,
+          :ignorecase => ignorecase,
+          :extended => extended }
+      end
     end
 
     def to_i

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

@@ -6,7 +6,7 @@
 
 require 'racc/parser.rb'
 module Regin
-  class Parser < Racc::Parser #:nodoc: all
+  class Parser < Racc::Parser
 
 def self.parse_regexp(regexp)
   options = Options.from_int(regexp.options)
@@ -30,117 +30,124 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-     1,    17,    18,    18,     7,     8,    10,    11,    48,    18,
-     1,    60,     2,     4,     7,     8,    10,    11,    45,    47,
-     1,    55,     2,     4,     7,     8,    10,    11,    28,    18,
-     1,    15,     2,     4,     7,     8,    10,    11,    64,    18,
-     1,    63,     2,     4,     7,     8,    10,    11,    61,    49,
-     1,    27,     2,     4,     7,     8,    10,    11,    36,    25,
-     1,    33,     2,     4,     7,     8,    10,    11,   nil,   nil,
-     1,   nil,     2,     4,     7,     8,    10,    11,    42,    43,
-    46,    31,     2,     4,    32,    20,    44,    37,    39,    41,
-    21,    22,    24,    20,    58,    37,    39,    41,    21,    22,
-    24,    13,   nil,    14,    30,    31,    15,   nil,    32,    51,
-    37,    39,    41,    37,    39,    41,    37,    39,    41,    37,
-    39,    41,    37,    39,    41,    37,    39,    41,    37,    39,
-    41 ]
+     3,    41,    42,    43,     9,    11,    13,    15,    52,    59,
+     3,    55,     4,     6,     9,    11,    13,    15,    22,    51,
+     3,    33,     4,     6,     9,    11,    13,    15,    21,    60,
+     3,    61,     4,     6,     9,    11,    13,    15,    20,    19,
+     3,    49,     4,     6,     9,    11,    13,    15,    35,    67,
+     3,    68,     4,     6,     9,    11,    13,    15,    40,    39,
+     3,    38,     4,     6,     9,    11,    13,    15,   nil,    29,
+     3,   nil,     4,     6,     9,    11,    13,    15,    44,    45,
+    31,   nil,     4,     6,    32,    24,    48,    41,    42,    43,
+    25,    26,    27,    17,   nil,    18,    50,   nil,    19,   nil,
+    32,    57,    41,    42,    43,    64,    41,    42,    43,    41,
+    42,    43,    41,    42,    43,    41,    42,    43,    41,    42,
+    43,    41,    42,    43 ]
 
 racc_action_check = [
-     0,     3,    52,     3,     0,     0,     0,     0,    36,    26,
-    49,    52,     0,     0,    49,    49,    49,    49,    26,    36,
-    43,    48,    49,    49,    43,    43,    43,    43,    14,    56,
-     5,    14,    43,    43,     5,     5,     5,     5,    56,    53,
-    34,    55,     5,     5,    34,    34,    34,    34,    53,    38,
-    11,    13,    34,    34,    11,    11,    11,    11,    24,    11,
-    18,    17,    11,    11,    18,    18,    18,    18,   nil,   nil,
-    42,   nil,    18,    18,    42,    42,    42,    42,    25,    25,
-    29,    29,    42,    42,    29,    19,    25,    25,    25,    25,
-    19,    19,    19,     6,    50,    50,    50,    50,     6,     6,
-     6,     1,   nil,     1,    16,    16,     1,   nil,    16,    40,
-    40,    40,    40,    54,    54,    54,    58,    58,    58,    59,
-    59,    59,    51,    51,    51,    62,    62,    62,    44,    44,
-    44 ]
+     0,    57,    57,    57,     0,     0,     0,     0,    40,    52,
+    22,    46,     0,     0,    22,    22,    22,    22,     8,    40,
+    55,    17,    22,    22,    55,    55,    55,    55,     7,    53,
+    45,    54,    55,    55,    45,    45,    45,    45,     5,    18,
+    44,    30,    45,    45,    44,    44,    44,    44,    20,    59,
+    10,    62,    44,    44,    10,    10,    10,    10,    27,    26,
+    15,    25,    10,    10,    15,    15,    15,    15,   nil,    15,
+    21,   nil,    15,    15,    21,    21,    21,    21,    29,    29,
+    16,   nil,    21,    21,    16,    14,    29,    29,    29,    29,
+    14,    14,    14,     3,   nil,     3,    34,   nil,     3,   nil,
+    34,    47,    47,    47,    47,    56,    56,    56,    56,    58,
+    58,    58,    64,    64,    64,    65,    65,    65,    48,    48,
+    48,    66,    66,    66 ]
 
 racc_action_pointer = [
-    -3,    97,   nil,     1,   nil,    27,    81,   nil,   nil,   nil,
-   nil,    47,   nil,    46,    22,   nil,    99,    61,    57,    73,
-   nil,   nil,   nil,   nil,    49,    65,     7,   nil,   nil,    75,
-   nil,   nil,   nil,   nil,    37,   nil,    -1,   nil,    36,   nil,
-    88,   nil,    67,    17,   106,   nil,   nil,   nil,    12,     7,
-    73,   100,     0,    37,    91,    21,    27,   nil,    94,    97,
-   nil,   nil,   103,   nil,   nil,   nil,   nil,   nil ]
+    -3,   nil,   nil,    89,   nil,    38,   nil,    26,    16,   nil,
+    47,   nil,   nil,   nil,    73,    57,    75,    16,    30,   nil,
+    48,    67,     7,   nil,   nil,    49,    47,    49,   nil,    65,
+    30,   nil,   nil,   nil,    91,   nil,   nil,   nil,   nil,   nil,
+    -1,   nil,   nil,   nil,    37,    27,    -2,    80,    96,   nil,
+   nil,   nil,     0,    18,    20,    17,    84,   -21,    87,    29,
+   nil,   nil,    40,   nil,    90,    93,    99,   nil,   nil,   nil,
+   nil,   nil ]
 
 racc_action_default = [
-   -37,   -37,   -19,   -37,   -20,    -2,    -6,   -11,   -12,    -7,
-   -14,   -37,   -13,   -37,   -29,   -28,   -37,   -37,   -37,    -4,
-   -23,   -21,   -22,    -5,   -37,   -37,   -37,    -8,   -29,   -37,
-    -9,   -27,   -26,    68,    -1,    -3,   -37,   -34,   -37,   -35,
-   -37,   -36,   -37,   -37,   -37,   -15,   -10,   -25,   -37,   -37,
-   -37,   -37,   -37,   -37,   -37,   -37,   -37,   -33,   -37,   -37,
-   -17,   -18,   -37,   -24,   -16,   -32,   -31,   -30 ]
+   -40,   -10,   -16,   -40,   -22,   -40,   -23,    -1,    -2,   -14,
+    -5,   -15,    -7,   -17,    -9,   -40,   -40,   -40,   -40,   -32,
+   -40,   -40,   -40,    -6,   -26,   -24,   -25,   -40,    -8,   -40,
+   -40,   -12,   -31,   -11,   -40,    72,    -3,    -4,   -27,   -28,
+   -40,   -37,   -38,   -39,   -40,   -40,   -40,   -40,   -40,   -18,
+   -13,   -30,   -40,   -40,   -40,   -40,   -40,   -40,   -40,   -40,
+   -20,   -21,   -40,   -36,   -40,   -40,   -40,   -29,   -19,   -35,
+   -34,   -33 ]
 
 racc_goto_table = [
-     3,    40,    19,    38,    16,    23,    34,   nil,   nil,   nil,
-   nil,    26,   nil,   nil,   nil,   nil,    50,    29,    35,   nil,
-    54,   nil,   nil,   nil,   nil,   nil,    57,    59,   nil,   nil,
-    62,    19,   nil,   nil,    65,    66,   nil,   nil,    67,   nil,
-   nil,   nil,    52,    53,   nil,   nil,   nil,   nil,   nil,    56 ]
+     5,    47,    16,    36,    37,    23,    46,    28,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    30,   nil,    34,   nil,    56,
+    58,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    63,    65,
+    66,   nil,   nil,   nil,   nil,   nil,    69,    70,    71,   nil,
+   nil,   nil,   nil,   nil,    53,    54,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,    62 ]
 
 racc_goto_check = [
-     1,     9,     3,     8,     6,     4,     2,   nil,   nil,   nil,
-   nil,     1,   nil,   nil,   nil,   nil,     9,     6,     4,   nil,
-     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,    12,     9,     3,     3,     5,    11,     7,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     1,   nil,     9,   nil,    12,
+    12,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    12,    12,
+    12,   nil,   nil,   nil,   nil,   nil,    12,    12,    12,   nil,
+   nil,   nil,   nil,   nil,     1,     1,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     1 ]
 
 racc_goto_pointer = [
-   nil,     0,   -12,    -3,    -1,   nil,     3,   nil,   -22,   -24 ]
+   nil,     0,   nil,   -18,   nil,    -5,   nil,    -7,   nil,    -1,
+   nil,   -23,   -28 ]
 
 racc_goto_default = [
-   nil,   nil,     5,     6,   nil,     9,   nil,    12,   nil,   nil ]
+   nil,   nil,     7,     8,    10,    12,    14,   nil,     1,   nil,
+     2,   nil,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 26, :_reduce_1,
-  1, 26, :_reduce_2,
+  1, 26, :_reduce_1,
+  1, 26, :_reduce_none,
   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,
-  3, 30, :_reduce_15,
-  6, 30, :_reduce_16,
-  5, 30, :_reduce_17,
-  5, 30, :_reduce_18,
+  3, 27, :_reduce_4,
+  1, 28, :_reduce_5,
+  2, 29, :_reduce_6,
+  1, 29, :_reduce_7,
+  2, 30, :_reduce_8,
+  1, 30, :_reduce_none,
+  1, 31, :_reduce_none,
+  3, 31, :_reduce_11,
+  3, 31, :_reduce_12,
+  4, 31, :_reduce_13,
+  1, 31, :_reduce_14,
+  1, 31, :_reduce_15,
+  1, 31, :_reduce_16,
+  1, 31, :_reduce_17,
+  3, 33, :_reduce_18,
+  6, 33, :_reduce_19,
+  5, 33, :_reduce_20,
+  5, 33, :_reduce_21,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_none,
   1, 32, :_reduce_none,
   1, 32, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  1, 29, :_reduce_none,
-  5, 29, :_reduce_24,
-  3, 29, :_reduce_25,
-  2, 31, :_reduce_26,
-  2, 31, :_reduce_27,
-  1, 31, :_reduce_none,
-  1, 31, :_reduce_none,
-  4, 33, :_reduce_30,
-  4, 33, :_reduce_31,
-  4, 33, :_reduce_32,
-  3, 33, :_reduce_33,
-  1, 34, :_reduce_34,
-  1, 34, :_reduce_35,
-  1, 34, :_reduce_36 ]
-
-racc_reduce_n = 37
-
-racc_shift_n = 68
+  1, 32, :_reduce_none,
+  2, 32, :_reduce_27,
+  2, 32, :_reduce_28,
+  5, 32, :_reduce_29,
+  3, 32, :_reduce_30,
+  2, 34, :_reduce_31,
+  1, 34, :_reduce_none,
+  4, 36, :_reduce_33,
+  4, 36, :_reduce_34,
+  4, 36, :_reduce_35,
+  3, 36, :_reduce_36,
+  1, 37, :_reduce_37,
+  1, 37, :_reduce_38,
+  1, 37, :_reduce_39 ]
+
+racc_reduce_n = 40
+
+racc_shift_n = 72
 
 racc_token_table = {
   false => 0,
@@ -217,7 +224,10 @@ Racc_token_to_s_table = [
   "EXTENDED",
   "$start",
   "expression",
-  "branch",
+  "alternation",
+  "subexpression",
+  "expression_ary",
+  "quantified_atom",
   "atom",
   "quantifier",
   "group",
@@ -233,163 +243,178 @@ Racc_debug_parser = false
 # reduce 0 omitted
 
 def _reduce_1(val, _values, result)
- result = Expression.new(Alternation.reduce(val[0], val[2])) 
+ result = Expression.new(val[0]) 
     result
 end
 
-def _reduce_2(val, _values, result)
- result = Expression.reduce(val[0]) 
-    result
-end
+# reduce 2 omitted
 
 def _reduce_3(val, _values, result)
- result = Expression.reduce(val[0], val[1].dup(:quantifier => val[2])) 
+ result = val[0] + [val[2]] 
     result
 end
 
 def _reduce_4(val, _values, result)
- result = Expression.reduce(val[0], val[1]) 
+ result = Alternation.new(val[0], val[2])  
     result
 end
 
 def _reduce_5(val, _values, result)
- result = val[0].dup(:quantifier => val[1]) 
+ result = Expression.new(val[0]) 
     result
 end
 
-# reduce 6 omitted
+def _reduce_6(val, _values, result)
+ result = val[0] + [val[1]] 
+    result
+end
 
-# reduce 7 omitted
+def _reduce_7(val, _values, result)
+ result = [val[0]] 
+    result
+end
 
 def _reduce_8(val, _values, result)
+ result = val[0].dup(:quantifier => val[1]) 
+    result
+end
+
+# reduce 9 omitted
+
+# reduce 10 omitted
+
+def _reduce_11(val, _values, result)
  result = CharacterClass.new(val[1]) 
     result
 end
 
-def _reduce_9(val, _values, result)
+def _reduce_12(val, _values, result)
  result = CharacterClass.new(val[1]) 
     result
 end
 
-def _reduce_10(val, _values, result)
+def _reduce_13(val, _values, result)
  result = CharacterClass.new(val[2], :negate => true) 
     result
 end
 
-def _reduce_11(val, _values, result)
+def _reduce_14(val, _values, result)
  result = CharacterClass.new(val[0]) 
     result
 end
 
-def _reduce_12(val, _values, result)
+def _reduce_15(val, _values, result)
  result = CharacterClass.new('.') 
     result
 end
 
-def _reduce_13(val, _values, result)
+def _reduce_16(val, _values, result)
  result = Anchor.new(val[0]) 
     result
 end
 
-def _reduce_14(val, _values, result)
+def _reduce_17(val, _values, result)
  result = Character.new(val[0]) 
     result
 end
 
-def _reduce_15(val, _values, result)
+def _reduce_18(val, _values, result)
           result = Group.new(val[1], :index => @capture_index_stack.pop)
 
     result
 end
 
-def _reduce_16(val, _values, result)
+def _reduce_19(val, _values, result)
           result = Group.new(val[4], val[2].merge(:capture => false))
           @options_stack.pop
 
     result
 end
 
-def _reduce_17(val, _values, result)
+def _reduce_20(val, _values, result)
           result = Group.new(val[3], :capture => false);
 
     result
 end
 
-def _reduce_18(val, _values, result)
+def _reduce_21(val, _values, result)
           result = Group.new(val[3], :name => val[2], :index => @capture_index_stack.pop);
 
     result
 end
 
-# reduce 19 omitted
+# reduce 22 omitted
 
-# reduce 20 omitted
+# reduce 23 omitted
 
-# reduce 21 omitted
+# reduce 24 omitted
 
-# reduce 22 omitted
+# reduce 25 omitted
 
-# reduce 23 omitted
+# reduce 26 omitted
 
-def _reduce_24(val, _values, result)
+def _reduce_27(val, _values, result)
  result = val.join 
     result
 end
 
-def _reduce_25(val, _values, result)
+def _reduce_28(val, _values, result)
  result = val.join 
     result
 end
 
-def _reduce_26(val, _values, result)
+def _reduce_29(val, _values, result)
  result = val.join 
     result
 end
 
-def _reduce_27(val, _values, result)
+def _reduce_30(val, _values, result)
  result = val.join 
     result
 end
 
-# reduce 28 omitted
+def _reduce_31(val, _values, result)
+ result = val.join 
+    result
+end
 
-# reduce 29 omitted
+# reduce 32 omitted
 
-def _reduce_30(val, _values, result)
+def _reduce_33(val, _values, result)
             @options_stack << result = { val[1] => false, val[2] => false, val[3] => false }
 
     result
 end
 
-def _reduce_31(val, _values, result)
+def _reduce_34(val, _values, result)
             @options_stack << result = { val[0] => true, val[2] => false, val[3] => false }
 
     result
 end
 
-def _reduce_32(val, _values, result)
+def _reduce_35(val, _values, result)
             @options_stack << result = { val[0] => true, val[1] => true, val[3] => false }
 
     result
 end
 
-def _reduce_33(val, _values, result)
+def _reduce_36(val, _values, result)
             @options_stack << result = { val[0] => true, val[1] => true, val[2] => true }
 
     result
 end
 
-def _reduce_34(val, _values, result)
+def _reduce_37(val, _values, result)
  result = :multiline 
     result
 end
 
-def _reduce_35(val, _values, result)
+def _reduce_38(val, _values, result)
  result = :ignorecase 
     result
 end
 
-def _reduce_36(val, _values, result)
+def _reduce_39(val, _values, result)
  result = :extended 
     result
 end
@@ -399,7 +424,7 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-end   # module Regin
+  end   # module Regin
 
 require 'regin/tokenizer'
 

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

@@ -1,11 +1,12 @@
 #--
 # DO NOT MODIFY!!!!
-# This file is automatically generated by rex 1.0.5.beta1
+# This file is automatically generated by rex 1.0.4
 # from lexical definition file "lib/regin/tokenizer.rex".
 #++
 
 require 'racc/parser'
-class Regin::Parser < Racc::Parser
+module Regin
+class Parser < Racc::Parser
   require 'strscan'
 
   class ScanError < StandardError ; end
@@ -20,7 +21,7 @@ class Regin::Parser < Racc::Parser
     @state  = nil
   end
 
-  def action
+  def action(&block)
     yield
   end
 
@@ -28,7 +29,6 @@ class Regin::Parser < Racc::Parser
     scan_setup(str)
     do_parse
   end
-  alias :scan :scan_str
 
   def load_file( filename )
     @filename = filename
@@ -137,7 +137,7 @@ class Regin::Parser < Racc::Parser
          action { @state = nil; [:RBRACK, text] }
 
       when (text = @ss.scan(/\^/))
-         action { [:NEGATE, text] }
+         action { [@ss.string[@ss.pos-2, 1] == '[' ? :NEGATE : :CHAR, text] }
 
       when (text = @ss.scan(/:(alnum|alpha|ascii|blank|cntrl|digit|graph|lower|print|punct|space|upper|word|xdigit):/))
          action { [:CTYPE, text] }
@@ -211,3 +211,4 @@ class Regin::Parser < Racc::Parser
   end  # def next_token
 
 end # class
+end # module

data/lib/rack/mount/vendor/regin/regin/version.rb

@@ -1,3 +1,3 @@
 module Regin
-  Version = '0.2.0'
+  Version = '0.3.4'
 end

data/lib/rack/mount/version.rb

@@ -1,3 +1,3 @@
 module Rack::Mount
-  Version = '0.6.4'
+  Version = '0.6.7'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  version: 0.6.7
 platform: ruby
 authors: 
 - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-21 00:00:00 -05:00
+date: 2010-07-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency