@@ -16,10 +16,42 @@ class ControllerGenerator < Genosaurus end def after_generate # :nodoc: + add_actions + update_routes_file + ControllerHelperGenerator.run(@options) + end + + private + def update_routes_file # :nodoc: + unless @actions.empty? + routes = File.join(Mack.root, "config", "routes.rb") + rf = File.open(routes).read + unless rf.match(".resource :#{@name_plural}") + puts "Updating routes.rb" + nrf = "" + rf.each do |line| + if line.match("Mack::Routes.build") + x = line.match(/\|(.+)\|/).captures + line << "\n # Added by rake generate:controller name=#{param(:name)} actions=#{param(:actions)}\n" + line << "\n r.with_options(:controller => :#{@name_plural}) do |map|\n" + @actions.each do |action| + line << "\n map.#{@name_plural}_#{action}_url \"/#{@name_plural}#{action == "index" ? "" : "/#{action}"}\", :action => :#{action}" + end + line << "\n end # #{@name_plural}\n" + end + nrf << line + end + File.open(routes, "w") do |f| + f.puts nrf + end + end + end + end + + def add_actions @actions.each do |action| template(action_template(action), File.join("app", "views", @name_plural, "#{action}.html.erb")) - end - ControllerHelperGenerator.run(@options) + end end def action_template(action) # :nodoc: lib/mack/generators/controller_generator/controller_generator.rb @@ -12,10 +12,15 @@ describe ControllerGenerator do before(:each) do common_cleanup + @route_file_loc = File.join(Mack.root, "config", "routes.rb") + @original_route_file = File.read(@route_file_loc) end after(:each) do common_cleanup + File.open(@route_file_loc, "w") do |f| + f.puts @original_route_file + end end it "should require a name parameter" do @@ -36,6 +41,15 @@ describe ControllerGenerator do File.read(show).should match(/<p>You can find me in app\/views\/zoos\/show.html.erb<\/p>/) end + it "should update the routes file if there are actions" do + ControllerGenerator.run("name" => "zoo", "actions" => "index,show") + File.read(@route_file_loc).should match(/ # Added by rake generate:controller name=zoo actions=index,show/) + File.read(@route_file_loc).should match(/ r.with_options\(:controller => :zoos\) do \|map\|/) + File.read(@route_file_loc).should match(/ map.zoos_index_url "\/zoos", :action => :index/) + File.read(@route_file_loc).should match(/ map.zoos_show_url "\/zoos\/show", :action => :show/) + File.read(@route_file_loc).should match(/ end # zoos/) + end + it "should generate a controller" do file = File.join(Mack.root, "app", "controllers", "zoos_controller.rb") File.should_not be_exists(file) test/unit/generators/controller_generator_spec.rb 32524881c1f10c595d6d918a618284eba6a63969 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/9502e60855e78a9c9319e45ce7a75162a92d7cb1 9502e60855e78a9c9319e45ce7a75162a92d7cb1 2008-08-05T09:01:23-07:00 2008-08-05T09:01:23-07:00 ControllerGenerator now adds actions to the routes file. [#25 state:resolved] 16aaf8c46a35ba6f3ac3b1cf6f869a219964c10f Mark Bates mark@markbates.com