rails 0.12.1 → 0.13.0

data/lib/console_sandbox.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Base.lock_mutex
+ActiveRecord::Base.connection.begin_db_transaction
+at_exit do
+  ActiveRecord::Base.connection.rollback_db_transaction
+  ActiveRecord::Base.unlock_mutex
+end

data/lib/dispatcher.rb

@@ -25,17 +25,24 @@ require 'breakpoint'
 
 class Dispatcher
   class << self
-    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
+    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout)
       begin
         request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
         prepare_application
-        ActionController::Routing::Routes.recognize!(request).process(request, response).out
+        ActionController::Routing::Routes.recognize!(request).process(request, response).out(output)
       rescue Object => exception
-        ActionController::Base.process_with_exception(request, response, exception).out
+        ActionController::Base.process_with_exception(request, response, exception).out(output)
       ensure
-        reset_application
+        reset_after_dispatch
       end
     end
+
+    def reset_application!
+      Controllers.clear!
+      Dependencies.clear
+      Dependencies.remove_subclasses_for(ActiveRecord::Base, ActiveRecord::Observer, ActionController::Base)
+      Dependencies.remove_subclasses_for(ActionMailer::Base) if defined?(ActionMailer::Base)
+    end
     
     private
       def prepare_application
@@ -44,13 +51,8 @@ class Dispatcher
         Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
       end
     
-      def reset_application
-        if Dependencies.load?
-          Controllers.clear!
-          Dependencies.clear
-          Dependencies.remove_subclasses_for(ActiveRecord::Base, ActiveRecord::Observer, ActionController::Base)
-        end
-
+      def reset_after_dispatch
+        reset_application! if Dependencies.load?
         Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
       end
   end

data/lib/fcgi_handler.rb

@@ -0,0 +1,166 @@
+require 'fcgi'
+require 'logger'
+require 'dispatcher'
+
+class RailsFCGIHandler
+  SIGNALS = {
+    'HUP'  => :reload,
+    'TERM' => :graceful_exit,
+    'USR1' => :graceful_exit
+  }
+
+  attr_reader :when_ready
+  attr_reader :processing
+
+  attr_accessor :log_file_path
+  attr_accessor :gc_request_period
+
+
+  # Initialize and run the FastCGI instance, passing arguments through to new.
+  def self.process!(*args, &block)
+    new(*args, &block).process!
+  end
+
+  # Initialize the FastCGI instance with the path to a crash log
+  # detailing unhandled exceptions (default RAILS_ROOT/log/fastcgi.crash.log)
+  # and the number of requests to process between garbage collection runs
+  # (default nil for normal GC behavior.)  Optionally, pass a block which
+  # takes this instance as an argument for further configuration.
+  def initialize(log_file_path = nil, gc_request_period = nil)
+    @when_ready = nil
+    @processing = false
+
+    self.log_file_path = log_file_path || "#{RAILS_ROOT}/log/fastcgi.crash.log"
+    self.gc_request_period = gc_request_period
+
+    # Yield for additional configuration.
+    yield self if block_given?
+
+    # Safely install signal handlers.
+    install_signal_handlers
+
+    # Start error timestamp at 11 seconds ago.
+    @last_error_on = Time.now - 11
+
+    dispatcher_log(:info, "starting")
+  end
+
+  def process!(provider = FCGI)
+    # Make a note of $" so we can safely reload this instance.
+    mark!
+
+    # Begin countdown to garbage collection.
+    run_gc! if gc_request_period
+
+    provider.each_cgi do |cgi| 
+      # Safely reload this instance if requested.
+      if when_ready == :reload
+        run_gc! if gc_request_period
+        restore!
+        @when_ready = nil
+        dispatcher_log(:info, "reloaded")
+      end
+
+      process_request(cgi)
+
+      # Break if graceful exit requested.
+      break if when_ready == :exit
+
+      # Garbage collection countdown.
+      if gc_request_period
+        @gc_request_countdown -= 1
+        run_gc! if @gc_request_countdown <= 0
+      end
+    end
+
+    GC.enable
+    dispatcher_log(:info, "terminated gracefully")
+
+  rescue SystemExit => exit_error
+    dispatcher_log(:info, "terminated by explicit exit")
+
+  rescue Object => fcgi_error
+    # retry on errors that would otherwise have terminated the FCGI process,
+    # but only if they occur more than 10 seconds apart.
+    if !(SignalException === fcgi_error) && Time.now - @last_error_on > 10
+      @last_error_on = Time.now
+      dispatcher_error(fcgi_error, "almost killed by this error")
+      retry
+    else
+      dispatcher_error(fcgi_error, "killed by this error")
+    end
+  end
+  
+  
+  private
+    def logger
+      @logger ||= Logger.new(@log_file_path)
+    end
+
+    def dispatcher_log(level, msg)
+      time_str = Time.now.strftime("%d/%b/%Y:%H:%M:%S")
+      logger.send(level, "[#{time_str} :: #{$$}] #{msg}")
+    rescue Object => log_error
+      STDERR << "Couldn't write to #{@log_file_path.inspect}: #{msg}\n"
+      STDERR << "  #{log_error.class}: #{log_error.message}\n"
+    end
+
+    def dispatcher_error(e,msg="")
+      error_message =
+        "Dispatcher failed to catch: #{e} (#{e.class})\n" +
+        "  #{e.backtrace.join("\n  ")}\n#{msg}"
+      dispatcher_log(:error, error_message)
+    end
+
+    def install_signal_handlers
+      SIGNALS.each do |signal, handler_name|
+        install_signal_handler signal, method("#{handler_name}_handler").to_proc
+      end
+    end
+
+    def install_signal_handler(signal, handler)
+      trap signal, handler
+    rescue ArgumentError
+      dispatcher_log :warn, "Ignoring unsupported signal #{signal}."
+    end
+
+    def graceful_exit_handler(signal)
+      if processing
+        dispatcher_log :info, "asked to terminate ASAP"
+        @when_ready = :exit
+      else
+        dispatcher_log :info, "told to terminate NOW"
+        exit
+      end
+    end
+
+    def reload_handler(signal)
+      @when_ready = :reload
+      dispatcher_log :info, "asked to reload ASAP"
+    end
+
+    def process_request(cgi)
+      @processing = true
+      Dispatcher.dispatch(cgi)
+    rescue Object => e
+      raise if SignalException === e
+      dispatcher_error(e)
+    ensure
+      @processing = false
+    end
+
+    def mark!
+      @features = $".clone
+    end
+
+    def restore!
+      $".replace @features
+      Dispatcher.reset_application!
+      ActionController::Routing::Routes.reload
+    end
+
+    def run_gc!
+      @gc_request_countdown = gc_request_period
+      GC.enable; GC.start; GC.disable
+    end
+end

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -23,27 +23,27 @@ class AppGenerator < Rails::Generator::Base
 
       # Root
       m.file "fresh_rakefile", "Rakefile"
