dependencies.yml lib/waves/helpers/css.rb templates/classic/views/pages.rb.erb @@ -5,21 +5,7 @@ rescue LoadError => e raise e end -runtime_deps = {:rack => '~> 0.4', - 'rack-cache' => '~> 0.2', - :extensions => '~> 0.6', - :english => '~> 0.3', - :live_console => '~> 0.2', - :functor => '>= 0.5.0', - :rakegen => '~> 0.6', - :autocode => '>= 1.0.0', - :filebase => '>= 0.3.5', - :RedCloth => '~> 4.0', - :choice => '~> 0.1', - :metaid => '~> 1.0', - :daemons => '~>1.0.10' - } - +runtime_deps = YAML::load_file( 'dependencies.yml' ) developer_deps = { :bacon => '~> 1.0', :facon => '~> 0.4' } gem = Gem::Specification.new do |gem| @@ -98,23 +84,6 @@ task "edge:gemspec" => :gemspec do end end -desc "Publish to RubyForge" -task( :publish => [ :package, :rdoc_publish ] ) do - `rubyforge login` - `rubyforge add_release #{gem.name} #{gem.name} #{gem.version} #{gem.name}-#{gem.version}.gem` -end - -task( :rdoc_publish => :rdoc ) do - path = "/var/www/gforge-projects/#{gem.name}/" - `rsync -a --delete ./doc/rdoc/ dyoder67@rubyforge.org:#{path}` -end - -Rake::RDocTask.new do |rdoc| - rdoc.rdoc_dir = 'doc/rdoc' - rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'doc/README' - rdoc.rdoc_files.add [ 'lib/**/*.rb', 'doc/*' ] -end - # based on a blog post by Assaf Arkin desc "Set up dependencies so you can work from source" task( :setup ) do @@ -169,3 +138,15 @@ end desc "Run all specs and tests." task :spec => %w[ test specs:run ] + +Rake::RDocTask.new do |rdoc| + rdoc.rdoc_dir = 'doc/rdoc' + rdoc.options << '--line-numbers' << '--inline-source' << '--main' << 'doc/README' + rdoc.rdoc_files.add [ 'lib/**/*.rb', 'doc/*' ] +end + +task( :rdoc_publish => :rdoc ) do + path = "/var/www/gforge-projects/#{gem.name}/" + `rsync -a --delete ./doc/rdoc/ dyoder67@rubyforge.org:#{path}` +end + Rakefile @@ -1,6 +1,5 @@ -# TODO: Move ALL of this stuff where it is needed to avoid -# unnecessary dependencies. - +require 'yaml' +YAML::load_file( File.expand_path( File.dirname( __FILE__ )) + '/../dependencies.yml' ).each { |name,version| gem name, version } # External Dependencies require "rubygems" require 'rack' lib/waves.rb @@ -1,3 +1,4 @@ +gem 'choice', require 'choice' Choice.options do lib/waves/commands/console.rb @@ -1,4 +1,5 @@ require 'choice' +gem 'rakegen', '=0.6.6' require 'rakegen' waves = File.expand_path( File.dirname( __FILE__ ) / '..' / '..' / '..' ) lib/waves/commands/generate.rb @@ -9,9 +9,7 @@ module Waves def self.included( app ) - gem 'dyoder-autocode', '~> 1.0.1' require 'autocode' - require 'waves/layers/mvc' require 'waves/layers/text/inflect/english' require 'waves/views/templated' lib/waves/foundations/classic.rb @@ -1,11 +1,6 @@ module Waves module Helpers module Basic - attr_reader :request - include Waves::ResponseMixin - - def app ; Waves.main ; end - end end end \ No newline at end of file lib/waves/helpers/basic.rb @@ -19,7 +19,7 @@ module Waves end app.auto_create_module( :Views ) do - auto_create_class :Default, Hoshi::View[:html4_transitional] do + auto_create_class :Default, Hoshi::View[:html4] do include Waves::Views::Mixin include Waves::Helpers::Basic include Waves::Helpers::Formatting lib/waves/layers/mvc.rb @@ -29,12 +29,14 @@ module Waves def controller( resource = nil ) resource ||= self.class.basename.snake_case - @controller ||= app::Controllers[ resource ].new( @request ) + @controller ||= {} + @controller[resource] ||= app::Controllers[ resource ].new( @request ) end def view( resource = nil ) resource ||= self.class.basename.snake_case - @view ||= app::Views[ resource ].new( @request ) + @view ||= {} + @view[resource] ||= app::Views[ resource ].new( @request ) end # MVC Params get automatically destructured with the keys as accessors methods. lib/waves/layers/mvc/extensions.rb @@ -124,10 +124,15 @@ module Waves # File extension of path, with leading dot def extension - @ext ||= ( if ( e = File.extname( path )).empty? then nil else e end ) + @ext ||= ( ( e = File.extname( path ) ).empty? ? nil : e ) end + alias :ext :extension + def basename + @basename ||= File.basename( path ) + end + module Utilities def self.destructure( hash ) lib/waves/runtime/request.rb @@ -31,24 +31,18 @@ module Waves define_method( m ) { request.send( m ) } end - # Issue a redirect for the given location. def redirect(location, status = '302'); request.redirect(location, status); end - # Access the Waves::Logger. + def log; Waves::Logger; end - # access stuff from an app - def app_name ; self.class.rootname.snake_case.to_sym ; end - def app ; eval( "::#{app_name.to_s.camel_case}" ) ; end + + def app ; self.class.root ; end + + def main ; Waves.main ; end + def paths( rname = nil ) ( rname ? app::Resources[ rname ].paths : resource.class.paths ).new end - # these take strings or operate on the path by default - def basename( str = nil ) ; ( str or path ).sub(/\.([^\.]+)$/,'') ; end - - def extension( str = nil ) - ( m = ( str or path ).match(/\.([^\.]+)$/) ) ? m[1] : nil - end - end end lib/waves/runtime/response_mixin.rb @@ -10,6 +10,7 @@ module Waves def initialize( request ) @request = request + super() end end lib/waves/views/mixin.rb @@ -3,6 +3,9 @@ module <%= @name %> class Server include Waves::Resources::Mixin + def get + view(:pages).welcome + end end end end \ No newline at end of file templates/classic/resources/server.rb.erb b3703685d67f09ef5c85c83843058ee247e76f2e Dan Yoder dan@zeraweb.com http://github.com/waves/edge/commit/0ced74174fee8ebe553dd2cdfd35b9c42477aade 0ced74174fee8ebe553dd2cdfd35b9c42477aade 2009-08-22T20:36:11-07:00 2009-08-22T20:36:11-07:00 Created external dependencies file to manage them by specific version, along with corresponding changes in code; minor updates to waves commands; further changes to make Cassandra and Hoshi the defaults for views; gave default classic app a default welcome view. 75a549265ef511cce553de0c3b606217189b3027 Dan Yoder dan@zeraweb.com