waves 0.6.7 → 0.6.9

data/lib/waves.rb

@@ -39,7 +39,10 @@ require 'runtime/response_mixin'
 require 'runtime/response_proxy'
 require 'runtime/session'
 require 'runtime/configuration'
-require 'runtime/mapping'
+
+# waves URI mapping
+require 'mapping/mapping'
+require 'mapping/pretty_urls'
 
 # waves mvc support
 require 'controllers/mixin'
@@ -47,4 +50,8 @@ require 'views/mixin'
 require 'renderers/mixin'
 require 'renderers/markaby'
 require 'renderers/erubis'
-# require 'helpers/form.rb'
+require 'helpers/common.rb'
+require 'helpers/form.rb'
+require 'helpers/formatting.rb'
+require 'helpers/model.rb'
+require 'helpers/view.rb'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: waves
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
-date: 2008-01-26 00:00:00 -08:00
+  version: 0.6.9
+date: 2008-01-31 00:00:00 -08:00
 summary: Open-source framework for building Ruby-based Web applications.
 require_paths: 
 - lib
@@ -37,6 +37,8 @@ files:
 - lib/helpers/formatting.rb
 - lib/helpers/model.rb
 - lib/helpers/view.rb
+- lib/mapping/mapping.rb
+- lib/mapping/pretty_urls.rb
 - lib/renderers/erubis.rb
 - lib/renderers/markaby.rb
 - lib/renderers/mixin.rb
@@ -44,7 +46,6 @@ files:
 - lib/runtime/configuration.rb
 - lib/runtime/console.rb
 - lib/runtime/logger.rb
-- lib/runtime/mapping.rb
 - lib/runtime/mime_types.rb
 - lib/runtime/request.rb
 - lib/runtime/response.rb
@@ -76,6 +77,7 @@ files:
 - app/lib/startup.rb.erb
 - app/lib/tasks
 - app/lib/tasks/cluster.rb
+- app/lib/tasks/generate.rb
 - app/lib/tasks/schema.rb
 - app/log
 - app/models
@@ -87,13 +89,13 @@ files:
 - app/public/javascript
 - app/Rakefile
 - app/schema
-- app/schema/migration
-- app/schema/migration/templates
-- app/schema/migration/templates/empty.rb.erb
+- app/schema/migrations
+- app/schema/migrations/templates
+- app/schema/migrations/templates/empty.rb.erb
 - app/templates
 - app/templates/errors
-- app/templates/errors/not_found.mab
-- app/templates/errors/server_error.mab
+- app/templates/errors/not_found_404.mab
+- app/templates/errors/server_error_500.mab
 - app/templates/layouts
 - app/templates/layouts/default.mab
 - app/tmp

data/lib/runtime/mapping.rb

@@ -1,82 +0,0 @@
-module Waves
-
-	module Mapping
-		
-		def before( pattern, options=nil, &block )
-			filters[:before] << [ pattern, options, block ]
-		end
-		
-		def after( pattern, options=nil, &block )
-			filters[:after] << [ pattern, options, block ]
-		end
-		
-		def wrap( pattern, options=nil, &block )
-			filters[:before] << [ pattern, options, block ]
-			filters[:after] << [ pattern, options, block ]
-		end		
-
-		def map( options, &block )
-			pattern = options[:path] || options[:url]
-			mapping << [ pattern, options, block ]
-		end
-		
-		def path( pat, options = {}, &block )
-			options[:path] = pat; map( options, &block )
-		end
-		
-		def url( pat, options = {}, &block )
-			options[:url] = pat; map( options, block )
-		end
-		
-		def []( request )
-
-			rx = { :before => [], :after => [], :action => nil }
-			
-			( filters[:before] + filters[:wrap] ).each do | pattern, options, function |
-				matches = pattern.match(request.path)
-				rx[:before] << [ function, matches[1..-1] ] if matches &&
-					( ! options || satisfy( request, options ))
-			end
-			
-			mapping.find do |pattern, options, function|
-				matches = pattern.match(request.path)
-				rx[:action] = [ function, matches[1..-1] ] if matches && 
-					( ! options || satisfy( request, options ) )
-			end
-			
-			( filters[:after] + filters[:wrap] ).each do | pattern, options, function |
-				matches = pattern.match(request.path)
-				rx[:after] << [ function, matches[1..-1] ] if matches &&
-					( ! options || satisfy( request, options ))
-			end
-			
-			not_found(request) unless rx[:action]
-			
-			return rx
-				
-		end		
-				
-		private
-		
-		def mapping; @mapping ||= []; end
-		
-		def filters; @filters ||= { :before => [], :after => [], :wrap => [] }; end
-
-		def not_found(request)
-			raise Waves::Dispatchers::NotFoundError.new( request.url + ' not found.')
-		end
-		
-		def satisfy( request, options )
-			options.each do |method, param|
-				return false unless self.send( method, param, request )
-			end
-			return true
-		end
-		
-		def method( method, request )
-			request.method == method
-		end
-
-	end
-
-end