rails 0.8.5 → 0.9.0

data/environments/test.rb

@@ -1,6 +1,3 @@
-require File.dirname(__FILE__) + "/shared"
-
-ActiveRecord::Base.logger = ActionController::Base.logger = ActionMailer::Base.logger =
-  Logger.new(File.dirname(__FILE__) + "/../../log/test.log")
-
-ActiveRecord::Base.establish_connection(database_configurations["test"])
+ActionController::Base.consider_all_requests_local = true
+ActionController::Base.reload_dependencies         = false
+ActiveRecord::Base.reload_associations             = false

data/fresh_rakefile

@@ -4,11 +4,11 @@ require 'rake/rdoctask'
 
 $VERBOSE = nil
 
-require File.dirname(__FILE__) + '/config/environments/production'
+require File.dirname(__FILE__) + '/config/environment'
 require 'code_statistics'
 
 desc "Run all the tests on a fresh test database"
-task :default => [ :clone_production_structure_to_test, :test_units, :test_functional ]
+task :default => [ :clone_development_structure_to_test, :test_units, :test_functional ]
 
 desc "Generate API documentatio, show coding stats"
 task :doc => [ :appdoc, :stats ]
@@ -43,6 +43,7 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.title    = "Rails Framework Documentation"
   rdoc.options << '--line-numbers --inline-source'
   rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('vendor/railties/lib/breakpoint.rb')
   rdoc.rdoc_files.include('vendor/railties/CHANGELOG')
   rdoc.rdoc_files.include('vendor/railties/MIT-LICENSE')
   rdoc.rdoc_files.include('vendor/activerecord/README')
@@ -53,6 +54,9 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_files.include('vendor/actionpack/CHANGELOG')
   rdoc.rdoc_files.include('vendor/actionpack/lib/action_controller/**/*.rb')
   rdoc.rdoc_files.include('vendor/actionpack/lib/action_view/**/*.rb')
+  rdoc.rdoc_files.include('vendor/actionmailer/README')
+  rdoc.rdoc_files.include('vendor/actionmailer/CHANGELOG')
+  rdoc.rdoc_files.include('vendor/actionmailer/lib/action_mailer/base.rb')
 }
 
 desc "Report code statistics (KLOCs, etc) from the application"
@@ -66,36 +70,36 @@ task :stats do
   ).to_s
 end
 
-desc "Recreate the test databases from the production structure"
-task :clone_production_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
-  if database_configurations["test"]["adapter"] == "mysql"
-    ActiveRecord::Base.establish_connection(database_configurations["test"])
+desc "Recreate the test databases from the development structure"
+task :clone_development_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
+  if ActiveRecord::Base.configurations["test"]["adapter"] == "mysql"
+    ActiveRecord::Base.establish_connection(:test)
     ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-    IO.readlines("db/production_structure.sql").join.split("\n\n").each do |table|
+    IO.readlines("db/development_structure.sql").join.split("\n\n").each do |table|
       ActiveRecord::Base.connection.execute(table)
     end
-  elsif database_configurations["test"]["adapter"] == "postgresql"
-    `psql -U #{database_configurations["test"]["username"]} -f db/production_structure.sql #{database_configurations["test"]["database"]}`
+  elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
+    `psql -U #{ActiveRecord::Base.configurations["test"]["username"]} -f db/development_structure.sql #{ActiveRecord::Base.configurations["test"]["database"]}`
   end
 end
 
 desc "Dump the database structure to a SQL file"
 task :db_structure_dump do
-  if database_configurations["test"]["adapter"] == "mysql"
-    ActiveRecord::Base.establish_connection(database_configurations["production"])
-    File.open("db/production_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-  elsif database_configurations["test"]["adapter"] == "postgresql"
-    `pg_dump -U #{database_configurations["test"]["username"]} -s -f db/production_structure.sql #{database_configurations["production"]["database"]}`
+  if ActiveRecord::Base.configurations["development"]["adapter"] == "mysql"
+    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations["development"])
+    File.open("db/development_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+  elsif ActiveRecord::Base.configurations["development"]["adapter"] == "postgresql"
+    `pg_dump -U #{ActiveRecord::Base.configurations["development"]["username"]} -s -f db/development_structure.sql #{ActiveRecord::Base.configurations["development"]["database"]}`
   end
 end
 
 desc "Drop the test database and bring it back again"
 task :purge_test_database do
-  if database_configurations["test"]["adapter"] == "mysql"
-    ActiveRecord::Base.establish_connection(database_configurations["production"])
-    ActiveRecord::Base.connection.recreate_database(database_configurations["test"]["database"])
-  elsif database_configurations["test"]["adapter"] == "postgresql"
-    `dropdb -U #{database_configurations["test"]["username"]} #{database_configurations["test"]["database"]}`
-    `createdb -U #{database_configurations["test"]["username"]}  #{database_configurations["test"]["database"]}`
+  if ActiveRecord::Base.configurations["test"]["adapter"] == "mysql"
+    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations["development"])
+    ActiveRecord::Base.connection.recreate_database(ActiveRecord::Base.configurations["test"]["database"])
+  elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
+    `dropdb -U #{ActiveRecord::Base.configurations["test"]["username"]} #{ActiveRecord::Base.configurations["test"]["database"]}`
+    `createdb -U #{ActiveRecord::Base.configurations["test"]["username"]}  #{ActiveRecord::Base.configurations["test"]["database"]}`
   end
