0
@@ -19,6 +19,7 @@ module Waves
0
       def self.included( app )
0
 
0
         app.instance_eval do
0
+          include Waves::Layers::Inflect::English
0
           include Waves::Layers::Simple
0
         end
0
         

0
@@ -26,6 +26,7 @@ module Waves
0
           auto_create_class true, Waves::Configurations::Default
0
           auto_load :Mapping, :directories => [:configurations]
0
           auto_load true, :directories => [:configurations]
0
+          auto_create_module( :Mapping ) { extend Waves::Mapping }
0
         end
0
           
0
         app.auto_create_module( :Resources ) do

0
@@ -9,6 +9,10 @@ module Waves
0
     
0
     def mappings ; @mappings ||= Hash.new { |h,k| h[k] = [] } ; end
0
     
0
+    def clear
0
+      @mappings = Hash.new { |h,k| h[k] = [] }
0
+    end
0
+    
0
     def method_missing( name, *args, &block )
0
       return super unless RULES.include? name
0
       args << block if block_given?
0
@@ -27,6 +31,7 @@ module Waves
0
     end
0
     functor( :map, Symbol, Hash ) { | name, options | options[:name] = name ; map( options ) }
0
     functor( :map, Hash ) do | options |
0
+      raise ArgumentError, "A mapping must have a name or a block" if !options[:name] && !options[:block]
0
       options = ( @options || {} ).merge( options )
0
       options[ :method ] = method = METHODS.find { |method| options[ method ] }
0
       options[ :path ] = options[ method ]

0
@@ -13,6 +13,8 @@ module Waves
0
       
0
       def resource
0
         params['resource'] || params['resources'].singular
0
+      rescue NoMethodError
0
+        :default
0
       end
0
       
0
       def resources

0
@@ -1,14 +1,38 @@
0
 # require 'test_helper' because RubyMate needs help
0
 require File.join(File.dirname(__FILE__) , "helpers")
0
 
0
-describe "An anonymous action mapping"  do
0
+describe "A named action mapping"  do
0
   
0
-  it "does things" do
0
-    mapping.module_eval do
0
-      action( :get => [ :resources ] ) { "Brainy" }
0
-    end
0
+  before do
0
+    mapping.clear
0
+    @resource = mock('resource')
0
+    ResourceMappingApp::Resources::Default.stub!(:new).and_return(@resource)
0
+  end
0
+  
0
+  it "calls the method with the action name on the Resource" do
0
+    @resource.should.receive(:smurf)
0
+    mapping.action( :smurf, :get => [ "blue_critter" ] )
0
+    
0
+    request.get("/blue_critter").status.should == 200
0
+  end
0
+  
0
+  
0
+end
0
+
0
+describe "An anonymous action mapping" do
0
+  
0
+  before do
0
+    mapping.clear
0
+  end
0
+  
0
+  it "raises an ArgumentError when no block is supplied" do
0
+    lambda { mapping.action( :get => [ "one" ] ) }.should.raise ArgumentError
0
+  end
0
+  
0
+  it "uses the supplied block" do
0
+    mapping.action( :get => [ "two" ] ) { "Brainy" }
0
     
0
-    request.get("/smurf").body.should == "Brainy"
0
+    request.get("/two").body.should == "Brainy"
0
   end
0
   
0
 end
0
\ No newline at end of file

0
@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__) , "..", "helpers")
0
 
0
 # define basic app for use in testing
0
 # before methods may add to it using helper methods
0
-module ResourceMappingApp ; include Waves::Foundations::Simple ; end
0
+module ResourceMappingApp ; include Waves::Foundations::Default ; end
0
 Waves << ResourceMappingApp
0
 RMA = ResourceMappingApp
0
 Waves::Console.load( :mode => :development )
0
\ No newline at end of file