test/ext/object.rb test/ext/shortcuts.rb test/match/path.rb test/resources/path.rb test/runtime/configurations.rb test/runtime/request.rb test/runtime/response.rb test/views/views.rb @@ -54,7 +54,7 @@ module Waves def extract_path( request ) path = request.traits.waves.path return path if path - path = request.path.split('/') + path = request.path.split('/').map { |e| Rack::Utils.unescape(e) } path.shift unless path.empty? request.traits.waves.path = path end lib/matchers/path.rb @@ -98,7 +98,9 @@ module Waves when Symbol, String begin Waves.main::Resources[ resource ] - rescue NameError + rescue NameError => e + Waves::Logger.debug e.to_s + e.backtrace.each { |t| Waves::Logger.debug " #{t}" } raise Waves::Dispatchers::NotFoundError end Waves.main::Resources[ resource ] lib/resources/mixin.rb @@ -4,30 +4,128 @@ module Waves class Paths - attr_accessor :request + def self.compiled; @compiled ||= {} ; end - include Waves::ResponseMixin - - def initialize( request ) ; @request = request ; end + def compiled_paths; self.class.compiled ; end def generate( template, args ) - return "/#{ args * '/' }" unless template.is_a?( Array ) and not template.empty? + return "/" if template.empty? + if template.is_a? Array + if args.size == 1 and args.first.is_a? Hash + process_hash( template, args.first ) + else + process_array( template, args) + end + else + "/#{ args * '/' }" + end + end + + def process_array( template, args ) + template_key = template + compiled = compiled_paths[template_key] + if compiled + return ( compiled % args ) rescue raise [template, args].inspect + end + compilable = true + cpath, interpolations = "", [] + result = ( cpath % interpolations ) if template.all? do | want | + case want + when Symbol + cpath << "/%s" ; interpolations << args.shift + when String + cpath << "/#{want}" + when true + compilable = false + cpath += "/#{args.join("/")}"; args = [] + when Hash + compilable = false + key, value = want.to_a.first + case value + when true + cpath += "/#{args.join("/")}"; args = [] + when String, Symbol + compilable = true + component = args.shift + cpath << "/%s" + component ? interpolations << component : interpolations << value + when Regexp + component = args.shift.to_s + raise ArgumentError, "#{component} does not match #{want.inspect}" unless component =~ value + cpath << "/%s"; interpolations << component + end + when Regexp + compilable = false + component = args.shift.to_s + raise ArgumentError, "#{component} does not match #{want.inspect}" unless component =~ want + cpath << "/%s"; interpolations << component + end + end + raise ArgumentError, "Too many args" unless args.empty? + compiled_paths[template_key] = cpath if compilable + result + end + + def process_hash( template, hash ) path = [] - ( "/#{ path * '/' }" ) if template.all? do | want | + ( "/#{ path * '/' }" ) if template.all? do |want| case want - when true then path += args + when Symbol + raise ArgumentError, "Path generator needs a value for #{want.inspect}" unless component = hash[want] + path << component when String then path << want - when Symbol then path << args.shift - when Regexp then path << args.shift when Hash key, value = want.to_a.first case value + when Regexp + raise ArgumentError, "Path generator needs a value for #{want.inspect}" unless component = hash[key] + raise ArgumentError, "#{component} does not match #{want.inspect}" unless component =~ value + path << component + when String, Symbol + hash.has_key?(key) ? path << hash[key] : path << value + when true + raise ArgumentError, "Path generator needs a value for #{want.inspect}" unless component = hash[key] + path += [component].flatten + end + when Regexp, true + raise ArgumentError, "Path generator can't take an args hash, as it contains a Regexp or the value true" + end + end + end + + def original_generate( template, args ) + if template.is_a? Array and not template.empty? + path = [] + ( "/#{ path * '/' }" ) if template.all? do | want | + case want when true then path += args - when String, Symbol, RegExp then path << args.unshift + when String then path << want + when Symbol then path << args.shift + when Regexp + component = args.shift.to_s + raise ArgumentError, "#{component} does not match #{want.inspect}" unless component =~ want + path << component + when Hash + key, value = want.to_a.first + case value + when true then path += args + when String, Symbol + # if no args to interpolate, use hash element value as default + !args.empty? ? path << args.shift : path << value + when Regexp + component = args.shift.to_s + raise ArgumentError, "#{component} does not match #{want.inspect}" unless component =~ value + path << component + end end end + else + "/#{ args * '/' }" end end + + + end end lib/resources/paths.rb @@ -26,7 +26,7 @@ module Waves # Forwards logging methods to the logger. def self.method_missing(name,*args,&block) - @log.send name,*args, &block if @log + cache_method_missing name, "@log.#{name} *args, &block if @log", *args, &block end end lib/runtime/logger.rb @@ -53,10 +53,16 @@ module Waves # access HTTP headers as methods def method_missing( name, *args, &body ) - return super unless args.empty? and body.nil? - key = "HTTP_#{name.to_s.upcase}" - @request.env[ key ] if @request.env.has_key?( key ) + if args.empty? and not body + cache_method_missing name, <<-CODE, *args, &body + key = "HTTP_#{name.to_s.upcase}" + @request.env[ key ] if @request.env.has_key?( key ) + CODE + else + super + end end + # Raise a not found exception. def not_found lib/runtime/request.rb @@ -36,7 +36,7 @@ module Waves # Methods not explicitly defined by Waves::Response are delegated to Rack::Response. # Check the Rack documentation for more informations def method_missing(name,*args) - @response.send(name,*args) + cache_method_missing name, "@response.#{name} *args", *args end end lib/runtime/response.rb @@ -10,7 +10,7 @@ module Waves # Access the response. def response; request.response; end - def resource ; traits.waves.resource ; end + def resource; traits.waves.resource || ( self if self.kind_of? Waves::Resources::Mixin ) ; end def traits ; request.traits ; end @@ -39,7 +39,7 @@ module Waves def app_name ; self.class.rootname.snake_case.to_sym ; end def app ; eval( "::#{app_name.to_s.camel_case}" ) ; end def paths( rname = nil ) - ( rname.nil? ? resource.class.paths : app::Resources[ rname ].paths ).new( request ) + ( rname ? app::Resources[ rname ].paths : resource.class.paths ).new end # these take strings or operate on the path by default lib/runtime/response_mixin.rb @@ -25,7 +25,9 @@ module Waves def self.version ; File.read( File.expand_path( "#{File.dirname(__FILE__)}/../../doc/VERSION" ) ) ; end def self.license ; File.read( File.expand_path( "#{File.dirname(__FILE__)}/../../doc/LICENSE" ) ) ; end - def self.method_missing(name,*args,&block) ; instance.send(name,*args,&block) ; end + def self.method_missing(name,*args,&block) + cache_method_missing name, "instance.#{name}( *args, &block)", *args, &block + end # A Waves::Runtime takes an inert application module and gives it concrete, pokeable form. # Waves::Server and Waves::Console are types of runtime. lib/runtime/runtime.rb @@ -12,3 +12,5 @@ Bacon::Context.module_eval do alias_method :specification, :describe alias_method :feature, :it end + +Bacon.summary_on_exit \ No newline at end of file test/helpers.rb test/match/uri.rb 2518fa029d6fcb6d20c861c290521454f5f12bd7 f4313a2bf08dbbbcdd40e0e81143a361d33b8991 Jason Rush jrush@ypcmc03420.yellowpages.local http://github.com/dyoder/waves/commit/982d16c6d9cdfa10f94a731c43cf35869c497411 982d16c6d9cdfa10f94a731c43cf35869c497411 2009-01-06T09:09:59-08:00 2009-01-06T09:09:59-08:00 merged cd4b1d9c8aa7abf87f48cc38cbb692cde3f9e37c Jason Rush jrush@ypcmc03420.yellowpages.local