0
@@ -16,7 +16,8 @@ module Waves
0
         METHODS.all? do | method |
0
           wanted = instance_variable_get( "@#{method}")
0
           got = request.send( method ) if wanted
0
-          wanted === got
0
+          # wanted === got
0
+          wanted.is_a?( Proc) ? wanted.call( got ) : got === wanted
0
         end
0
       end
0
             

0
@@ -23,7 +23,18 @@ describe "A mapping"  do
0
   end
0
   
0
   it "can match the Accepts header" do
0
-    mapping.action( :accepts => 'text/plain' ) { "boooring."}
0
+    mapping.action( :accept => 'text/plain' ) { "boooring."}
0
+    
0
+    request.get("/foo", 'HTTP_ACCEPT' => 'text/plain').status.should == 200
0
+    request.get("/foo", 'HTTP_ACCEPT' => 'text/xml').status.should == 404
0
+  end
0
+  
0
+  it "can use a lambda on any of the above" do
0
+    mapping.action( :accept => lambda { |types| types.include? 'text/plain' } ) { "boooring."}
0
+    mapping.action( :accept => lambda { |types| types.include? /image/ } ) { "cool."}
0
+    
0
+    request.get("/foo", 'HTTP_ACCEPT' => 'text/plain').status.should == 200
0
+    request.get("/foo", 'HTTP_ACCEPT' => 'image/jpeg').status.should == 200
0
     request.get("/foo", 'HTTP_ACCEPT' => 'text/xml').status.should == 404
0
   end
0