rails 0.8.0 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,31 @@
+*0.8.5* (9)
+
+* Made dev-util available to all tests, so you can insert breakpoints in any test case to get an IRB prompt at that point [bitsweat]:
+
+    def test_complex_stuff
+      @david.projects << @new_project
+      breakpoint "Let's have a closer look at @david"
+    end
+  
+  You need to install dev-utils yourself for this to work ("gem install dev-util").
+
+* Added shared generator behavior so future upgrades should be possible without manually copying over files [bitsweat]
+
+* Added the new helper style to both controller and helper templates [bitsweat]
+
+* Added new_crud generator for creating a model and controller at the same time with explicit scaffolding [bitsweat]
+
+* Added configuration of Test::Unit::TestCase.fixture_path to test_helper to concide with the new AR fixtures style
+
+* Fixed that new_model was generating singular table/fixture names
+
+* Upgraded to Action Mailer 0.4.0
+
+* Upgraded to Action Pack 0.9.5
+
+* Upgraded to Active Record 1.1.0
+
+
 *0.8.0 (15)*
 
 * Removed custom_table_name option for new_model now that the Inflector is as powerful as it is

data/README

@@ -82,7 +82,7 @@ app
 
 app/controllers
   Holds controllers that should be named like weblog_controller.rb for
-  automated URL mapping. All controllers should descent from
+  automated URL mapping. All controllers should descend from
   ActionController::Base.
 
 app/models
@@ -118,4 +118,4 @@ test
   Unit and functional tests along with fixtures.
 
 vendor
-  External libraries that the application depend on. This directory is in the load path.
+  External libraries that the application depend on. This directory is in the load path.

data/Rakefile

@@ -2,11 +2,15 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
 
-PKG_NAME        = "rails"
-PKG_VERSION     = "0.8.0"
+
+PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+PKG_NAME        = 'rails'
+PKG_VERSION     = '0.8.5' + PKG_BUILD
+PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
 desc "Default Task"
@@ -163,9 +167,11 @@ task :copy_generators do
   File.cp "generators/new_controller.rb", "#{PKG_DESTINATION}/script/new_controller"
   File.cp "generators/new_model.rb", "#{PKG_DESTINATION}/script/new_model"
   File.cp "generators/new_mailer.rb", "#{PKG_DESTINATION}/script/new_mailer"
+  File.cp "generators/new_crud.rb", "#{PKG_DESTINATION}/script/new_crud"
   chmod 0755, "#{PKG_DESTINATION}/script/new_controller"
   chmod 0755, "#{PKG_DESTINATION}/script/new_model"
   chmod 0755, "#{PKG_DESTINATION}/script/new_mailer"
+  chmod 0755, "#{PKG_DESTINATION}/script/new_crud"
 end
 
 task :copy_rootfiles do
@@ -237,10 +243,10 @@ spec = Gem::Specification.new do |s|
     on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates.
   EOF
 
-  s.add_dependency('rake', '>= 0.4.4')
-  s.add_dependency('activerecord', '>= 1.0.0')
-  s.add_dependency('actionpack', '>= 0.9.0')
-  s.add_dependency('actionmailer', '>= 0.3.0')
+  s.add_dependency('rake', '>= 0.4.11')
+  s.add_dependency('activerecord', '>= 1.1.0')
+  s.add_dependency('actionpack', '>= 0.9.5')
+  s.add_dependency('actionmailer', '>= 0.4.0')
 
   s.files = PKG_FILES.to_a
   s.require_path = 'lib'
@@ -256,4 +262,10 @@ spec = Gem::Specification.new do |s|
 end
 
 Rake::GemPackageTask.new(spec) do |pkg|