-      m.file "README", "README"
-      m.file "CHANGELOG", "CHANGELOG"
+      m.file "README",         "README"
+      m.file "CHANGELOG",      "CHANGELOG"
 
       # Application
-      m.template "helpers/application.rb", "app/controllers/application.rb"
+      m.template "helpers/application.rb",        "app/controllers/application.rb"
       m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb"
-      m.template "helpers/test_helper.rb", "test/test_helper.rb"
+      m.template "helpers/test_helper.rb",        "test/test_helper.rb"
 
       # database.yml and .htaccess
       m.template "configs/database.yml", "config/database.yml"
-      m.template "configs/routes.rb", "config/routes.rb"
-      m.template "configs/apache.conf", "public/.htaccess"
+      m.template "configs/routes.rb",    "config/routes.rb"
+      m.template "configs/apache.conf",  "public/.htaccess"
 
       # Environments
       m.file "environments/environment.rb", "config/environment.rb"
-      m.file "environments/production.rb", "config/environments/production.rb"
+      m.file "environments/production.rb",  "config/environments/production.rb"
       m.file "environments/development.rb", "config/environments/development.rb"
-      m.file "environments/test.rb", "config/environments/test.rb"
+      m.file "environments/test.rb",        "config/environments/test.rb"
 
-      # Scripts
-      %w(console console_sandbox destroy generate server runner benchmarker profiler).each do |file|
+      # Scripts (tracker listener)
+      %w(console destroy generate server runner benchmarker profiler ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
       if options[:gem]
@@ -53,9 +53,10 @@ class AppGenerator < Rails::Generator::Base
       end
 
       # Dispatches
-      m.file "dispatches/dispatch.rb", "public/dispatch.rb", script_options
-      m.file "dispatches/dispatch.rb", "public/dispatch.cgi", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
+      m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
       m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
+      # m.file "dispatches/gateway.cgi",   "public/gateway.cgi", script_options
 
       # HTML files
       %w(404 500 index).each do |file|
@@ -66,6 +67,9 @@ class AppGenerator < Rails::Generator::Base
 
       # Javascripts
       m.file "html/javascripts/prototype.js", "public/javascripts/prototype.js"
+      m.file "html/javascripts/effects.js",   "public/javascripts/effects.js"
+      m.file "html/javascripts/dragdrop.js",  "public/javascripts/dragdrop.js"
+      m.file "html/javascripts/controls.js",  "public/javascripts/controls.js"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"

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

@@ -8,7 +8,7 @@ class MailerGenerator < Rails::Generator::NamedBase
       m.directory File.join('app/models', class_path)
       m.directory File.join('app/views', class_path, file_name)
       m.directory File.join('test/unit', class_path)
-      m.directory File.join('test/fixtures', class_path, table_name)
+      m.directory File.join('test/fixtures', class_path, file_name)
 
       # Mailer class and unit test.
       m.template "mailer.rb",    File.join('app/models',
@@ -24,7 +24,7 @@ class MailerGenerator < Rails::Generator::NamedBase
                    File.join('app/views', class_path, file_name, "#{action}.rhtml"),
                    :assigns => { :action => action }
         m.template "fixture.rhtml",
-                   File.join('test/fixtures', class_path, table_name, action),
+                   File.join('test/fixtures', class_path, file_name, action),
                    :assigns => { :action => action }
       end
     end

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

@@ -5,6 +5,8 @@ class <%= class_name %>Test < Test::Unit::TestCase
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
   CHARSET = "utf-8"
 
+  include ActionMailer::Quoting
+
   def setup
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
@@ -30,6 +32,6 @@ class <%= class_name %>Test < Test::Unit::TestCase
     end
 
     def encode(subject)
-      ActionMailer::Base.quoted_printable(subject, CHARSET)
+      quoted_printable(subject, CHARSET)
     end
 end

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

@@ -0,0 +1,14 @@
+Description:
+    The migration generator creates a stub for a new database migration.
+
+    The generator takes a migration name as its argument.  The migration name may be
+    given in CamelCase or under_score.
+
+    The generator creates a migration class in db/migrate prefixed by its number
+    in the queue.
+
+Example:
+    ./script/generate migration AddSslFlag
+
+    With 4 existing migrations, this will create an AddSslFlag migration in the
+    file db/migrate/5_add_ssl_flag.rb

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

@@ -0,0 +1,9 @@
+class MigrationGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      m.directory File.join('db/migrate')
+      next_migration_number = Dir.glob("db/migrate/[0-9]*.*").size + 1
+      m.template 'migration.rb', File.join('db/migrate', "#{next_migration_number}_#{file_name}.rb")
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+  end
+
+  def self.down
+  end
+end

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

@@ -12,7 +12,7 @@ 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")
+      m.template 'fixtures.yml',  File.join('test/fixtures', class_path, "#{ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name}.yml")
     end
   end
 end

data/lib/rails_generator/generators/components/scaffold/USAGE

@@ -25,7 +25,7 @@ Example:
     database and browse to http://localhost/bank/ -- voila, you're on Rails!
 
 Modules Example:
-    ./script/generate controller 'admin/credit_card' suspend late_fee
+    ./script/generate scaffold CreditCard 'admin/credit_card' suspend late_fee
 
     This will generate a CreditCard model and CreditCardController controller
     in the admin module.

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

@@ -2,7 +2,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 <% unless suffix -%>
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 <% end -%>
 
@@ -16,7 +16,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def show<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.find(@params[:id])
+    @<%= singular_name %> = <%= model_name %>.find(params[:id])
   end
 
   def new<%= suffix %>
@@ -24,31 +24,31 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def create<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.new(@params[:<%= singular_name %>])
+    @<%= singular_name %> = <%= model_name %>.new(params[:<%= singular_name %>])
     if @<%= singular_name %>.save
-      flash['notice'] = '<%= model_name %> was successfully created.'
+      flash[:notice] = '<%= model_name %> was successfully created.'
       redirect_to :action => 'list<%= suffix %>'
     else
-      render_action 'new<%= suffix %>'
+      render :action => 'new<%= suffix %>'
     end
   end
 
   def edit<%= suffix %>
-    @<%= singular_name %> = <%= model_name %>.find(@params[:id])
+    @<%= singular_name %> = <%= model_name %>.find(params[:id])
   end
 
   def update
-    @<%= singular_name %> = <%= model_name %>.find(@params[:id])
-    if @<%= singular_name %>.update_attributes(@params[:<%= singular_name %>])
-      flash['notice'] = '<%= model_name %> was successfully updated.'
+    @<%= singular_name %> = <%= model_name %>.find(params[:id])
+    if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>])
+      flash[:notice] = '<%= model_name %> was successfully updated.'
       redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>
     else
