@@ -11,10 +11,7 @@ module Waves include AutoCode auto_create_class :Default auto_load :Default, :directories => [ :models ] - end - - app.auto_eval( :Models ) do - auto_create_class true, app::Models::Default + auto_create_class true, :Default auto_load true, :directories => [ :models ] end @@ -25,7 +22,7 @@ module Waves end app.auto_eval( :Views ) do - auto_create_class true, app::Views::Default + auto_create_class true, :Default auto_load true, :directories => [ :views ] end @@ -33,10 +30,7 @@ module Waves include AutoCode auto_create_class :Default, Waves::Controllers::Base auto_load :Default, :directories => [ :controllers ] - end - - app.auto_eval( :Controllers ) do - auto_create_class true, app::Controllers::Default + auto_create_class true, :Default auto_load true, :directories => [ :controllers ] end @@ -44,6 +38,9 @@ module Waves include AutoCode auto_create_module( :Default ) { include Waves::Helpers::Extended } auto_load :Default, :directories => [ :helpers ] + end + + app.auto_eval( :Helpers ) do auto_create_module( true ) { include app::Helpers::Default } auto_load true, :directories => [ :helpers ] end lib/layers/mvc.rb @@ -36,7 +36,7 @@ module Waves end app.auto_eval :Models do - auto_create_class true, app::Models::Default + auto_create_class true, :Default auto_load true, :directories => [ :models ] # set the Sequel dataset based on the model class name # note that this is not done for app::Models::Default, as it isn't lib/layers/orm/providers/sequel.rb @@ -12,7 +12,11 @@ module Waves def self.included( app ) Waves::Views.renderers << self - Waves::Views::Base.send(:include, self::ViewMethods) + app.auto_eval :Views do + auto_eval true do + include ViewMethods + end + end end # def self.render( path, assigns={} ) lib/layers/renderers/erubis.rb @@ -12,17 +12,14 @@ module Waves require 'markaby' ::Markaby::Builder.set( :indent, 2 ) Waves::Views.renderers << self - Waves::Views::Base.send(:include, self::ViewMethods) + # Waves::Views::Base.send(:include, self::ViewMethods) + app.auto_eval :Views do + auto_eval :Default do + include ViewMethods + end + end end - # def self.render( path, assigns ) - # builder = ::Markaby::Builder.new( assigns ) - # helper = helper( path ) - # builder.meta_eval { include( helper ) } - # builder.instance_eval( template( path ) ) - # builder.to_s - # end - module ViewMethods def mab(string, assigns={}) lib/layers/renderers/markaby.rb @@ -2,32 +2,9 @@ module Waves module Renderers # :nodoc: - # 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 - # Adds the following methods to the mod class: - # - # - filename: generate a filename for the template based on a logical path. - # - template: read the template from the file corresponding to the given logical path. - # - helper: return a helper module that corresponds to the given logical path. - # - - # def included( app ) - # Waves::Views.renderers << self - # end - # - # def filename(path) - # "#{path}.#{self::Extension}" - # end - # - # def template( path ) - # File.read( filename( path ) ) - # end - # - # def helper( path ) - # Waves.main[ :helpers ][ File.basename( File.dirname( path ) ).camel_case ] - # end + end lib/renderers/mixin.rb @@ -35,7 +35,7 @@ module Waves file end - # The Views::Ext includes functionality that may be incompatible + # The Views::Mixin::Ext includes functionality that may be incompatible # with some template engines. It is included when the Mixin is included # unless the target class is incompatible module Ext lib/views/mixin.rb 4fd15358b805e399a74cbc6a672b849f19c7acff Matthew King automatthew@gmail.com http://github.com/dyoder/waves/commit/f6646a89e2a43850397cf4c5cfa5b068c7695233 f6646a89e2a43850397cf4c5cfa5b068c7695233 2009-01-08T14:39:41-08:00 2009-01-07T15:13:43-08:00 trying to make renderers inform app::views::default fd43407266b2094f09fa033f8daf4d9315be623c Matthew King automatthew@gmail.com