+end
+
+# Publish beta gem
+desc "Publish the API documentation"
+task :pgem => [:gem] do 
+  Rake::SshFilePublisher.new("davidhh@one.textdrive.com", "domains/rubyonrails.org/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
 end

data/doc/index.html

@@ -30,10 +30,10 @@
 <h1>Congratulations, you're on Rails!</h1>
 
 <p>
-  <i>You've succesfully configured your wb-server to point at this Rails application.</i>
+  <i>You've succesfully configured your web server to point at this Rails application.</i>
 </p>
 
-<p>Before you move on, verify that the following conditions have been meet:</p>
+<p>Before you move on, verify that the following conditions have been met:</p>
 
 <ol>
   <li>The log directory and the empty log files must be writable to the web server (<code>chmod -R 777 log</code>).
@@ -60,7 +60,7 @@
       <small>Help: Run with no arguments for documentation</small>
   <li>Create a new model using the <code>script/new_model</code> generator <br/>
       <small>Help: Run with no arguments for documentation</small>
-  <li>See all the tests run and by running <code>rake</code>.
+  <li>See all the tests run and fail by running <code>rake</code>.
   <li>Develop your Rails application!
   <li>Setup FastCGI or mod_ruby to get production-level performance
 </ol>

data/gem_snapshot

@@ -0,0 +1,14 @@
+#!/bin/sh
+WORK=$1-snapshot
+cd /tmp
+if [ -d $WORK ]; then
+    cd $WORK
+    cvs update
+else
+    cvs -d:pserver:anonymous@rubyforge.org:/var/cvs/$1 login
+    cvs -d:pserver:anonymous@rubyforge.org:/var/cvs/$1 checkout -d $WORK $1
+    cd $WORK
+fi
+rm -rf pkg
+EDGE_RAILS=`date -u "+%Y%m%d"` rake gem
+cp pkg/$1*gem /tmp

data/generators/new_controller.rb

@@ -1,87 +1,12 @@
 #!/usr/local/bin/ruby
-
 require File.dirname(__FILE__) + '/../config/environments/production'
+require 'generator'
 
-def create_controller_class(controller_class_name, controller_file_name, show_actions)
-  File.open("app/controllers/" + controller_file_name  + "_controller.rb", "w", 0777) do |controller_file|
-    controller_file.write <<EOF
-require 'abstract_application'
-require '#{controller_file_name}_helper'
-
-class #{controller_class_name}Controller < AbstractApplicationController
-  include #{controller_class_name}Helper
-
-#{show_actions.collect { |action| "  def #{action}\n  end" }.join "\n\n" }
-end
-EOF
-  end
-end
-
-def create_helper_class(controller_class_name, controller_file_name)
-  File.open("app/helpers/" + controller_file_name  + "_helper.rb", "w", 0777) do |helper_file|
-    helper_file.write <<EOF
-module #{controller_class_name}Helper
-  def self.append_features(controller) #:nodoc:
-    controller.ancestors.include?(ActionController::Base) ? controller.add_template_helper(self) : super
-  end
-end
-EOF
-  end
-end
-
-def create_templates(controller_class_name, controller_file_name, show_actions)
-  Dir.mkdir("app/views/#{controller_file_name}") rescue nil
-  show_actions.each { |action| File.open("app/views/#{controller_file_name}/#{action}.rhtml", "w", 0777) do |template_file|
-    template_file.write <<EOF
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>#{controller_class_name}##{action}</title>
-</head>   
-<body>
-<h1>#{controller_class_name}##{action}</h1>
-<p>Find me in app/views/#{controller_file_name}/#{action}.rhtml</p>
-</body>
-</html>
-EOF
-  end }
-end
-
-def create_test_class(controller_class_name, controller_file_name)
-  File.open("test/functional/" + controller_file_name + "_controller_test.rb", "w", 0777) do |test_file|
-    test_file.write <<EOF
-require File.dirname(__FILE__) + '/../test_helper'
-require '#{controller_file_name}_controller'
-
-# Raise errors beyond the default web-based presentation
-class #{controller_class_name}Controller; def rescue_action(e) raise e end; end
-
-class #{controller_class_name}ControllerTest < Test::Unit::TestCase
-  def setup
-    @controller = #{controller_class_name}Controller.new
-    @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
-  end
-
-  def test_truth
-    assert true, "Test implementation missing"
-  end
-end
-EOF
-  end
-end
-
-
-if !ARGV.empty?
-  controller_name = ARGV[0]
-  show_actions    = ARGV[1..-1]
-  
-  controller_class_name = Inflector.camelize(controller_name)
-  controller_file_name  = Inflector.underscore(controller_name)
-  
-  create_controller_class(controller_class_name, controller_file_name, show_actions)
-  create_helper_class(controller_class_name, controller_file_name)
-  create_templates(controller_class_name, controller_file_name, show_actions)
-  create_test_class(controller_class_name, controller_file_name)
+unless ARGV.empty?
+  rails_root = File.dirname(__FILE__) + '/..'
+  name       = ARGV.shift
+  actions    = ARGV
+  Generator::Controller.new(rails_root, name, actions).generate
 else
   puts <<-END_HELP
 
@@ -89,7 +14,7 @@ NAME
      new_controller - create controller and view stub files
 
 SYNOPSIS
-     new_controller [controller_name] [view_name ...]
+     new_controller ControllerName action [action ...]
 
 DESCRIPTION
      The new_controller generator takes the name of the new controller as the
@@ -115,4 +40,4 @@ EXAMPLE
      The BlogController class will have the following methods: list, display, new, edit.
      Each will default to render the associated template file.
 END_HELP
-end
+end

data/generators/new_crud.rb

@@ -0,0 +1,34 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environments/production'
+require 'generator'
+
+unless ARGV.empty?
+  rails_root = File.dirname(__FILE__) + '/..'
+  name       = ARGV.shift
+  actions    = ARGV
+  Generator::Model.new(rails_root, name).generate
+  Generator::Controller.new(rails_root, name, actions, :scaffold => true).generate
+else
+  puts <<-END_HELP
+
+NAME
+     new_crud - create a model and a controller scaffold
+
+SYNOPSIS
+     new_crud ModelName [action ...]
+
+DESCRIPTION
+     The new_crud generator takes the name of the new model as the
+     first argument and an optional list of controller actions as the
+     subsequent arguments.  All actions may be omitted since the controller
+     will have scaffolding automatically set up for this model.
+
+EXAMPLE
+     new_crud Account
+
+     This will generate an Account model and controller with scaffolding.
+     Now create the accounts table in your database and browse to
+     http://localhost/account/ -- voila, you're on Rails!
+
+END_HELP
+end

data/generators/new_mailer.rb

@@ -1,90 +1,12 @@
 #!/usr/local/bin/ruby
-
 require File.dirname(__FILE__) + '/../config/environments/production'
+require 'generator'
 
-def create_mailer_class(class_name, file_name, mail_actions)
-  File.open("app/models/" + file_name + ".rb", "w", 0777) do |mailer_file|
-    mailer_file.write <<EOF
-class #{class_name} < ActionMailer::Base
-#{mail_actions.collect { |action| 
-  "  def #{action}(sent_on = Time.now)\n" +
-  "    @recipients = ''\n" +
-  "    @from       = ''\n" +
-  "    @subject    = ''\n" +
-  "    @body       = { }\n" +
-  "    @sent_on    = sent_on\n" +
-  "  end" 
-}.join "\n\n" }
-end
-EOF
-  end
-end
-
-def create_templates(class_name, file_name, mail_actions)
-  Dir.mkdir("app/views/#{file_name}") rescue nil
-  mail_actions.each { |action| File.open("app/views/#{file_name}/#{action}.rhtml", "w", 0777) do |template_file|
-    template_file.write <<EOF
-#{class_name}##{action}
-EOF
-  end }
-end
-
-def create_fixtures(class_name, file_name, mail_actions)
-  Dir.mkdir("test/fixtures/" + file_name) rescue nil
-  mail_actions.each { |action| File.open("test/fixtures/#{file_name}/#{action}", "w", 0777) do |template_file|
-    template_file.write <<EOF
-#{class_name}##{action}
-EOF
-  end }
-end
-
-
-def create_test_class(class_name, file_name, mail_actions)
-  File.open("test/unit/" + file_name + "_test.rb", "w", 0777) do |test_file|
-    test_file.write <<EOF
-require File.dirname(__FILE__) + '/../test_helper'
-require '#{file_name}'
-
-class #{class_name}Test < Test::Unit::TestCase
-  def setup
-    @expected = TMail::Mail.new
-  end
-
-#{mail_actions.collect { |action| 
-  "  def test_#{action}\n" +
-  "    @expected.to      = ''\n" +
-  "    @expected.from    = ''\n" +
-  "    @expected.subject = ''\n" +
-  "    @expected.body    = read_notification_fixture \"#{action}\"\n" +
-  "    @expected.date    = Time.now\n" +
-  "    \n" +
-  "    actual = #{class_name}.create_#{action}(@expected.date)\n" +
-  "    \n" +
-  "    assert_equal @expected.encoded, actual.encoded\n" +
-  "  end" 
-}.join "\n\n" }
-
-  private
-    def read_notification_fixture(name)
-      IO.readlines(File.dirname(__FILE__) + "/../fixtures/#{file_name}/\#{name}").join
-    end
-end
-EOF
-  end
-end
-
-
-if !ARGV.empty?
-  mailer_name  = ARGV[0]
-  mail_actions = ARGV[1..-1]
-  
-  class_name = Inflector.camelize(mailer_name)
-  file_name  = Inflector.underscore(mailer_name)
-  
-  create_mailer_class(class_name, file_name, mail_actions)
-  create_templates(class_name, file_name, mail_actions)
-  create_fixtures(class_name, file_name, mail_actions)
-  create_test_class(class_name, file_name, mail_actions)
+unless ARGV.empty?
+  rails_root = File.dirname(__FILE__) + '/..'
+  name       = ARGV.shift
+  actions    = ARGV
+  Generator::Mailer.new(rails_root, name, actions).generate
 else
   puts <<-END_HELP
 
