0
@@ -14,18 +14,19 @@ gem = Gem::Specification.new do |gem|
0
   gem.name = "waves"
0
   gem.rubyforge_project = "waves"
0
   gem.summary = "Open-source framework for building Ruby-based Web applications."
0
-  gem.version = '0.7.7'
0
+  gem.version = '0.8.0'
0
   gem.homepage = 'http://rubywaves.com'
0
   gem.author = 'Dan Yoder'
0
   gem.email = 'dan@zeraweb.com'
0
   gem.platform = Gem::Platform::RUBY
0
   gem.required_ruby_version = '>= 1.8.6'
0
-  %w( mongrel rack markaby erubis haml RedCloth metaid filebase
0
+  %w( mongrel rack markaby erubis haml metaid filebase
0
       extensions live_console choice daemons rakegen functor ).each do |dep|
0
     gem.add_dependency dep
0
   end
0
   gem.add_dependency('sequel', '>= 2.0.0')
0
   gem.add_dependency('autocode', '>= 1.0.0')
0
+  gem.add_dependency('RedCloth', '>= 3.0.0')
0
   gem.files = FileList[ 'app/**/*', 'app/**/.gitignore', 'lib/**/*.rb','lib/**/*.erb', "{doc,samples,verify}/**/*" ]
0
   gem.has_rdoc = true
0
   gem.bindir = 'bin'

0
@@ -56,6 +56,10 @@ module Waves
0
           send( name, assigns )
0
         end
0
       end
0
+      
0
+      def layout_content
0
+        self << @layout_content
0
+      end
0
 
0
       # The doctype method simply generates a valid DOCTYPE declaration for your page.
0
       # Valid options are defined in the +DOCTYPES+ constant.

0
@@ -12,7 +12,7 @@ module Waves
0
 
0
       def initialize( resource ) ; @resource = resource ; end
0
 
0
-      functor( :generate, Array, Array ) do | keys, vals | 
0
+      functor( :generate, Array, Array ) do | keys, vals |
0
         path = '/' << keys.map { |key| generate( key, vals ) }.compact.join('/')
0
         path << "?" << vals.first.map { |k,v| "#{k}=#{v}" }.join("&") if vals.first.respond_to?( :keys )
0
         path
0
@@ -26,7 +26,11 @@ module Waves
0
 
0
       functor( :generate, Object ) { | val | val.to_s }
0
 
0
-      functor( :generate, Hash, Array ) { | h, vals | vals.shift or h.values.first }
0
+      functor( :generate, Hash, Array ) { | h, vals | k, v = h.first ; generate( k, v, vals ) }
0
+      functor( :generate, :resource, Object, Array ) { | key, val, args | @resource.singular }
0
+      functor( :generate, :resources, Object, Array ) { | key, val, args | @resource.plural }
0
+      functor( :generate, Symbol, Object, Array ) { | key, val, args | args.shift or val.to_s }
0
+      
0
     end
0
     
0
   end

0
@@ -15,25 +15,21 @@ module Waves
0
       functor( :match, nil, String ) { |pattern, path| {} }
0
       # an empty pattern array matches root, i.e. "/"
0
       functor( :match, [], '/' ) { | pattern, path | {} }
0
+      functor( :match, [], Array ) { false }
0
       # otherwise break the path down into an array and match arrays
0
       functor( :match, Array, String ) { | pattern, path | match( pattern, path.split('/')[1..-1] ) }
0
       # this variation should never come up ... right?
0
       functor( :match, Array, nil ) { | pattern, path | nil }
0
       # alright, now we are into the general case, matching two arrays ...
0
       functor( :match, Array, Array ) do | wants, gots |
0
-        r = {}; if wants.length > gots.length
0
+        if wants.length > gots.length
0
           # pad gots with nils so they are the same length
0
           gots = ( gots + ( [nil] * ( wants.length - gots.length ) ) )
0
         elsif wants.length < gots.length
0
-          # true is a wildcard matcher ...
0
-          return false unless wants.last == true
0
-          # special case where true is the entire pattern
0
-          return { true => gots } if wants.size == 1
0
-          # collapse last n elements down to an array to match true
0
-          r[ true ] = gots[ wants.size-2..-1 ]
0
-          gots = gots[ 0..wants.size-2 ]
0
+          # pad wants with last so they are the same length
0
+          wants = ( wants + ( [ wants.last ] * ( gots.length - wants.length ) ) )
0
         end
0
-        r if wants.zip( gots ).all? { |want, got| match( r, want, got ) }
0
+        r = {}; r if wants.zip( gots ).all? { |want, got| match( r, want, got ) }
0
       end
0
       functor( :match, Hash, String, String ) { | r, want, got | got if want == got }
0
       functor( :match, Hash, Regexp, String ) { | r, want, got | got if want === got }
0
@@ -41,6 +37,9 @@ module Waves
0
       functor( :match, Hash, Symbol, String ) do | r, want, got | 
0
         r[ want.to_s ] = match( r, /^(\S+)$/, got )
0
       end
0
+      functor( :match, Hash, true, Object ) do | r, key, got | 
0
+        r[ true ] ||= []; r[ true ] << got
0
+      end
0
       # a hash is either a param with a custom regexp or a default value ...
0
       functor( :match, Hash, Hash, Object ) do | r, want, got |
0
         key, want = want.first ; match( r, key, want, got )
0
@@ -51,6 +50,9 @@ module Waves
0
       functor( :match, Hash, Symbol, String, nil ) do | r, key, want, got |
0
         r[ key.to_s ] = want
0
       end
0
+      functor( :match, Hash, Symbol, true, Object ) do | r, key, want, got |
0
+        r[ key.to_s ] ||= []; r[ key.to_s ] << got
0
+      end
0
       functor( :match, Hash, Symbol, Regexp, String ) do | r, key, want, got |
0
         r[ key.to_s ] = match( r, want, got )
0
       end

0
@@ -39,7 +39,7 @@ module Waves
0
       # Starts the logger, using the active configuration to initialize it.
0
       def start
0
         @log = config[:rotation] ?
0
-          ::Logger.new( output, config[:rotation].intern ) :
0
+          ::Logger.new( output, config[:rotation].to_sym ) :
0
           ::Logger.new( output )
0
         @log.level = level
0
         @log.datetime_format = "%Y-%m-%d %H:%M:%S "

0
@@ -25,9 +25,12 @@ require 'benchmark'
0
 # require 'memcache'
0
 require 'base64'
0
 
0
-gem 'dyoder-filebase'
0
-require 'filebase'
0
-require 'filebase/model'
0
+# gem 'dyoder-filebase'
0
+# require 'filebase'
0
+# require 'filebase/model'
0
+$: << '../filebase/lib'
0
+require 'filebase.rb'
0
+require 'filebase/model.rb'
0
 
0
 # selected project-specific extensions
0
 require 'utilities/module'

0
@@ -1,17 +1,18 @@
0
 Gem::Specification.new do |s|
0
   s.name = %q{waves}
0
-  s.version = "0.7.7"
0
+  s.version = "0.8.0"
0
 
0
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
0
   s.authors = ["Dan Yoder"]
0
-  s.date = %q{2008-06-30}
0
+  s.date = %q{2008-08-17}
0
   s.email = %q{dan@zeraweb.com}
0
   s.executables = ["waves", "waves-server", "waves-console"]
0
-  s.files = ["lib/commands/waves-console.rb", "lib/commands/waves-server.rb", "lib/controllers/base.rb", "lib/controllers/mixin.rb", "lib/dispatchers/base.rb", "lib/dispatchers/default.rb", "lib/foundations/default.rb", "lib/foundations/simple.rb", "lib/helpers/asset_helper.rb", "lib/helpers/common.rb", "lib/helpers/default.rb", "lib/helpers/form.rb", "lib/helpers/formatting.rb", "lib/helpers/model.rb", "lib/helpers/number_helper.rb", "lib/helpers/tag_helper.rb", "lib/helpers/url_helper.rb", "lib/helpers/view.rb", "lib/layers/default_errors.rb", "lib/layers/mvc.rb", "lib/layers/orm/active_record/tasks/generate.rb", "lib/layers/orm/active_record/tasks/schema.rb", "lib/layers/orm/active_record.rb", "lib/layers/orm/data_mapper.rb", "lib/layers/orm/filebase.rb", "lib/layers/orm/migration.rb", "lib/layers/orm/sequel/tasks/generate.rb", "lib/layers/orm/sequel/tasks/schema.rb", "lib/layers/orm/sequel.rb", "lib/layers/simple.rb", "lib/layers/simple_errors.rb", "lib/mapping/mapping.rb", "lib/mapping/pretty_urls.rb", "lib/renderers/erubis.rb", "lib/renderers/markaby.rb", "lib/renderers/mixin.rb", "lib/runtime/application.rb", "lib/runtime/blackboard.rb", "lib/runtime/configuration.rb", "lib/runtime/console.rb", "lib/runtime/debugger.rb", "lib/runtime/logger.rb", "lib/runtime/mime_types.rb", "lib/runtime/request.rb", "lib/runtime/response.rb", "lib/runtime/response_mixin.rb", "lib/runtime/response_proxy.rb", "lib/runtime/server.rb", "lib/runtime/session.rb", "lib/tasks/cluster.rb", "lib/tasks/gem.rb", "lib/tasks/generate.rb", "lib/utilities/hash.rb", "lib/utilities/inflect/english.rb", "lib/utilities/inflect.rb", "lib/utilities/integer.rb", "lib/utilities/module.rb", "lib/utilities/object.rb", "lib/utilities/proc.rb", "lib/utilities/string.rb", "lib/utilities/symbol.rb", "lib/views/base.rb", "lib/views/mixin.rb", "lib/waves.rb", "lib/layers/orm/active_record/migrations/empty.rb.erb", "lib/layers/orm/sequel/migrations/empty.rb.erb", "app/bin", "app/bin/waves-console", "app/bin/waves-server", "app/configurations", "app/configurations/development.rb.erb", "app/configurations/mapping.rb.erb", "app/configurations/production.rb.erb", "app/controllers", "app/doc", "app/helpers", "app/lib", "app/lib/application.rb.erb", "app/lib/tasks", "app/log", "app/models", "app/public", "app/public/css", "app/public/flash", "app/public/images", "app/public/javascript", "app/Rakefile", "app/schema", "app/schema/migrations", "app/startup.rb", "app/templates", "app/templates/errors", "app/templates/errors/not_found_404.mab", "app/templates/errors/server_error_500.mab", "app/templates/layouts", "app/templates/layouts/default.mab", "app/tmp", "app/tmp/sessions", "app/views", "app/controllers/.gitignore", "app/doc/.gitignore", "app/helpers/.gitignore", "app/lib/tasks/.gitignore", "app/log/.gitignore", "app/models/.gitignore", "app/public/css/.gitignore", "app/public/flash/.gitignore", "app/public/images/.gitignore", "app/public/javascript/.gitignore", "app/schema/migrations/.gitignore", "app/tmp/sessions/.gitignore", "app/views/.gitignore", "bin/waves", "bin/waves-server", "bin/waves-console"]
0
+  s.files = ["app/bin", "app/bin/waves-console", "app/bin/waves-server", "app/configurations", "app/configurations/development.rb.erb", "app/configurations/mapping.rb.erb", "app/configurations/production.rb.erb", "app/controllers", "app/doc", "app/helpers", "app/lib", "app/lib/application.rb.erb", "app/lib/tasks", "app/log", "app/models", "app/public", "app/public/css", "app/public/flash", "app/public/images", "app/public/javascript", "app/Rakefile", "app/schema", "app/schema/migrations", "app/startup.rb", "app/templates", "app/templates/errors", "app/templates/errors/not_found_404.mab", "app/templates/errors/server_error_500.mab", "app/templates/layouts", "app/templates/layouts/default.mab", "app/tmp", "app/tmp/sessions", "app/views", "app/controllers/.gitignore", "app/doc/.gitignore", "app/helpers/.gitignore", "app/lib/tasks/.gitignore", "app/log/.gitignore", "app/models/.gitignore", "app/public/css/.gitignore", "app/public/flash/.gitignore", "app/public/images/.gitignore", "app/public/javascript/.gitignore", "app/schema/migrations/.gitignore", "app/tmp/sessions/.gitignore", "app/views/.gitignore", "lib/commands/waves-console.rb", "lib/commands/waves-server.rb", "lib/controllers/mixin.rb", "lib/dispatchers/base.rb", "lib/dispatchers/default.rb", "lib/foundations/default.rb", "lib/foundations/simple.rb", "lib/helpers/built_in.rb", "lib/helpers/common.rb", "lib/helpers/form.rb", "lib/helpers/formatting.rb", "lib/helpers/model.rb", "lib/helpers/view.rb", "lib/layers/default_errors.rb", "lib/layers/inflect/english/rules.rb", "lib/layers/inflect/english/string.rb", "lib/layers/inflect/english.rb", "lib/layers/mvc.rb", "lib/layers/orm/active_record/tasks/generate.rb", "lib/layers/orm/active_record/tasks/schema.rb", "lib/layers/orm/active_record.rb", "lib/layers/orm/data_mapper.rb", "lib/layers/orm/filebase.rb", "lib/layers/orm/migration.rb", "lib/layers/orm/sequel/tasks/generate.rb", "lib/layers/orm/sequel/tasks/schema.rb", "lib/layers/orm/sequel.rb", "lib/layers/pretty_urls.rb", "lib/layers/simple.rb", "lib/layers/simple_errors.rb", "lib/mapping/action.rb", "lib/mapping/constraints.rb", "lib/mapping/descriptors.rb", "lib/mapping/handler.rb", "lib/mapping/mapping.rb", "lib/mapping/paths.rb", "lib/mapping/pattern.rb", "lib/renderers/erubis.rb", "lib/renderers/haml.rb", "lib/renderers/markaby.rb", "lib/renderers/mixin.rb", "lib/resources/mixin.rb", "lib/resources/proxy.rb", "lib/runtime/blackboard.rb", "lib/runtime/configuration.rb", "lib/runtime/console.rb", "lib/runtime/debugger.rb", "lib/runtime/logger.rb", "lib/runtime/mime_types.rb", "lib/runtime/request.rb", "lib/runtime/response.rb", "lib/runtime/response_mixin.rb", "lib/runtime/runtime.rb", "lib/runtime/server.rb", "lib/runtime/session.rb", "lib/tasks/cluster.rb", "lib/tasks/gem.rb", "lib/tasks/generate.rb", "lib/utilities/float.rb", "lib/utilities/hash.rb", "lib/utilities/inflect.rb", "lib/utilities/integer.rb", "lib/utilities/module.rb", "lib/utilities/object.rb", "lib/utilities/proc.rb", "lib/utilities/string.rb", "lib/utilities/symbol.rb", "lib/utilities/tempfile.rb", "lib/views/mixin.rb", "lib/waves.rb", "lib/layers/orm/active_record/migrations/empty.rb.erb", "lib/layers/orm/sequel/migrations/empty.rb.erb", "doc/HISTORY", "doc/LICENSE", "doc/rdoc", "doc/rdoc/classes", "doc/rdoc/classes/Erubis", "doc/rdoc/classes/Erubis/Context.html", "doc/rdoc/classes/Hash.html", "doc/rdoc/classes/Inflect", "doc/rdoc/classes/Inflect/InflectorMethods.html", "doc/rdoc/classes/Integer.html", "doc/rdoc/classes/Kernel.html", "doc/rdoc/classes/Module.html", "doc/rdoc/classes/Object.html", "doc/rdoc/classes/Proc.html", "doc/rdoc/classes/String.html", "doc/rdoc/classes/Symbol.html", "doc/rdoc/classes/Waves", "doc/rdoc/classes/Waves/Application.html", "doc/rdoc/classes/Waves/Blackboard.html", "doc/rdoc/classes/Waves/Configurations", "doc/rdoc/classes/Waves/Configurations/Base.html", "doc/rdoc/classes/Waves/Configurations/Default.html", "doc/rdoc/classes/Waves/Configurations.html", "doc/rdoc/classes/Waves/Console.html", "doc/rdoc/classes/Waves/Controllers", "doc/rdoc/classes/Waves/Controllers/Base.html", "doc/rdoc/classes/Waves/Controllers/Mixin.html", "doc/rdoc/classes/Waves/Controllers.html", "doc/rdoc/classes/Waves/Dispatchers", "doc/rdoc/classes/Waves/Dispatchers/Base.html", "doc/rdoc/classes/Waves/Dispatchers/Default.html", "doc/rdoc/classes/Waves/Dispatchers/NotFoundError.html", "doc/rdoc/classes/Waves/Dispatchers/Redirect.html", "doc/rdoc/classes/Waves/Dispatchers.html", "doc/rdoc/classes/Waves/Foundations", "doc/rdoc/classes/Waves/Foundations/Default.html", "doc/rdoc/classes/Waves/Foundations/Simple.html", "doc/rdoc/classes/Waves/Foundations.html", "doc/rdoc/classes/Waves/Helpers", "doc/rdoc/classes/Waves/Helpers/Common.html", "doc/rdoc/classes/Waves/Helpers/Default.html", "doc/rdoc/classes/Waves/Helpers/Form.html", "doc/rdoc/classes/Waves/Helpers/Formatting.html", "doc/rdoc/classes/Waves/Helpers/Model.html", "doc/rdoc/classes/Waves/Helpers/View.html", "doc/rdoc/classes/Waves/Helpers.html", "doc/rdoc/classes/Waves/Layers", "doc/rdoc/classes/Waves/Layers/DefaultErrors.html", "doc/rdoc/classes/Waves/Layers/MVC.html", "doc/rdoc/classes/Waves/Layers/ORM", "doc/rdoc/classes/Waves/Layers/ORM/DataMapper.html", "doc/rdoc/classes/Waves/Layers/ORM/Filebase.html", "doc/rdoc/classes/Waves/Layers/ORM/Sequel.html", "doc/rdoc/classes/Waves/Layers/Simple.html", "doc/rdoc/classes/Waves/Layers/SimpleErrors.html", "doc/rdoc/classes/Waves/Layers.html", "doc/rdoc/classes/Waves/Logger.html", "doc/rdoc/classes/Waves/Mapping", "doc/rdoc/classes/Waves/Mapping/PrettyUrls", "doc/rdoc/classes/Waves/Mapping/PrettyUrls/GetRules.html", "doc/rdoc/classes/Waves/Mapping/PrettyUrls/RestRules.html", "doc/rdoc/classes/Waves/Mapping/PrettyUrls.html", "doc/rdoc/classes/Waves/Mapping.html", "doc/rdoc/classes/Waves/MimeTypes.html", "doc/rdoc/classes/Waves/Orm", "doc/rdoc/classes/Waves/Orm/Migration.html", "doc/rdoc/classes/Waves/Renderers", "doc/rdoc/classes/Waves/Renderers/Erubis.html", "doc/rdoc/classes/Waves/Renderers/Markaby.html", "doc/rdoc/classes/Waves/Renderers/Mixin.html", "doc/rdoc/classes/Waves/Request", "doc/rdoc/classes/Waves/Request/ParseError.html", "doc/rdoc/classes/Waves/Request.html", "doc/rdoc/classes/Waves/Response.html", "doc/rdoc/classes/Waves/ResponseMixin.html", "doc/rdoc/classes/Waves/ResponseProxy.html", "doc/rdoc/classes/Waves/Server.html", "doc/rdoc/classes/Waves/Session.html", "doc/rdoc/classes/Waves/Views", "doc/rdoc/classes/Waves/Views/Base.html", "doc/rdoc/classes/Waves/Views/Mixin.html", "doc/rdoc/classes/Waves/Views/NoTemplateError.html", "doc/rdoc/classes/Waves/Views.html", "doc/rdoc/classes/Waves.html", "doc/rdoc/created.rid", "doc/rdoc/files", "doc/rdoc/files/doc", "doc/rdoc/files/doc/HISTORY.html", "doc/rdoc/files/lib", "doc/rdoc/files/lib/commands", "doc/rdoc/files/lib/commands/waves-console_rb.html", "doc/rdoc/files/lib/commands/waves-server_rb.html", "doc/rdoc/files/lib/controllers", "doc/rdoc/files/lib/controllers/base_rb.html", "doc/rdoc/files/lib/controllers/mixin_rb.html", "doc/rdoc/files/lib/dispatchers", "doc/rdoc/files/lib/dispatchers/base_rb.html", "doc/rdoc/files/lib/dispatchers/default_rb.html", "doc/rdoc/files/lib/foundations", "doc/rdoc/files/lib/foundations/default_rb.html", "doc/rdoc/files/lib/foundations/simple_rb.html", "doc/rdoc/files/lib/helpers", "doc/rdoc/files/lib/helpers/common_rb.html", "doc/rdoc/files/lib/helpers/default_rb.html", "doc/rdoc/files/lib/helpers/form_rb.html", "doc/rdoc/files/lib/helpers/formatting_rb.html", "doc/rdoc/files/lib/helpers/model_rb.html", "doc/rdoc/files/lib/helpers/view_rb.html", "doc/rdoc/files/lib/layers", "doc/rdoc/files/lib/layers/default_errors_rb.html", "doc/rdoc/files/lib/layers/mvc_rb.html", "doc/rdoc/files/lib/layers/orm", "doc/rdoc/files/lib/layers/orm/active_record", "doc/rdoc/files/lib/layers/orm/active_record/tasks", "doc/rdoc/files/lib/layers/orm/active_record/tasks/schema_rb.html", "doc/rdoc/files/lib/layers/orm/active_record_rb.html", "doc/rdoc/files/lib/layers/orm/data_mapper_rb.html", "doc/rdoc/files/lib/layers/orm/filebase_rb.html", "doc/rdoc/files/lib/layers/orm/migration_rb.html", "doc/rdoc/files/lib/layers/orm/sequel", "doc/rdoc/files/lib/layers/orm/sequel/tasks", "doc/rdoc/files/lib/layers/orm/sequel/tasks/schema_rb.html", "doc/rdoc/files/lib/layers/orm/sequel_rb.html", "doc/rdoc/files/lib/layers/simple_errors_rb.html", "doc/rdoc/files/lib/layers/simple_rb.html", "doc/rdoc/files/lib/mapping", "doc/rdoc/files/lib/mapping/mapping_rb.html", "doc/rdoc/files/lib/mapping/pretty_urls_rb.html", "doc/rdoc/files/lib/renderers", "doc/rdoc/files/lib/renderers/erubis_rb.html", "doc/rdoc/files/lib/renderers/markaby_rb.html", "doc/rdoc/files/lib/renderers/mixin_rb.html", "doc/rdoc/files/lib/runtime", "doc/rdoc/files/lib/runtime/application_rb.html", "doc/rdoc/files/lib/runtime/blackboard_rb.html", "doc/rdoc/files/lib/runtime/configuration_rb.html", "doc/rdoc/files/lib/runtime/console_rb.html", "doc/rdoc/files/lib/runtime/debugger_rb.html", "doc/rdoc/files/lib/runtime/logger_rb.html", "doc/rdoc/files/lib/runtime/mime_types_rb.html", "doc/rdoc/files/lib/runtime/request_rb.html", "doc/rdoc/files/lib/runtime/response_mixin_rb.html", "doc/rdoc/files/lib/runtime/response_proxy_rb.html", "doc/rdoc/files/lib/runtime/response_rb.html", "doc/rdoc/files/lib/runtime/server_rb.html", "doc/rdoc/files/lib/runtime/session_rb.html", "doc/rdoc/files/lib/tasks", "doc/rdoc/files/lib/tasks/cluster_rb.html", "doc/rdoc/files/lib/tasks/gem_rb.html", "doc/rdoc/files/lib/tasks/generate_rb.html", "doc/rdoc/files/lib/utilities", "doc/rdoc/files/lib/utilities/hash_rb.html", "doc/rdoc/files/lib/utilities/inflect_rb.html", "doc/rdoc/files/lib/utilities/integer_rb.html", "doc/rdoc/files/lib/utilities/kernel_rb.html", "doc/rdoc/files/lib/utilities/module_rb.html", "doc/rdoc/files/lib/utilities/object_rb.html", "doc/rdoc/files/lib/utilities/proc_rb.html", "doc/rdoc/files/lib/utilities/string_rb.html", "doc/rdoc/files/lib/utilities/symbol_rb.html", "doc/rdoc/files/lib/views", "doc/rdoc/files/lib/views/base_rb.html", "doc/rdoc/files/lib/views/mixin_rb.html", "doc/rdoc/files/lib/waves_rb.html", "doc/rdoc/files/README_rdoc.html", "doc/rdoc/fr_class_index.html", "doc/rdoc/fr_file_index.html", "doc/rdoc/fr_method_index.html", "doc/rdoc/index.html", "doc/rdoc/rdoc-style.css", "samples/blog", "samples/blog/bin", "samples/blog/bin/waves-console", "samples/blog/bin/waves-server", "samples/blog/blog.db", "samples/blog/configurations", "samples/blog/configurations/development.rb", "samples/blog/configurations/mapping.rb", "samples/blog/configurations/production.rb", "samples/blog/doc", "samples/blog/doc/EMTPY", "samples/blog/lib", "samples/blog/lib/application.rb", "samples/blog/models", "samples/blog/models/comment.rb", "samples/blog/models/entry.rb", "samples/blog/public", "samples/blog/public/css", "samples/blog/public/css/site.css", "samples/blog/public/javascript", "samples/blog/public/javascript/site.js", "samples/blog/Rakefile", "samples/blog/schema", "samples/blog/schema/migrations", "samples/blog/schema/migrations/001_initial_schema.rb", "samples/blog/schema/migrations/002_add_comments.rb", "samples/blog/schema/migrations/templates", "samples/blog/schema/migrations/templates/empty.rb.erb", "samples/blog/startup.rb", "samples/blog/templates", "samples/blog/templates/comment", "samples/blog/templates/comment/add.mab", "samples/blog/templates/comment/list.mab", "samples/blog/templates/entry", "samples/blog/templates/entry/edit.mab", "samples/blog/templates/entry/list.mab", "samples/blog/templates/entry/show.mab", "samples/blog/templates/entry/summary.mab", "samples/blog/templates/errors", "samples/blog/templates/errors/not_found_404.mab", "samples/blog/templates/errors/server_error_500.mab", "samples/blog/templates/layouts", "samples/blog/templates/layouts/default.mab", "samples/jblog", "samples/jblog/bin", "samples/jblog/bin/waves-console", "samples/jblog/bin/waves-server", "samples/jblog/configurations", "samples/jblog/configurations/development.rb", "samples/jblog/configurations/mapping.rb", "samples/jblog/configurations/production.rb", "samples/jblog/doc", "samples/jblog/doc/EMTPY", "samples/jblog/lib", "samples/jblog/lib/application.rb", "samples/jblog/models", "samples/jblog/models/comment.rb", "samples/jblog/models/entry.rb", "samples/jblog/public", "samples/jblog/public/css", "samples/jblog/public/css/site.css", "samples/jblog/public/javascript", "samples/jblog/public/javascript/site.js", "samples/jblog/Rakefile", "samples/jblog/schema", "samples/jblog/schema/migrations", "samples/jblog/schema/migrations/001_initial_schema.rb", "samples/jblog/schema/migrations/002_add_comments.rb", "samples/jblog/schema/migrations/templates", "samples/jblog/schema/migrations/templates/empty.rb.erb", "samples/jblog/startup.rb", "samples/jblog/templates", "samples/jblog/templates/comment", "samples/jblog/templates/comment/add.mab", "samples/jblog/templates/comment/list.mab", "samples/jblog/templates/entry", "samples/jblog/templates/entry/edit.mab", "samples/jblog/templates/entry/list.mab", "samples/jblog/templates/entry/show.mab", "samples/jblog/templates/entry/summary.mab", "samples/jblog/templates/errors", "samples/jblog/templates/errors/not_found_404.mab", "samples/jblog/templates/errors/server_error_500.mab", "samples/jblog/templates/layouts", "samples/jblog/templates/layouts/default.mab", "verify/app_generation", "verify/app_generation/helpers.rb", "verify/app_generation/startup.rb", "verify/blackboard", "verify/blackboard/blackboard_verify.rb", "verify/blackboard/helpers.rb", "verify/configurations", "verify/configurations/attributes.rb", "verify/configurations/helpers.rb", "verify/configurations/rack_integration.rb", "verify/controllers", "verify/controllers/helpers.rb", "verify/controllers/interface.rb", "verify/core", "verify/core/application.rb", "verify/core/helpers.rb", "verify/core/response_mixin.rb", "verify/core/runtime.rb", "verify/core/track_feature.rb", "verify/core/utilities.rb", "verify/foundations", "verify/foundations/default_application", "verify/foundations/default_application/bin", "verify/foundations/default_application/configurations", "verify/foundations/default_application/controllers", "verify/foundations/default_application/doc", "verify/foundations/default_application/helpers", "verify/foundations/default_application/lib", "verify/foundations/default_application/lib/tasks", "verify/foundations/default_application/log", "verify/foundations/default_application/models", "verify/foundations/default_application/public", "verify/foundations/default_application/public/css", "verify/foundations/default_application/public/flash", "verify/foundations/default_application/public/images", "verify/foundations/default_application/public/javascript", "verify/foundations/default_application/schema", "verify/foundations/default_application/schema/migrations", "verify/foundations/default_application/schema/migrations/templates", "verify/foundations/default_application/templates", "verify/foundations/default_application/templates/errors", "verify/foundations/default_application/templates/layouts", "verify/foundations/default_application/tmp", "verify/foundations/default_application/tmp/sessions", "verify/foundations/default_application/views", "verify/foundations/helpers.rb", "verify/foundations/simple.rb", "verify/helpers.rb", "verify/layers", "verify/layers/data_mapper", "verify/layers/data_mapper/track_feature.rb", "verify/layers/default_errors.rb", "verify/layers/helpers.rb", "verify/layers/migration.rb", "verify/layers/sequel", "verify/layers/sequel/model.rb", "verify/layers/sequeltest.db", "verify/mapping", "verify/mapping/constraint_matching.rb", "verify/mapping/evaluation.rb", "verify/mapping/exception_handler.rb", "verify/mapping/filters.rb", "verify/mapping/helpers.rb", "verify/mapping/pattern_matching.rb", "verify/mapping/story.txt", "verify/requests", "verify/requests/accept.rb", "verify/requests/helpers.rb", "verify/requests/request.rb", "verify/requests/response.rb", "verify/requests/session.rb", "verify/resources", "verify/resources/helpers.rb", "verify/resources/paths.rb", "verify/resources/resource.rb", "verify/views", "verify/views/helpers.rb", "verify/views/rendering.rb", "verify/views/templates", "verify/views/templates/foo.erb", "verify/views/templates/moo.erb", "verify/views/templates/moo.mab", "bin/waves", "bin/waves-server", "bin/waves-console"]
0
   s.has_rdoc = true
0
   s.homepage = %q{http://rubywaves.com}
0
   s.require_paths = ["lib"]
0
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.6")
0
+  s.rubyforge_project = %q{waves}
0
   s.rubygems_version = %q{1.2.0}
0
   s.summary = %q{Open-source framework for building Ruby-based Web applications.}
0
 
0
@@ -24,43 +25,52 @@ Gem::Specification.new do |s|
0
       s.add_runtime_dependency(%q<rack>, [">= 0"])
0
       s.add_runtime_dependency(%q<markaby>, [">= 0"])
0
       s.add_runtime_dependency(%q<erubis>, [">= 0"])
0
-      s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
0
+      s.add_runtime_dependency(%q<haml>, [">= 0"])
0
       s.add_runtime_dependency(%q<metaid>, [">= 0"])
0
+      s.add_runtime_dependency(%q<filebase>, [">= 0"])
0
       s.add_runtime_dependency(%q<extensions>, [">= 0"])
0
       s.add_runtime_dependency(%q<live_console>, [">= 0"])
0
       s.add_runtime_dependency(%q<choice>, [">= 0"])
0
       s.add_runtime_dependency(%q<daemons>, [">= 0"])
0
       s.add_runtime_dependency(%q<rakegen>, [">= 0"])
0
+      s.add_runtime_dependency(%q<functor>, [">= 0"])
0
       s.add_runtime_dependency(%q<sequel>, [">= 2.0.0"])
0
       s.add_runtime_dependency(%q<autocode>, [">= 1.0.0"])
0
+      s.add_runtime_dependency(%q<RedCloth>, [">= 3.0.0"])
0
     else
0
       s.add_dependency(%q<mongrel>, [">= 0"])
0
       s.add_dependency(%q<rack>, [">= 0"])
0
       s.add_dependency(%q<markaby>, [">= 0"])
0
       s.add_dependency(%q<erubis>, [">= 0"])
0
-      s.add_dependency(%q<RedCloth>, [">= 0"])
0
+      s.add_dependency(%q<haml>, [">= 0"])
0
       s.add_dependency(%q<metaid>, [">= 0"])
0
+      s.add_dependency(%q<filebase>, [">= 0"])
0
       s.add_dependency(%q<extensions>, [">= 0"])
0
       s.add_dependency(%q<live_console>, [">= 0"])
0
       s.add_dependency(%q<choice>, [">= 0"])
0
       s.add_dependency(%q<daemons>, [">= 0"])
0
       s.add_dependency(%q<rakegen>, [">= 0"])
0
+      s.add_dependency(%q<functor>, [">= 0"])
0
       s.add_dependency(%q<sequel>, [">= 2.0.0"])
0
       s.add_dependency(%q<autocode>, [">= 1.0.0"])
0
+      s.add_dependency(%q<RedCloth>, [">= 3.0.0"])
0
     end
0
   else
0
     s.add_dependency(%q<mongrel>, [">= 0"])
0
     s.add_dependency(%q<rack>, [">= 0"])
0
     s.add_dependency(%q<markaby>, [">= 0"])
0
     s.add_dependency(%q<erubis>, [">= 0"])
0
-    s.add_dependency(%q<RedCloth>, [">= 0"])
0
+    s.add_dependency(%q<haml>, [">= 0"])
0
     s.add_dependency(%q<metaid>, [">= 0"])
0
+    s.add_dependency(%q<filebase>, [">= 0"])
0
     s.add_dependency(%q<extensions>, [">= 0"])
0
     s.add_dependency(%q<live_console>, [">= 0"])
0
     s.add_dependency(%q<choice>, [">= 0"])
0
     s.add_dependency(%q<daemons>, [">= 0"])
0
     s.add_dependency(%q<rakegen>, [">= 0"])
0
+    s.add_dependency(%q<functor>, [">= 0"])
0
     s.add_dependency(%q<sequel>, [">= 2.0.0"])
0
     s.add_dependency(%q<autocode>, [">= 1.0.0"])
0
+    s.add_dependency(%q<RedCloth>, [">= 3.0.0"])
0
   end
0
 end