0
@@ -1,5 +1,7 @@
0
 * [#73] Tests no longer use the functional/unit directories
0
 * [#69] Added ViewHelperGenerator and ControllerHelperGenerator
0
+* [#25] Added ControllerGenerator
0
+* gem: genosaurus 1.2.2
0
 
0
 ===0.6.1.1
0
 * [#72] Fixed serial data type in DataMapper doesn't work with SQLite3

0
@@ -11,10 +11,22 @@ class ControllerGenerator < Genosaurus
0
     @name_plural = param(:name).plural.underscore
0
     @name_singular_camel = @name_singular.camelcase
0
     @name_plural_camel = @name_plural.camelcase
0
+    @actions = []
0
+    @actions = param(:actions).split(",") unless param(:actions).blank?
0
   end
0
   
0
-  def after_generate
0
+  def after_generate # :nodoc:
0
+    @actions.each do |action|
0
+      template(action_template(action), File.join("app", "views", @name_plural, "#{action}.html.erb"))
0
+    end
0
     ControllerHelperGenerator.run(@options)
0
   end
0
   
0
+  def action_template(action) # :nodoc:
0
+    %{
0
+<h1>#{@name_plural_camel}Controller##{action}</h1>
0
+<p>You can find me in app/views/#{@name_plural}/#{action}.html.erb</p>
0
+    }.strip
0
+  end
0
+  
0
 end
0
\ No newline at end of file

0
@@ -2,6 +2,9 @@ controller_template:
0
   type: file
0
   template_path: <%= File.join(templates_directory_path, "app", "controllers", "controller.rb.template") %>
0
   output_path: <%= File.join("app", "controllers", "#{@name_plural}_controller.rb") %>
0
+views_migrations:
0
+  type: directory
0
+  output_path: <%= File.join("app", "views", @name_plural) %>
0
 <% if app_config.mack.testing_framework == "test_case" -%>
0
 test_template:
0
   type: file

0
@@ -1,4 +1,7 @@
0
 class <%= @name_plural_camel %>Controller
0
   include Mack::Controller
0
-  
0
+  <% @actions.each do |action| %>
0
+  def <%= action %>
0
+  end
0
+  <% end %>
0
 end

0
@@ -112,7 +112,7 @@ helper_test_spec_example:
0
 app_helper_test_spec_example:
0
   type: file
0
   template_path: <%= File.join(templates_directory_path, "test", "helpers", "views", "application_helper_spec.rb.template") %>
0
-  output_path: <%= File.join(app_name, "test", "helpers", "view", "application_helper_spec.rb") %>
0
+  output_path: <%= File.join(app_name, "test", "helpers", "views", "application_helper_spec.rb") %>
0
 test_spec_models:
0
   type: directory
0
   output_path: <%= File.join(app_name, "test", "models") %>

0
@@ -57,7 +57,7 @@ namespace :gem do
0
         s.add_dependency("crypt", "1.1.4")
0
         s.add_dependency("daemons", "1.0.10")
0
         s.add_dependency("erubis", "2.6.2")
0
-        s.add_dependency("genosaurus", "1.2.1")
0
+        s.add_dependency("genosaurus", "1.2.2")
0
         s.add_dependency("rcov", "0.8.1.2.0")
0
         s.add_dependency("rspec", "1.1.4")
0
         s.add_dependency("ruby-debug", "0.10.0")

0
@@ -4,10 +4,10 @@ require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper'
0
 describe ControllerGenerator do
0
   
0
   def common_cleanup
0
-    FileUtils.rm_rf(File.join(Mack.root, "app", "controllers", "controllers", "zoos_controller.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "app", "controllers", "zoos_controller.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "app", "views", "zoos"))
0
     FileUtils.rm_rf(File.join(Mack.root, "app", "helpers", "controllers", "zoos_controller_helper.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_test.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_spec.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "test"))
0
   end
0
   
0
   before(:each) do
0
@@ -23,7 +23,18 @@ describe ControllerGenerator do
0
     ControllerGenerator.new("name" => "zoo").should be_instance_of(ControllerGenerator)
0
   end
0
   
0
-  it "should also take an optional 'actions' parameter"
0
+  it "should also take an optional 'actions' parameter" do
0
+    index = File.join(Mack.root, "app", "views", "zoos", "index.html.erb")
0
+    show = File.join(Mack.root, "app", "views", "zoos", "show.html.erb")
0
+    file = File.join(Mack.root, "app", "controllers", "zoos_controller.rb")
0
+    ControllerGenerator.run("name" => "zoo", "actions" => "index,show")
0
+    File.should be_exists(file)
0
+    File.read(file).should == fixture("zoos_controller_with_actions.rb")
0
+    File.should be_exists(index)
0
+    File.read(index).should match(/<h1>ZoosController#index<\/h1>/)
0
+    File.should be_exists(show)
0
+    File.read(show).should match(/<p>You can find me in app\/views\/zoos\/show.html.erb<\/p>/)
0
+  end
0
   
0
   it "should generate a controller" do
0
     file = File.join(Mack.root, "app", "controllers", "zoos_controller.rb")
0
@@ -31,6 +42,7 @@ describe ControllerGenerator do
0
     ControllerGenerator.run("name" => "zoo")
0
     File.should be_exists(file)
0
     File.read(file).should == fixture("zoos_controller.rb")
0
+    File.should be_exists(File.join(Mack.root, "app", "views", "zoos"))
0
   end
0
   
0
   it "should generate a controller helper" do

0
@@ -5,14 +5,12 @@ describe ControllerHelperGenerator do
0
   
0
   before(:each) do
0
     FileUtils.rm_rf(File.join(Mack.root, "app", "helpers", "controllers", "zoos_controller_helper.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_test.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_spec.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "test"))
0
   end
0
   
0
   after(:each) do
0
     FileUtils.rm_rf(File.join(Mack.root, "app", "helpers", "controllers", "zoos_controller_helper.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_test.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "controllers", "zoos_controller_helper_spec.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "test"))
0
   end
0
   
0
   it "should require a name parameter" do

0
@@ -5,14 +5,12 @@ describe ViewHelperGenerator do
0
   
0
   before(:each) do
0
     FileUtils.rm_rf(File.join(Mack.root, "app", "helpers", "views", "zoo_helper.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "views", "zoo_helper_test.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "views", "zoo_helper_spec.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "test"))
0
   end
0
   
0
   after(:each) do
0
     FileUtils.rm_rf(File.join(Mack.root, "app", "helpers", "views", "zoo_helper.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "views", "zoo_helper_test.rb"))
0
-    FileUtils.rm_rf(File.join(Mack.root, "test", "helpers", "views", "zoo_helper_spec.rb"))
0
+    FileUtils.rm_rf(File.join(Mack.root, "test"))
0
   end
0
   
0
   it "should require a name parameter" do

0
@@ -16,6 +16,8 @@ describe "rake" do
0
 
0
 Available Generators:
0
 
0
+ControllerGenerator
0
+  rake generate:controller
0
 ControllerHelperGenerator
0
   rake generate:controller_helper
0
 MackApplicationGenerator