waves 0.7.3 → 0.7.5

data/app/Rakefile

@@ -1,22 +1,14 @@
 #!/usr/bin/env ruby
-if File.exist?(waves_src = File.join(File.dirname(__FILE__), 'waves'))
-  $:.unshift(File.join(waves_src, 'lib'))
-end
+#
+# Warning:  This file is clobbered when you update your
+# application with the waves script.  Accordingly, you may
+# wish to keep your tasks in .rb or .rake files in lib/tasks
+require 'startup'
+Waves::Console.load(:mode => ENV['mode'])
 
-begin
-  require 'waves'
-  Waves::Console.load
-  %w( schema cluster generate ).each { |task| require "lib/tasks/#{task}.rb" }
-rescue LoadError
-  puts "Can't find waves gem or ./waves/lib directory.  try rake symlink waves=/path/to/waves/"
-end
+# load tasks from waves framework
+%w( cluster 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 }
 
-desc "Create lib and bin symlinks using waves=<path>"
-task :symlink do
-  waves = ENV['waves']
-  system "mkdir waves"
-  libdir = File.join(waves, 'lib')
-  bindir = File.join(waves, 'bin')
-  system(cmd = "ln -s #{libdir} waves/") && puts(cmd)
-  system(cmd = "ln -s #{bindir} waves/") && puts(cmd)
-end

data/app/bin/waves-console

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-if File.exist?(waves_src = File.join(File.dirname(__FILE__), '..', 'waves'))
-  $:.unshift(File.join(waves_src, 'lib'))
-end
-
-load File.join(waves_src, 'bin', 'waves-console')
+require 'rubygems'
+require 'startup'
+require 'commands/waves-console'

data/app/bin/waves-server

@@ -1,6 +1,4 @@
 #!/usr/bin/env ruby
-if File.exist?(waves_src = File.join(File.dirname(__FILE__), '..', 'waves'))
-  $:.unshift(File.join(waves_src, 'lib'))
-end
-
-load File.join(waves_src, 'bin', 'waves-server')
+require 'rubygems'
+require 'startup'
+require 'commands/waves-server'

data/app/configurations/development.rb.erb

@@ -1,22 +1,30 @@
-module <%= name %>
+module <%= @name %>
+
   module Configurations
+
     class Development < Default
-    
+
+      database :adapter => 'sqlite', :database => '<%= @name.downcase %>'
+
+      reloadable [ <%= @name %> ]
+
+      log :level => :debug
+
       host '127.0.0.1'
 
       port 3000
 
-			reloadable [ <%= name %> ]
-
-			log :level => :debug	
+    handler ::Rack::Handler::Mongrel, :Host => host, :Port => port
+      # handler ::Rack::Handler::WEBrick, :BindAddress => host, :Port => port
+      # handler ::Rack::Handler::Thin, :Host => host, :Port => port
 
       application do
-				use Rack::ShowExceptions
-				run Waves::Dispatchers::Default.new
-			end				
-			
+        use ::Rack::ShowExceptions
+        run ::Waves::Dispatchers::Default.new
+      end
+
     end
-  end
-end
 
+  end
 
+end

data/app/configurations/mapping.rb.erb

@@ -1,9 +1,8 @@
-module <%= name %>
-  
+module <%= @name %>
+
   module Configurations
-    
+
     module Mapping
-      extend Waves::Mapping
       # your custom rules go here
       include Waves::Mapping::PrettyUrls::RestRules
       include Waves::Mapping::PrettyUrls::GetRules
@@ -11,4 +10,4 @@ module <%= name %>
 
   end
 
-end
+end

data/app/configurations/production.rb.erb

@@ -1,25 +1,30 @@
-module <%= name %>
+module <%= @name %>
 
   module Configurations
-      
+
     class Production < Default
-  
+
+      database :host => 'localhost', :adapter => 'mysql', :database => '<%= @name.downcase %>',
+        :user => 'root', :password => ''
+
+      reloadable []
+
+      log :level => :error,
+        :output => ( :log / "waves.#{$$}" ),
+        :rotation => :weekly
+
       host '0.0.0.0'
 
       port 80
 