@@ -92,28 +14,30 @@ NAME
      new_mailer - create mailer and view stub files
 
 SYNOPSIS
-     new_mailer [mailer_name] [mail_actions ...]
+     new_mailer MailerName action [action ...]
 
 DESCRIPTION
      The new_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.
-     
+     first argument and a variable number of mail action names as subsequent
+     arguments.
+
      From the passed arguments, new_mailer generates a class file in
      app/models with a mail action for each of the mail action names passed.
-     It then creates a mail test suite in test/unit with one stub test case and one
-     stub fixture per mail action. Finally, it creates a template stub for each of the
-     mail action names in app/views under a directory with the same name as the class.
-     
+     It then creates a mail test suite in test/unit with one stub test case
+     and one stub fixture per mail action. Finally, it creates a template stub
+     for each of the mail action names in app/views under a directory with the
+     same name as the class.
+
 EXAMPLE
      new_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.
+     The Notifications class will have the following methods: signup,
+     forgot_password, and invoice.
 END_HELP
-end
+end

data/generators/new_model.rb

@@ -1,50 +1,11 @@
 #!/usr/local/bin/ruby
-
 require File.dirname(__FILE__) + '/../config/environments/production'
+require 'generator'
 
-def create_model_class(model_name, file_name)
-  File.open("app/models/" + file_name  + ".rb", "w", 0777) do |model_file|
-    model_file.write <<EOF
-require 'active_record'
-
-class #{model_name} < ActiveRecord::Base
-end
-EOF
-  end
-end
-
-def create_test_class(model_name, file_name, table_name)
-    File.open("test/unit/" + file_name  + "_test.rb", "w", 0777) do |test_file|
-        test_file.write <<EOF
-require File.dirname(__FILE__) + '/../test_helper'
-require '#{file_name}'
-
-class #{model_name}Test < Test::Unit::TestCase
-  def setup
-    @#{table_name} = create_fixtures "#{table_name}"
-  end
-
-  def test_something
-    assert true, "Test implementation missing"
-  end
-end
-EOF
-    end
-end
-
-def create_fixtures_directory(table_name)
-  Dir.mkdir("test/fixtures/" + table_name) rescue puts "Fixtures directory already exists"
-end
-
-
-if !ARGV.empty?
-  model_name = ARGV.shift
-  file_name  = Inflector.underscore(model_name)
-  table_name = ARGV.shift || file_name
-
-  create_model_class(model_name, file_name)
-  create_test_class(model_name, file_name, table_name)
-  create_fixtures_directory(table_name)
+if ARGV.size == 1
+  rails_root = File.dirname(__FILE__) + '/..'
+  name = ARGV.shift
+  Generator::Model.new(rails_root, name).generate
 else
   puts <<-HELP
 