-      render_action 'edit<%= suffix %>'
+      render :action => 'edit<%= suffix %>'
     end
   end
 
   def destroy<%= suffix %>
-    <%= model_name %>.find(@params[:id]).destroy
+    <%= model_name %>.find(params[:id]).destroy
     redirect_to :action => 'list<%= suffix %>'
   end
 end

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

@@ -16,65 +16,83 @@ class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
 <% for action in unscaffolded_actions -%>
   def test_<%= action %>
     get :<%= action %>
-    assert_rendered_file '<%= action %>'
+    assert_response :success
+    assert_template '<%= action %>'
   end
 
 <% end -%>
 <% unless suffix -%>
   def test_index
     get :index
-    assert_rendered_file 'list'
+    assert_response :success
+    assert_template 'list'
   end
 
 <% end -%>
   def test_list<%= suffix %>
     get :list<%= suffix %>
-    assert_rendered_file 'list<%= suffix %>'
-    assert_template_has '<%= plural_name %>'
+
+    assert_response :success
+    assert_template 'list<%= suffix %>'
+
+    assert_not_nil assigns(:<%= plural_name %>)
   end
 
   def test_show<%= suffix %>
-    get :show<%= suffix %>, 'id' => 1
-    assert_rendered_file 'show'
-    assert_template_has '<%= singular_name %>'
-    assert_valid_record '<%= singular_name %>'
+    get :show<%= suffix %>, :id => 1
+
+    assert_response :success
+    assert_template 'show'
+
+    assert_not_nil assigns(:<%= singular_name %>)
+    assert assigns(:<%= singular_name %>).valid?
   end
 
   def test_new<%= suffix %>
     get :new<%= suffix %>