-  		reloadable []
-
-  		log :level => :error, 
-  		  :output => ( :log / "waves.#{$$}" ),
-  		  :rotation => :weekly
+    handler ::Rack::Handler::Mongrel, :Host => host, :Port => port
+      # handler ::Rack::Handler::WEBrick, :BindAddress => host, :Port => port
+      # handler ::Rack::Handler::Thin, :Host => host, :Port => port
 
       application do
-  			run Waves::Dispatchers::Default.new
-  		end				
-		
-    end
+        run ::Waves::Dispatchers::Default.new
+      end
 
+    end
   end
-  
 end

data/app/lib/application.rb.erb

@@ -1,52 +1,5 @@
-require 'sequel'
-module <%= name %>
-
-	extend Autocreate; extend Autoload; extend Reloadable
-	autoload true; directories :lib
-
-	[ :Configurations, :Models, :Views, :Controllers, :Helpers ].each do | name |
-		autocreate( name, Module.new ) do
-
-      # dynamically access module constants
-			def self.[]( cname )
-			  eval("#{name}::#{cname.to_s.camel_case}")
-			end
-
-		  # first try to load and only create if that fails
-		  # which means install autoload *after* autocreate
-		  extend Autocreate; extend Autoload
-		  
-		  # autoload any files in appropriately named directories
-		  # exampe: models/blog.rb for Blog
-			autoload true; directories name.to_s.snake_case
-			
-			# autocreate declarations ...
-			case name
-		  # don't autocreate configs
-		  when :Configurations then nil
-		  # set the dataset for Models
-		  when :Models
-			  autocreate true, eval("<%= name %>::Models::Default") do
-			    set_dataset <%= name %>.database[ basename.snake_case.plural.intern ]
-			  end
-			# everything else just use the exemplar
-			else
-			  autocreate true, eval("<%= name %>::#{name}::Default")
-			end
-
-		end
-
-	end
-		
-	# accessor methods for modules and other key application objects ...
-	class << self
-		def config ; Waves::Server.config rescue nil || Waves::Console.config ; end
-		def database ; @database ||= Sequel.open( config.database ) ; end
-		def configurations ; <%= name %>::Configurations ; end
-		def controllers ; <%= name %>::Controllers ; end
-		def models ; <%= name %>::Models ; end
-		def helpers ; <%= name %>::Helpers ; end
-		def views ; <%= name %>::Views ; end
-	end
-	
+require 'layers/orm/sequel'
+module <%= @name %>
+  include Waves::Foundations::Default
+  include Waves::Layers::ORM::Sequel
 end

data/app/startup.rb

@@ -0,0 +1,5 @@
+lambda {
+  waves = ( ( WAVES if defined? WAVES ) || ENV['WAVES'] || File.join(File.dirname(__FILE__), 'waves') )
+  $:.unshift(File.join( waves, "lib" )) if File.exist? waves
+}.call
+require 'waves'

data/app/templates/layouts/default.mab

@@ -5,10 +5,10 @@ html do
   head do
     title @title
   end
-  
+
   body do
     layout_content
   end
 
 end
-  
+

data/bin/waves

@@ -1,38 +1,49 @@
 #!/usr/bin/env ruby
-
-unless ARGV.length == 1
-	$stderr.puts "Usage: waves {name}"
-	exit 1
+require 'rubygems'
+require 'choice'
+require 'rakegen'
+
+# if we're in the waves source, prepend it to the load path
+waves_lib = File.expand_path( "#{File.dirname(__FILE__)}/../../waves/lib" )
+$:.unshift waves_lib if File.exist?(waves_lib)
+require 'waves'
+
+begin
+  require 'utilities/string'
+rescue LoadError
+  require File.join(File.dirname(__FILE__), '..', 'lib', 'utilities', 'string')
 end
 
-require 'rubygems'
-require 'erubis'
-require 'extensions/all'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'utilities', 'string')
+Choice.options do
+  banner 'Usage:  waves path/to/app [-h]'
+  option :help  do
+    long '--help'
+    desc 'Show this message'
+  end
+  
+end
 
-puts "** Creating new Waves application ..."
 app_path = ARGV[0]
 app_name = File.basename(app_path)