@@ -52,19 +13,19 @@ NAME
      new_model - create model stub files
 
 SYNOPSIS
-     new_model [model_name]
+     new_model ModelName
 
 DESCRIPTION
-     The new_model generator takes the name of the new model and generates a model
-     file in app/models that decents from ActiveRecord::Base but is otherwise empty.
-     It then creates a model test suite in test/unit with one failing
-     test case. Finally, it creates fixture directory in test/fixtures.
-     
+     The new_model generator takes a model name (in CamelCase) and generates
+     a new, empty model in app/models, a test suite in test/unit with one
+     failing test case, and a fixtures directory in test/fixtures.
+
 EXAMPLE
      new_model Account
-     
-     This will generate a Account class in app/models/account.rb, a AccountTest in 
-     test/unit/account_test.rb, and the directory test/fixtures/account.
+
+     This will generate an Account class in app/models/account.rb, an
+     AccountTest in test/unit/account_test.rb, and the directory
+     test/fixtures/account.
 
 HELP
-end
+end

data/generators/templates/controller.erb

@@ -0,0 +1,24 @@
+require 'abstract_application'
+<% if options[:scaffold] -%>
+require '<%= file_name %>'
+<% end -%>
+
+class <%= class_name %>Controller < AbstractApplicationController
+  helper :<%= file_name %>
+
+<% if options[:scaffold] -%>
+  scaffold :<%= options[:scaffold] %>
+
+  <%- for action in actions -%>
+  #def <%= action %>
+  #end
+
+  <%- end -%>
+<% else -%>
+  <%- for action in actions -%>
+  def <%= action %>
+  end
+
+  <%- end -%>
+<% end -%>
+end

