rails 1.2.6 → 2.0.0

data/lib/rails_generator/generators/components/controller/USAGE

@@ -1,30 +1,29 @@
 Description:
-    The controller generator creates stubs for a new controller and its views.
+    Stubs out a new controller and its views. Pass the controller name, either
+    CamelCased or under_scored, and a list of views as arguments.
 
-    The generator takes a controller name and a list of views as arguments.
-    The controller name may be given in CamelCase or under_score and should
-    not be suffixed with 'Controller'.  To create a controller within a
-    module, specify the controller name as 'module/controller'.
+    To create a controller within a module, specify the controller name as a
+    path like 'parent_module/controller_name'.
 
-    The generator creates a controller class in app/controllers with view
-    templates in app/views/controller_name, a helper class in app/helpers,
-    and a functional test suite in test/functional.
+    This generates a controller class in app/controllers, view templates in
+    app/views/controller_name, a helper class in app/helpers, and a functional
+    test suite in test/functional.
 
 Example:
-    ./script/generate controller CreditCard open debit credit close
+    `./script/generate controller CreditCard open debit credit close`
 
     Credit card controller with URLs like /credit_card/debit.
         Controller: app/controllers/credit_card_controller.rb
-        Views:      app/views/credit_card/debit.rhtml [...]
+        Views:      app/views/credit_card/debit.html.erb [...]
         Helper:     app/helpers/credit_card_helper.rb
         Test:       test/functional/credit_card_controller_test.rb
 
 Modules Example:
-    ./script/generate controller 'admin/credit_card' suspend late_fee
+    `./script/generate controller 'admin/credit_card' suspend late_fee`
 
     Credit card admin controller with URLs /admin/credit_card/suspend.
         Controller: app/controllers/admin/credit_card_controller.rb
-        Views:      app/views/admin/credit_card/debit.rhtml [...]
+        Views:      app/views/admin/credit_card/debit.html.erb [...]
         Helper:     app/helpers/admin/credit_card_helper.rb
         Test:       test/functional/admin/credit_card_controller_test.rb
 

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

@@ -28,8 +28,8 @@ 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,
+        path = File.join('app/views', class_path, file_name, "#{action}.html.erb")
+        m.template 'view.html.erb', path,
           :assigns => { :action => action, :path => path }
       end
     end

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

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

data/lib/rails_generator/generators/components/integration_test/USAGE

@@ -1,14 +1,8 @@
 Description:
-    The model generator creates a stub for a new integration test.
-
-    The generator takes an integration test name as its argument.  The test
-    name may be given in CamelCase or under_score and should not be suffixed
-    with 'Test'.
-
-    The generator creates an integration test class in test/integration.
+    Stubs out a new integration test. Pass the name of the test, either
+    CamelCased or under_scored, as an argument. The new test class is
+    generated in test/integration/testname_test.rb
 
 Example:
-    ./script/generate integration_test GeneralStories
-
-    This will create a GeneralStores integration test:
-        test/integration/general_stories_test.rb
+    `./script/generate integration_test GeneralStories` creates a GeneralStories
+    integration test in test/integration/general_stories_test.rb

data/lib/rails_generator/generators/components/mailer/USAGE

@@ -1,18 +1,16 @@
 Description:
-    The mailer generator creates stubs for a new mailer and its views.
+    Stubs out a new mailer and its views. Pass the mailer name, either
+    CamelCased or under_scored, and an optional list of emails as arguments.
 
-    The generator takes a mailer name and a list of views as arguments.
-    The mailer name may be given in CamelCase or under_score.
-
-    The generator creates a mailer class in app/models with view templates
-    in app/views/mailer_name, and a test suite with fixtures in test/unit.
+    This generates a mailer class in app/models, view templates in
+    app/views/mailer_name, a unit test in test/unit, and fixtures in
+    test/fixtures.
 
 Example:
-    ./script/generate mailer Notifications signup forgot_password invoice
+    `./script/generate mailer Notifications signup forgot_password invoice`
 
-    This will create a Notifications mailer class:
+    creates a Notifications mailer class, views, test, and fixtures:
         Mailer:     app/models/notifications.rb
-        Views:      app/views/notifications/signup.rhtml [...]
+        Views:      app/views/notifications/signup.erb [...]
         Test:       test/unit/test/unit/notifications_test.rb
         Fixtures:   test/fixtures/notifications/signup [...]
-

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

@@ -21,12 +21,12 @@ class MailerGenerator < Rails::Generator::NamedBase
       # View template and fixture for each action.
       actions.each do |action|
         relative_path = File.join(file_path, action)
-        view_path     = File.join('app/views', "#{relative_path}.rhtml")
+        view_path     = File.join('app/views', "#{relative_path}.erb")
         fixture_path  = File.join('test/fixtures', relative_path)
 
-        m.template "view.rhtml", view_path,
+        m.template "view.erb", view_path,
                    :assigns => { :action => action, :path => view_path }
-        m.template "fixture.rhtml", fixture_path,
+        m.template "fixture.erb", fixture_path,
                    :assigns => { :action => action, :path => view_path }
       end
     end

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

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= action %>
+
+Find me in <%= path %>

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

@@ -1,3 +0,0 @@
-<%= class_name %>#<%= action %>
-
-Find me in <%= path %>

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

@@ -1,21 +1,7 @@
 require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
-class <%= class_name %>Test < Test::Unit::TestCase
-  FIXTURES_PATH = File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../fixtures'
-  CHARSET = "utf-8"
-
-  include ActionMailer::Quoting
-
-  def setup
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
-
-    @expected = TMail::Mail.new
-    @expected.set_content_type "text", "plain", { "charset" => CHARSET }
-    @expected.mime_version = '1.0'
-  end
-
+class <%= class_name %>Test < ActionMailer::TestCase
+  tests <%= class_name %>
 <% for action in actions -%>
   def test_<%= action %>
     @expected.subject = '<%= class_name %>#<%= action %>'
@@ -26,12 +12,10 @@ class <%= class_name %>Test < Test::Unit::TestCase
   end
 
 <% end -%>
-  private
-    def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/<%= file_path %>/#{action}")
-    end
-
-    def encode(subject)
-      quoted_printable(subject, CHARSET)
-    end
+<% if actions.blank? -%>
+  # replace this with your real tests
+  def test_truth
+    assert true
+  end
+<% end -%>
 end

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

@@ -0,0 +1,3 @@
+<%= class_name %>#<%= action %>
+
+Find me in <%= path %>

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

@@ -1,3 +0,0 @@
-<%= class_name %>#<%= action %>
-
-Find me in <%= path %>

data/lib/rails_generator/generators/components/migration/USAGE

@@ -1,14 +1,29 @@
 Description:
-    The migration generator creates a stub for a new database migration.
+    Stubs out a new database migration. Pass the migration name, either
+    CamelCased or under_scored, and an optional list of attribute pairs as arguments.
 
-    The generator takes a migration name as its argument.  The migration name may be
-    given in CamelCase or under_score.
+    A migration class is generated in db/migrate prefixed by the latest migration number.
 
-    The generator creates a migration class in db/migrate prefixed by its number
-    in the queue.
+    You can name your migration in either of these formats to generate add/remove
+    column lines from supplied attributes: AddColumnsToTable or RemoveColumnsFromTable
 
 Example:
-    ./script/generate migration AddSslFlag
+    `./script/generate migration AddSslFlag`
 
-    With 4 existing migrations, this will create an AddSslFlag migration in the
-    file db/migrate/005_add_ssl_flag.rb
+    With 4 existing migrations, this creates the AddSslFlag migration in
+    db/migrate/005_add_ssl_flag.rb
+
+    `./script/generate migration AddTitleBodyToPost title:string body:text published:boolean`
+    
+    This will create the AddTitleBodyToPost in db/migrate/005_add_title_body_to_post.rb with
+    this in the Up migration:
+
+      add_column :posts, :title, :string  
+      add_column :posts, :body, :text  
+      add_column :posts, :published, :boolean
+
+    And this in the Down migration:
+    
+      remove_column :posts, :published  
+      remove_column :posts, :body  
+      remove_column :posts, :title

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

@@ -1,7 +1,20 @@
-class MigrationGenerator < Rails::Generator::NamedBase
+class MigrationGenerator < Rails::Generator::NamedBase  
   def manifest
     record do |m|
-      m.migration_template 'migration.rb', 'db/migrate'
+      m.migration_template 'migration.rb', 'db/migrate', :assigns => get_local_assigns
     end
   end
+
+  
+  private  
+    def get_local_assigns
+      returning(assigns = {}) do
+        if class_name.underscore =~ /^(add|remove)_.*_(?:to|from)_(.*)/
+          assigns[:migration_action] = $1
+          assigns[:table_name]       = $2.pluralize
+        else
+          assigns[:attributes] = []
+        end
+      end
+    end
 end

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

@@ -1,7 +1,11 @@
 class <%= class_name.underscore.camelize %> < ActiveRecord::Migration
-  def self.up
+  def self.up<% attributes.each do |attribute| %>
+    <%= migration_action %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'add' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
   end
 
-  def self.down
+  def self.down<% attributes.reverse.each do |attribute| %>
+    <%= migration_action == 'add' ? 'remove' : 'add' %>_column :<%= table_name %>, :<%= attribute.name %><% if migration_action == 'remove' %>, :<%= attribute.type %><% end -%>
+  <%- end %>
   end
 end

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

@@ -1,26 +1,27 @@
 Description:
-    The model generator creates stubs for a new model.
+    Stubs out a new model. Pass the model name, either CamelCased or
+    under_scored, and an optional list of attribute pairs as arguments.
 
-    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'.
+    Attribute pairs are column_name:sql_type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
 
-    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.
+    You don't have to think up every attribute up front, but it helps to
+    sketch out a few so you can start working with the model immediately.
 
