1 files changed, 0 insertions, 148 deletions
diff --git a/actionpack/lib/action_dispatch/vendor/rack-mount-0.6.6.pre/rack/mount/utils.rb b/actionpack/lib/action_dispatch/vendor/rack-mount-0.6.6.pre/rack/mount/utils.rb
deleted file mode 100644
index aa23b1162f..0000000000
--- a/actionpack/lib/action_dispatch/vendor/rack-mount-0.6.6.pre/rack/mount/utils.rb
+++ /dev/null
@@ -1,148 +0,0 @@
-begin
-  require 'regin'
-rescue LoadError
-  $: << File.expand_path(File.join(File.dirname(__FILE__), 'vendor/regin'))
-  require 'regin'
-end
-
-require 'uri'
-
-module Rack::Mount
-  # Private utility methods used throughout Rack::Mount.
-  #--
-  # This module is a trash can. Try to move these functions into
-  # more appropriate contexts.
-  #++
-  module Utils
-    # Normalizes URI path.
-    #
-    # Strips off trailing slash and ensures there is a leading slash.
-    #
-    #   normalize_path("/foo")  # => "/foo"
-    #   normalize_path("/foo/") # => "/foo"
-    #   normalize_path("foo")   # => "/foo"
-    #   normalize_path("")      # => "/"
-    def normalize_path(path)
-      path = "/#{path}"
-      path.squeeze!('/')
-      path.sub!(%r{/+\Z}, '')
-      path = '/' if path == ''
-      path
-    end
-    module_function :normalize_path
-
-    # Removes trailing nils from array.
-    #
-    #   pop_trailing_nils!([1, 2, 3])           # => [1, 2, 3]
-    #   pop_trailing_nils!([1, 2, 3, nil, nil]) # => [1, 2, 3]
-    #   pop_trailing_nils!([nil])               # => []
-    def pop_trailing_nils!(ary)
-      while ary.length > 0 && ary.last.nil?
-        ary.pop
-      end
-      ary
-    end
-    module_function :pop_trailing_nils!
-
-    RESERVED_PCHAR = ':@&=+$,;%'
-    SAFE_PCHAR = "#{URI::REGEXP::PATTERN::UNRESERVED}#{RESERVED_PCHAR}"
-    if RUBY_VERSION >= '1.9'
-      UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false).freeze
-    else
-      UNSAFE_PCHAR = Regexp.new("[^#{SAFE_PCHAR}]", false, 'N').freeze
-    end
-
-    Parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
-
-    def escape_uri(uri)
-      Parser.escape(uri.to_s, UNSAFE_PCHAR)
-    end
-    module_function :escape_uri
-
-    if ''.respond_to?(:force_encoding)
-      def unescape_uri(uri)
-        Parser.unescape(uri).force_encoding('utf-8')
-      end
-    else
-      def unescape_uri(uri)
-        URI.unescape(uri)
-      end
-    end
-    module_function :unescape_uri
-
-    # Taken from Rack 1.1.x to build nested query strings
-    def build_nested_query(value, prefix = nil) #:nodoc:
-      case value
-      when Array
-        value.map { |v|
-          build_nested_query(v, "#{prefix}[]")
-        }.join("&")
-      when Hash
-        value.map { |k, v|
-          build_nested_query(v, prefix ? "#{prefix}[#{Rack::Utils.escape(k)}]" : Rack::Utils.escape(k))
-        }.join("&")
-      when String
-        raise ArgumentError, "value must be a Hash" if prefix.nil?
-        "#{prefix}=#{Rack::Utils.escape(value)}"
-      else
-        prefix
-      end
-    end
-    module_function :build_nested_query
-
-    # Determines whether the regexp must match the entire string.
-    #
-    #   regexp_anchored?(/^foo$/) # => true
-    #   regexp_anchored?(/foo/)   # => false
-    #   regexp_anchored?(/^foo/)  # => false
-    #   regexp_anchored?(/foo$/)  # => false
-    def regexp_anchored?(regexp)
-     regexp.source =~ /\A(\\A|\^).*(\\Z|\$)\Z/m ? true : false
-    end
-    module_function :regexp_anchored?
-
-    def normalize_extended_expression(regexp)
-      return regexp unless regexp.options & Regexp::EXTENDED != 0
-      source = regexp.source
-      source.gsub!(/#.+$/, '')
-      source.gsub!(/\s+/, '')
-      source.gsub!(/\\\//, '/')
-      Regexp.compile(source)
-    end
-    module_function :normalize_extended_expression
-
-    def parse_regexp(regexp)
-      cache = @@_parse_regexp_cache ||= {}
-
-      if expression = cache[regexp]
-        return expression
-      end
-
-      unless regexp.is_a?(RegexpWithNamedGroups)
-        regexp = RegexpWithNamedGroups.new(regexp)
-      end
-
-      expression = Regin.parse(regexp)
-
-      unless Regin.regexp_supports_named_captures?
-        tag_captures = Proc.new do |group|
-          case group
-          when Regin::Group
-            # TODO: dup instead of mutating
-            group.instance_variable_set('@name', regexp.names[group.index]) if group.index
-            tag_captures.call(group.expression)
-          when Regin::Expression
-            group.each { |child| tag_captures.call(child) }
-          end
-        end
-        tag_captures.call(expression)
-      end
-
-      cache[regexp] = expression.freeze
-      expression
-    rescue Racc::ParseError, Regin::Parser::ScanError
-      []
-    end
-    module_function :parse_regexp
-  end
-end