railties 3.0.7 → 3.0.8.rc1

data/CHANGELOG

@@ -1,3 +1,7 @@
+*Rails 3.0.8 (unreleased)*
+
+* Fix Rake 0.9.0 support.
+
 *Rails 3.0.7 (April 18, 2011)*
 
 *No changes.

data/guides/source/i18n.textile

@@ -133,9 +133,9 @@ The _setting part_ is easy. You can set the locale in a +before_filter+ in the +
 
 <ruby>
 before_filter :set_locale
+
 def set_locale
-  # if params[:locale] is nil then I18n.default_locale will be used
-  I18n.locale = params[:locale]
+  I18n.locale = params[:locale] || I18n.default_locale
 end
 </ruby>
 
@@ -158,7 +158,7 @@ You can implement it like this in your +ApplicationController+:
 before_filter :set_locale
 
 def set_locale
-  I18n.locale = extract_locale_from_tld
+  I18n.locale = extract_locale_from_tld || I18n.default_locale
 end
 
 # Get locale from top-level domain or return nil if such locale is not available
@@ -182,7 +182,7 @@ We can also set the locale from the _subdomain_ in a very similar way:
 # in your /etc/hosts file to try this out locally
 def extract_locale_from_subdomain
   parsed_locale = request.subdomains.first
-  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale  : nil
+  I18n.available_locales.include?(parsed_locale.to_sym) ? parsed_locale : nil
 end
 </ruby>
 

data/guides/source/rails_on_rack.textile

@@ -228,8 +228,8 @@ h4. Learning Rack
 
 * "Official Rack Website":http://rack.github.com
 * "Introducing Rack":http://chneukirchen.org/blog/archive/2007/02/introducing-rack.html
-* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/2008/11/17/ruby-on-rack-1
-* "Ruby on Rack #2 - The Builder":http://m.onkey.org/2008/11/18/ruby-on-rack-2-rack-builder
+* "Ruby on Rack #1 - Hello Rack!":http://m.onkey.org/ruby-on-rack-1-hello-rack
+* "Ruby on Rack #2 - The Builder":http://m.onkey.org/ruby-on-rack-2-the-builder
 
 h4. Understanding Middlewares
 

data/guides/source/testing.textile

@@ -247,8 +247,7 @@ h4. Running Tests
 Running a test is as simple as invoking the file containing the test cases through Ruby:
 
 <shell>
-$ cd test
-$ ruby unit/post_test.rb
+$ ruby -Itest test/unit/post_test.rb
 
 Loaded suite unit/post_test
 Started
@@ -258,12 +257,12 @@ Finished in 0.023513 seconds.
 1 tests, 1 assertions, 0 failures, 0 errors
 </shell>
 
-This will run all the test methods from the test case.
+This will run all the test methods from the test case. Note that +test_helper.rb+ is in the +test+ directory, hence this directory needs to be added to the load path using the +-I+ switch.
 
 You can also run a particular test method from the test case by using the +-n+ switch with the +test method name+.
 
 <shell>
-$ ruby -Itest test/unit/post_test.rb -n test_the_truth
+$ ruby -Itest test/unit/post_test.rb -n test_truth
 
 Loaded suite unit/post_test
 Started

data/lib/rails/application.rb

@@ -211,10 +211,12 @@ module Rails
     end
 
     def initialize_tasks
-      require "rails/tasks"
-      task :environment do
-        $rails_rake_task = true
-        require_environment!
+      self.class.rake_tasks do
+        require "rails/tasks"
+        task :environment do
+          $rails_rake_task = true
+          require_environment!
+        end
       end
     end
 

data/lib/rails/commands/console.rb

@@ -47,6 +47,6 @@ module Rails
 end
 
 # Has to set the RAILS_ENV before config/application is required
-if ARGV.first && !ARGV.first.index("-") && env = ARGV.pop # has to pop the env ARGV so IRB doesn't freak
+if ARGV.first && !ARGV.first.index("-") && env = ARGV.shift # has to shift the env ARGV so IRB doesn't freak
   ENV['RAILS_ENV'] = %w(production development test).detect {|e| e =~ /^#{env}/} || env
 end

data/lib/rails/commands/dbconsole.rb

@@ -1,4 +1,10 @@
 require 'erb'
+
+begin
+  require 'psych'
+rescue LoadError
+end
+
 require 'yaml'
 require 'optparse'
 require 'rbconfig'

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

@@ -405,6 +405,13 @@ module Rails
         end
       end
 
+      def version_constraint_for_database_gem
+        case options[:database]
+        when "mysql"      then "~> 0.2.6"
+        else nil
+        end
+      end
+
       def mysql_socket
         @mysql_socket ||= [
           "/tmp/mysql.sock",                        # default

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

@@ -12,7 +12,7 @@ gem 'rails', '<%= Rails::VERSION::STRING %>'
 <%- end -%>
 
 <% unless options[:skip_active_record] -%>
-gem '<%= gem_for_database %>'
+gem '<%= gem_for_database %>'<%= ", '#{version_constraint_for_database_gem}'" if version_constraint_for_database_gem %>
 <% end -%>
 
 # Use unicorn as the web server

data/lib/rails/railtie.rb

@@ -181,6 +181,7 @@ module Rails
     end
 
     def load_tasks
+      extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each(&:call)
     end
 

data/lib/rails/version.rb

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

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: 
+  hash: 15424055
+  prerelease: 6
   segments: 
   - 3
   - 0
-  - 7
-  version: 3.0.7
+  - 8
+  - rc
+  - 1
+  version: 3.0.8.rc1
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 Z
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -57,12 +59,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -73,12 +77,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15424055
         segments: 
         - 3
         - 0
-        - 7
-        version: 3.0.7
+        - 8
+        - rc
+        - 1
+        version: 3.0.8.rc1
   type: :runtime
   version_requirements: *id004
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -479,16 +485,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.7.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.