rails 1.1.6 → 1.2.0

data/lib/rails_generator/generators/components/controller/controller_generator.rb

@@ -29,8 +29,7 @@ class ControllerGenerator < Rails::Generator::NamedBase
       # View template for each action.
       actions.each do |action|
         path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
-        m.template 'view.rhtml',
-          path,
+        m.template 'view.rhtml', path,
           :assigns => { :action => action, :path => path }
       end
     end

data/lib/rails_generator/generators/components/mailer/mailer_generator.rb

@@ -6,9 +6,9 @@ class MailerGenerator < Rails::Generator::NamedBase
 
       # Mailer, view, test, and fixture directories.
       m.directory File.join('app/models', class_path)
-      m.directory File.join('app/views', class_path, file_name)
+      m.directory File.join('app/views', file_path)
       m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path, file_name)
+      m.directory File.join('test/fixtures', file_path)
 
       # Mailer class and unit test.
       m.template "mailer.rb",    File.join('app/models',
@@ -20,12 +20,14 @@ class MailerGenerator < Rails::Generator::NamedBase
 
       # View template and fixture for each action.
       actions.each do |action|
-        m.template "view.rhtml",
-                   File.join('app/views', class_path, file_name, "#{action}.rhtml"),
-                   :assigns => { :action => action }
-        m.template "fixture.rhtml",
-                   File.join('test/fixtures', class_path, file_name, action),
-                   :assigns => { :action => action }
+        relative_path = File.join(file_path, action)
+        view_path     = File.join('app/views', "#{relative_path}.rhtml")
+        fixture_path  = File.join('test/fixtures', relative_path)
+
+        m.template "view.rhtml", view_path,
+                   :assigns => { :action => action, :path => view_path }
+        m.template "fixture.rhtml", fixture_path,
+                   :assigns => { :action => action, :path => view_path }
       end
     end
   end

data/lib/rails_generator/generators/components/mailer/templates/fixture.rhtml

@@ -1,3 +1,3 @@
 <%= class_name %>#<%= action %>
 
-Find me in app/views/<%= file_name %>/<%= action %>.rhtml
+Find me in <%= path %>

data/lib/rails_generator/generators/components/mailer/templates/unit_test.rb

@@ -1,8 +1,7 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require '<%= file_name %>'
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
 class <%= class_name %>Test < Test::Unit::TestCase
-  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+  FIXTURES_PATH = File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../fixtures'
   CHARSET = "utf-8"
 
   include ActionMailer::Quoting
@@ -14,6 +13,7 @@ class <%= class_name %>Test < Test::Unit::TestCase
 
     @expected = TMail::Mail.new
     @expected.set_content_type "text", "plain", { "charset" => CHARSET }
+    @expected.mime_version = '1.0'
   end
 
 <% for action in actions -%>
@@ -28,7 +28,7 @@ class <%= class_name %>Test < Test::Unit::TestCase
 <% end -%>
   private
     def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/<%= file_name %>/#{action}")
+      IO.readlines("#{FIXTURES_PATH}/<%= file_path %>/#{action}")
     end
 
     def encode(subject)

data/lib/rails_generator/generators/components/mailer/templates/view.rhtml

@@ -1,3 +1,3 @@
 <%= class_name %>#<%= action %>
 
-Find me in app/views/<%= file_name %>/<%= action %>.rhtml
+Find me in <%= path %>

data/lib/rails_generator/generators/components/migration/templates/migration.rb

@@ -1,4 +1,4 @@
-class <%= class_name %> < ActiveRecord::Migration
+class <%= class_name.underscore.camelize %> < ActiveRecord::Migration
   def self.up
   end
 

data/lib/rails_generator/generators/components/model/USAGE

@@ -1,19 +1,26 @@
 Description:
     The model generator creates stubs for a new model.
 
-    The generator takes a model name as its argument.  The model name may be
-    given in CamelCase or under_score and should not be suffixed with 'Model'.
+    The generator takes a model name as its argument.  The model name may be given in CamelCase or under_score and
+    should not be suffixed with 'Model'.
 
-    The generator creates a model class in app/models, a test suite in
-    test/unit, test fixtures in test/fixtures/singular_name.yml, and a migration
-    in db/migrate.
+    As additional parameters, the generator will take attribute pairs described by name and type. These attributes will
+    be used to prepopulate the migration to create the table for the model and give you a set of predefined fixture.    
+    You don't have to think up all attributes up front, but it's a good idea of adding just the baseline of what's 
+    needed to start really working with the resource.
 
-Example:
-    ./script/generate model Account
+    The generator creates a model class in app/models, a test suite in test/unit, test fixtures in
+    test/fixtures/singular_name.yml, and a migration in db/migrate.
 
-    This will create an Account model:
-        Model:      app/models/account.rb
-        Test:       test/unit/account_test.rb
-        Fixtures:   test/fixtures/accounts.yml
-        Migration:  db/migrate/XXX_add_accounts.rb
+Examples:
+    ./script/generate model account
 
+        This will create an Account model:
+            Model:      app/models/account.rb
+            Test:       test/unit/account_test.rb
+            Fixtures:   test/fixtures/accounts.yml
+            Migration:  db/migrate/XXX_add_accounts.rb
+
+    ./script/generate model post title:string created_on:date body:text published:boolean
+    
+        Creates post model with predefined attributes.

data/lib/rails_generator/generators/components/model/model_generator.rb

@@ -25,6 +25,10 @@ class ModelGenerator < Rails::Generator::NamedBase
   end
 
   protected
+    def banner
+      "Usage: #{$0} generate ModelName [field:type, field:type]"
+    end
+
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'

data/lib/rails_generator/generators/components/model/templates/fixtures.yml

@@ -1,5 +1,11 @@
 # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-first:
+one:
   id: 1
-another:
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+two:
   id: 2
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>

data/lib/rails_generator/generators/components/model/templates/migration.rb

@@ -1,7 +1,9 @@
 class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= table_name %> do |t|
-      # t.column :name, :string
+<% for attribute in attributes -%>
+      t.column :<%= attribute.name %>, :<%= attribute.type %>
+<% end -%>
     end
   end
 

data/lib/rails_generator/generators/components/observer/USAGE

@@ -0,0 +1,15 @@
+Description:
+    The observer generator creates stubs for a new observer.
+
+    The generator takes a observer name as its argument.  The observer name may be
+    given in CamelCase or under_score and should not be suffixed with 'Observer'.
+
+    The generator creates a observer class in app/models and a test suite in
+    test/unit.
+
+Example:
+    ./script/generate observer Account
+
+    This will create an Account observer:
+        Observer:   app/models/account_observer.rb
+        Test:       test/unit/account_observer_test.rb

data/lib/rails_generator/generators/components/observer/observer_generator.rb

@@ -0,0 +1,16 @@
+class ObserverGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Observer", "#{class_name}ObserverTest"
+
+      # Observer, and test directories.
+      m.directory File.join('app/models', class_path)
+      m.directory File.join('test/unit', class_path)
+
+      # Observer class and unit test fixtures.
+      m.template 'observer.rb',   File.join('app/models', class_path, "#{file_name}_observer.rb")
+      m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_observer_test.rb")
+    end
+  end
+end

data/lib/rails_generator/generators/components/observer/templates/observer.rb

@@ -0,0 +1,2 @@
+class <%= class_name %>Observer < ActiveRecord::Observer
+end

data/lib/rails_generator/generators/components/observer/templates/unit_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+
+class <%= class_name %>ObserverTest < Test::Unit::TestCase
+  fixtures :<%= table_name %>
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -9,6 +9,9 @@ class PluginGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, class_name
+
       m.directory "#{plugin_path}/lib"
       m.directory "#{plugin_path}/tasks"
       m.directory "#{plugin_path}/test"
@@ -17,6 +20,7 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.template 'Rakefile',      "#{plugin_path}/Rakefile"
       m.template 'init.rb',       "#{plugin_path}/init.rb"
       m.template 'install.rb',    "#{plugin_path}/install.rb"
+      m.template 'uninstall.rb',  "#{plugin_path}/uninstall.rb"
       m.template 'plugin.rb',     "#{plugin_path}/lib/#{file_name}.rb"
       m.template 'tasks.rake',    "#{plugin_path}/tasks/#{file_name}_tasks.rake"
       m.template 'unit_test.rb',  "#{plugin_path}/test/#{file_name}_test.rb"

data/lib/rails_generator/generators/components/plugin/templates/uninstall.rb

@@ -0,0 +1 @@
+# Uninstall hook code here

data/lib/rails_generator/generators/components/resource/resource_generator.rb

@@ -0,0 +1,76 @@
+class ResourceGenerator < Rails::Generator::NamedBase
+  attr_reader   :controller_name,
+                :controller_class_path,
+                :controller_file_path,
+                :controller_class_nesting,
+                :controller_class_nesting_depth,
+                :controller_class_name,
+                :controller_singular_name,
+                :controller_plural_name
+  alias_method  :controller_file_name,  :controller_singular_name
+  alias_method  :controller_table_name, :controller_plural_name
+
+  def initialize(runtime_args, runtime_options = {})
+    super
+
+    @controller_name = @name.pluralize
+
+    base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
+    @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
+
+    if @controller_class_nesting.empty?
+      @controller_class_name = @controller_class_name_without_nesting
+    else
+      @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}"
+    end
+  end
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_path, "#{class_name}")
+
+      # Controller, helper, views, and test directories.
+      m.directory(File.join('app/models', class_path))
+      m.directory(File.join('app/controllers', controller_class_path))
+      m.directory(File.join('app/helpers', controller_class_path))
+      m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('test/functional', controller_class_path))
+      m.directory(File.join('test/unit', class_path))
+
+      m.template('model.rb', File.join('app/models', class_path, "#{file_name}.rb"))
+
+      m.template(
+        'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
+      )
+
+      m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
+      m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
+      m.template('unit_test.rb',       File.join('test/unit',       class_path, "#{file_name}_test.rb"))
+      m.template('fixtures.yml',       File.join('test/fixtures', "#{table_name}.yml"))
+
+      unless options[:skip_migration]
+        m.migration_template(
+          'migration.rb', 'db/migrate', 
+          :assigns => {
+            :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}",
+            :attributes     => attributes
+          }, 
+          :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+        )
+      end
+
+      m.route_resources controller_file_name
+    end
+  end
+
+  protected
+    def banner
+      "Usage: #{$0} resource ModelName [field:type, field:type]"
+    end
+
+    def model_name 
+      class_name.demodulize
+    end
+end

