merb-haml/lib/generators/controller.rb merb-haml/lib/generators/layout.rb merb-haml/lib/generators/resource_controller.rb merb-haml/lib/generators/templates/controller/app/views/%file_name%/index.html.haml merb-haml/lib/generators/templates/layout/app/views/layout/%file_name%.html.haml merb-haml/lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/edit.html.haml merb-haml/lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/index.html.haml merb-haml/lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/new.html.haml merb-haml/lib/generators/templates/resource_controller/activerecord/app/views/%file_name%/show.html.haml merb-haml/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/edit.html.haml merb-haml/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/index.html.haml merb-haml/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/new.html.haml merb-haml/lib/generators/templates/resource_controller/datamapper/app/views/%file_name%/show.html.haml merb-haml/lib/generators/templates/resource_controller/none/app/views/%file_name%/edit.html.haml merb-haml/lib/generators/templates/resource_controller/none/app/views/%file_name%/index.html.haml merb-haml/lib/generators/templates/resource_controller/none/app/views/%file_name%/new.html.haml merb-haml/lib/generators/templates/resource_controller/none/app/views/%file_name%/show.html.haml merb-haml/lib/generators/templates/resource_controller/sequel/app/views/%file_name%/edit.html.haml merb-haml/lib/generators/templates/resource_controller/sequel/app/views/%file_name%/index.html.haml merb-haml/lib/generators/templates/resource_controller/sequel/app/views/%file_name%/new.html.haml merb-haml/lib/generators/templates/resource_controller/sequel/app/views/%file_name%/show.html.haml @@ -11,6 +11,7 @@ module Merb::Generators DESC option :testing_framework, :desc => 'Testing framework to use (one of: spec, test_unit)' + option :template_engine, :default => :erb, :desc => 'Template engine to use (one of: erb, haml, markaby, etc...)' first_argument :name, :required => true, :desc => "controller name" @@ -21,7 +22,7 @@ module Merb::Generators destination("app/controllers", base_path, "#{file_name}.rb") end - template :index do + template :index_erb, :template_engine => :erb do source('app/views/%file_name%/index.html.erb') destination("app/views", base_path, "#{file_name}/index.html.erb") end merb-gen/lib/generators/controller.rb @@ -17,4 +17,10 @@ if defined?(Merb::Plugins) self end end + + generators = File.join(File.dirname(__FILE__), 'generators') + Merb.add_generators generators / "resource_controller" + Merb.add_generators generators / "controller" + Merb.add_generators generators / "layout" + end \ No newline at end of file merb-haml/lib/merb-haml.rb 0232f1c07806a756e22b4a2488fe35101376020c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-more/commit/e9f309ede5289fc80b6ac04e28cd8727f1a63677 e9f309ede5289fc80b6ac04e28cd8727f1a63677 2008-08-09T12:01:23-07:00 2008-08-09T12:01:23-07:00 Merged in HAML generators. This adds --template-engine option to generator and HAML templates. Squashed commit of the following: commit 0fb870a171cbccf9c0689ca2109ce8efc2bf4c4b Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 9 15:14:17 2008 +0200 added haml templates for layout, resource_controller and controller generators (thanks jonuts) commit eeecf5ff05677b11e39bcf310271dca5a155253d Author: Jonas Nicklas <jonas.nicklas@gmail.com> Date: Sat Aug 9 14:30:16 2008 +0200 made erb template engine explicit for controller generator b1582331b26033f785e47f47f16b1b12b038b6ea Michael S. Klishin michael@novemberain.com