@@ -11,15 +11,15 @@ module Merb::Generators DESC # Install a script/merb script for local execution (for frozen apps). - file :script_merb do - source(bin_merb_location) - destination('script/merb') + file :script_merb do |f| + f.source = bin_merb_location + f.destination = 'script/merb' end # Install a script/merb-gen script for local execution (for frozen apps). - file :script_merb_gen do - source(bin_merb_gen_location) - destination('script/merb-gen') + file :script_merb_gen do |f| + f.source = bin_merb_gen_location + f.destination = 'script/merb-gen' end protected @@ -48,4 +48,4 @@ module Merb::Generators puts ScriptsGenerator -end \ No newline at end of file +end merb-gen/lib/generators/scripts.rb @@ -1,4 +1,4 @@ -Merb::Generators::ControllerGenerator.template :index_haml, :template_engine => :haml do - source(File.dirname(__FILE__), 'templates/controller/app/views/%file_name%/index.html.haml') - destination("app/views", base_path, "#{file_name}/index.html.haml") +Merb::Generators::ControllerGenerator.template :index_haml, :template_engine => :haml do |t| + t.source = File.join(File.dirname(__FILE__), 'templates/controller/app/views/%file_name%/index.html.haml') + t.destination = File.join("app/views", base_path, "#{file_name}/index.html.haml") end \ No newline at end of file merb-haml/lib/generators/controller.rb @@ -1,4 +1,4 @@ -Merb::Generators::LayoutGenerator.template :layout_haml, :template_engine => :haml do - source(File.dirname(__FILE__), 'templates/layout/app/views/layout/%file_name%.html.haml') - destination("app/views/layout/#{file_name}.html.haml") -end \ No newline at end of file +Merb::Generators::LayoutGenerator.template :layout_haml, :template_engine => :haml do |t| + t.source = File.join(File.dirname(__FILE__), 'templates/layout/app/views/layout/%file_name%.html.haml') + t.destination = "app/views/layout/#{file_name}.html.haml" +end merb-haml/lib/generators/layout.rb @@ -2,11 +2,11 @@ [:show, :index, :edit, :new].each do |view| - Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do - source(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml") - destination("app/views", base_path, "#{file_name}/#{view}.html.haml") + Merb::Generators::ResourceControllerGenerator.template "view_#{view}_haml", :orm => orm, :template_engine => :haml do |t| + t.source = File.join(File.dirname(__FILE__), "templates/resource_controller/#{orm}/app/views/%file_name%/#{view}.html.haml") + t.destination = File.join("app/views", base_path, "#{file_name}/#{view}.html.haml") end end -end \ No newline at end of file +end merb-haml/lib/generators/resource_controller.rb @@ -21,9 +21,9 @@ module Merb::Generators def self.common_template(name, template_source) common_base_dir = File.expand_path(File.dirname(__FILE__)) - template name do - source common_base_dir, 'templates', 'common', template_source - destination template_source + template name do |t| + t.source = File.join(common_base_dir, 'templates', 'common', template_source) + t.destination = template_source end end @@ -31,4 +31,4 @@ module Merb::Generators add :slice, SliceGenerator -end \ No newline at end of file +end merb-slices/lib/generators/base.rb 6d1284d72992c731cfc4d758f592c085285d5c7c Justin S. Leitgeb jsl@hcoop.net http://github.com/wycats/merb-more/commit/745386a9b46faaa1e56c5c19b9387b3b9b3fa61f 745386a9b46faaa1e56c5c19b9387b3b9b3fa61f 2008-09-07T17:06:34-07:00 2008-09-07T17:06:34-07:00 Templater 0.2 fixes e56766eff491a60cb1e7898e22b80ec90b7176f3 Justin S. Leitgeb jsl@hcoop.net