data/lib/rails_generator/generators/components/resource/templates/USAGE

@@ -0,0 +1,18 @@
+Description:
+    The resource generator creates an empty model and controller for use in a REST-friendly, resource-oriented
+    application. Say you want to a resource called post. Normally, you could just call "script/generate model post" and
+    "script/generate controller posts". This generator basically just collapses these two generators into one step.
+
+    The generator takes the name of the model as its first argument. This model name is then pluralized to get the 
+    controller name. So "resource post" will generate a Post model and a PostsController and will be intended
+    for URLs like /posts and /posts/45.
+
+    As additional parameters, the generator will take attribute pairs described by name and type. These attributes will
+    be used to prepopulate the migration to create the table for the model and give you a set of predefined fixture.    
+    You don't have to think up all attributes up front, but it's a good idea of adding just the baseline of what's 
+    needed to start really working with the resource.
+
+Examples:
+    ./script/generate resource post
+    ./script/generate resource post title:string created_on:date body:text published:boolean
+    ./script/generate resource purchase order_id:integer created_at:datetime amount:decimal

data/lib/rails_generator/generators/components/resource/templates/controller.rb

@@ -0,0 +1,2 @@
+class <%= controller_class_name %>Controller < ApplicationController
+end

data/lib/rails_generator/generators/components/resource/templates/fixtures.yml

