Permalink
Browse files

Updated classic template to take advantage of the new Hoshi-based vie…

…ws and to provide a default startup page.
  • Loading branch information...
Dan Yoder
Dan Yoder committed Aug 31, 2009
1 parent c033153 commit 593d429d0f904426edf5faeea471460441f74a6b
Showing with 16 additions and 10 deletions.
  1. +2 −1 bin/waves
  2. +7 −5 dependencies.yml
  3. +6 −1 lib/waves.rb
  4. +1 −3 templates/classic/resources/server.rb.erb
View
@@ -1,7 +1,8 @@
#!/usr/bin/env ruby
# WARNING: This strange preamble might look easy to clean-up, but it is needed
-# to work with older versions of gems (< 1.2).
+# to work with older versions of gems (< 1.2). Also allows for local versions of
+# Waves to be used instead of the gem.
require 'rubygems'
View
@@ -2,10 +2,8 @@ choice: =0.1.3
rakegen: =0.6.6
rack: ~>1.0
rack-cache: ~>0.2
-dyoder-autocode: =1.0.1
cassandra: =0.2.3
RedCloth: =4.1.9
-hoshi: =0.2.1
#activerecord: 2.3.2
#datamapper: ???
sequel: =3.2.0
@@ -16,7 +14,11 @@ english: =0.3.1
daemons: =1.0.10
extensions: =0.6.0
metaid: =1.0
-functor: =0.5.1
-filebase: =0.3.6
mongrel: =1.1.5
-live-console: ~> 0.2
+# live-console: ~> 0.2
+# waves gems
+functor: =0.6.0
+filebase: =0.3.10
+autocode: =1.0.1
+hoshi: =0.2.1
+dyoder-hive: =0.1.8
View
@@ -17,6 +17,7 @@
require 'base64'
require 'functor'
require 'filebase'
+require 'hive/worker'
require 'filebase/model'
# selected project-specific extensions
@@ -38,8 +39,8 @@
require 'waves/dispatchers/default'
require 'waves/runtime/logger'
require 'waves/runtime/mime_types'
+require 'waves/runtime/applications'
require 'waves/runtime/runtime'
-require 'waves/runtime/worker'
require 'waves/runtime/accept'
require 'waves/runtime/request'
require 'waves/runtime/response'
@@ -65,3 +66,7 @@
require 'waves/views/errors'
require 'waves/renderers/mixin'
+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
+end
@@ -1,8 +1,6 @@
module <%= @name %>
module Resources
- class Server
- include Waves::Resources::Mixin
-
+ class Server < <%= @name%>::Resources::Default
def get
view(:pages).welcome
end

0 comments on commit 593d429

Please sign in to comment.