rails 0.9.5 → 0.10.0

data/CHANGELOG

@@ -1,3 +1,49 @@
+*0.10.0* (24th February, 2005)
+
+* Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 [Marcel]
+
+* Fixed that script/server -d was broken so daemon mode couldn't be used #687 [Nicholas Seckar]
+
+* Upgraded to breakpoint 92 which fixes:
+
+    * overload IRB.parse_opts(), fixes #443
+      => breakpoints in tests work even when running them via rake
+    * untaint handlers, might fix an issue discussed on the Rails ML
+    * added verbose mode to breakpoint_client
+    * less noise caused by breakpoint_client by default
+    * ignored TerminateLineInput exception in signal handler
+      => quiet exit on Ctrl-C
+
+* Added support for independent components residing in /components. Example:
+
+    Controller: components/list/items_controller.rb
+    (holds a List::ItemsController class with uses_component_template_root called)
+    
+    Model     : components/list/item.rb
+    (namespace is still shared, so an Item model in app/models will take precedence)
+    
+    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 'recent' as a rake target that'll run tests for files that changed in the last 10 minutes #612 [bitsweat]
+
+* Changed script/console to default to development environment and drop --no-inspect #650 [bitsweat]
+
+* 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 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 Action Web Service as a new add-on framework for Action Pack [Leon Bredt]
+
+* Added Active Support as an independent utility and standard library extension bundle
+
+* Upgraded to Active Record 1.7.0, Action Pack 1.5.0, Action Mailer 0.7.0
+
+
 *0.9.5* (January 25th, 2005)
 
 * Fixed dependency reloading by switching to a remove_const approach where all Active Records, Active Record Observers, and Action Controllers are reloading by undefining their classes. This enables you to remove methods in all three types and see the change reflected immediately and it fixes #539. This also means that only those three types of classes will benefit from the const_missing and reloading approach. If you want other classes (like some in lib/) to reload, you must use require_dependency to do it.

data/README

@@ -32,7 +32,7 @@ link:files/vendor/actionpack/README.html.
 
 == Optionals
 
-* Apache 1.3.x or 2.x (or any FastCGI-capable webserver with a
+* Apache 1.3.x or 2.x or lighttpd 1.3.11+ (or any FastCGI-capable webserver with a
   mod_rewrite-like module)
 * FastCGI (or mod_ruby) for better performance on Apache
 
@@ -49,7 +49,7 @@ link:files/vendor/actionpack/README.html.
   <VirtualHost *:80>
     ServerName rails
     DocumentRoot /path/application/public/
-    ErrorLog /path/application/log/apache.log
+    ErrorLog /path/application/log/server.log
   
     <Directory /path/application/public/>
       Options ExecCGI FollowSymLinks
@@ -65,9 +65,36 @@ through CGI, so no Apache restart is necessary for changes. All other requests
 goes through FCGI (or mod_ruby) that requires restart to show changes.
 
 
+== Example for lighttpd conf (with FastCGI)
+
+server.port = 8080
+server.bind = "127.0.0.1"
+# server.event-handler = "freebsd-kqueue" # needed on OS X
+
+server.modules = ( "mod_rewrite", "mod_fastcgi" )
+
+url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
+server.error-handler-404 = "/dispatch.fcgi"
+
+server.document-root = "/path/application/public"
+server.errorlog      = "/path/application/log/server.log"
+
+fastcgi.server = ( ".fcgi" =>
+  ( "localhost" =>
+      (
+        "min-procs" => 1, 
+        "max-procs" => 5,
+        "socket"   => "/tmp/application.fcgi.socket",
+        "bin-path" => "/path/application/public/dispatch.fcgi",
+        "bin-environment" => ( "RAILS_ENV" => "development" )
+      )
+  )
+)
+
+
 == Debugging Rails
 
-Have "tail -f" commands running on both the apache.log, production.log, and
+Have "tail -f" commands running on both the server.log, production.log, and
 test.log files. Rails will automatically display debugging and runtime
 information to these files. Debugging info will also be shown in the browser
 on requests from 127.0.0.1.
@@ -139,17 +166,18 @@ app/helpers
   Holds view helpers that should be named like weblog_helper.rb.
 
 config
-  Configuration files for Apache, database, and other dependencies.
+  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
+
+components
+  Self-contained mini-applications that can bundle controllers, models, and views together.
 
 lib
   Application specific libraries. Basically, any kind of custom code that doesn't
   belong controllers, models, or helpers. This directory is in the load path.
     
 public
-  The directory available for Apache, which includes symbolic links to other
-  parts of the structure that are to be made available. Refrain from placing
-  actual files in here if you're using CVS and don't want to check in this
-  directory.
+  The directory available for the web server. Contains sub-directories for images, stylesheets,
+  and javascripts. Also contains the dispatchers and the default HTML files.
 
 script
   Helper scripts for automation and generation.

data/Rakefile

@@ -9,22 +9,21 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.9.5' + PKG_BUILD
+PKG_VERSION     = '0.10.0' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
 
-BASE_DIRS   = %w( app config/environments db doc log lib public script test vendor )
-APP_DIRS    = %w( models controllers helpers views views/layouts )
-PUBLIC_DIRS = %w( images javascripts stylesheets _doc )
+BASE_DIRS   = %w( app config/environments components db doc log lib public script test vendor )
+APP_DIRS    = %w( apis models controllers helpers views views/layouts )
+PUBLIC_DIRS = %w( images javascripts stylesheets )
 TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/testing )
 
-LOG_FILES    = %w( apache.log development.log test.log production.log )
+LOG_FILES    = %w( server.log development.log test.log production.log )
 HTML_FILES   = %w( 404.html 500.html index.html )
-BIN_FILES    = %w( generate breakpointer console server )
-GENERATORS   = %w( controller mailer model scaffold )
+BIN_FILES    = %w( generate destroy breakpointer console server update )
 
-VENDOR_LIBS = %w( actionpack activerecord actionmailer railties )
+VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
 
 
 desc "Default Task"
@@ -42,6 +41,9 @@ task :fresh_rails_without_docs => [ :clean, :make_dir_structure, :initialize_fil
 desc "Generates a fresh Rails package without documentation (faster)"
 task :fresh_rails_without_docs_using_links => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ]
 
+desc "Generates minimal Rails package using symlinks"
+task :dev => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ]
+
 desc "Packages the fresh Rails package with documentation"
 task :package => [ :clean, :fresh_rails ] do
   system %{cd ..; tar -czvf #{PKG_NAME}-#{PKG_VERSION}.tgz #{PKG_NAME}}
@@ -107,8 +109,7 @@ end
 desc "Make copies of all the default content of ties"
 task :copy_ties_content => [ 
   :copy_rootfiles, :copy_dispatches, :copy_html_files, :copy_application,
-  :copy_configs, :copy_binfiles, :copy_test_helpers, :copy_docs_in_public,
-  :copy_app_doc_readme ]
+  :copy_configs, :copy_binfiles, :copy_test_helpers, :copy_app_doc_readme ]
 
 task :copy_dispatches do
   copy_with_rewritten_ruby_path("dispatches/dispatch.rb", "#{PKG_DESTINATION}/public/dispatch.rb")
@@ -133,6 +134,7 @@ end
 
 task :copy_configs do
   cp "configs/database.yml", "#{PKG_DESTINATION}/config/database.yml"
+  cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb"
 
   cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess"
 
@@ -142,14 +144,6 @@ task :copy_configs do
   cp "environments/test.rb", "#{PKG_DESTINATION}/config/environments/test.rb"
 end
 
-task :copy_generators do
-  mkdir_p File.join(PKG_DESTINATION, 'script/generators')
-
-  GENERATORS.each do |dir|
-    cp_r File.join('generators', dir), File.join(PKG_DESTINATION, 'script', 'generators', dir)
-  end
-end
-
 task :copy_binfiles do
   BIN_FILES.each do |file|
     dest_file = File.join(PKG_DESTINATION, 'script', file)
@@ -168,10 +162,6 @@ task :copy_test_helpers do
   cp "helpers/test_helper.rb", "#{PKG_DESTINATION}/test/test_helper.rb"
 end
 
-task :copy_docs_in_public do
-  cp "doc/index.html", "#{PKG_DESTINATION}/public/_doc/index.html"
-end
-
 task :copy_app_doc_readme do
   cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
 end
@@ -247,10 +237,13 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.4.15')
-  s.add_dependency('activerecord', '>= 1.6.0')
-  s.add_dependency('actionpack', '>= 1.4.0')
-  s.add_dependency('actionmailer', '>= 0.6.1')
+  s.add_dependency('activesupport',    '= 1.0.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.7.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.5.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 0.7.0' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 0.5.0' + PKG_BUILD)
 
+  s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 
   s.files = PKG_FILES.to_a.delete_if {|f| f.include?('.svn')}

data/bin/console

@@ -1,35 +1,22 @@
 #!/usr/local/bin/ruby
+irb = RUBY_PLATFORM =~ /mswin32/ ? 'irb.bat' : 'irb'
 
-if ARGV[0]
-  ENV['RAILS_ENV'] = ARGV[0]
-  puts "Loading environment..."
-  if RUBY_PLATFORM =~ /mswin32/
-    irb_name = "irb.bat"
-  else
-    irb_name = 'irb'
-  end
-  exec "#{irb_name} -r config/environment.rb -r irb/completion --noinspect"
-else
-  puts <<-HELP
-
-NAME
-     console - interact with the domain model through a environment console (on IRB)
+require 'optparse'
+options = {}
+OptionParser.new do |opt|
+  opt.on('-s', '--sandbox', 'Rollback database modifications on exit.') { |options[:sandbox]| }
+  opt.parse!(ARGV)
+end
 
-SYNOPSIS
-     console [environment]
+libs =  " -r #{File.dirname(__FILE__)}/../config/environment"
+libs << " -r #{File.dirname(__FILE__)}/console_sandbox" if options[:sandbox]
+libs << " -r irb/completion"
 
-DESCRIPTION
-     Starts an environment console using IRB that lets you manipulate and interrogate
-     the domain model or even trigger controller actions. The database connection and
-     configuration available to the web application is already setup.
-     
-     Tab completion is available to see classes and methods on individual objects.
-     
-EXAMPLE
-     console production
-     
-     This will initialize the production environment (as setup in config/database.yml
-     and config/environments/production.rb). You would now be ready to start requiring
-     models using require_dependency.
-HELP
+ENV['RAILS_ENV'] = ARGV.first || 'development'
+if options[:sandbox]
+  puts "Loading #{ENV['RAILS_ENV']} environment in sandbox."
+  puts "Any modifications you make will be rolled back on exit."
+else
+  puts "Loading #{ENV['RAILS_ENV']} environment."
 end
+exec "#{irb} #{libs}"

data/bin/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/bin/destroy

@@ -0,0 +1,5 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+require 'rails_generator/scripts/destroy'
+Rails::Generator::Scripts::Destroy.new.run(ARGV)

data/bin/generate

@@ -1,73 +1,5 @@
 #!/usr/local/bin/ruby
 require File.dirname(__FILE__) + '/../config/environment'
 require 'rails_generator'
-
-ARGV.shift unless ARGV.empty? or not ['--help', '-h'].include?(ARGV[0])
-
-def find_synonyms(word)
-  require 'open-uri'
-  require 'timeout'
-
-  uri = "http://wordnet.princeton.edu/cgi-bin/webwn2.0?stage=2" +
-    "&word=%s&posnumber=1&searchtypenumber=2&senses=&showglosses=1"
-
-  timeout(5) do
-    open(uri % word) do |stream|
-      data = stream.read.gsub("&nbsp;", " ").gsub("<BR>", "")
-      data.scan(/^Sense \d+\n.+?\n\n/m)
-    end
-  end
-rescue Timeout::Error, Exception
-  return nil
-end
-
-unless ARGV.empty?
-  begin
-    name = ARGV.shift
-    generator = Rails::Generator.instance(name, ARGV)
-
-    if msg = generator.collision_with_builtin? then
-      $stderr.puts msg
-
-      if synonyms = find_synonyms(generator.class_name) then
-        $stderr.puts(
-          "", "Here are a few synonyms from WordNet. Maybe they will help you find an alternative name.",
-          "", synonyms
-        )
-      end
-    else
-      generator.generate
-    end
-  rescue Rails::Generator::UsageError => e
-    puts e.message
-  end
-else
-  builtin_generators = Rails::Generator.builtin_generators.join(', ')
-  contrib_generators = Rails::Generator.contrib_generators.join(', ')
-
-  $stderr.puts <<end_usage
-  #{$0} generator [args]
-
-  Rails comes with #{builtin_generators} generators.
-    #{$0} controller Login login logout
-    #{$0} model Account
-    #{$0} mailer AccountMailer
-    #{$0} scaffold Account action another_action
-
-end_usage
-
-  unless contrib_generators.empty?
-    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/script/generators):"
-    $stderr.puts "    #{contrib_generators}"
-    $stderr.puts
-  end
-
-  $stderr.puts <<end_usage
-  More generators are available at http://rubyonrails.org/show/Generators
-    1. Download, for example, login_generator.tar.gz
-    2. Unzip to directory #{RAILS_ROOT}/script/generators/login
-    3. Generate without args for usage information
-         #{$0} login
-end_usage
-  exit 0
-end
+require 'rails_generator/scripts/generate'
+Rails::Generator::Scripts::Generate.new.run(ARGV)

data/bin/rails

