0
@@ -24,9 +24,7 @@ module Waves
0
           
0
           auto_create_module( :Resources ) do
0
             include AutoCode
0
-            auto_create_class true, Waves::Resources::Base
0
-            # this should probably be refactored into a separate layer
0
-            auto_eval do
0
+            auto_create_class true, Waves::Resources::Base do
0
               def resource ; self.class.name ; end
0
               def resources ; resource.plural ; end
0
               def controller ; @controller ||= controllers[ resource ].process( @request ) { self } ; end

0
@@ -43,6 +43,7 @@ module Waves
0
         request.params.merge!( @params )
0
         @action.call( request )
0
       end
0
+    end
0
 
0
   end
0
 

0
@@ -44,6 +44,8 @@ module Waves
0
     
0
     private
0
     
0
+    def mappings; @mappings ||= {}; end
0
+    
0
     include Functor::Method
0
     
0
     functor( :normalize, Symbol, Hash ) { | name, options | options.merge!( :name => name ) }

0
@@ -4,10 +4,12 @@ module Waves
0
     
0
     class Pattern
0
       
0
+      include Functor::Method
0
+      
0
       attr_accessor :target, :pattern
0
       def initialize( options )
0
         @keys = [] ; @target = options[ :target ]
0
-        @pattern = compile( option[ :pattern ] )
0
+        @pattern = compile( options[ :pattern ] )
0
       end
0
       
0
       def match( request )

0
@@ -7,6 +7,7 @@ require 'live_console'
0
 
0
 # gem 'dyoder-autocode'
0
 require 'autocode'
0
+require 'functor'
0
 
0
 # for mimetypes only or when using as default handler
0
 require 'mongrel'
0
@@ -32,7 +33,6 @@ require 'utilities/inflect'
0
 require 'utilities/proc'
0
 require 'utilities/hash'
0
 require 'utilities/attributes'
0
-require 'utilities/functor'
0
 # waves Runtime
0
 require 'dispatchers/base'
0
 require 'dispatchers/default'
0
@@ -51,6 +51,10 @@ require 'runtime/configuration'
0
 
0
 # waves URI mapping
0
 require 'mapping/mapping'
0
+require 'mapping/action'
0
+require 'mapping/pattern'
0
+require 'mapping/constraints'
0
+require 'mapping/descriptors'
0
 require 'resources/mixin'
0
 
0
 # waves mvc support

0
@@ -2,6 +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 MappingApp ; include Waves::Foundations::Simple ; end
0
-Waves << MappingApp
0
+module ResourceMappingApp ; include Waves::Foundations::Simple ; end
0
+Waves << ResourceMappingApp
0
+RMA = ResourceMappingApp
0
 Waves::Console.load( :mode => :development )
0
\ No newline at end of file