rails 0.12.1 → 0.13.0

data/CHANGELOG

@@ -1,3 +1,52 @@
+*SVN*
+
+* Changed the default logging level in config/environment.rb to INFO for production (so SQL statements won't be logged)
+
+* Added migration generator: ./script/generate migration add_system_settings
+
+* Added "migrate" as rake task to execute all the pending migrations from db/migrate
+
+* Fixed that model generator would make fixtures plural, even if ActiveRecord::Base.pluralize_table_names was false #1185 [Marcel Molina]
+
+* Added a DOCTYPE of HTML transitional to the HTML files generated by Rails #1124 [Michael Koziarski]
+
+* SIGTERM also gracefully exits dispatch.fcgi.  Ignore SIGUSR1 on Windows.
+
+* Add the option to manually manage garbage collection in the FastCGI dispatcher.  Set the number of requests between GC runs in your public/dispatch.fcgi [skaes@web.de]
+
+* Allow dynamic application reloading for dispatch.fcgi processes by sending a SIGHUP. If the process is currently handling a request, the request will be allowed to complete first. This allows production fcgi's to be reloaded without having to restart them.
+
+* RailsFCGIHandler (dispatch.fcgi) no longer tries to explicitly flush $stdout (CgiProcess#out always calls flush)
+
+* Fixed rakefile actions against PostgreSQL when the password is all numeric #1462 [michael@schubert.cx]
+
+* ActionMailer::Base subclasses are reloaded with the other rails components #1262
+
+* Made the WEBrick adapter not use a mutex around action performance if ActionController::Base.allow_concurrency is true (default is false)
+
+* Fixed that mailer generator generated fixtures/plural while units expected fixtures/singular #1457 [Scott Barron]
+
+* Added a 'whiny nil' that's aim to ensure that when users pass nil to methods where that isn't appropriate, instead of NoMethodError? and the name of some method used by the framework users will see a message explaining what type of object was expected. Only active in test and development environments by default #1209 [Michael Koziarski]
+
+* Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar]
+
+* Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar]
+
+* Added -e/--environment option to script/runner #1408 [fbeausoleil@ftml.net]
+
+* Modernize the scaffold generator to use the simplified render and test methods and to change style from @params["id"] to params[:id].  #1367
+
+* Added graceful exit from pressing CTRL-C during the run of the rails command #1150 [Caleb Tennis]
+
+* Allow graceful exits for dispatch.fcgi processes by sending a SIGUSR1. If the process is currently handling a request, the request will be allowed to complete and then will terminate itself. If a request is not being handled, the process is terminated immediately (via #exit). This basically works like restart graceful on Apache. [Jamis Buck]
+
+* Made dispatch.fcgi more robust by catching fluke errors and retrying unless its a permanent condition. [Jamis Buck]
+
+* Added console --profile for profiling an IRB session #1154 [Jeremy Kemper]
+
+* Changed console_sandbox into console --sandbox #1154 [Jeremy Kemper]
+
+
 *0.12.1* (20th April, 2005)
 
 * Upgraded to Active Record 1.10.1, Action Pack 1.8.1, Action Mailer 0.9.1, Action Web Service 0.7.1
@@ -132,17 +181,17 @@
     Views     : components/list/items/show.rhtml
 
 
-* Added --sandbox option to script/console that'll roll back all changes made to the database when you quit #672 [bitsweat]
+* Added --sandbox option to script/console that'll roll back all changes made to the database when you quit #672 [Jeremy Kemper]
 
-* Added 'recent' as a rake target that'll run tests for files that changed in the last 10 minutes #612 [bitsweat]
+* Added 'recent' as a rake target that'll run tests for files that changed in the last 10 minutes #612 [Jeremy Kemper]
 
-* Changed script/console to default to development environment and drop --no-inspect #650 [bitsweat]
+* Changed script/console to default to development environment and drop --no-inspect #650 [Jeremy Kemper]
 
-* Added that the 'fixture :posts' syntax can be used for has_and_belongs_to_many fixtures where a model doesn't exist #572 [bitsweat]
+* Added that the 'fixture :posts' syntax can be used for has_and_belongs_to_many fixtures where a model doesn't exist #572 [Jeremy Kemper]
 
 * Added that running test_units and test_functional now performs the clone_structure_to_test as well #566 [rasputnik]
 
-* Added new generator framework that informs about its doings on generation and enables updating and destruction of generated artifacts. See the new script/destroy and script/update for more details #487 [bitsweat]
+* Added new generator framework that informs about its doings on generation and enables updating and destruction of generated artifacts. See the new script/destroy and script/update for more details #487 [Jeremy Kemper]
 
 * Added Action Web Service as a new add-on framework for Action Pack [Leon Bredt]
 
@@ -346,7 +395,7 @@
   Nothing changes inside the files themselves.
 
 
-* Fixed a few references in the tests generated by new_mailer [bitsweat]
+* Fixed a few references in the tests generated by new_mailer [Jeremy Kemper]
 
 * Added support for mocks in testing with test/mocks
 
@@ -355,7 +404,7 @@
 
 *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]:
+* Made dev-util available to all tests, so you can insert breakpoints in any test case to get an IRB prompt at that point [Jeremy Kemper]:
 
     def test_complex_stuff
       @david.projects << @new_project
@@ -364,11 +413,11 @@
   
   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 shared generator behavior so future upgrades should be possible without manually copying over files [Jeremy Kemper]
 
-* Added the new helper style to both controller and helper templates [bitsweat]
+* Added the new helper style to both controller and helper templates [Jeremy Kemper]
 
-* Added new_crud generator for creating a model and controller at the same time with explicit scaffolding [bitsweat]
+* Added new_crud generator for creating a model and controller at the same time with explicit scaffolding [Jeremy Kemper]
 
 * Added configuration of Test::Unit::TestCase.fixture_path to test_helper to concide with the new AR fixtures style
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.12.1' + PKG_BUILD
+PKG_VERSION     = '0.13.0' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -25,8 +25,8 @@ PUBLIC_DIRS = %w( images javascripts stylesheets )
 TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
 
 LOG_FILES    = %w( server.log development.log test.log production.log )
-HTML_FILES   = %w( 404.html 500.html index.html favicon.ico javascripts/prototype.js )
-BIN_FILES    = %w( generate destroy breakpointer console console_sandbox server update runner profiler benchmarker )
+HTML_FILES   = %w( 404.html 500.html index.html favicon.ico javascripts/prototype.js javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
+BIN_FILES    = %w( generate destroy breakpointer console server update runner profiler benchmarker ) # listener tracker
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
 
@@ -59,6 +59,15 @@ task :clean do
   rm_rf PKG_DESTINATION
 end
 
+# Get external spinoffs -------------------------------------------------------------------
+
+desc "Updates railties to the latest version of the javascript spinoffs"
+task :update_js do
+  for js in %w( prototype controls dragdrop effects )
+    rm "html/javascripts/#{js}.js"
+    cp "./../actionpack/lib/action_view/helpers/javascripts/#{js}.js", "html/javascripts"
+  end
+end
 
 # Make directory structure ----------------------------------------------------------------
 
@@ -123,6 +132,9 @@ task :copy_dispatches do
 
   copy_with_rewritten_ruby_path("dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.fcgi"
+
+  # copy_with_rewritten_ruby_path("dispatches/gateway.cgi", "#{PKG_DESTINATION}/public/gateway.cgi")
+  # chmod 0755, "#{PKG_DESTINATION}/public/gateway.cgi"
 end
 
 task :copy_html_files do
@@ -239,11 +251,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.5.3')
-  s.add_dependency('activesupport',    '= 1.0.4' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.10.1' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.8.1' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 0.9.1' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 0.7.1' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 1.1.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.11.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.9.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 1.0.0' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 0.8.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -268,8 +280,8 @@ end
 # Publishing -------------------------------------------------------
 desc "Publish the API documentation"
 task :pgem => [:gem] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.com './gemupdate.sh'`
+  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
 end
 
 desc "Publish the release files to RubyForge."
@@ -385,4 +397,4 @@ task :release => [:gem] do
       first_file = false
     end
   end
-end
+end

data/bin/console

@@ -2,15 +2,16 @@
 irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
 
 require 'optparse'
-options = {}
+options = { :sandbox => false, :irb => irb }
 OptionParser.new do |opt|
   opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
+  opt.on("--irb=[#{irb}]", 'Invoke a different irb.') { |options[:irb]| }
   opt.parse!(ARGV)
 end
 
-libs =  " -r #{File.dirname(__FILE__)}/../config/environment"
-libs << " -r #{File.dirname(__FILE__)}/console_sandbox" if options[:sandbox]
-libs << " -r irb/completion"
+libs =  " -r irb/completion"
+libs << " -r #{File.dirname(__FILE__)}/../config/environment"
+libs << " -r console_sandbox" if options[:sandbox]
 
 ENV['RAILS_ENV'] = ARGV.first || 'development'
 if options[:sandbox]
@@ -19,4 +20,4 @@ if options[:sandbox]
 else
   puts "Loading #{ENV['RAILS_ENV']} environment."
 end
-exec "#{irb} #{libs}"
+exec "#{options[:irb]} #{libs} --prompt-mode simple"

data/bin/console_sandbox

@@ -1,6 +0,0 @@
-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/bin/listener

@@ -0,0 +1,86 @@
+#!/usr/local/bin/ruby
+
+require 'stringio'
+require 'fileutils'
+require 'fcgi_handler'
+
+def message(s)
+  $stderr.puts "listener: #{s}" if ENV && ENV["DEBUG_GATEWAY"]
+end
+
+class RemoteCGI < CGI
+  attr_accessor :stdinput, :stdoutput, :env_table
+  def initialize(env_table, input = nil, output = nil)
+    self.env_table = env_table
+    self.stdinput = input || StringIO.new
+    self.stdoutput = output || StringIO.new
+    super()
+  end
+
+  def out(stream) # Ignore the requested output stream
+    super(stdoutput)
+  end
+end
+
+class Listener
+  include DRbUndumped
+
+  def initialize(timeout, socket_path)
+    @socket = File.expand_path(socket_path)
+    @mutex = Mutex.new
+    @active = false
+    @timeout = timeout
+
+    @handler = RailsFCGIHandler.new
+    @handler.extend DRbUndumped
+
+    message 'opening socket'
+    DRb.start_service("drbunix:#{@socket}", self)
+
+    message 'entering process loop'
+    @handler.process! self
+  end
+
+  def each_cgi(&cgi_block)
+    @cgi_block = cgi_block
+    message 'entering idle loop'
+    loop do
+      sleep @timeout rescue nil
+      die! unless @active
+      @active = false
+    end
+  end
+
+  def process(env, input)
+    message 'received request'
+    @mutex.synchronize do
+      @active = true
+
+      message 'creating input stream'
+      input_stream = StringIO.new(input)
+      message 'building CGI instance'
+      cgi = RemoteCGI.new(eval(env), input_stream)
+
+      message 'yielding to fcgi handler'
+      @cgi_block.call cgi
+      message 'yield finished -- sending output'
+
+      cgi.stdoutput.seek(0)
+      output = cgi.stdoutput.read
+
+      return output
+    end
+  end
+
+  def die!
+    message 'shutting down'
+    DRb.stop_service
+    FileUtils.rm_f @socket
+    Kernel.exit 0
+  end
+end
+
+socket_path = ARGV.shift
+timeout = (ARGV.shift || 90).to_i
+
+Listener.new(timeout, socket_path)

data/bin/profiler

@@ -1,17 +1,34 @@
 #!/usr/local/bin/ruby
-
 if ARGV.empty?
-  puts "Usage: profiler 'Person.expensive_method(10)' [times]"
-  exit
+  $stderr.puts "Usage: profiler 'Person.expensive_method(10)' [times]"
+  exit(1)
 end
 
+# Keep the expensive require out of the profile.
+$stderr.puts 'Loading Rails...'
 require File.dirname(__FILE__) + '/../config/environment'
-require "profiler"
 
-# Don't include compilation in the profile
-eval(ARGV.first)
+# Define a method to profile.
+if ARGV[1] and ARGV[1].to_i > 1
+  eval "def profile_me() #{ARGV[1]}.times { #{ARGV[0]} } end"
+else
+  eval "def profile_me() #{ARGV[0]} end"
+end
 
-Profiler__::start_profile
-(ARGV[1] || 1).to_i.times { eval(ARGV.first) }
-Profiler__::stop_profile
-Profiler__::print_profile($stdout)
+# Use the ruby-prof extension if available.  Fall back to stdlib profiler.
+begin
+  require 'prof'
+  $stderr.puts 'Using the ruby-prof extension.'
+  Prof.clock_mode = Prof::GETTIMEOFDAY
+  Prof.start
+  profile_me
+  results = Prof.stop
+  require 'rubyprof_ext'
+  Prof.print_profile(results, $stderr)
+rescue LoadError
+  $stderr.puts 'Using the standard Ruby profiler.'
+  Profiler__.start_profile
+  profile_me
+  Profiler__.stop_profile
+  Profiler__.print_profile($stderr)
+end

data/bin/rails

@@ -1,6 +1,8 @@
 abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
 
+Signal.trap("INT") { puts; exit }
+
 require File.dirname(__FILE__) + '/../lib/rails_generator'
 require 'rails_generator/scripts/generate'
 Rails::Generator::Base.use_application_sources!
-Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')

data/bin/runner

@@ -1,3 +1,27 @@
+require 'optparse'
+
+options = { :environment => "development" }
+
+ARGV.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = "Usage: runner 'puts Person.find(1).name' [options]"
+
+  opts.separator ""
+
+  opts.on("-e", "--environment=name", String,
+          "Specifies the environment for the runner to operate under (test/development/production).",
+          "Default: development") { |options[:environment]| }
+
+  opts.separator ""
+
+  opts.on("-h", "--help",
+          "Show this help message.") { puts opts; exit }
+
+  opts.parse!
+end
+
+ENV["RAILS_ENV"] = options[:environment]
+
 #!/usr/local/bin/ruby
 
 require File.dirname(__FILE__) + '/../config/environment'

data/bin/server

@@ -45,4 +45,5 @@ require 'webrick_server'
 OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
 
 puts "=> Rails application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
+puts "=> Ctrl-C to shutdown server; call with --help for options" if OPTIONS[:server_type] == WEBrick::SimpleServer
 DispatchServlet.dispatch(OPTIONS)

data/bin/tracker

@@ -0,0 +1,69 @@
+#!/usr/local/bin/ruby
+
+require 'drb'
+require 'thread'
+
+def message(s)
+  $stderr.puts "tracker: #{s}" if ENV && ENV["DEBUG_GATEWAY"]
+end
+
+class Tracker
+  include DRbUndumped
+
+  def initialize(instances, socket_path)
+    @instances = instances
+    @socket = File.expand_path(socket_path)
+    @active = false
+
+    @listeners = []
+    @instances.times { @listeners << Mutex.new }
+
+    message "using #{@listeners.length} listeners"
+    message "opening socket at #{@socket}"
+
+    @service = DRb.start_service("drbunix://#{@socket}", self)
+  end
+
+  def with_listener
+    message "listener requested"
+
+    mutex = has_lock = index = nil
+    3.times do 
+      @listeners.each_with_index do |mutex, index|
+        has_lock = mutex.try_lock
+        break if has_lock
+      end
+      break if has_lock
+      sleep 0.05
+    end
+
+    if has_lock
+      message "obtained listener #{index}"
+      @active = true
+      begin yield index
+      ensure
+        mutex.unlock
+        message "released listener #{index}"
+      end
+    else
+      message "dropping request because no listeners are available!"
+    end
+  end
+
+  def background(check_interval = nil)
+    if check_interval
+      loop do
+        sleep check_interval
+        message "Idle for #{check_interval}, shutting down" unless @active
+        @active = false
+        Kernel.exit 0
+      end
+    else DRb.thread.join
+    end
+  end
+end
+
+socket_path = ARGV.shift
+instances = ARGV.shift.to_i
+t = Tracker.new(instances, socket_path)
+t.background(ARGV.first ? ARGV.shift.to_i : 90)