lib/nitro/dispatcher.rb in nitro-0.30.0 vs lib/nitro/dispatcher.rb in nitro-0.31.0

@@ -126,11 +126,11 @@
     @controllers.each do |base, c|
       base = '' if base == '/'
       for m in c.action_methods
         m = m.to_sym
         if route = c.ann(m).route and (!route.nil?)
-          add_route(route.first, :controller => c, :action => m, :params => route.last)
+          add_rule(route.first, :controller => c, :action => m, :params => route.last)
         end
       end
     end
   end
   
@@ -166,9 +166,10 @@
       context.params.update(params) if params
       # gmosx, FIXME/OPTIMIZE: no annotation for mount point!! 
       return klass, "#{action}_action", klass.mount_path
     end
     
+    path = path.sub(/#{Router.strip_path}/, '') if Router.strip_path
     parts = path.split('/')
     parts.shift # get rid of the leading '/'.
 
     if klass = controller_class_for("/#{parts.first}")
       base = "/#{parts.shift}"