Changeset 1220

Timestamp:

01/08/08 22:31:03 (11 months ago)

Author:

e.@brainspl.at

Message:

Custom member and collection resource routes should accept a format file extension like .xml etc.. closes #424 [brasten@gmail.com]

Files:

• trunk/lib/merb/router.rb (modified) (2 diffs)
• trunk/spec/merb/router_spec.rb (modified) (2 diffs)

trunk/lib/merb/router.rb

@@ -366 +366 @@
-          member.each_pair do |action, methods|
-            behaviors << Behavior.new(
-
+(\.:format)?
-              { :action => action.to_s }, next_level
-            )
@@ -376 +376 @@
-          collection.each_pair do |action, methods|
-            behaviors << Behavior.new(
-
+(\.:format)?
-              { :action => action.to_s }, next_level
-            )

trunk/spec/merb/router_spec.rb

@@ -565 +565 @@
-    generate(:random_flowers).should == '/flowers/random'
-  end
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  before :each do
-    Merb::Router.prepare do |r|
@@ -577 +591 @@
-    generate(:pick_flower, :id => 1).should == '/flowers/1/pick'
-  end
+  
+  it "should match GET to /flowers/2/pick" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/flowers/2/pick', :method => :get), {})
+    route[:controller].should == 'flowers'
+    route[:action].should == 'pick'
+    route[:id].should == '2'
+  end
+
+  it "should not match POST to /flowers/2/pick" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/flowers/2/pick', :method => :post), {})
+    route[:controller].should_not == 'flowers'
+    route[:action].should_not == 'pick'
+    route[:id].should_not == '2'
+  end
+
+  it "should not match PUT to /flowers/2/pick" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/flowers/2/pick', :method => :put), {})
+    route[:controller].should_not == 'flowers'
+    route[:action].should_not == 'pick'
+    route[:id].should_not == '2'
+  end
+
+  it "should not match DELETE to /flowers/2/pick" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/flowers/2/pick', :method => :delete), {})
+    route[:controller].should_not == 'flowers'
+    route[:action].should_not == 'pick'
+    route[:id].should_not == '2'
+  end
+  
+  it "should match GET to /flowers/2/pick.xml" do
+    index, route = Merb::Router.match(SimpleRequest.new(:path => '/flowers/2/pick.xml', :method => :get), {})
+    route[:controller].should == 'flowers'
+    route[:action].should == 'pick'
+    route[:id].should == '2'
+    route[:format].should == 'xml'
+  end
+  
-end
-