railties 3.0.9 → 3.0.10.rc1

data/CHANGELOG

@@ -1,4 +1,8 @@
-*Rails 3.0.8 (unreleased)*
+*Rails 3.0.10 (unreleased)*
+
+*Rails 3.0.9 (June 16, 2011)*
+
+*Rails 3.0.8 (June 7, 2011)*
 
 * Fix Rake 0.9.0 support.
 

data/guides/source/contributing_to_ruby_on_rails.textile

@@ -2,7 +2,7 @@ h2. Contributing to Ruby on Rails
 
 This guide covers ways in which _you_ can become a part of the ongoing development of Ruby on Rails. After reading it, you should be familiar with:
 
-* Using Lighthouse to report issues
+* Using GitHub to report issues
 * Cloning master and running the test suite
 * Helping to resolve existing issues
 * Contributing to the Ruby on Rails documentation
@@ -14,29 +14,25 @@ endprologue.
 
 h3. Reporting an Issue
 
-Ruby on Rails uses a "Lighthouse project":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/ to track issues (primarily bugs and contributions of new code). If you've found a bug in Ruby on Rails, this is the place to start. You'll need to create a (free) Lighthouse account in order to comment on issues or to upload patches.
+Ruby on Rails uses "GitHub Issue Tracking":https://github.com/rails/rails/issues to track issues (primarily bugs and contributions of new code). If you've found a bug in Ruby on Rails, this is the place to start. You'll need to create a (free) GitHub account in order to either submit an issue, comment on them or create pull requests.
 
 NOTE: Bugs in the most recent released version of Ruby on Rails are likely to get the most attention. Also, the Rails core team is always interested in feedback from those who can take the time to test _edge Rails_ (the code for the version of Rails that is currently under development). Later in this guide you'll find out how to get edge Rails for testing.
 
 h4. Creating a Bug Report
 
-If you've found a problem in Ruby on Rails which is not a security risk do a search in Lighthouse in case it was already reported. If you find no ticket addressing it you can "add a new one":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new. (See the next section for reporting security issues.)
+If you've found a problem in Ruby on Rails which is not a security risk do a search in GitHub Issues in case it was already reported. If you find no issue addressing it you can "add a new one":https://github.com/rails/rails/issues/new. (See the next section for reporting security issues.)
 
-At the minimum, your ticket needs a title and descriptive text. But that's only a minimum. You should include as much relevant information as possible. You need to at least post the code sample that has the issue. Even better is to include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself - and others - to replicate the bug and figure out a fix.
+At the minimum, your issue report needs a title and descriptive text. But that's only a minimum. You should include as much relevant information as possible. You need to at least post the code sample that has the issue. Even better is to include a unit test that shows how the expected behavior is not occurring. Your goal should be to make it easy for yourself - and others - to replicate the bug and figure out a fix.
 
-You shouldn't assign the bug to a particular core developer unless you know for sure which developer will be handling that issue. The core team periodically reviews issues and assigns developers and milestones to them.
-
-You should set tags for your issue. Use the "bug" tag for a bug report, and add the "patch" tag if you are attaching a patch. Try to find some relevant tags from the existing tag list (which will appear as soon as you start typing in the "Choose some tags" textbox), rather than creating new tags.
-
-Then don't get your hopes up. Unless you have a "Code Red, Mission Critical, The World is Coming to an End" kind of bug, you're creating this ticket in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the ticket automatically will see any activity or that others will jump to fix it. Creating a ticket like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with a "I'm having this problem too" comment.
+Then don't get your hopes up. Unless you have a "Code Red, Mission Critical, The World is Coming to an End" kind of bug, you're creating this issue report in the hope that others with the same problem will be able to collaborate with you on solving it. Do not expect that the issue report will automatically see any activity or that others will jump to fix it. Creating an issue like this is mostly to help yourself start on the path of fixing the problem and for others to confirm it with a "I'm having this problem too" comment.
 
 h4. Special Treatment for Security Issues
 
-WARNING: Please do not report security vulnerabilities on public Lighthouse tickets. The "Rails security policy page":http://rubyonrails.org/security details the procedure to follow for security issues.
+WARNING: Please do not report security vulnerabilities with public GitHub issue reports. The "Rails security policy page":http://rubyonrails.org/security details the procedure to follow for security issues.
 
 h4. What About Feature Requests?
 