-template = File.join( File.dirname(__FILE__),'..','app')
-system "cp -R #{template} #{app_path}"
-
-# get rid of placeholder files left over from gem install
-Dir["#{app_path}/**/EMPTY"].each { |path| system "rm #{path}" }
-
-# next, process all template files ...
-Dir["#{app_path}/**/*.erb"].each do |path|
-  unless path =~ %r{^#{app_path}/(schema/migrations/templates|templates)}
-    name = app_name.camel_case
-    File.write( path.gsub(/\.erb$/,''), 
-      Erubis::Eruby.new( File.read( path ) ).result( binding ) )
-    system "rm #{path}"
-  end
+if app_name =~ /[^\w\d_]/
+  raise ArgumentError, <<-TEXT
+  Unusable name: \"#{app_name}\"
+  Application names may contain only letters, numbers, and underscores."
+TEXT
+end
+
+template = "#{WAVES}/app"
+
+generator = Rakegen.new("waves:app") do |gen|
+  gen.source = template
+  gen.target = app_path
+  gen.template_assigns = {:name => app_name.camel_case}
+  gen.executables = %w{ bin/waves-console  bin/waves-server}
 end
 
-# make the scripts executable
-system "chmod ug+x #{app_path}/bin/waves-*"
+puts "** Creating new Waves application ..."
 
-# finally, change the lib/application.rb file
-system "mv #{app_path}/lib/application.rb #{app_path}/lib/#{app_name}.rb"
+Rake::Task["waves:app"].invoke
 
 puts "** Application created!"
+

data/bin/waves-console

@@ -1,26 +1,4 @@
 #!/usr/bin/env ruby
-require 'waves'
-require 'choice'
-
-Choice.options do
-  header 'Run a waves application server.'
-  header ''
-  option :mode do
-    short '-c'
-    long '--config=CONFIG'
-    desc 'Configuration to use.'
-    desc 'Defaults to development.'
-    cast Symbol
-  end
-  separator ''
-  option :directory do
-    short '-D'
-    long '--dir=DIR'
-    desc 'Directory containing the application.'
-    desc 'Defaults to the current directory.'
-  end
-  separator ''  
-end
-    
-Waves::Console.load( Choice.choices )
-require 'irb'; IRB.start
+require 'rubygems'
+require 'startup'
+require 'commands/waves-console'

data/bin/waves-server

@@ -1,45 +1,4 @@
-require 'waves'
-require 'choice'
-
-Choice.options do
-  header 'Run a waves application server.'
-  header ''
-  option :port  do
-    short '-p'
-    long '--port=PORT'
-    desc 'Port to listen on.'
-    desc 'Defaults to value given in configuration.'
-    cast Integer
-  end
-  separator ''  
-  option :host do
-    short '-h'
-    long '--host=HOST'
-    desc 'Host or IP address of the host to bind.'
-    desc 'Defaults to value given in configuration.'
-  end
-  separator ''
-  option :mode do
-    short '-c'
-    long '--config=CONFIG'
-    desc 'Configuration to use.'
-    desc 'Defaults to development.'
-    cast Symbol
-  end
-  separator ''
-  option :directory do
-    short '-D'
-    long '--dir=DIR'
-    desc 'Directory containing the application.'
-    desc 'Defaults to the current directory.'
-  end
-  separator ''  
-  option :daemon do
-    short '-d'
-    long '--daemon'
-    desc 'Run as a daemon.'
-  end
-  separator ''
-end
-    
-Waves::Server.run( Choice.choices )
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'startup'
+require 'commands/waves-server'

data/lib/commands/waves-console.rb

@@ -0,0 +1,21 @@
+require 'choice'
+
+Choice.options do
+  header 'Run waves in console mode.'
+  header ''
+  option :mode do
+    short '-c'
+    long '--config=CONFIG'
+    desc 'Configuration to use.'
+    desc 'Defaults to development.'
+    cast Symbol
+  end
+  separator ''
+end
+
+console = Waves::Console.load( Choice.choices )
+Object.send(:define_method, :waves) { console }
+require 'irb'
+require 'irb/completion'
+ARGV.clear
+IRB.start