testing empty formats

lib/journey/route.rb

@@ -42,6 +42,11 @@ def visit_GROUP node
         end
       end
 
+      def visit_SEGMENT node
+        segment = super
+        segment == '/' ? '' : segment
+      end
+
       def visit_SYMBOL node
         key = node.to_sym
 

lib/journey/router.rb

@@ -48,7 +48,7 @@ def call env
 
     def recognize req
       match_data, route = route_for req.env
-      yield(route, nil, match_data.merge(route.extras))
+      yield(route, nil, match_data)
     end
 
     private
@@ -59,6 +59,8 @@ def route_for env
         match_data = route.path =~ env['PATH_INFO']
       end
 
+      return unless route
+
       [match_data.merge(route.extras), route]
     end
   end

test/test_route.rb

@@ -13,6 +13,14 @@ def test_initialize
       assert_equal defaults, route.extras
     end
 
+    def test_format_empty
+      path  = Path::Pattern.new '/messages/:id(.:format)'
+      route = Route.new(nil, path, nil,
+                        { :controller => 'foo', :action => 'bar' })
+
+      assert_equal ['/messages', {}], route.format({})
+    end
+
     def test_connects_all_match
       path  = Path::Pattern.new '/:controller(/:action(/:id(.:format)))'
       route = Route.new(nil, path, nil,