rack-mount 0.2.1 → 0.2.2

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

@@ -63,20 +63,20 @@ module Rack::Mount
               if index > 0
                 previous = parts[index-1]
                 if previous.literal?
-                  boundaries << previous.value
+                  boundaries << previous.to_s
                 end
               end
 
               if inside = part[0][0]
                 if inside.literal?
-                  boundaries << inside.value
+                  boundaries << inside.to_s
                 end
               end
 
               if index < parts.length
                 following = parts[index+1]
                 if following.literal?
-                  boundaries << following.value
+                  boundaries << following.to_s
                 end
               end
             end

data/lib/rack/mount/recognition/code_generation.rb

@@ -12,8 +12,9 @@ module Rack::Mount
 
       private
         def expire!
+          remove_metaclass_method :recognize
+
           class << self
-            undef :recognize
             alias_method :recognize, :_expired_recognize
           end
 
@@ -63,8 +64,9 @@ module Rack::Mount
             end
           }.join(', ')
 
+          remove_metaclass_method :recognize
+
           instance_eval(<<-RUBY, __FILE__, __LINE__)
-            undef :recognize
             def recognize(obj, &block)
               cache = {}
               container = @recognition_graph[#{keys}]
@@ -84,6 +86,16 @@ module Rack::Mount
             end
           RUBY
         end
+
+        # method_defined? can't distinguish between instance
+        # and meta methods. So we have to rescue if the method
+        # has not been defined in the metaclass yet.
+        def remove_metaclass_method(symbol)
+          metaclass = class << self; self; end
+          metaclass.send(:remove_method, symbol)
+        rescue NameError => e
+          nil
+        end
     end
   end
 end

data/lib/rack/mount/route.rb

@@ -36,7 +36,7 @@ module Rack::Mount
       end
       @app = app
 
-      @name = name.to_sym if name
+      @name = name ? name.to_sym : nil
       @defaults = (defaults || {}).freeze
 
       unless conditions.is_a?(Hash)

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

@@ -164,7 +164,7 @@ class Multimap < Hash
   # Ignore alias_method since the definition above serves
   # as its documentation.
   #++
-  undef :each_association
+  remove_method :each_association
   module_eval "alias_method :each_association, :each_pair"
 
   # call-seq:

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

@@ -5,14 +5,12 @@
 #
 
 require 'racc/parser.rb'
-
-require 'reginald/tokenizer'
-
 module Reginald
   class Parser < Racc::Parser
 
 attr_accessor :capture_index
 attr_accessor :capture_index_stack
+
 ##### State transition tables begin ###
 
 racc_action_table = [
@@ -385,3 +383,5 @@ end
 
   end   # class Parser
 end   # module Reginald
+
+require 'reginald/tokenizer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-mount
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Joshua Peek
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -06:00
+date: 2009-11-23 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency