@@ -1 +1 @@ -0.8.2 \ No newline at end of file +0.9.0 \ No newline at end of file doc/VERSION @@ -3,23 +3,23 @@ # External Dependencies require "rubygems" - require 'rack' - require 'rack/cache' - require 'daemons' +require 'rack' +require 'rack/cache' +require 'daemons' - # a bunch of handy stuff - require 'extensions/io' - require 'extensions/symbol' unless Symbol.instance_methods.include? 'to_proc' - require 'fileutils' - require 'metaid' - require 'forwardable' - require 'date' - require 'benchmark' - require 'base64' - require 'functor' - require 'filebase' - require 'filebase/model' - require 'english/style' +# a bunch of handy stuff +require 'extensions/io' +require 'extensions/symbol' unless Symbol.instance_methods.include? 'to_proc' +require 'fileutils' +require 'metaid' +require 'forwardable' +require 'date' +require 'benchmark' +require 'base64' +require 'functor' +require 'filebase' +require 'filebase/model' +require 'english/style' # selected project-specific extensions lib/waves.rb @@ -35,11 +35,10 @@ module Waves auto_create_class true, :Default auto_load true, :directories => [ :resources ] auto_eval :Map do - handler( Waves::Dispatchers::NotFoundError ) do + request.response.content_type = 'text/html' app::Views::Error.new( request ).not_found_404 end - end end lib/waves/foundations/classic.rb @@ -4,16 +4,6 @@ module Waves module Mixin - def controller( resource = nil ) - resource ||= self.class.basename - @controller ||= app::Controllers[ resource ].new( @request ) - end - - def view( resource = nil ) - resource ||= self.class.basename - @view ||= app::Views[ resource ].new( @request ) - end - end end @@ -32,7 +22,20 @@ module Waves # # to find an instance of a given model. Again, the plurality of the controller and # model must be the same for this to work. - def model; app::Models[ model_name.intern ]; end + def model( resource = nil ) + resource ||= self.class.basename.snake_case + app::Models[ resource ] + end + + def controller( resource = nil ) + resource ||= self.class.basename.snake_case + @controller ||= app::Controllers[ resource ].new( @request ) + end + + def view( resource = nil ) + resource ||= self.class.basename.snake_case + @view ||= app::Views[ resource ].new( @request ) + end # MVC Params get automatically destructured with the keys as accessors methods. # You can still access the original query by calling request.query lib/waves/layers/mvc/extensions.rb @@ -75,27 +75,35 @@ module Waves def initialize( request ); @request = request ; end + # define defaults for all the functors, providing the analog + # of "not implemented" behaviors. this avoids complicating + # the error handling with having to distinguish between + # functor match-related errors and actual application errors + + # by default, don't do anything in the wrapper methods + before {} ; after {} ; always {} + + # if we get here, this is a 404 + %w( post get put delete head ).each do | method | + on( method ) { not_found } + end + + # default handler is just to propagate the exception + handler( Exception ) { |e| raise( e ) } + def process begin - before ; body = send( request.method ) ; after - rescue Waves::Dispatchers::Redirect => e - raise e + before ; rval = send( request.method ) ; after rescue => e response.status = ( StatusCodes[ e.class ] || 500 ) - begin - body = handler( e ) - rescue => f - unless f.is_a? NoMethodError # no handler defined - Waves::Logger.error "Exception in handler for #{e.class}." - Waves::Logger.debug [ f.message, *f.backtrace ].join("\n\t") - end - raise e # re-raise - end - Waves::Logger.warn "Handled #{e.class}: #{e.message}" + rval = handler( e ) ensure always end - return body + # note: the dispatcher decides what to do with the + # return value; all we care about is returning the + # value from the appropriate application block + return rval end def to( resource ) @@ -103,12 +111,6 @@ module Waves when Base resource when Symbol, String - begin - Waves.main::Resources[ resource ] - rescue NameError => e - Waves::Logger.debug [ e.message, *e.backtrace ].join("\n\t") - raise Waves::Dispatchers::NotFoundError - end Waves.main::Resources[ resource ] end r = traits.waves.resource = resource.new( request ) @@ -121,13 +123,6 @@ module Waves # determine how to handle the request def deferred? ; false ; end - before {} ; after {} ; always {} - # handler( Waves::Dispatchers::Redirect ) { |e| raise e } - - %w( post get put delete head ).each do | method | - on( method ) { not_found } - end - end end lib/waves/resources/mixin.rb ac9bd4eb2ed3a5e507397f400c155e0ece902ecd Dan Yoder dan@zeraweb.com http://github.com/waves/edge/commit/fbd61d27b31b0d0753ee3d997349b192a4698652 fbd61d27b31b0d0753ee3d997349b192a4698652 2009-07-19T17:56:33-07:00 2009-07-19T17:56:33-07:00 Streamlined/simplified error handling some more. Moved controller and view classic methods into ResponseMixin and added similar method for accessing a resource. 32032d3cf6361f5e49458c39447d5029f3a144bf Dan Yoder dan@zeraweb.com