-Please don't put "feature request" tickets into Lighthouse. If there's a new feature that you want to see added to Ruby on Rails, you'll need to write the code yourself - or convince someone else to partner with you to write the code. Later in this guide you'll find detailed instructions for proposing a patch to Ruby on Rails. If you enter a wishlist item in Lighthouse with no code, you can expect it to be marked "invalid" as soon as it's reviewed.
+Please don't put "feature request" items into GitHub Issues. If there's a new feature that you want to see added to Ruby on Rails, you'll need to write the code yourself - or convince someone else to partner with you to write the code. Later in this guide you'll find detailed instructions for proposing a patch to Ruby on Rails. If you enter a wishlist item in GitHub Issues with no code, you can expect it to be marked "invalid" as soon as it's reviewed.
 
 h3. Running the Test Suite
 
@@ -48,7 +44,7 @@ Ruby on Rails uses git for source code control. The "git homepage":http://git-sc
 
 * "Everyday Git":http://www.kernel.org/pub/software/scm/git/docs/everyday.html will teach you just enough about git to get by.
 * The "PeepCode screencast":https://peepcode.com/products/git on git ($9) is easier to follow.
-* "GitHub":http://github.com/guides/home offers links to a variety of git resources.
+* "GitHub":http://help.github.com offers links to a variety of git resources.
 * "Pro Git":http://progit.org/book/ is an entire book about git with a Creative Commons license.
 
 h4. Clone the Ruby on Rails Repository
@@ -56,8 +52,8 @@ h4. Clone the Ruby on Rails Repository
 Navigate to the folder where you want the Ruby on Rails source code (it will create its own +rails+ subdirectory) and run:
 
 <shell>
-git clone git://github.com/rails/rails.git
-cd rails
+$ git clone git://github.com/rails/rails.git
+$ cd rails
 </shell>
 
 h4. Set up and Run the Tests
@@ -67,40 +63,48 @@ The test suite must pass with any submitted code. No matter whether you are writ
 Install first libxml2 and libxslt together with their development files for Nokogiri. In Ubuntu that's
 
 <shell>
-sudo apt-get install libxml2 libxml2-dev libxslt1-dev
+$ sudo apt-get install libxml2 libxml2-dev libxslt1-dev
 </shell>
 
 Also, SQLite3 and its development files for the +sqlite3-ruby+ gem, in Ubuntu you're done with
 
 <shell>
-sudo apt-get install sqlite3 libsqlite3-dev
+$ sudo apt-get install sqlite3 libsqlite3-dev
 </shell>
 
 Get a recent version of "Bundler":http://gembundler.com/:
 
 <shell>
-gem install bundler
+$ gem install bundler
 </shell>
 
 and run:
 
 <shell>
-bundle install --without db
+$ bundle install --without db
 </shell>
 
 This command will install all dependencies except the MySQL and PostgreSQL Ruby drivers. We will come back at these soon. With dependencies installed, you can run the test suite with:
 
 <shell>
-rake test
+$ rake test
+</shell>
+
+You can also run tests for a specific framework, like Action Pack, by going into its directory and executing the same command:
+
+<shell>
+$ cd actionpack
+$ rake test
 </shell>
 
-You can also run tests for an specific framework, like Action Pack, by going into its directory and executing the same command:
+If you want to run tests from the specific directory use the +TEST_DIR+ environment variable. For example, this will run tests inside +railties/test/generators+ directory only:
 
 <shell>
-cd actionpack
-rake test
+$ cd railties
+$ TEST_DIR=generators rake test
 </shell>
 
+
 h4. Warnings
 
 The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no warning, but there may be a few, and also some from third-party libraries. Please ignore (or fix!) them if any, and submit patches that do not issue new warnings.
@@ -108,7 +112,7 @@ The test suite runs with warnings enabled. Ideally Ruby on Rails should issue no
 As of this writing they are specially noisy with Ruby 1.9. If you are sure about what you are doing and would like to have a more clear output, there's a way to override the flag:
 
 <shell>
-RUBYOPT=-W0 rake test
+$ RUBYOPT=-W0 rake test
 </shell>
 
 h4. Testing Active Record
@@ -122,8 +126,8 @@ h5. SQLite3
 The gem +sqlite3-ruby+ does not belong to the "db" group indeed, if you followed the instructions above you're ready. This is how you run the Active Record test suite only for SQLite3:
 
 <shell>
-cd activerecord
-rake test_sqlite3
+$ cd activerecord
+$ rake test_sqlite3
 </shell>
 
 h5. MySQL and PostgreSQL
@@ -131,15 +135,15 @@ h5. MySQL and PostgreSQL
 To be able to run the suite for MySQL and PostgreSQL we need their gems. Install first the servers, their client libraries, and their development files. In Ubuntu just run
 
 <shell>
-sudo apt-get install mysql-server libmysqlclient15-dev
-sudo apt-get install postgresql postgresql-client postgresql-contrib libpq-dev
+$ sudo apt-get install mysql-server libmysqlclient15-dev
+$ sudo apt-get install postgresql postgresql-client postgresql-contrib libpq-dev
 </shell>
 
 After that run:
 
 <shell>
-rm .bundle/config
-bundle install
+$ rm .bundle/config
+$ bundle install
 </shell>
 
 We need first to delete +.bundle/config+ because Bundler remembers in that file that we didn't want to install the "db" group (alternatively you can edit the file).
@@ -156,21 +160,21 @@ mysql> GRANT ALL PRIVILEGES ON activerecord_unittest2.*
 and create the test databases:
 
 <shell>
-cd activerecord
-rake mysql:build_databases
+$ cd activerecord
+$ rake mysql:build_databases
 </shell>
 
 PostgreSQL's authentication works differently. A simple way to setup the development environment for example is to run with your development account
 
 <shell>
-sudo -u postgres createuser --superuser $USER
+$ sudo -u postgres createuser --superuser $USER
 </shell>
 
 and after that create the test databases with
 
 <shell>
-cd activerecord
-rake postgresql:build_databases
+$ cd activerecord
+$ rake postgresql:build_databases
 </shell>
 
 NOTE: Using the rake task to create the test databases ensures they have the correct character set and collation.
@@ -188,7 +192,7 @@ test_postgresql
 respectively. As we mentioned before
 
 <shell>
-rake test
+$ rake test
 </shell>
 
 will now run the four of them in turn.
@@ -200,19 +204,19 @@ h4. Older versions of Ruby on Rails
 If you want to add a fix to older versions of Ruby on Rails, you'll need to set up and switch to your own local tracking branch. Here is an example to switch to the 2-3-stable branch:
 
 <shell>
-git branch --track 2-3-stable origin/2-3-stable
-git checkout 2-3-stable
+$ git branch --track 2-3-stable origin/2-3-stable
+$ git checkout 2-3-stable
 </shell>
 
 TIP: You may want to "put your git branch name in your shell prompt":http://qugstart.com/blog/git-and-svn/add-colored-git-branch-name-to-your-shell-prompt/ to make it easier to remember which version of the code you're working with.
 
 h3. Helping to Resolve Existing Issues
 
-As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "open tickets":https://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets?q=state%3Aopen list in Lighthouse, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
+As a next step beyond reporting issues, you can help the core team resolve existing issues. If you check the "Everyone's Issues":https://github.com/rails/rails/issues?sort=created&direction=desc&state=open&page=1 list in GitHub Issues, you'll find lots of issues already requiring attention. What can you do for these? Quite a bit, actually:
 
 h4. Verifying Bug Reports
 
-For starters, it helps to just verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the ticket saying that you're seeing the same thing.
+For starters, it helps to just verify bug reports. Can you reproduce the reported issue on your own computer? If so, you can add a comment to the issue saying that you're seeing the same thing.
 
 If something is very vague, can you help squish it down into something specific? Maybe you can provide additional information to help reproduce a bug, or eliminate needless steps that aren't required to help demonstrate the problem.
 
@@ -222,44 +226,45 @@ Anything you can do to make bug reports more succinct or easier to reproduce is
 
 h4. Testing Patches
 
-You can also help out by examining patches that have been submitted to Ruby on Rails via Lighthouse. To apply someone's changes you need to first create a dedicated branch:
+You can also help out by examining pull requests that have been submitted to Ruby on Rails via GitHub. To apply someone's changes you need to first create a dedicated branch:
 
 <shell>
-git checkout -b testing_branch
+$ git checkout -b testing_branch
 </shell>
 
-Then you can apply their patch:
+Then you can use their remote branch to update your codebase. For example, let's say the GitHub user JohnSmith has forked and pushed to the topic branch located at https://github.com/JohnSmith/rails.
 
 <shell>
-git am their-patch-file.diff
+$ git remote add JohnSmith git://github.com/JohnSmith/rails.git
+$ git pull JohnSmith topic
 </shell>
 
-After applying a patch, test it out! Here are some things to think about:
+After applying their branch, test it out! Here are some things to think about:
 
-* Does the patch actually work?
+* Does the change actually work?
 * Are you happy with the tests? Can you follow what they're testing? Are there any tests missing?
 * Does it have proper documentation coverage? Should documentation elsewhere be updated?
 * Do you like the implementation? Can you think of a nicer or faster way to implement a part of their change?
 
-Once you're happy that the patch contains a good change, comment on the Lighthouse ticket indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:
+Once you're happy that the pull request contains a good change, comment on the GitHub issue indicating your approval. Your comment should indicate that you like the change and what you like about it. Something like:
 
 <blockquote>
 I like the way you've restructured that code in generate_finder_sql, much nicer. The tests look good too.
 </blockquote>
 
-If your comment simply says "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the patch. Once three people have approved it, add the "verified" tag. This will bring it to the attention of a core team member who will review the changes looking for the same kinds of things.
+If your comment simply says "+1", then odds are that other reviewers aren't going to take it too seriously. Show that you took the time to review the pull request.
 
 h3. Contributing to the Rails Documentation
 
 Ruby on Rails has two main sets of documentation: The guides help you to learn Ruby on Rails, and the API is a reference.
 
-You can create a ticket in Lighthouse to fix or expand documentation. However, if you're confident about your changes you can push them yourself directly via "docrails":http://github.com/lifo/docrails/tree/master. docrails is a branch with an *open commit policy* and public write access. Commits to docrails are still reviewed, but that happens after they are pushed. docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
+You can create an issue in GitHub issues to fix or expand documentation. However, if you're confident about your changes you can push them yourself directly via "docrails":https://github.com/lifo/docrails/tree/master. docrails is a branch with an *open commit policy* and public write access. Commits to docrails are still reviewed, but that happens after they are pushed. docrails is merged with master regularly, so you are effectively editing the Ruby on Rails documentation.
 
 When working with documentation, please take into account the "API Documentation Guidelines":api_documentation_guidelines.html and the "Ruby on Rails Guides Guidelines":ruby_on_rails_guides_guidelines.html.
 
 NOTE: As explained above, ordinary code patches should have proper documentation coverage. docrails is only used for isolated documentation improvements.
 
-WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails.
+WARNING: docrails has a very strict policy: no code can be touched whatsoever, no matter how trivial or small the change. Only RDoc and guides can be edited via docrails. Also, CHANGELOGs should never be edited in docrails.
 
 If you have an idea for a new guide you can refer to the "contribution page":contribute.html for instructions on getting involved.
 
@@ -270,14 +275,14 @@ h4. Clone the Rails Repository
 The first thing you need to do to be able to contribute code is to clone the repository:
 
 <shell>
-git clone git://github.com/rails/rails.git
+$ git clone git://github.com/rails/rails.git
 </shell>
 
 and create a dedicated branch:
 
 <shell>
-cd rails
-git checkout -b my_new_branch
+$ cd rails
+$ git checkout -b my_new_branch
 </shell>
 
 It doesn’t really matter what name you use, because this branch will only exist on your local computer.
@@ -295,10 +300,16 @@ h4. Follow the Coding Conventions
 
 Rails follows a simple set of coding style conventions.
 
-* Two spaces, no tabs
-* Prefer +&amp;&amp;+/+||+ over +and+/+or+
-* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+
-* Follow the conventions you see used in the source already
+* Two spaces, no tabs.
+* No trailing whitespace. Blank lines should not have any space.
+* Indent after private/protected.
+* Prefer +&amp;&amp;+/+||+ over +and+/+or+.
+* Prefer class << self block over self.method for class methods.
+* +MyClass.my_method(my_arg)+ not +my_method( my_arg )+ or +my_method my_arg+.
+* a = b and not a=b.
+* Follow the conventions you see used in the source already.
+
+These are some guidelines and please use your best judgment in using them.
 
 h4. Sanity Check
 
@@ -311,7 +322,7 @@ h4. Commit Your Changes
 When you're happy with the code on your computer, you need to commit the changes to git:
 
 <shell>
-git commit -a -m "Here is a commit message"
+$ git commit -a -m "Here is a commit message on what I changed in this commit"
 </shell>
 
 h4. Update master
@@ -319,37 +330,48 @@ h4. Update master
 It’s pretty likely that other changes to master have happened while you were working. Go get them:
 
 <shell>
-git checkout master
-git pull
+$ git checkout master
+$ git pull
 </shell>
 
 Now reapply your patch on top of the latest changes:
 
 <shell>
-git checkout my_new_branch
-git rebase master
+$ git checkout my_new_branch
+$ git rebase master
 </shell>
 
 No conflicts? Tests still pass? Change still seems reasonable to you? Then move on.
 
-h4. Create a Patch
+h4. Fork
 
-Now you can create a patch file to share with other developers (and with the core team). Still in your branch, run
+Navigate to the Rails "GitHub repository":https://github.com/rails/rails and press "Fork" in the upper right hand corner.
+
+Add the new remote to your local repository on your local machine:
+
+<shell>
+$ git remote add mine git@github.com:<your user name>/rails.git
+</shell>
+
+Push to your remote:
 
 <shell>
-git commit -a
-git format-patch master --stdout > my_new_patch.diff
+$ git push mine my_new_branch
 </shell>
 
-Sanity check the results of this operation: open the diff file in your text editor of choice and make sure that no unintended changes crept in.
+h4. Issue a Pull Request
+
+Navigate to the Rails repository you just pushed to (e.g. https://github.com/your-user-name/rails) and press "Pull Request" in the upper right hand corner.
 
-h4. Create a Lighthouse Ticket
+Write your branch name in branch field (is filled with master by default) and press "Update Commit Range"
 
-Now create a ticket with your patch. Go to the "new ticket":http://rails.lighthouseapp.com/projects/8994-ruby-on-rails/tickets/new page at Lighthouse. Fill in a reasonable title and description, remember to attach your patch file, and tag the ticket with the ‘patch’ tag and whatever other subject area tags make sense.
+Ensure the changesets you introduced are included in the "Commits" tab and that the "Files Changed" incorporate all of your changes.
+
+Fill in some details about your potential patch including a meaningful title. When finished, press "Send pull request." Rails Core will be notified about your submission.
 
 h4. Get Some Feedback
 
-Now you need to get other people to look at your patch, just as you've looked at other people's patches. You can use the rubyonrails-core mailing list or the #rails-contrib channel on IRC freenode for this. You might also try just talking to Rails developers that you know.
+Now you need to get other people to look at your patch, just as you've looked at other people's patches. You can use the "rubyonrails-core mailing list":http://groups.google.com/group/rubyonrails-core/ or the #rails-contrib channel on IRC freenode for this. You might also try just talking to Rails developers that you know.
 
 h4. Iterate as Necessary
 
@@ -363,8 +385,10 @@ All contributions, either via master or docrails, get credit in "Rails Contribut
 
 h3. Changelog
 
+* May 12, 2011: Modified to prefer topic branches instead of master branch for users contributions by "Guillermo Iguaran":http://quillarb.org
+* April 29, 2011: Reflect GitHub Issues and Pull Request workflow by "Dan Pickett":http://www.enlightsolutions.com
+* April 14, 2011: Modified Contributing to the Rails Code section to add '[#ticket_number state:commited]' on patches commit messages by "Sebastian Martinez":http://wyeworks.com
 * December 28, 2010: Complete revision by "Xavier Noria":credits.html#fxn
 * April 6, 2010: Fixed document to validate XHTML 1.0 Strict. "Jaime Iniesta":http://jaimeiniesta.com
 * August 1, 2009: Updates/amplifications by "Mike Gunderloy":credits.html#mgunderloy
 * March 2, 2009: Initial draft by "Mike Gunderloy":credits.html#mgunderloy
-

data/lib/rails/generators/rails/app/app_generator.rb

@@ -155,6 +155,8 @@ module Rails
 
     class AppGenerator < Base
       DATABASES = %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+      JDBC_DATABASES = %w( jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc )
+      DATABASES.concat(JDBC_DATABASES)
 
       attr_accessor :rails_template
       add_shebang_option!
@@ -204,6 +206,7 @@ module Rails
         @original_wd = Dir.pwd
 
         super
+        convert_database_option_for_jruby
 
         if !options[:skip_active_record] && !DATABASES.include?(options[:database])
           raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
@@ -394,20 +397,35 @@ module Rails
       end
 
       def gem_for_database
-        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db )
+        # %w( mysql oracle postgresql sqlite3 frontbase ibm_db jdbcmysql jdbcsqlite3 jdbcpostgresql)
         case options[:database]
         when "oracle"     then "ruby-oci8"
         when "postgresql" then "pg"
         when "sqlite3"    then "sqlite3"
         when "frontbase"  then "ruby-frontbase"
         when "mysql"      then "mysql2"
+        when "jdbcmysql"  then "activerecord-jdbcmysql-adapter"
+        when "jdbcsqlite3"  then "activerecord-jdbcsqlite3-adapter"
+        when "jdbcpostgresql"  then "activerecord-jdbcpostgresql-adapter"
+        when "jdbc"           then "activerecord-jdbc-adapter"
         else options[:database]
         end
       end
 
+      def convert_database_option_for_jruby
+        if defined?(JRUBY_VERSION)
+          case options[:database]
+          when "oracle"     then options[:database].replace "jdbc"
+          when "postgresql" then options[:database].replace "jdbcpostgresql"
+          when "mysql"      then options[:database].replace "jdbcmysql"
+          when "sqlite3"    then options[:database].replace "jdbcsqlite3"
+          end
+        end
+      end
+
       def version_constraint_for_database_gem
         case options[:database]
-        when "mysql"      then "~> 0.2.6"
+        when "mysql"      then "~> 0.2.11"
         else nil
         end
       end

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -7,6 +7,7 @@ gem 'rails', :git => 'git://github.com/rails/rails.git'
 <%- else -%>
 gem 'rails', '<%= Rails::VERSION::STRING %>'
 
+<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) -%>
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 <%- end -%>

data/lib/rails/generators/rails/app/templates/config/databases/jdbc.yml

@@ -0,0 +1,62 @@
+# If you are using mssql, derby, hsqldb, or h2 with one of the
+# ActiveRecord JDBC adapters, install the appropriate driver, e.g.,:
+#   gem install activerecord-jdbcmssql-adapter
+#
+# Configure using Gemfile:
+#   gem 'activerecord-jdbcmssql-adapter'
+#
+#development:
+#  adapter: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_development
+#
+# 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: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_test
+#
+#production:
+#  adapter: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_production
+
+# If you are using oracle, db2, sybase, informix or prefer to use the plain
+# JDBC adapter, configure your database setting as the example below (requires
+# you to download and manually install the database vendor's JDBC driver .jar
+# file). See your driver documentation for the apropriate driver class and
+# connection string:
+
+development:
+  adapter: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_development
+
+# 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: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_test
+
+production:
+  adapter: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_production

data/lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml

@@ -0,0 +1,30 @@
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+#
+# Install the MySQL driver:
+#   gem install activerecord-jdbcmysql-adapter
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql
+  database: <%= app_name %>_development
+  username: root
+  password:
+  host: localhost
+
+# 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
+  database: <%= app_name %>_test
+  username: root
+  password:
+  host: localhost
+
+production:
+  adapter: mysql
+  database: <%= app_name %>_production
+  username: root
+  password:
+  host: localhost

data/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml

@@ -0,0 +1,43 @@
+# PostgreSQL. Versions 7.4 and 8.x are supported.
+#
+ # Configure Using Gemfile
+ # gem 'activerecord-jdbcpostgresql-adapter'development:
+
+development:
+  adapter: postgresql
+  encoding: unicode
+  database: <%= app_name %>_development
+  username: <%= app_name %>
+  password:
+
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
+  # domain sockets, so uncomment these lines.
+  #host: localhost
+  #port: 5432
+
+  # Schema search path. The server defaults to $user,public
+  #schema_search_path: myapp,sharedapp,public
+
+  # Minimum log levels, in increasing order:
+  #   debug5, debug4, debug3, debug2, debug1,
+  #   log, notice, warning, error, fatal, and panic
+  # 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".
+# Do not set this db to the same as development or production.
+test:
+  adapter: postgresql
+  encoding: unicode
+  database: <%= app_name %>_test
+  username: <%= app_name %>
+  password:
+
+production:
+  adapter: postgresql
+  encoding: unicode
+  database: <%= app_name %>_production
+  username: <%= app_name %>
+  password:

data/lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml

@@ -0,0 +1,17 @@
+# SQLite version 3.x
+#   gem 'activerecord-jdbcsqlite3-adapter'
+
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+
+# 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: sqlite3
+  database: db/test.sqlite3
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3

data/lib/rails/tasks/framework.rake

@@ -19,14 +19,14 @@ namespace :rails do
   desc "Update both configs and public/javascripts from Rails (or use just update:javascripts or update:configs)"
   task :update => [ "update:configs", "update:javascripts", "update:scripts", "update:application_controller" ]
 
-  desc "Applies the template supplied by LOCATION=/path/to/template"
+  desc "Applies the template supplied by LOCATION=(/path/to/template) or URL"
   task :template do
     template = ENV["LOCATION"]
+    raise "No LOCATION value given. Please set LOCATION either as path to a file or a URL" if template.blank?
     template = File.expand_path(template) if template !~ %r{\A[A-Za-z][A-Za-z0-9+\-\.]*://}
-
     require 'rails/generators'
     require 'rails/generators/rails/app/app_generator'
-    generator = Rails::Generators::AppGenerator.new [ Rails.root ], {}, :destination_root => Rails.root
+    generator = Rails::Generators::AppGenerator.new [Rails.root], {}, :destination_root => Rails.root
     generator.apply template, :verbose => false
   end
 

data/lib/rails/tasks/misc.rake

@@ -14,7 +14,7 @@ task :secret do
 end
 
 desc 'List versions of all Rails frameworks and the environment'
-task :about do
+task :about => :environment do
   puts Rails::Info
 end
 

data/lib/rails/test_unit/testing.rake

@@ -103,9 +103,9 @@ namespace :test do
   Rake::TestTask.new(:uncommitted => "test:prepare") do |t|
     def t.file_list
       if File.directory?(".svn")
-        changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
+        changed_since_checkin = silence_stderr { `svn status` }.split.map { |path| path.chomp[7 .. -1] }
       elsif File.directory?(".git")
-        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.map { |path| path.chomp }
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
       end

data/lib/rails/version.rb

@@ -2,8 +2,8 @@ module Rails
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 0
-    TINY  = 9
-    PRE   = nil
+    TINY  = 10
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: 
+  prerelease: true
   segments: 
   - 3
   - 0
-  - 9
-  version: 3.0.9
+  - 10
+  - rc1
+  version: 3.0.10.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,17 +15,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-16 00:00:00 Z
+date: 2011-08-04 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
         segments: 
         - 0
         - 8
@@ -37,11 +36,9 @@ dependencies:
   name: thor
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 0
         - 14
@@ -53,11 +50,9 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 3
         - 4
@@ -68,32 +63,30 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 3
         - 0
-        - 9
-        version: 3.0.9
+        - 10
+        - rc1
+        version: 3.0.10.rc1
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 3
         - 0
-        - 9
-        version: 3.0.9
+        - 10
+        - rc1
+        version: 3.0.10.rc1
   type: :runtime
   version_requirements: *id005
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -324,6 +317,10 @@ files:
 - lib/rails/generators/rails/app/templates/config/boot.rb
 - lib/rails/generators/rails/app/templates/config/databases/frontbase.yml
 - lib/rails/generators/rails/app/templates/config/databases/ibm_db.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbc.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcmysql.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
+- lib/rails/generators/rails/app/templates/config/databases/jdbcsqlite3.yml
 - lib/rails/generators/rails/app/templates/config/databases/mysql.yml
 - lib/rails/generators/rails/app/templates/config/databases/oracle.yml
 - lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -471,6 +468,7 @@ files:
 - lib/rails/generators/rails/app/templates/test/integration/.empty_directory
 - lib/rails/generators/rails/app/templates/test/unit/.empty_directory
 - lib/rails/generators/rails/generator/templates/templates/.empty_directory
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -481,29 +479,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.8.2
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.