-end
+end

data/generators/controller/USAGE

@@ -0,0 +1,28 @@
+GENERATOR
+     controller - create controller and view stub files
+
+SYNOPSIS
+     generate controller ControllerName action [action ...]
+
+DESCRIPTION
+     The controller generator takes the name of the new controller as the
+     first argument and a variable number of view names as subsequent arguments.
+     The controller name should be supplied without a "Controller" suffix. The
+     generator will add that itself.
+     
+     Controller generates a controller file in app/controllers with a render
+     action for each of the view names passed, a test suite in test/functional
+     with one passing test case, and HTML stubs for each view in app/views
+     under a directory with the same name as the controller.
+     
+EXAMPLE
+     ./script/generate controller Blog list display new edit
+     
+     This will generate a BlogController class in
+     app/controllers/blog_controller.rb, a BlogHelper class in
+     app/helpers/blog_helper.rb and a BlogControllerTest in
+     test/functional/blog_controller_test.rb, and list.rhtml,
+     display.rhtml, new.rhtml, and edit.rhtml in app/views/blog.
+     
+     The BlogController class will have list, display, new, and edit actions.
+     Each action will render the associated view by default.

data/generators/controller/controller_generator.rb

@@ -0,0 +1,22 @@
+require 'rails_generator'
+
+class ControllerGenerator < Rails::Generator::Base
+  attr_reader :actions
+
+  def generate
+    @actions = args
+
+    # Controller class, functional test, and helper class.
+    template "controller.rb", "app/controllers/#{file_name}_controller.rb"
+    template "functional_test.rb", "test/functional/#{file_name}_controller_test.rb"
+    template "helper.rb", "app/helpers/#{file_name}_helper.rb"
+
+    # Create the views directory even if there are no actions.
+    FileUtils.mkdir_p "app/views/#{file_name}"
+
+    # Create a view for each action.
+    actions.each do |action|
+      template "view.rhtml", "app/views/#{file_name}/#{action}.rhtml", binding
+    end
+  end
+end

data/generators/controller/templates/controller.rb

@@ -0,0 +1,10 @@
+class <%= class_name %>Controller < ApplicationController
+<% if options[:scaffold] -%>
+  scaffold :<%= singular_name %>
+<% end -%>
+<% for action in actions -%>
+
+  def <%= action %>
+  end
+<% end -%>
+end

data/generators/{templates/controller_test.erb → controller/templates/functional_test.rb}

@@ -10,7 +10,7 @@ class <%= class_name %>ControllerTest < Test::Unit::TestCase
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 
-  # Replace this with your real tests
+  # Replace this with your real tests.
   def test_truth
     assert true
   end

data/generators/controller/templates/view.rhtml

@@ -0,0 +1,2 @@
+<h1><%= class_name %>#<%= action %></h1>
+<p>Find me in app/views/<%= file_name %>/<%= action %>.rhtml</p>

data/generators/mailer/USAGE

@@ -0,0 +1,27 @@
+GENERATOR
+     mailer - create mailer and view stub files
+
+SYNOPSIS
+     generate mailer MailerName action [action ...]
+
+DESCRIPTION
+     The mailer generator takes the name of the new mailer class as the
+     first argument and a variable number of mail action names as subsequent
+     arguments.
+
+     Mailer generates a class file in app/models with action methods for each
+     of the mail action names passed, a test suite in test/unit with a stub
+     test case and fixture per action, and template stubs for each action in
+     app/views under a directory with the same name as the class.
+
+EXAMPLE
+     ./script/generate mailer Notifications signup forgot_password invoice
+
+     This will generate a Notifications class in
+     app/models/notifications.rb, a NotificationsTest in
+     test/unit/notifications_test.rb, and signup, forgot_password, and invoice
+     in test/fixture/notification. It will also create signup.rhtml,
+     forgot_password.rhtml, and invoice.rhtml in app/views/notifications.
+     
+     The Notifications class will have the following methods: signup,
+     forgot_password, and invoice.