-    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 generates a model class in app/models, a unit test in test/unit,
+    a test fixture in test/fixtures/singular_name.yml, and a migration in
+    db/migrate.
 
 Examples:
-    ./script/generate model account
+    `./script/generate model account`
 
-        This will create an Account model:
+        creates an Account model, test, fixture, and migration:
             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.
+    `./script/generate model post title:string body:text published:boolean`
+
+        creates a Post model with a string title, text body, and published flag.

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

@@ -1,5 +1,5 @@
 class ModelGenerator < Rails::Generator::NamedBase
-  default_options :skip_migration => false
+  default_options :skip_timestamps => false, :skip_migration => false, :skip_fixture => false
 
   def manifest
     record do |m|
@@ -14,7 +14,10 @@ class ModelGenerator < Rails::Generator::NamedBase
       # Model class, unit test, and fixtures.
       m.template 'model.rb',      File.join('app/models', class_path, "#{file_name}.rb")
       m.template 'unit_test.rb',  File.join('test/unit', class_path, "#{file_name}_test.rb")
-      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{table_name}.yml")
+
+      unless options[:skip_fixture] 
+       	m.template 'fixtures.yml',  File.join('test/fixtures', "#{table_name}.yml")
+      end
 
       unless options[:skip_migration]
         m.migration_template 'migration.rb', 'db/migrate', :assigns => {
@@ -26,13 +29,17 @@ class ModelGenerator < Rails::Generator::NamedBase
 
   protected
     def banner
-      "Usage: #{$0} generate ModelName [field:type, field:type]"
+      "Usage: #{$0} #{spec.name} ModelName [field:type, field:type]"
     end
 
     def add_options!(opt)
       opt.separator ''
       opt.separator 'Options:'
+      opt.on("--skip-timestamps",
+             "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
       opt.on("--skip-migration", 
              "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
+      opt.on("--skip-fixture",
+             "Don't generation a fixture file for this model") { |v| options[:skip_fixture] = v}
     end
 end

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

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

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

@@ -2,7 +2,10 @@ class <%= migration_name %> < ActiveRecord::Migration
   def self.up
     create_table :<%= table_name %> do |t|
 <% for attribute in attributes -%>
-      t.column :<%= attribute.name %>, :<%= attribute.type %>
+      t.<%= attribute.type %> :<%= attribute.name %>
+<% end -%>
+<% unless options[:skip_timestamps] %>
+      t.timestamps
 <% end -%>
     end
   end

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

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

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

@@ -1,15 +1,13 @@
 Description:
-    The observer generator creates stubs for a new observer.
+    Stubs out a new observer. Pass the observer name, either CamelCased or
+    under_scored, as an argument.
 
-    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
+    The generator creates an observer class in app/models and a unit test in
     test/unit.
 
 Example:
-    ./script/generate observer Account
+    `./script/generate observer Account`
 
-    This will create an Account observer:
+    creates an Account observer and unit test:
         Observer:   app/models/account_observer.rb
         Test:       test/unit/account_observer_test.rb

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

@@ -1,8 +1,6 @@
 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

data/lib/rails_generator/generators/components/plugin/USAGE

@@ -1,19 +1,15 @@
 Description:
-    The plugin generator creates stubs for a new plugin.
+    Stubs out a new plugin. Pass the plugin name, either CamelCased or
+    under_scored, as an argument. Pass --with-generator to add an example
+    generator also.
 
-    The generator takes a plugin name as its argument.  The plugin name may be
-    given in CamelCase or under_score and should not be suffixed with 'Plugin'.
-
-    The generator creates a plugin directory in vendor/plugins that includes
-    both init.rb and README files as well as lib, task, and test directories.
-
-    It's also possible to generate stub files for a generator to go with the 
-    plugin by using --with-generator
+    This creates a plugin in vendor/plugins including an init.rb and README
+    as well as standard lib, task, and test directories.
 
 Example:
-    ./script/generate plugin BrowserFilters
+    `./script/generate plugin BrowserFilters`
 
-    This will create:
+    creates a standard browser_filters plugin:
         vendor/plugins/browser_filters/README
         vendor/plugins/browser_filters/init.rb
         vendor/plugins/browser_filters/install.rb
@@ -23,13 +19,7 @@ Example:
 
     ./script/generate plugin BrowserFilters --with-generator
 
-    This will create:
-        vendor/plugins/browser_filters/README
-        vendor/plugins/browser_filters/init.rb
-        vendor/plugins/browser_filters/install.rb
-        vendor/plugins/browser_filters/lib/browser_filters.rb
-        vendor/plugins/browser_filters/test/browser_filters_test.rb
-        vendor/plugins/browser_filters/tasks/browser_filters_tasks.rake
+    creates a browser_filters generator also:
         vendor/plugins/browser_filters/generators/browser_filters/browser_filters_generator.rb
         vendor/plugins/browser_filters/generators/browser_filters/USAGE
         vendor/plugins/browser_filters/generators/browser_filters/templates/