data/generators/templates/controller_test.erb

@@ -0,0 +1,17 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require '<%= file_name %>_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, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
+  end
+
+  # Replace this with your real tests
+  def test_truth
+    assert true
+  end
+end

data/generators/templates/controller_view.rhtml

@@ -0,0 +1,10 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title><%= class_name %>#<%= action %></title>
+</head>   
+<body>
+<h1><%= class_name %>#<%= action %></h1>
+<p>Find me in app/views/<%= file_name %>/<%= action %>.rhtml</p>
+</body>
+</html>

data/generators/templates/helper.erb

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

data/generators/templates/mailer.erb

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

data/generators/templates/mailer_action.rhtml

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

data/generators/templates/mailer_fixture.rhtml

@@ -0,0 +1,4 @@
+<%= class_name %>#<%= action %>
+
+Find me in test/fixtures/<%= file_name %>/<%= action %>.
+I'm tested against the view in app/views/<%= file_name %>/<%= action %>.

data/generators/templates/mailer_test.erb

@@ -0,0 +1,37 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require '<%= file_name %>'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
+
+  def setup
+    ActionMailer::Base.delivery_method = :test
+    ActionMailer::Base.perform_deliveries = true
+    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.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
+  end
+
+<% end -%>
+  private
+    def read_fixture(action)
+      IO.readlines("#{FIXTURES_PATH}/<%= file_name %>/#{action}")
+    end
+end

data/generators/templates/model.erb

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

data/generators/templates/model_test.erb

@@ -0,0 +1,11 @@
+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
+  def test_truth
+    assert true
+  end
+end

data/helpers/abstract_application.rb

@@ -1,8 +1,7 @@
 require 'action_controller'
-require 'application_helper'
 
 # The filters added to this controller will be run for all controllers in the application.
 # Likewise will all the methods added be available for all controllers.
 class AbstractApplicationController < ActionController::Base
-  include ApplicationHelper
+  helper :application
 end

data/helpers/application_helper.rb

@@ -1,6 +1,3 @@
 # The methods added to this helper will be available to all templates in the application.
 module ApplicationHelper
-  def self.append_features(controller) #:nodoc:
-    controller.ancestors.include?(ActionController::Base) ? controller.add_template_helper(self) : super
-  end
 end

data/helpers/test_helper.rb

@@ -4,6 +4,12 @@ require 'test/unit'
 require 'active_record/fixtures'
 require 'action_controller/test_process'
 
+# Make rubygems available for testing if possible
+begin require('rubygems');        rescue LoadError; end
+begin require('dev-utils/debug'); rescue LoadError; end
+
 def create_fixtures(*table_names)
   Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures", table_names)
-end
+end
+
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"

data/lib/generator.rb

