waves 0.8.0 → 0.8.1

data/bin/waves

@@ -8,20 +8,21 @@ require 'rubygems'
 WAVES = "#{File.dirname(__FILE__)}/.." unless defined? WAVES
 
 waves = [
-    WAVES, ENV['WAVES'], './waves'
-].compact.map { |dir| File.join(dir, 'lib') }.find( &File.method( :directory? ) )
+  WAVES, ENV['WAVES'], './waves'
+].compact.map { |dir| File.join(dir, 'lib') }.find { |d|
+  File.exist? File.join( d, 'waves.rb' )
+}
 if waves
-    $: << waves
-    waves = File.join( waves, 'waves' )
+  $: << waves
+  waves = File.join( waves, 'waves' )
 else
-    waves = 'waves'
+  waves = 'waves'
 end
-require waves
 
+require waves
 
 puts "** Waves #{Waves.version} **"
 
-
 begin
   require "commands/#{ARGV.first}"
 rescue LoadError => e

data/doc/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/commands/help.rb

@@ -1,5 +1,5 @@
 puts <<-HELP
-Usage: waves [ gen | start | console ] [ options ]
+Usage: waves [ generate | server | console ] [ options ]
 Run a waves command with the given options. Use --help with any command to learn
-more about that command. EXAMPLE: waves gen --help
+more about that command. EXAMPLE: waves generate --help
 HELP

data/lib/dispatchers/base.rb

@@ -8,7 +8,7 @@ module Waves
 
     # Redirect exceptions are rescued by the Waves dispatcher and used to set the 
     # response status and location.
-    class Redirect < Exception
+    class Redirect < SignalException
       attr_reader :path, :status
       def initialize( path, status = '302' )
         @path = path

data/lib/dispatchers/default.rb

@@ -2,10 +2,6 @@ module Waves
 
   module Dispatchers
 
-    #
-    # Waves::Dispatchers::Default processes a Waves::Request and returns a Waves::Response as follows:
-    #
-
     class Default < Base
 
       # Takes a Waves::Request and returns a Waves::Response    

data/lib/foundations/classic.rb

@@ -14,6 +14,7 @@ module Waves
         require 'layers/inflect/english'
         require 'helpers/extended'
         require 'layers/renderers/erubis'
+        require 'layers/renderers/markaby'
         
         app.module_eval do
 
@@ -21,7 +22,7 @@ module Waves
           
           app.auto_create_module( :Configurations ) do
             include AutoCode
-            auto_create_class :Default
+            auto_create_class :Default, Waves::Configurations::Default
             auto_load :Default, :directories => [ :configurations ]
           end
 
@@ -51,6 +52,7 @@ module Waves
           include Waves::Layers::Inflect::English
           include Waves::Layers::MVC
           include Waves::Renderers::Erubis   
+          include Waves::Renderers::Markaby   
           
         end
         

data/lib/layers/orm/migration.rb

@@ -56,7 +56,7 @@ module Waves
       # <em>orm</em> can be a symbol or string
       def self.migration_template(orm, name=nil)
         file = ( name || 'empty' ) + '.rb.erb'
-        source = File.dirname(__FILE__) / orm / :migrations / file
+        source = File.dirname(__FILE__) / :providers / orm / :migrations / file
       end
 
       # Given a migration name, returns the path of the file that would be created.

data/lib/resources/mixin.rb

@@ -82,7 +82,6 @@ module Waves
               response.status = ( StatusCodes[ e.class ] || 500 )
               ( body = handler( e ) ) rescue raise e
               Waves::Logger.warn e.to_s
-              Waves::Logger.debug "#{e.class.name} : #{e.message}"
               e.backtrace.each { |t| Waves::Logger.debug "    #{t}" }
             ensure
               always
@@ -98,7 +97,7 @@ module Waves
               begin 
                 Waves.main::Resources[ resource ]
               rescue NameError
-                raise Waves::Dispatchers::NotFoundError 
+                raise Waves::Dispatchers::NotFoundError
               end
               Waves.main::Resources[ resource ]
             end
@@ -113,6 +112,7 @@ module Waves
           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 }

data/lib/runtime/configuration.rb

@@ -52,9 +52,6 @@ module Waves
       # parameters for the database connection, varies by ORM
       attribute( :database )
       
-      # options for the session: options for duration and path
-      attribute( :session )
-      
       # set the debug mode flag; typically done in dev / test configurations
       attribute( :debug )
       
@@ -85,7 +82,6 @@ module Waves
       
       # default options
       debug true
-      session :duration => 30.minutes, :path => '/tmp/sessions'
       log :level => :info, :output => $stderr
       reloadable []
       dependencies []
@@ -97,7 +93,6 @@ module Waves
         :path => '/',
         :expire_after => 2592000,
         :secret => 'Change it'
-        
         run ::Waves::Dispatchers::Default.new
       }
     end

data/templates/classic/Rakefile

@@ -4,83 +4,43 @@
 # application with the waves script.  Accordingly, you may
 # wish to keep your tasks in .rb or .rake files in lib/tasks
 
+require 'rubygems'
+
+WAVES = "#{File.dirname(__FILE__)}/.." unless defined? WAVES
+
+waves = [
+  WAVES, ENV['WAVES'], './waves'
+].compact.map { |dir| File.join(dir, 'lib') }.find { |d|
+  File.exist? File.join( d, 'waves.rb' )
+}
+if waves
+  $: << waves
+  waves = File.join( waves, 'waves' )
+else
+  waves = 'waves'
+end
+
+require waves
+require 'runtime/console'
+
 begin
-  require 'startup'
   Waves::Console.load(:mode => ENV['mode'])
 
   # load tasks from waves framework
-  %w( cluster generate gem ).each { |task| require "tasks/#{task}.rb" }
+  %w( generate gem ).each { |task| require "tasks/#{task}.rb" }
 
   # load tasks from this app's lib/tasks
   Dir["lib/tasks/*.{rb,rake}"].each { |task| require task }
   
 rescue LoadError => e
   if e.message == 'no such file to load -- waves'
-    puts "Can't find Waves source.  Install gem, freeze Waves, or define WAVES in startup.rb"
+    puts "Can't find Waves source.  Install gem, freeze Waves, or define WAVES at the top of the Rakefile"
     puts
   else
     raise e
   end
 end
 
-namespace :dep do
-
-  desc "check if all the dependencies specified in the configuration"
-  task :check do
-
-    gems = Gem::SourceIndex.from_installed_gems.to_a.to_s
-    missing = Array.new
-
-    puts "\nApplication-level dependencies:"
-    puts " ('*' means gem is installed and available)"
-    
-    Waves.config.dependencies.each do |dep|
-      pattern = /=#{dep}\s/
-      print "\t#{dep}:\t\t"
-      print "\t" if dep.length < 7  # keep our formatting pretty, please.
-      unless pattern.match(gems).nil?
-        print "[*]\n"
-      else
-        print "[ ]\n"
-      end
-    end    
-  end
-  
-  desc "install any missing dependencies specified in the configuration"
-  task :install do
-
-    gems = Gem::SourceIndex.from_installed_gems.to_a.to_s
-    missing = Array.new
-
-    Waves.config.dependencies.each do |dep|
-      pattern = /=#{dep}\s/
-      missing << dep if pattern.match(gems).nil?
-    end
-
-    missing.each do |m|
-      dep,ver = m.is_a?(String) ? [m,''] : m
-      puts "Installing dependency: #{dep}"
-      puts ver
-      begin
-        require 'rubygems/dependency_installer'
-        if Gem::RubyGemsVersion =~ /^1\.0\./
-          Gem::DependencyInstaller.new(dep).install
-        else
-          # as of 1.1.0
-          Gem::DependencyInstaller.new.install(dep)
-        end
-      rescue LoadError # < rubygems 1.0.1
-        require 'rubygems/remote_installer'
-        Gem::RemoteInstaller.new.install(dep)
-      end
-    end
-
-    puts "Environment complete. Nothing to install." if missing.empty?
-
-  end
-
-end
-
 namespace :waves do
   
   desc "freeze src=<wherever> to ./waves"

data/templates/classic/templates/errors/not_found_404.mab

@@ -1,2 +1,7 @@
+style <<-STYLE
+  body { background: #933; padding: 20px; font-family: verdana, sans-serif; }
+  h1 { font-size: 60px; font-weight: bold; margin: 0px; }
+  p { font-size: 24px; margin: 0px; }
+STYLE
 h1 '404'
-p %q( That URL does not exist on this server. )
+p { 'That URL does not exist on this server.' }

data/templates/classic/templates/errors/server_error_500.mab

@@ -1,2 +1,7 @@
+style <<-STYLE
+  body { background: #c93; padding: 20px; font-family: verdana, sans-serif; }
+  h1 { font-size: 60px; font-weight: bold; margin: 0px; }
+  p { font-size: 24px; margin: 0px; }
+STYLE
 h1 '500'
 p %q( Internal server error. Sorry, but your request could not be processed. )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: waves
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - Dan Yoder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-02 01:00:00 -07:00
+date: 2008-11-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,9 +18,19 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: choice
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.6
+        version: "0.1"
     version: 
 - !ruby/object:Gem::Dependency 
   name: autocode
@@ -38,9 +48,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: "0.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -48,9 +58,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: "0.4"
     version: 
 - !ruby/object:Gem::Dependency 
   name: filebase
@@ -68,9 +78,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.3.0
+        version: "0.3"
     version: 
 - !ruby/object:Gem::Dependency 
   name: extensions
@@ -78,9 +88,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.6.0
+        version: "0.6"
     version: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
@@ -88,9 +98,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 4.0.0
+        version: "4.0"
     version: 
 - !ruby/object:Gem::Dependency 
   name: live_console
@@ -98,9 +108,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: "0.2"
     version: 
 - !ruby/object:Gem::Dependency 
   name: functor
@@ -121,6 +131,50 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- templates/classic
+- templates/classic/configurations
+- templates/classic/configurations/default.rb.erb
+- templates/classic/configurations/development.rb.erb
+- templates/classic/configurations/production.rb.erb
+- templates/classic/controllers
+- templates/classic/helpers
+- templates/classic/lib
+- templates/classic/lib/tasks
+- templates/classic/models
+- templates/classic/public
+- templates/classic/public/css
+- templates/classic/public/flash
+- templates/classic/public/images
+- templates/classic/public/javascript
+- templates/classic/Rakefile
+- templates/classic/resources
+- templates/classic/resources/map.rb.erb
+- templates/classic/schema
+- templates/classic/schema/migrations
+- templates/classic/startup.rb.erb
+- templates/classic/templates
+- templates/classic/templates/errors
+- templates/classic/templates/errors/not_found_404.mab
+- templates/classic/templates/errors/server_error_500.mab
+- templates/classic/templates/layouts
+- templates/classic/templates/layouts/default.mab
+- templates/classic/tmp
+- templates/classic/tmp/sessions
+- templates/classic/views
+- templates/compact
+- templates/compact/startup.rb.erb
+- templates/classic/controllers/.gitignore
+- templates/classic/helpers/.gitignore
+- templates/classic/lib/tasks/.gitignore
+- templates/classic/models/.gitignore
+- templates/classic/public/css/.gitignore
+- templates/classic/public/flash/.gitignore
+- templates/classic/public/images/.gitignore
+- templates/classic/public/javascript/.gitignore
+- templates/classic/resources/.gitignore
+- templates/classic/schema/migrations/.gitignore
+- templates/classic/tmp/sessions/.gitignore
+- templates/classic/views/.gitignore
 - lib/caches/file.rb
 - lib/caches/memcached.rb
 - lib/caches/simple.rb
@@ -251,38 +305,6 @@ files:
 - samples/blog/templates/waves/status.mab
 - samples/blog/tmp
 - samples/blog/tmp/sessions
-- templates/classic
-- templates/classic/configurations
-- templates/classic/configurations/default.rb.erb
-- templates/classic/configurations/development.rb.erb
-- templates/classic/configurations/production.rb.erb
-- templates/classic/controllers
-- templates/classic/helpers
-- templates/classic/lib
-- templates/classic/lib/tasks
-- templates/classic/models
-- templates/classic/public
-- templates/classic/public/css
-- templates/classic/public/flash
-- templates/classic/public/images
-- templates/classic/public/javascript
-- templates/classic/Rakefile
-- templates/classic/resources
-- templates/classic/resources/map.rb.erb
-- templates/classic/schema
-- templates/classic/schema/migrations
-- templates/classic/startup.rb.erb
-- templates/classic/templates
-- templates/classic/templates/errors
-- templates/classic/templates/errors/not_found_404.mab
-- templates/classic/templates/errors/server_error_500.mab
-- templates/classic/templates/layouts
-- templates/classic/templates/layouts/default.mab
-- templates/classic/tmp
-- templates/classic/tmp/sessions
-- templates/classic/views
-- templates/compact
-- templates/compact/startup.rb.erb
 has_rdoc: true
 homepage: http://rubywaves.com
 post_install_message: