rails 2.0.5 → 2.1.0

data/CHANGELOG

@@ -1,16 +1,128 @@
-*2.0.5* (October 19th, 2008)
+*2.1.0 (May 31st, 2008)*
 
-* Security fixes for Active Record and Action Pack
+* script/dbconsole fires up the command-line database client.  #102 [Steve Purcell]
 
+* Fix bug where plugin init.rb files from frozen gem specs weren't being run.  (pjb3) [#122 state:resolved]
 
-*2.0.4* (2nd September 2008)
+* Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88]
+
+* Rails Edge info returns the latest git commit hash [Francesc Esplugas]
+
+* Added Rails.public_path to control where HTML and assets are expected to be loaded from (defaults to Rails.root + "/public") #11581 [nicksieger]
+
+* rake time:zones:local finds correct base utc offset for zones in the Southern Hemisphere [Geoff Buesing]
+
+* Don't require rails/gem_builder during rails initialization, it's only needed for the gems:build task. [rick]
+
+* script/performance/profiler compatibility with the ruby-prof >= 0.5.0. Closes #9176. [Catfish]
+
+* Flesh out rake gems:unpack to unpack all gems, and add rake gems:build for native extensions. #11513 [ddollar]
+
+  rake gems:unpack             # unpacks all gems
+  rake gems:unpack GEM=mygem   # unpacks only the gem 'mygem'
+  
+  rake gems:build              # builds all unpacked gems
+  rake gems:build GEM=mygem    # builds only the gem 'mygem'
+
+* Add config.active_support for future configuration options.  Also, add more new Rails 3 config settings to new_rails_defaults.rb [rick]
+
+* Add Rails.logger, Rails.root, Rails.env and Rails.cache shortcuts for RAILS_* constants [pratik]
+
+* Allow files in plugins to be reloaded like the rest of the application.  [rick]
+
+  Enables or disables plugin reloading.
+  
+    config.reload_plugins = true
+  
+  You can get around this setting per plugin.
+  If #reload_plugins? == false (DEFAULT), add this to your plugin's init.rb to make it reloadable:
+  
+    Dependencies.load_once_paths.delete lib_path
+  
+  If #reload_plugins? == true, add this to your plugin's init.rb to only load it once:
+  
+    Dependencies.load_once_paths << lib_path
+
+* Small tweak to allow plugins to specify gem dependencies.  [rick]
+
+  # OLD open_id_authentication plugin init.rb
+  require 'yadis'
+  require 'openid'
+  ActionController::Base.send :include, OpenIdAuthentication
+
+  # NEW
+  config.gem "ruby-openid", :lib => "openid", :version => "1.1.4"
+  config.gem "ruby-yadis",  :lib => "yadis",  :version => "0.3.4"
+
+  config.after_initialize do
+    ActionController::Base.send :include, OpenIdAuthentication
+  end
+
+* Added config.gem for specifying which gems are required by the application, as well as rake tasks for installing and freezing gems. [rick]
+
+  Rails::Initializer.run do |config|
+    config.gem "bj"
+    config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
+    config.gem "aws-s3", :lib => "aws/s3"
+  end
+  
+  # List required gems.
+  rake gems
+  
+  # Install all required gems:
+  rake gems:install
+  
+  # Unpack specified gem to vendor/gems/gem_name-x.x.x
+  rake gems:unpack GEM=bj
+
+* Removed the default .htaccess configuration as there are so many good deployment options now (kept it as an example in README) [DHH]
+
+* config.time_zone accepts TZInfo::Timezone identifiers as well as Rails TimeZone identifiers [Geoff Buesing]
+
+* Rails::Initializer#initialize_time_zone raises an error if value assigned to config.time_zone is not recognized. Rake time zone tasks only require ActiveSupport instead of entire environment [Geoff Buesing]
+
+* Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons [DHH]
+
+* Added that gems can now be plugins if they include rails/init.rb #11444 [jbarnette]
+
+* Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [lazyatom]
+
+    plugin = Rails::Plugin.new(path_to_my_plugin)
+    plugin.about["author"] # => "James Adam"
+    plugin.about["url"] # => "http://interblah.net"
+
+* Improve documentation. [Radar, Jan De Poorter, chuyeow, xaviershay, danger, miloops, Xavier Noria,  Sunny Ripert]
+
+* Added config.time_zone = 'UTC' in the default environment.rb [Geoff Buesing]
+
+* Added rake tasks time:zones:all, time:zones:us and time:zones:local for finding time zone names for config.time_zone option [Geoff Buesing]
+
+* Add config.time_zone for configuring the default Time.zone value.  #10982 [Geoff Buesing]
+
+* Added support for installing plugins hosted at git repositories #11294 [danger]
+
+* Fixed that script/generate would not look for plugin generators in plugin_paths #11000 [glv]
+
+* Fixed database rake tasks to work with charset/collation and show proper error messages on failure. Closes #11301 [matt]
+
+* Added a -e/--export to script/plugin install, uses svn export. #10847 [jon@blankpad.net)]
+
+* Reshuffle load order so that routes and observers are initialized after plugins and app initializers.  Closes #10980 [rick]
+
+* Git support for script/generate.  #10690 [ssoroka]
+
+* Update scaffold to use labels instead of bold tags.  Closes #10757 [zach-inglis-lt3]
 
 * Resurrect WordNet synonym lookups.  #10710 [tom./, matt]
 
+* Added config.cache_store to environment options to control the default cache store (default is FileStore if tmp/cache is present, otherwise MemoryStore is used) [DHH]
+
 * Added that rails:update is run when you do rails:freeze:edge to ensure you also get the latest JS and config files #10565 [jeff]
 
 * SQLite: db:drop:all doesn't fail silently if the database is already open.  #10577 [Cheah Chu Yeow, mrichman]
 
+* Introduce native mongrel handler and push mutex into dispatcher.  [Jeremy Kemper]
+
 * Ruby 1.9 compatibility.  #1689, #10546 [Cheah Chu Yeow, frederico]
 
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2007 David Heinemeier Hansson
+Copyright (c) 2004-2008 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -1,14 +1,14 @@
 == Welcome to Rails
 
-Rails is a web-application and persistence framework that includes everything
-needed to create database-backed web-applications according to the
-Model-View-Control pattern of separation. This pattern splits the view (also
-called the presentation) into "dumb" templates that are primarily responsible
-for inserting pre-built data in between HTML tags. The model contains the
-"smart" domain objects (such as Account, Product, Person, Post) that holds all
-the business logic and knows how to persist themselves to a database. The
-controller handles the incoming requests (such as Save New Account, Update
-Product, Show Post) by manipulating the model and directing data to the view.
+Rails is a web-application framework that includes everything needed to create 
+database-backed web applications according to the Model-View-Control pattern. 
+
+This pattern splits the view (also called the presentation) into "dumb" templates
+that are primarily responsible for inserting pre-built data in between HTML tags.
+The model contains the "smart" domain objects (such as Account, Product, Person,
+Post) that holds all the business logic and knows how to persist themselves to
+a database. The controller handles the incoming requests (such as Save New Account,
+Update Product, Show Post) by manipulating the model and directing data to the view.
 
 In Rails, the model is handled by what's called an object-relational mapping
 layer entitled Active Record. This layer allows you to present the data from
@@ -29,9 +29,8 @@ link:files/vendor/rails/actionpack/README.html.
 
 1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
    and your application name. Ex: rails myapp
-   (If you've downloaded Rails in a complete tgz or zip, this step is already done)
 2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
-3. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
+3. Go to http://localhost:3000/ and get "Welcome aboard: You're riding the Rails!"
 4. Follow the guidelines to start developing your application
 
 
@@ -62,6 +61,50 @@ Apache, LiteSpeed, IIS are just a few. For more information on FCGI,
 please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI
 
 
+== Apache .htaccess example
+
+# General Apache options
+AddHandler fastcgi-script .fcgi
+AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+
+
 == Debugging Rails
 
 Sometimes your application goes wrong.  Fortunately there are a lot of tools that
@@ -102,7 +145,9 @@ and also on programming in general.
 
 Debugger support is available through the debugger command when you start your Mongrel or
 Webrick server with --debugger. This means that you can break out of execution at any point
-in the code, investigate and change the model, AND then resume execution! Example:
+in the code, investigate and change the model, AND then resume execution! 
+You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'
+Example:
 
   class WeblogController < ActionController::Base
     def index
@@ -140,6 +185,13 @@ Passing an argument will specify a different environment, like <tt>script/consol
 
 To reload your controllers and models after launching the console run <tt>reload!</tt>
 
+== dbconsole
+
+You can go to the command line of your database directly through <tt>script/dbconsole</tt>.
+You would be connected to the database with the credentials defined in database.yml.
+Starting the script without arguments will connect you to the development database. Passing an
+argument will connect you to a different database, like <tt>script/dbconsole production</tt>.
+Currently works for mysql, postgresql and sqlite.
 
 == Description of Contents
 
@@ -157,13 +209,13 @@ app/models
 
 app/views
   Holds the template files for the view that should be named like
-  weblogs/index.erb for the WeblogsController#index action. All views use eRuby
+  weblogs/index.html.erb for the WeblogsController#index action. All views use eRuby
   syntax.
 
 app/views/layouts
   Holds the template files for layouts to be used with views. This models the common
   header/footer method of wrapping views. In your views, define a layout using the
-  <tt>layout :default</tt> and create a file named default.erb. Inside default.erb,
+  <tt>layout :default</tt> and create a file named default.html.erb. Inside default.html.erb,
   call <% yield %> to render the view using this layout.
 
 app/helpers
@@ -200,4 +252,5 @@ test
 
 vendor
   External libraries that the application depends on. Also includes the plugins subdirectory.
+  If the app has frozen rails, those gems also go here, under vendor/rails/.
   This directory is in the load path.

data/Rakefile

@@ -2,7 +2,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'rake/contrib/sshpublisher'
 require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
@@ -29,7 +28,7 @@ task :default => :test
 ## we can see the failures
 task :test do 
   Dir['test/**/*_test.rb'].all? do |file|
-    system("ruby #{file}")
+    system("ruby -Itest #{file}")
   end or raise "Failures"
 end
 
@@ -161,7 +160,6 @@ end
 
 # Copy Ties Content -----------------------------------------------------------------------
 
-# :link_apache_config
 desc "Make copies of all the default content of ties"
 task :copy_ties_content => [ 
   :copy_rootfiles, :copy_dispatches, :copy_html_files, :copy_application,
@@ -198,8 +196,6 @@ task :copy_configs do
   
   cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb"
 
-  cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess"
-
   cp "configs/initializers/inflections.rb", "#{PKG_DESTINATION}/config/initializers/inflections.rb"
   cp "configs/initializers/mime_types.rb",  "#{PKG_DESTINATION}/config/initializers/mime_types.rb"
 
@@ -232,12 +228,6 @@ task :copy_app_doc_readme do
   cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
 end
 
-task :link_apache_config do
-  chdir(File.join(PKG_DESTINATION, 'config')) {
-    ln_s "../public/.htaccess", "apache.conf"
-  }
-end
-
 def copy_with_rewritten_ruby_path(src_file, dest_file)
   ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
 
@@ -313,12 +303,12 @@ spec = Gem::Specification.new do |s|
     on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
   EOF
 
-  s.add_dependency('rake', '>= 0.7.2')
-  s.add_dependency('activesupport',    '= 2.0.5' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.0.5' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.0.5' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.0.5' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.0.5' + PKG_BUILD)
+  s.add_dependency('rake', '>= 0.8.1')
+  s.add_dependency('activesupport',    '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.1.0' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.1.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -343,8 +333,8 @@ end
 # Publishing -------------------------------------------------------
 desc "Publish the API documentation"
 task :pgem => [:gem] do 
-  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh david@greed.loudthinking.com '/u/sites/gems/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."

data/bin/dbconsole

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'

data/builtin/rails_info/rails/info.rb

@@ -29,8 +29,8 @@ module Rails
         "#{component.classify}::VERSION::STRING".constantize
       end
 
-      def edge_rails_revision(info = svn_info)
-        info[/^Revision: (\d+)/, 1] || freeze_edge_version
+      def edge_rails_revision(info = git_info)
+        info[/commit ([a-z0-9-]+)/, 1] || freeze_edge_version
       end
 
       def freeze_edge_version
@@ -67,10 +67,10 @@ module Rails
           @rails_vendor_root ||= "#{RAILS_ROOT}/vendor/rails"
         end
 
-        def svn_info
+        def git_info
           env_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
           Dir.chdir(rails_vendor_root) do
-            silence_stderr { `svn info` }
+            silence_stderr { `git log -n 1` }
           end
         ensure
           ENV['LC_ALL'] = env_lang
@@ -98,7 +98,7 @@ module Rails
       end
     end
 
-    # The Rails SVN revision, if it's checked out into vendor/rails.
+    # The Rails Git revision, if it's checked out into vendor/rails.
     property 'Edge Rails revision' do
       edge_rails_revision
     end

data/configs/databases/frontbase.yml

@@ -10,8 +10,8 @@ development:
   username: <%= app_name %>
   password: ''
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: frontbase

data/configs/databases/mysql.yml

@@ -26,8 +26,8 @@ development:
   host: localhost
 <% end -%>
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: mysql

data/configs/databases/oracle.yml

@@ -4,7 +4,7 @@
 #  http://rubyforge.org/projects/ruby-oci8/
 #
 # Specify your database using any valid connection syntax, such as a
-# tnsnames.ora service name, or a sql connect url string of the form:
+# tnsnames.ora service name, or a SQL connect url string of the form:
 #
 #   //host:[port][/service name]
 #
@@ -23,8 +23,8 @@ development:
   username: <%= app_name %>
   password:
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: oracle

data/configs/databases/postgresql.yml

@@ -30,8 +30,8 @@ development:
   # The server defaults to notice.
   #min_messages: warning
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: postgresql

data/configs/databases/sqlite2.yml

@@ -4,8 +4,8 @@ development:
   adapter: sqlite
   database: db/development.sqlite2
 
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
   adapter: sqlite