@@ -1,28 +1,4 @@
-if ARGV[0]
-  ENV["RAILS_PKG_DESTINATION"] = File.expand_path(ARGV[0])
-  if RUBY_PLATFORM =~ /mswin32/
-    Dir.chdir File.dirname(__FILE__)
-    system %{rake.cmd fresh_gem_rails}
-  else
-    system %{ cd #{File.dirname(__FILE__)}; rake fresh_gem_rails }
-  end
-else
-  puts <<-HELP
-
-NAME
-     rails - creates a new Rails installation 
-
-SYNOPSIS
-     rails [full path]
-
-DESCRIPTION
-     This generator will create a suggested directory structure, lots of minor helper
-     files, and a default configuration for creating a new Rails application. Once the
-     generator is done, you're advised to look at the README in the root of the folder.
-     
-EXAMPLE
-     rails ~/Code/Ruby/weblog
-     
-     This will generate a new Rails installation in the ~/Code/Ruby/weblog folder.
-HELP
-end
+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')

data/bin/server

@@ -5,7 +5,7 @@ require 'optparse'
 
 OPTIONS = {
   :port        => 3000,
-  :ip          => "127.0.0.1",
+  :ip          => "0.0.0.0",
   :environment => "development",
   :server_root => File.expand_path(File.dirname(__FILE__) + "/../public/"),
   :server_type => WEBrick::SimpleServer
@@ -45,5 +45,7 @@ ENV["RAILS_ENV"] = OPTIONS[:environment]
 require File.dirname(__FILE__) + "/../config/environment"
 require 'webrick_server'
 
+OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
+
 puts "=> Rails application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
-DispatchServlet.dispatch(OPTIONS)
+DispatchServlet.dispatch(OPTIONS)

data/bin/update

@@ -0,0 +1,5 @@
+#!/usr/local/bin/ruby
+require File.dirname(__FILE__) + '/../config/environment'
+require 'rails_generator'
+require 'rails_generator/scripts/update'
+Rails::Generator::Scripts::Update.new.run(ARGV)

data/configs/apache.conf

@@ -3,59 +3,12 @@ AddHandler fastcgi-script .fcgi
 AddHandler cgi-script .cgi
 Options +FollowSymLinks +ExecCGI
 
-# Make sure that mod_ruby.c has been added and loaded as a module with Apache
+# Redirect all requests not available on the filesystem to Rails
 RewriteEngine On
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ /dispatch.cgi?$1 [QSA,L]
 
-# Change extension from .cgi to .fcgi to switch to FCGI and to .rb to switch to mod_ruby
-RewriteBase /dispatch.cgi
-
-# Enable this rewrite rule to point to the controller/action that should serve root.
-# RewriteRule ^$ /controller/action [R]
-
-# <caching>
-# no query string?
-RewriteCond %{QUERY_STRING} ^$
-
-# no POST method? 
-RewriteCond %{REQUEST_METHOD} !^POST$ [NC]
-
-# Request filename is a directory?
-RewriteCond %{REQUEST_FILENAME} -d
-
-# Request filename + '/index' is a file?
-RewriteCond %{REQUEST_FILENAME}/index -f
-
-# Rewrite to request filename + '/index' and finish
-RewriteRule ^(.*)/?$ $1/index [QSA,L]
-
-# no query string?
-RewriteCond %{QUERY_STRING} ^$
-
-# no POST method?
-RewriteCond %{REQUEST_METHOD} !^POST$ [NC]
-
-# Request filename is a file?
-RewriteCond %{REQUEST_FILENAME} -f
-
-# Finish rewriting
-RewriteRule .* - [L]
-
-# Set default type of cached files to text/html
-DefaultType text/html
-# </caching>
-
-# Add missing slash
-RewriteRule ^([-_a-zA-Z0-9]+)$                                            /$1/ [R]
-
-# Default rewriting rules. 
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$                  ?controller=$1&action=$2&id=$3 [QSA,L]
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$                           ?controller=$1&action=$2 [QSA,L]
-RewriteRule ^([-_a-zA-Z0-9]+)/$                                           ?controller=$1&action=index [QSA,L]
-
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([0-9]+)$ ?module=$1&controller=$2&action=$3&id=$4 [QSA,L]
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)$          ?module=$1&controller=$2&action=$3 [QSA,L]
-RewriteRule ^([-_a-zA-Z0-9]+)/([-_a-zA-Z0-9]+)/$                          ?module=$1&controller=$2&action=index [QSA,L]
-
-# You can also point these error messages to a controller/action
-ErrorDocument 500 /500.html
-ErrorDocument 404 /404.html
+# In case Rails experiences terminal errors
+ErrorDocument 500 /500.html