@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+two:
+  id: 2
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>

data/lib/rails_generator/generators/components/resource/templates/functional_test.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '<%= '/..' * controller_class_nesting_depth %>/../test_helper'
+require '<%= controller_file_path %>_controller'
+
+# Re-raise errors caught by the controller.
+class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
+
+class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
+  fixtures :<%= table_name %>
+
+  def setup
+    @controller = <%= controller_class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/lib/rails_generator/generators/components/resource/templates/helper.rb

@@ -0,0 +1,2 @@
+module <%= controller_class_name %>Helper
+end

data/lib/rails_generator/generators/components/resource/templates/migration.rb

@@ -0,0 +1,13 @@
+class <%= migration_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+<% for attribute in attributes -%>
+      t.column :<%= attribute.name %>, :<%= attribute.type %>
+<% end -%>
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/rails_generator/generators/components/resource/templates/model.rb

@@ -0,0 +1,2 @@
+class <%= class_name %> < ActiveRecord::Base
+end

data/lib/rails_generator/generators/components/resource/templates/unit_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  fixtures :<%= table_name %>
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -30,6 +30,10 @@ class ActionView::Helpers::InstanceTag
   def to_datetime_select_tag(options = {})
     "<%= datetime_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
   end
+  
+  def to_time_select_tag(options = {})
+    "<%= time_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
+  end
 end
 
 class ScaffoldGenerator < Rails::Generator::NamedBase
