doc/LICENSE lib/helpers/default.rb verify/layers/data_mapper/association_verify.rb verify/mapping/named.rb @@ -1,5 +1,5 @@ begin - $: << 'lib'; %w( rubygems rake/testtask rake/rdoctask rake/gempackagetask rcov/rcovtask extensions/all + $: << 'lib'; %w( rubygems rake/testtask rake/rdoctask rake/gempackagetask extensions/all utilities/string utilities/symbol date).each { |dep| require dep } rescue puts "Better do `rake setup` to get all the fancies you're missing" @@ -93,7 +93,7 @@ end desc "Run verification suite." Rake::TestTask.new(:verify) do |t| - t.test_files = FileList["verify/*/*.rb"].exclude("**/helpers.rb", "**/app_generation/*.rb") + t.test_files = FileList["verify/**/*.rb"].exclude("**/helpers.rb", "**/app_generation/*.rb") t.verbose = true end Rakefile @@ -8,6 +8,7 @@ module Waves auto_eval :Configurations do auto_eval :Mapping do + extend Waves::Mapping handle(Waves::Dispatchers::NotFoundError) do html = Waves.application.views[:errors].process( request ) do not_found_404( :error => Waves::Dispatchers::NotFoundError ) lib/layers/default_errors.rb @@ -33,8 +33,9 @@ module Waves auto_create_module( :Helpers ) do include AutoCode - auto_create_module { include Waves::Helpers::Default } + auto_create_module auto_load true, :directories => [ :helpers ] + auto_eval( true ){ include Waves::Helpers::Default } end end lib/layers/mvc.rb @@ -5,10 +5,9 @@ module Waves module Filebase def self.included(app) - app.module_eval + app.module_eval do auto_eval( :Models ) do - include AutoCode - auto_eval true { include Filebase::Model[ :db / self.name.snake_case ] } + auto_eval( true ) { include Filebase::Model[ :db / self.name.snake_case ] } end end end @@ -19,4 +18,4 @@ module Waves end -end +end \ No newline at end of file lib/layers/orm/filebase.rb @@ -16,8 +16,14 @@ module Waves auto_create :Models do include AutoCode auto_create_class true, ::Sequel::Model + auto_load true, :directories => [ :models ] auto_eval true do - set_dataset Waves.application.database[ basename.snake_case.pluralize.intern ] + default = superclass.basename.snake_case.pluralize.intern + if @dataset && @dataset.opts[:from] != [ default ] + # don't clobber dataset from autoloaded file + else + set_dataset Waves.application.database[ basename.snake_case.pluralize.intern ] + end end end lib/layers/orm/sequel.rb @@ -5,6 +5,7 @@ module Waves def app.config ; Waves.config ; end def app.configurations ; self::Configurations ; end + def app.paths ; configurations::Mapping.named; end app.instance_eval do @@ -12,10 +13,12 @@ module Waves auto_create_module( :Configurations ) do include AutoCode - auto_eval( :Mapping ) { extend Waves::Mapping } auto_create_class true, Waves::Configurations::Default auto_load :Mapping, :directories => [:configurations] auto_load true, :directories => [:configurations] + auto_eval :Mapping do + extend Waves::Mapping + end end end lib/layers/simple.rb @@ -139,10 +139,10 @@ module Waves # Maps a request to a block. Don't use this method directly unless you know what # you're doing. Use +path+ or +url+ instead. def map( path, options = {}, params = {}, &block ) - if path.is_a? Hash - params = options - options = path - else + case path + when Hash + params = options; options = path + when String options[:path] = path end mapping << [ options, params, block ] @@ -198,7 +198,7 @@ module Waves end return false end - + # Match the given request against the defined rules. This is typically only called # by a dispatcher object, so you shouldn't typically use it directly. def []( request ) @@ -262,5 +262,6 @@ module Waves end end end + end lib/mapping/mapping.rb @@ -2,9 +2,6 @@ module Waves module Renderers - extend AutoCode - # auto_load :renderers, Class - # The renderers mixin provides a number of methods to simplify writing new renderers. # Just include this in your Renderer class and write your render method. module Mixin lib/renderers/mixin.rb @@ -33,7 +33,7 @@ class String end def snake_case - gsub(/([a-z\d])([A-Z])/){ "#{$1}_#{$2}"}.tr("-", "_").downcase + gsub(/\s+/,'').gsub(/([a-z\d])([A-Z])/){ "#{$1}_#{$2}"}.tr("-", "_").downcase end def title_case lib/utilities/string.rb @@ -26,6 +26,10 @@ module Waves def threaded(*args,&block) mapping.threaded(*args,&block) end + + def generator(*args,&block) + mapping.generator(*args,&block) + end end end lib/verify/mapping.rb @@ -60,7 +60,7 @@ module Waves # A class method that returns the known Renderers, which is any module that is defined within Waves::Renderers and includes the Renderers::Mixin. You can define new Renderers simply be reopening Waves::Renderers and defining a module that mixes in Renderers::Mixin. def Views.renderers return [] if Renderers.constants.nil? - Renderers.constants.inject([]) do |rx,cname| + Renderers.constants.sort.inject([]) do |rx,cname| ( Module === (c=Renderers.const_get(cname)) && c < Renderers::Mixin ) ? ( rx << c ) : rx end lib/views/mixin.rb @@ -5,7 +5,7 @@ require 'rack' require 'daemons' require 'live_console' -gem 'dyoder-autocode' +# gem 'dyoder-autocode' require 'autocode' # for mimetypes only or when using as default handler @@ -57,19 +57,19 @@ require 'controllers/mixin' require 'controllers/base' require 'views/mixin' require 'views/base' -require 'renderers/mixin' -require 'renderers/markaby' -require 'helpers/asset_helper' -require 'helpers/number_helper' require 'helpers/tag_helper' require 'helpers/url_helper' +require 'helpers/common' +require 'helpers/form' +require 'helpers/formatting' +require 'helpers/model' +require 'helpers/view' +require 'helpers/default' +require 'helpers/asset_helper' +require 'helpers/number_helper' +require 'renderers/mixin' require 'renderers/erubis' -require 'helpers/common.rb' -require 'helpers/form.rb' -require 'helpers/formatting.rb' -require 'helpers/model.rb' -require 'helpers/view.rb' -require 'helpers/base' +require 'renderers/markaby' # waves test support require 'verify/mapping.rb' lib/waves.rb @@ -14,7 +14,7 @@ module Blog port 3000 - handler ::Rack::Handler::Mongrel, :Host => host, :Port => port + handler ::Rack::Handler::Mongrel, :Host => host, :Port => port # handler ::Rack::Handler::WEBrick, :BindAddress => host, :Port => port # handler ::Rack::Handler::Thin, :Host => host, :Port => port samples/blog/configurations/development.rb @@ -17,7 +17,7 @@ module Blog port 80 - handler ::Rack::Handler::Mongrel, :Host => host, :Port => port + handler ::Rack::Handler::Mongrel, :Host => host, :Port => port # handler ::Rack::Handler::WEBrick, :BindAddress => host, :Port => port # handler ::Rack::Handler::Thin, :Host => host, :Port => port samples/blog/configurations/production.rb @@ -2,7 +2,7 @@ module Blog module Models - class Entry < Default + class Entry < Sequel::Model one_to_many :comments, :class => Blog::Models::Comment, :key => :entry_id end samples/blog/models/entry.rb @@ -3,8 +3,6 @@ Bacon.extend Bacon::TestUnitOutput Bacon.summary_on_exit -# protect TextMate from itself. - # Prepend the framework lib to the loadpath $:.unshift( File.join(File.dirname(__FILE__), "..", "lib") ) require 'waves' verify/helpers.rb @@ -5,7 +5,7 @@ require 'layers/orm/sequel' module TestApplication include AutoCode module Configurations - module Development + class Development stub!(:database).and_return(:adapter => 'sqlite', :database => 'test.db') end end verify/layers/sequel/model.rb @@ -27,22 +27,22 @@ describe "A developer can map requests to filters." do mapping.before('/pathstring') { request.response.write("Before pathstring") } mapping.wrap('/pathstring') { request.response.write("Wrap pathstring") } - mapping.map('/pathstring') { "During pathstring" } + mapping.path('/pathstring') { "During pathstring" } mapping.after('/pathstring') { request.response.write("After pathstring") } mapping.before(%r{^/pathregexp$}) { request.response.write("Before pathregexp") } mapping.wrap(%r{^/pathregexp$}) { request.response.write("Wrap pathregexp") } - mapping.map(%r{^/pathregexp$}) { "During pathregexp" } + mapping.path(%r{^/pathregexp$}) { "During pathregexp" } mapping.after(%r{^/pathregexp$}) { request.response.write("After pathregexp") } mapping.before('/pathstring/name', :method => :post) { request.response.write("Before pathstring post") } mapping.wrap('/pathstring/name', :method => :post) { request.response.write("Wrap pathstring post") } - mapping.map('/pathstring/name', :method => :post) { "During pathstring post" } + mapping.path('/pathstring/name', :method => :post) { "During pathstring post" } mapping.after('/pathstring/name', :method => :post) { request.response.write("After pathstring post") } mapping.before(%r{^/pathregexp/name$}, :method => :post) { request.response.write("Before pathregexp post") } mapping.wrap(%r{^/pathregexp/name$}, :method => :post) { request.response.write("Wrap pathregexp post") } - mapping.map(%r{^/pathregexp/name$}, :method => :post) { "During pathregexp post" } + mapping.path(%r{^/pathregexp/name$}, :method => :post) { "During pathregexp post" } mapping.after(%r{^/pathregexp/name$}, :method => :post) { request.response.write("After pathregexp post") } end @@ -61,5 +61,5 @@ describe "A developer can map requests to filters." do it "When having 'before', 'after' and 'wrap' filters but no corresponding map action this results in a 404" do get('/filters_with_no_map').status.should == 404 end - + end verify/mapping/filters.rb @@ -1,32 +1,34 @@ # require 'test_helper' because RubyMate needs help require File.join(File.dirname(__FILE__) , "helpers") -class TestView - include Waves::Views::Mixin -end +Dir.chdir(File.dirname(__FILE__)) do + class TestView + include Waves::Views::Mixin + end -describe "Waves::Views" do + describe "Waves::Views" do - it "provides a list of Renderers" do - Waves::Views.renderers.should.respond_to :[] - end + it "provides a list of Renderers" do + Waves::Views.renderers.should.respond_to :[] + end - it "defines an error for missing templates" do - defined?(Waves::Views::NoTemplateError).should.not.be.nil - end + it "defines an error for missing templates" do + defined?(Waves::Views::NoTemplateError).should.not.be.nil + end -end + end -describe "A class which has included Waves::Views::Mixin" do + describe "A class which has included Waves::Views::Mixin" do - before do - @view = TestView.new(mock(:request)) - end + before do + @view = TestView.new(mock(:request)) + end - it "uses the first renderer for which it can find a template file with the associated extension" do - @view.renderer("foo").should == Waves::Renderers::Erubis - @view.renderer("moo").should == Waves::Renderers::Erubis - @view.renderer("bleat").should == nil - end + it "uses the first renderer for which it can find a template file with the associated extension" do + @view.renderer("foo").should == Waves::Renderers::Erubis + @view.renderer("moo").should == Waves::Renderers::Erubis + @view.renderer("bleat").should == nil + end + end end \ No newline at end of file verify/views/rendering.rb lib/helpers/base.rb verify/data_mapper/association_verify.rb b2afb99741c52794f5dd4504986a1981d6e61255 1b5f38e64f148398e2de3da38aeb55affba69dbf Pascal psq@psq-imac-2.local http://github.com/dyoder/waves/commit/d1d522e724fc133230f9a70dedf8a745918e1449 d1d522e724fc133230f9a70dedf8a745918e1449 2008-05-30T01:00:31-07:00 2008-05-30T01:00:31-07:00 merged with master cd1cd2022a797276fd165fe277fc1deec85c2f17 Pascal psq@psq-imac-2.local