data/generators/mailer/mailer_generator.rb

@@ -0,0 +1,22 @@
+require 'rails_generator'
+
+class MailerGenerator < Rails::Generator::Base
+  attr_reader :actions
+
+  def generate
+    @actions = args
+
+    # Mailer class and unit test.
+    template "mailer.rb", "app/models/#{file_name}.rb"
+    template "unit_test.rb", "test/unit/#{file_name}_test.rb"
+
+    # Test fixtures directory.
+    FileUtils.mkdir_p "test/fixtures/#{table_name}"
+
+    # View template and fixture for each action.
+    args.each do |action|
+      template "view.rhtml", "app/views/#{file_name}/#{action}.rhtml", binding
+      template "fixture.rhtml", "test/fixtures/#{table_name}/#{action}", binding
+    end
+  end
+end

data/generators/{templates/mailer.erb → mailer/templates/mailer.rb}

@@ -1,15 +1,15 @@
 require 'action_mailer'
 
 class <%= class_name %> < ActionMailer::Base
-
 <% for action in actions -%>
+
   def <%= action %>(sent_on = Time.now)
+    @subject    = '<%= class_name %>#<%= action %>'
+    @body       = {}
     @recipients = ''
     @from       = ''
-    @subject    = ''
-    @body       = {}
     @sent_on    = sent_on
+    @headers    = {}
   end
-
 <% end -%>
 end

data/generators/{templates/mailer_test.erb → mailer/templates/unit_test.rb}

@@ -10,23 +10,15 @@ class <%= class_name %>Test < Test::Unit::TestCase
     ActionMailer::Base.deliveries = []
 
     @expected = TMail::Mail.new
-    @expected.to      = 'test@localhost'
-    @expected.from    = 'test@localhost'
-    @expected.subject = '<%= class_name %> test mail'
   end
 
 <% for action in actions -%>
   def test_<%= action %>
+    @expected.subject = '<%= class_name %>#<%= action %>'
     @expected.body    = read_fixture('<%= action %>')
     @expected.date    = Time.now
 
-    created = nil
-    assert_nothing_raised { created = <%= class_name %>.create_<%= action %>(@expected.date) }
-    assert_not_nil created
-    assert_equal expected.encoded, created.encoded
-
-    assert_nothing_raised { <%= class_name %>.deliver_<%= action %>(@expected.date) }
-    assert_equal expected.encoded, ActionMailer::Base.deliveries.first.encoded
+    assert_equal @expected.encoded, <%= class_name %>.create_<%= action %>(@expected.date).encoded
   end
 
 <% end -%>

data/generators/mailer/templates/view.rhtml

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

data/generators/model/USAGE

@@ -0,0 +1,17 @@
+GENERATOR
+     model - create model stub files
+
+SYNOPSIS
+     generate model ModelName
+
+DESCRIPTION
+     The model generator takes a model name and generates an empty model in
+     app/models, a test suite in test/unit with one passing test case, and a
+     fixtures YAML file in the test/fixtures directory.
+
+EXAMPLE
+     ./script/generate model Account
+
+     This will generate an Account class in app/models/account.rb, an
+     AccountTest in test/unit/account_test.rb, and the fixtures file
+     test/fixtures/account.yml.

data/generators/model/model_generator.rb

@@ -0,0 +1,10 @@
+require 'rails_generator'
+
+class ModelGenerator < Rails::Generator::Base
+  def generate
+    # Model class, unit test, and fixtures.
+    template "model.rb", "app/models/#{file_name}.rb"
+    template "unit_test.rb", "test/unit/#{file_name}_test.rb"
+    template "fixtures.yml", "test/fixtures/#{table_name}.yml"
+  end
+end

data/generators/model/templates/fixtures.yml

@@ -0,0 +1 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html

data/generators/{templates/model.erb → model/templates/model.rb}

@@ -1,4 +1,2 @@
-require 'active_record'
-
 class <%= class_name %> < ActiveRecord::Base
 end

data/generators/{templates/model_test.erb → model/templates/unit_test.rb}

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

data/generators/scaffold/USAGE