-    assert_rendered_file 'new<%= suffix %>'
-    assert_template_has '<%= singular_name %>'
+
+    assert_response :success
+    assert_template 'new<%= suffix %>'
+
+    assert_not_nil assigns(:<%= singular_name %>)
   end
 
   def test_create
-    num_<%= plural_name %> = <%= model_name %>.find_all.size
+    num_<%= plural_name %> = <%= model_name %>.count
+
+    post :create<%= suffix %>, :<%= singular_name %> => {}
 
-    post :create<%= suffix %>, '<%= singular_name %>' => { }
+    assert_response :redirect
     assert_redirected_to :action => 'list<%= suffix %>'
 
-    assert_equal num_<%= plural_name %> + 1, <%= model_name %>.find_all.size
+    assert_equal num_<%= plural_name %> + 1, <%= model_name %>.count
   end
 
   def test_edit<%= suffix %>
-    get :edit<%= suffix %>, 'id' => 1
-    assert_rendered_file 'edit<%= suffix %>'
-    assert_template_has '<%= singular_name %>'
-    assert_valid_record '<%= singular_name %>'
+    get :edit<%= suffix %>, :id => 1
+
+    assert_response :success
+    assert_template 'edit<%= suffix %>'
+
+    assert_not_nil assigns(:<%= singular_name %>)
+    assert assigns(:<%= singular_name %>).valid?
   end
 
   def test_update<%= suffix %>
-    post :update<%= suffix %>, 'id' => 1
+    post :update<%= suffix %>, :id => 1
+    assert_response :redirect
     assert_redirected_to :action => 'show<%= suffix %>', :id => 1
   end
 
   def test_destroy<%= suffix %>
     assert_not_nil <%= model_name %>.find(1)
 
-    post :destroy, 'id' => 1
+    post :destroy, :id => 1
+    assert_response :redirect
     assert_redirected_to :action => 'list<%= suffix %>'
 
     assert_raise(ActiveRecord::RecordNotFound) {
-      <%= singular_name %> = <%= model_name %>.find(1)
+      <%= model_name %>.find(1)
     }
   end
 end