@@ -70,6 +74,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.directory File.join('app/controllers', controller_class_path)
       m.directory File.join('app/helpers', controller_class_path)
       m.directory File.join('app/views', controller_class_path, controller_file_name)
+      m.directory File.join('app/views/layouts', controller_class_path)
       m.directory File.join('test/functional', controller_class_path)
 
       # Depend on model generator but skip if the model exists.
@@ -115,7 +120,11 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
                             "#{controller_file_name}_helper.rb")
 
       # Layout and stylesheet.
-      m.template 'layout.rhtml',  "app/views/layouts/#{controller_file_name}.rhtml"
+      m.template 'layout.rhtml',
+                  File.join('app/views/layouts',
+                            controller_class_path,
+                            "#{controller_file_name}.rhtml")
+
       m.template 'style.css',     'public/stylesheets/scaffold.css'
 
 

data/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb

@@ -11,6 +11,8 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
     @controller = <%= controller_class_name %>Controller.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+
+    @first_id = <%= plural_name %>(:first).id
   end
 
 <% for action in unscaffolded_actions -%>
@@ -39,7 +41,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_show<%= suffix %>
-    get :show<%= suffix %>, :id => 1
+    get :show<%= suffix %>, :id => @first_id
 
     assert_response :success
     assert_template 'show'
@@ -69,7 +71,7 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_edit<%= suffix %>
-    get :edit<%= suffix %>, :id => 1
+    get :edit<%= suffix %>, :id => @first_id
 
     assert_response :success
     assert_template 'edit<%= suffix %>'
@@ -79,20 +81,22 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
   end
 
   def test_update<%= suffix %>
-    post :update<%= suffix %>, :id => 1
+    post :update<%= suffix %>, :id => @first_id
     assert_response :redirect
-    assert_redirected_to :action => 'show<%= suffix %>', :id => 1
+    assert_redirected_to :action => 'show<%= suffix %>', :id => @first_id
   end
 
   def test_destroy<%= suffix %>
-    assert_not_nil <%= model_name %>.find(1)
+    assert_nothing_raised {
+      <%= model_name %>.find(@first_id)
+    }
 
-    post :destroy, :id => 1
+    post :destroy, :id => @first_id
     assert_response :redirect
     assert_redirected_to :action => 'list<%= suffix %>'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      <%= model_name %>.find(1)
+      <%= model_name %>.find(@first_id)
     }
   end
 end