@@ -0,0 +1,25 @@
+GENERATOR
+     scaffold - create a model and basic controller
+
+SYNOPSIS
+     generate scaffold ModelName [action ...]
+
+DESCRIPTION
+     The scaffold generator takes the name of the new model as the
+     first argument and an optional list of controller actions as the
+     subsequent arguments.  Any actions with scaffolding code available
+     will be generated in your controller; others will be left as stubs.
+
+     The generated controller has the same code that "scaffold :model"
+     uses, so it's easy to migrate when you want to start customizing
+     your controller.
+
+EXAMPLE
+     ./script/generate scaffold Account debit credit
+
+     This will generate the Account model with unit tests and fixtures,
+     the AccountController controller with actions, views, and tests for
+     index, list, show, new, create, edit, update, and destroy.
+
+     Now create the accounts table in your database and browse to
+     http://localhost/account/ -- voila, you're on Rails!

data/generators/scaffold/scaffold_generator.rb

@@ -0,0 +1,53 @@
+require 'rails_generator'
+
+class ScaffoldGenerator < Rails::Generator::Base
+  def generate
+    # Model.
+    generator('model').generate
+
+    # Fixtures.
+    template "fixtures.yml", "test/fixtures/#{table_name}.yml"
+
+    # Controller class, functional test, helper, and views.
+    template "controller.rb", "app/controllers/#{file_name}_controller.rb"
+    template "functional_test.rb", "test/functional/#{file_name}_controller_test.rb"
+    template "controller/helper.rb", "app/helpers/#{file_name}_helper.rb"
+
+    # Layout and stylesheet.
+    unless File.file?("app/views/layouts/scaffold.rhtml")
+      template "layout.rhtml", "app/views/layouts/scaffold.rhtml"
+    end
+    unless File.file?("public/stylesheets/scaffold.css")
+      template "style.css", "public/stylesheets/scaffold.css"
+    end
+
+    # Scaffolded views.
+    scaffold_views.each do |action|
+      template "view_#{action}.rhtml", "app/views/#{file_name}/#{action}.rhtml"
+    end
+
+    # Unscaffolded views.
+    unscaffolded_actions.each do |action|
+      template "controller/view.rhtml",
+               "app/views/#{file_name}/#{action}.rhtml",
+               binding
+    end
+  end
+
+  protected
+    def scaffold_views
+      %w(list show new edit)
+    end
+
+    def scaffold_actions
+      scaffold_views + %w(index create update destroy)
+    end
+
+    def unscaffolded_actions
+      args - scaffold_actions
+    end
+
+    def suffix
+      "_#{singular_name}" if options[:suffix]
+    end
+end

data/generators/scaffold/templates/controller.rb

@@ -0,0 +1,57 @@
+class <%= class_name %>Controller < ApplicationController
+  layout 'scaffold'
+
+<% unless suffix -%>
+  def index
+    list
+    render_action 'list'
+  end
+<% end -%>
+
+<% for action in unscaffolded_actions -%>
+  def <%= action %><%= suffix %>
+  end
+
+<% end -%>
+  def list<%= suffix %>
+    @<%= plural_name %> = <%= class_name %>.find_all
+  end
+
+  def show<%= suffix %>
+    @<%= singular_name %> = <%= class_name %>.find(@params['id'])
+  end
+
+  def new<%= suffix %>
+    @<%= singular_name %> = <%= class_name %>.new
+  end
+
+  def create<%= suffix %>
+    @<%= singular_name %> = <%= class_name %>.new(@params['<%= singular_name %>'])
+    if @<%= singular_name %>.save
+      flash['notice'] = '<%= class_name %> was successfully created.'
+      redirect_to :action => 'list<%= suffix %>'
+    else
+      render_action 'new<%= suffix %>'
+    end
+  end
+
+  def edit<%= suffix %>
+    @<%= singular_name %> = <%= class_name %>.find(@params['id'])
+  end
+
+  def update
+    @<%= singular_name %> = <%= class_name %>.find(@params['<%= singular_name %>']['id'])
+    @<%= singular_name %>.attributes = @params['<%= singular_name %>']
+    if @<%= singular_name %>.save
+      flash['notice'] = '<%= class_name %> was successfully updated.'
+      redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>.id
+    else
+      render_action 'edit<%= suffix %>'
+    end
+  end
+
+  def destroy<%= suffix %>
+    <%= class_name %>.find(@params['id']).destroy
+    redirect_to :action => 'list<%= suffix %>'
+  end
+end