0
@@ -159,8 +159,11 @@
0
       # ==== Returns
0
       # Behavior:: The new behavior.
0
       def match_without_path(conditions = {})
0
-        new_behavior = self.class.new(conditions, {}, self)
0
-        conditions.delete :path if ['', '^$'].include?(conditions[:path])
0
+        params = conditions.delete(:params) || {} #parents params will be merged  in Route#new
0
+        params[:controller] = conditions.delete(:controller) || params[:controller]
0
+        params[:action] = conditions.delete(:action) || params[:action]
0
+        params.delete_if{|_k,value| value.nil?}
0
+        new_behavior = self.class.new(conditions, params, self)
0
         yield new_behavior if block_given?
0
         new_behavior
0
       end
0
@@ -776,7 +779,7 @@
0
         compiled = {}
0
         params.each_pair do |key, value|
0
           unless value.is_a? String
0
-            raise ArgumentError, "param value  must be string (#{value.inspect})"
0
+            raise ArgumentError, "param value for #{key.to_s} must be string (#{value.inspect})"
0
           end
0
           result = []
0
           value = value.dup

0
@@ -1 +1,53 @@
0
+require File.join(File.dirname(__FILE__), "spec_helper")
0
+
0
+describe "A route derived from the blocks of #match" do
0
+  
0
+  it "should inherit the :controller option." do
0
+    Merb::Router.prepare do |r|
0
+      r.match('/alpha', :controller=>'Alphas') do |alpha| 
0
+        alpha.match('').to(:action=>'normal')
0
+      end
0
+    end
0
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'normal')
0
+  end
0
+  
0
+  it "should inherit the :action option." do
0
+    Merb::Router.prepare do |r|
0
+      r.match('/alpha', :action=>'wierd') do |alpha| 
0
+        alpha.match('').to(:controller=>'Alphas')
0
+      end
0
+    end
0
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'wierd')
0
+  end
0
+  
0
+  it "should inherit the default :action of 'index'" do
0
+    Merb::Router.prepare do |r|
0
+      r.match('/alpha', :controller=>'Alphas') do |alpha| 
0
+        alpha.match('').to({})
0
+      end
0
+    end
0
+    route_to('/alpha').should have_route(:controller=>'Alphas',:action=>'index')
0
+  end
0
+  
0
+  it "should make use of the :params option" do
0
+    Merb::Router.prepare do |r|
0
+      r.match('/alpha', :controller=>'Alphas', :params =>{:key=>'value'}) do |alpha| 
0
+        alpha.match('').to(:action=>'normal',:key2=>'value2')
0
+      end
0
+    end
0
+    route_to('/alpha').should have_route(:controller=>'Alphas',:key=>'value',:action=>'normal',:key2=>'value2')
0
+  end
0
+  
0
+  it "should inherit the parameters through many levels" do
0
+    Merb::Router.prepare do |r|
0
+      r.match('/alpha', :controller=>'Alphas') do |alpha| 
0
+        alpha.match('/beta', :action=>'normal') do |beta|
0
+          beta.match('/:id').to(:id=>':id')
0
+        end
0
+      end
0
+    end
0
+    route_to('/alpha/beta/gamma').should have_route(:controller=>'Alphas',:action=>'normal', :id=>'gamma')
0
+  end
0
+  
0
+end