@@ -0,0 +1,112 @@
+require 'fileutils'
+require 'active_record/support/inflector'
+
+module Generator
+  class GeneratorError < StandardError; end
+
+  class Base
+    @@template_root = File.dirname(__FILE__) + '/../generators/templates'
+    cattr_accessor :template_root
+
+    attr_reader :rails_root, :class_name, :file_name, :table_name,
+                :actions, :options
+
+    def initialize(rails_root, object_name, actions = [], options = {})
+      @rails_root = rails_root
+      @class_name = Inflector.camelize(object_name)
+      @file_name  = Inflector.underscore(@class_name)
+      @table_name = Inflector.pluralize(@file_name)
+      @actions    = actions
+      @options    = options
+
+      # Use local templates if rails_root/generators directory exists.
+      local_template_root = File.join(@rails_root, 'generators')
+      if File.directory?(local_template_root)
+        self.class.template_root = local_template_root
+      end
+    end
+
+    protected
+
+      # Generate a file in a fresh Rails app from an ERB template.
+      # Takes a template path relative to +template_root+, a
+      # destination path relative to +rails_root+, evaluates the template,
+      # and writes the result to the destination.
+      def generate_file(template_file_path, rails_file_path, eval_binding = nil)
+        # Determine full paths for source and destination files.
+        template_path = File.join(template_root, template_file_path)
+        rails_path    = File.join(rails_root, rails_file_path)
+
+        # Create destination directories.
+        FileUtils.mkdir_p(File.dirname(rails_path))
+
+        # Render template and write result.
+        eval_binding ||= binding
+        contents = ERB.new(File.read(template_path), nil, '-').result(eval_binding)
+        File.open(rails_path, 'w') { |file| file.write(contents) }
+      end
+  end
+
+  # Generate controller, helper, functional test, and views.
+  class Controller < Base
+    def generate
+      options[:scaffold] = file_name if options[:scaffold]
+
+      # Controller class.
+      generate_file "controller.erb", "app/controllers/#{file_name}_controller.rb"
+
+      # Helper class.
+      generate_file "helper.erb", "app/helpers/#{file_name}_helper.rb"
+
+      # Function test.
+      generate_file "controller_test.erb", "test/functional/#{file_name}_controller_test.rb"
+
+      # View template for each action.
+      @actions.each do |action|
+        generate_file "controller_view.rhtml",
+                      "app/views/#{file_name}/#{action}.rhtml",
+                      binding
+      end
+    end
+  end
+
+  # Generate model, unit test, and fixtures.
+  class Model < Base
+    def generate
+
+      # Model class.
+      generate_file "model.erb", "app/models/#{file_name}.rb"
+
+      # Model unit test.
+      generate_file "model_test.erb", "test/unit/#{file_name}_test.rb"
+
+      # Test fixtures directory.
+      FileUtils.mkdir_p("test/fixtures/#{table_name}")
+    end
+  end
+
+  # Generate mailer, helper, functional test, and views.
+  class Mailer < Base
+    def generate
+
+      # Mailer class.
+      generate_file "mailer.erb", "app/models/#{file_name}.rb"
+
+      # Mailer unit test.
+      generate_file "mailer_test.erb", "test/unit/#{file_name}_test.rb"
+
+      # Test fixtures directory.
+      FileUtils.mkdir_p("test/fixtures/#{table_name}")
+
+      # View template and fixture for each action.
+      @actions.each do |action|
+        generate_file "mailer_action.rhtml",
+                      "app/views/#{file_name}/#{action}.rhtml",
+                      binding
+        generate_file "mailer_fixture.rhtml",
+                      "test/fixtures/#{table_name}/#{action}",
+                      binding
+      end
+    end
+  end
+end

data/lib/webrick_server.rb

@@ -110,7 +110,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
       end
       
       dispatch_rb_path = File.expand_path(File.join(@server_options[:server_root], "dispatch.rb"))
-      IO.popen(ruby_interpreter, "r+") do |ruby|
+      IO.popen(ruby_interpreter, "rb+") do |ruby|
         ruby.puts <<-END
           require 'cgi'
           require 'stringio'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2004-10-25
+  version: 0.8.5
+date: 2004-11-18
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -33,6 +33,7 @@ files:
   - doc
   - environments
   - fresh_rakefile
+  - gem_snapshot
   - generators
   - helpers
   - html
@@ -56,8 +57,20 @@ files:
   - environments/shared_for_gem.rb
   - environments/test.rb
   - generators/new_controller.rb
+  - generators/new_crud.rb
   - generators/new_mailer.rb
   - generators/new_model.rb
+  - generators/templates
+  - generators/templates/controller.erb
+  - generators/templates/controller_test.erb
+  - generators/templates/controller_view.rhtml
+  - generators/templates/helper.erb
+  - generators/templates/mailer.erb
+  - generators/templates/mailer_action.rhtml
+  - generators/templates/mailer_fixture.rhtml
+  - generators/templates/mailer_test.erb
+  - generators/templates/model.erb
+  - generators/templates/model_test.erb
   - helpers/abstract_application.rb
   - helpers/application_helper.rb
   - helpers/test_helper.rb
@@ -66,6 +79,7 @@ files:
   - html/index.html
   - lib/code_statistics.rb
   - lib/dispatcher.rb
+  - lib/generator.rb
   - lib/webrick_server.rb
 test_files: []
 rdoc_options: []
@@ -83,7 +97,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.4.4
+            version: 0.4.11
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -93,7 +107,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.1.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -103,7 +117,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.9.0
+            version: 0.9.5
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -113,5 +127,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.3.0
+            version: 0.4.0
       version: