rack-mount 0.6.10 → 0.6.11

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

@@ -22,7 +22,7 @@ module Rack::Mount
         end
 
         def inspect
-          "#{method}[#{index}]"
+          "#{method}[#{index}].split(#{separators.inspect})"
         end
       end
 

data/lib/rack/mount/code_generation.rb

@@ -25,6 +25,8 @@ module Rack::Mount
       end
 
       def optimize_container_iterator(container)
+        Utils.debug "optimizing container - size #{container.size}"
+
         body = []
 
         container.each_with_index { |route, i|
@@ -67,6 +69,8 @@ module Rack::Mount
       end
 
       def optimize_recognize!
+        Utils.debug "optimizing recognize"
+
         keys = @recognition_keys.map { |key|
           if key.respond_to?(:call_source)
             key.call_source(:cache, :obj)
@@ -105,7 +109,7 @@ module Rack::Mount
       # has not been defined in the metaclass yet.
       def remove_metaclass_method(symbol)
         metaclass = class << self; self; end
-        metaclass.send(:remove_method, symbol)
+        Utils.silence_debug { metaclass.send(:remove_method, symbol) }
       rescue NameError => e
         nil
       end

data/lib/rack/mount/route_set.rb

@@ -245,10 +245,14 @@ module Rack::Mount
     end
 
     def rehash #:nodoc:
+      Utils.debug "rehashing"
+
       @recognition_keys  = build_recognition_keys
       @recognition_graph = build_recognition_graph
       @generation_keys   = build_generation_keys
       @generation_graph  = build_generation_graph
+
+      self
     end
 
     # Finalizes the set and builds optimized data structures. You *must*
@@ -323,7 +327,7 @@ module Rack::Mount
           catch(:skip) do
             k = keys.map { |key| block.call(key, index) }
             Utils.pop_trailing_nils!(k)
-            k.map! { |key| key || /.+/ }
+            k.map! { |key| key || /.*/ }
             graph[*k] = route
           end
         end
@@ -337,7 +341,9 @@ module Rack::Mount
       end
 
       def build_recognition_keys
-        @recognition_key_analyzer.report
+        keys = @recognition_key_analyzer.report
+        Utils.debug "recognition keys - #{keys.inspect}"
+        keys
       end
 
       def build_generation_graph
@@ -353,7 +359,9 @@ module Rack::Mount
       end
 
       def build_generation_keys
-        @generation_key_analyzer.report
+        keys = @generation_key_analyzer.report
+        Utils.debug "generation keys - #{keys.inspect}"
+        keys
       end
 
       def extract_params!(*args)

data/lib/rack/mount/utils.rb

@@ -14,6 +14,19 @@ module Rack::Mount
   # more appropriate contexts.
   #++
   module Utils
+    def silence_debug
+      old_debug, $DEBUG = $DEBUG, nil
+      yield
+    ensure
+      $DEBUG = old_debug
+    end
+    module_function :silence_debug
+
+    def debug(msg)
+      warn "Rack::Mount #{msg}" if $DEBUG
+    end
+    module_function :debug
+
     # Normalizes URI path.
     #
     # Strips off trailing slash and ensures there is a leading slash.

data/lib/rack/mount/version.rb

@@ -1,3 +1,3 @@
 module Rack::Mount
-  Version = '0.6.10'
+  Version = '0.6.11'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 6
-  - 10
-  version: 0.6.10
+  - 11
+  version: 0.6.11
 platform: ruby
 authors: 
 - Joshua Peek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 -05:00
+date: 2010-08-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency