about summary refs log tree commit homepage
path: root/lib/mongrel.rb
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-22 08:06:03 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-22 08:06:03 +0000
commitf761e28896ab26be610dfb1770510df87c1a0500 (patch)
treef279d7f26a117edc702c4881e512d0ed6499a84a /lib/mongrel.rb
parente5ceebe3e9b97dec1bcdce9a055c361022e074aa (diff)
downloadunicorn-f761e28896ab26be610dfb1770510df87c1a0500.tar.gz
no sense breaking the internal api (@routes => @handler_map again)
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@730 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel.rb')
-rw-r--r--lib/mongrel.rb22
1 files changed, 10 insertions, 12 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 28baace..87afe00 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -37,21 +37,21 @@ require 'uri'
 module Mongrel
 
   class URIClassifier
-    attr_reader :routes
-    
+  
     class RegistrationError < RuntimeError
     end
     class UsageError < RuntimeError
     end
 
+    attr_reader :handler_map  
+
     # Returns the URIs that have been registered with this classifier so far.
-    # The URIs returned should not be modified.
     def uris
-      @routes.keys
+      @handler_map.keys
     end
 
     def initialize
-      @routes = {}
+      @handler_map = {}
       @matcher = //
     end
     
@@ -61,16 +61,16 @@ module Mongrel
     # Registering a handler is not necessarily threadsafe, so be careful if you go
     # mucking around once the server is running.
     def register(uri, handler)
-      raise RegistrationError, "#{uri.inspect} is already registered" if @routes[uri]
+      raise RegistrationError, "#{uri.inspect} is already registered" if @handler_map[uri]
       raise RegistrationError, "URI is empty" if !uri or uri.empty?
       raise RegistrationError, "URI must begin with a \"#{Const::SLASH}\"" unless uri[0..0] == Const::SLASH
-      @routes[uri.dup] = handler
+      @handler_map[uri.dup] = handler
       rebuild
     end
     
     # Unregister a particular URI and its handler.
     def unregister(uri)
-      handler = @routes.delete(uri)
+      handler = @handler_map.delete(uri)
       raise RegistrationError, "#{uri.inspect} was not registered" unless handler
       rebuild
       handler
@@ -84,18 +84,16 @@ module Mongrel
         path_info = match.post_match
         # A root mounted ("/") handler must resolve such that path info matches the original URI.
         path_info = "#{Const::SLASH}#{path_info}" if uri == Const::SLASH
-        [uri, path_info, @routes[uri]]
+        [uri, path_info, @handler_map[uri]]
       else
         [nil, nil, nil]
       end
     end
         
-    alias :handler_map :routes # Legacy
-    
     private
     
     def rebuild
-      routes = @routes.keys.sort.sort_by do |uri|
+      routes = @handler_map.keys.sort.sort_by do |uri|
         -uri.length
       end
       @matcher = Regexp.new(routes.map do |uri|