railties 3.2.0.rc1 → 3.2.0.rc2

data/lib/rails/generators/test_case.rb

@@ -218,8 +218,8 @@ module Rails
       #
       #   create_generated_attribute(:string, 'name')
       #
-      def create_generated_attribute(attribute_type, name = 'test')
-        Rails::Generators::GeneratedAttribute.new(name, attribute_type.to_s)
+      def create_generated_attribute(attribute_type, name = 'test', index = nil)
+        Rails::Generators::GeneratedAttribute.parse([name, attribute_type, index].compact.join(':'))
       end
 
       protected

data/lib/rails/plugin.rb

@@ -53,6 +53,7 @@ module Rails
     end
 
     def initialize(root)
+      ActiveSupport::Deprecation.warn "You have Rails 2.3-style plugins in vendor/plugins! Support for these plugins will be removed in Rails 4.0. Move them out and bundle them in your Gemfile, or fold them in to your app as lib/myplugin/* and config/initializers/myplugin.rb. See the release notes for more on this: http://weblog.rubyonrails.org/2012/01/04/rails-3-2-0-rc2-has-been-released"
       @name = File.basename(root).to_sym
       config.root = root
     end

data/lib/rails/tasks/documentation.rake

@@ -63,7 +63,7 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers'
-    rdoc.rdoc_files.include('README')
+    rdoc.rdoc_files.include('README.rdoc')
 
     gem_path('actionmailer') do |actionmailer|
       %w(README.rdoc CHANGELOG.md MIT-LICENSE lib/action_mailer/base.rb).each do |file|

data/lib/rails/test_unit/sub_test_task.rb

@@ -0,0 +1,36 @@
+module Rails
+  # Don't abort when tests fail; move on the next test task.
+  # Silence the default description to cut down on `rake -T` noise.
+  class SubTestTask < Rake::TestTask
+    # Create the tasks defined by this task lib.
+    def define
+      lib_path = @libs.join(File::PATH_SEPARATOR)
+      task @name do
+        run_code = ''
+        RakeFileUtils.verbose(@verbose) do
+          run_code =
+            case @loader
+            when :direct
+              "-e 'ARGV.each{|f| load f}'"
+            when :testrb
+              "-S testrb #{fix}"
+            when :rake
+              rake_loader
+            end
+          @ruby_opts.unshift( "-I\"#{lib_path}\"" )
+          @ruby_opts.unshift( "-w" ) if @warning
+
+          begin
+            ruby @ruby_opts.join(" ") +
+              " \"#{run_code}\" " +
+              file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
+              " #{option_list}"
+          rescue => error
+            warn "Error running #{name}: #{error.inspect}"
+          end
+        end
+      end
+      self
+    end
+  end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,35 +1,6 @@
 require 'rbconfig'
 require 'rake/testtask'
-
-# Monkey-patch to silence the description from Rake::TestTask to cut down on rake -T noise
-class TestTaskWithoutDescription < Rake::TestTask
-  # Create the tasks defined by this task lib.
-  def define
-    lib_path = @libs.join(File::PATH_SEPARATOR)
-    task @name do
-      run_code = ''
-      RakeFileUtils.verbose(@verbose) do
-        run_code =
-          case @loader
-          when :direct
-            "-e 'ARGV.each{|f| load f}'"
-          when :testrb
-            "-S testrb #{fix}"
-          when :rake
-            rake_loader
-          end
-        @ruby_opts.unshift( "-I\"#{lib_path}\"" )
-        @ruby_opts.unshift( "-w" ) if @warning
-        ruby @ruby_opts.join(" ") +
-          " \"#{run_code}\" " +
-          file_list.collect { |fn| "\"#{fn}\"" }.join(' ') +
-          " #{option_list}"
-      end
-    end
-    self
-  end
-end
-
+require 'rails/test_unit/sub_test_task'
 
 TEST_CHANGES_SINCE = Time.now - 600
 
@@ -76,20 +47,7 @@ task :default => :test
 
 desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
 task :test do
-  tests_to_run = ENV['TEST'] ? ["test:single"] : %w(test:units test:functionals test:integration)
-  errors = tests_to_run.collect do |task|
-    begin
-      Rake::Task[task].invoke
-      nil
-    rescue => e
-      { :task => task, :exception => e }
-    end
-  end.compact
-  
-  if errors.any?
-    puts errors.map { |e| "Errors running #{e[:task]}! #{e[:exception].inspect}" }.join("\n")
-    abort
-  end
+  Rake::Task[ENV['TEST'] ? 'test:single' : 'test:run'].invoke
 end
 
 namespace :test do
@@ -97,6 +55,8 @@ namespace :test do
     # Placeholder task for other Railtie and plugins to enhance. See Active Record for an example.
   end
 
+  task :run => %w(test:units test:functionals test:integration)
+
   Rake::TestTask.new(:recent => "test:prepare") do |t|
     since = TEST_CHANGES_SINCE
     touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
@@ -134,33 +94,33 @@ namespace :test do
     t.libs << "test"
   end
 
-  TestTaskWithoutDescription.new(:units => "test:prepare") do |t|
+  Rails::SubTestTask.new(:units => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:functionals => "test:prepare") do |t|
+  Rails::SubTestTask.new(:functionals => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/functional/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:integration => "test:prepare") do |t|
+  Rails::SubTestTask.new(:integration => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:benchmark => 'test:prepare') do |t|
+  Rails::SubTestTask.new(:benchmark => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
     t.options = '-- --benchmark'
   end
 
-  TestTaskWithoutDescription.new(:profile => 'test:prepare') do |t|
+  Rails::SubTestTask.new(:profile => 'test:prepare') do |t|
     t.libs << 'test'
     t.pattern = 'test/performance/**/*_test.rb'
   end
 
-  TestTaskWithoutDescription.new(:plugins => :environment) do |t|
+  Rails::SubTestTask.new(:plugins => :environment) do |t|
     t.libs << "test"
 
     if ENV['PLUGIN']

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 2
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,90 +1,130 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: railties
-version: !ruby/object:Gem::Version
-  version: 3.2.0.rc1
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 977940591
+  prerelease: true
+  segments: 
+  - 3
+  - 2
+  - 0
+  - rc2
+  version: 3.2.0.rc2
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-20 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-04 00:00:00 -02:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: &2151958420 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
   type: :runtime
-  prerelease: false
-  version_requirements: *2151958420
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: thor
-  requirement: &2151957520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 14
+        - 6
         version: 0.14.6
   type: :runtime
-  prerelease: false
-  version_requirements: *2151957520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rack-ssl
-  requirement: &2151956520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
   type: :runtime
-  prerelease: false
-  version_requirements: *2151956520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &2151955840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.4'
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 4
+        version: "3.4"
   type: :runtime
-  prerelease: false
-  version_requirements: *2151955840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &2151955200 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 977940591
+        segments: 
+        - 3
+        - 2
+        - 0
+        - rc2
+        version: 3.2.0.rc2
   type: :runtime
-  prerelease: false
-  version_requirements: *2151955200
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &2151954380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.2.0.rc1
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 977940591
+        segments: 
+        - 3
+        - 2
+        - 0
+        - rc2
+        version: 3.2.0.rc2
   type: :runtime
-  prerelease: false
-  version_requirements: *2151954380
-description: ! 'Rails internals: application bootup, plugins, generators, and rake
-  tasks.'
+  version_requirements: *id006
+description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
-executables:
+executables: 
 - rails
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG.md
 - README.rdoc
 - bin/rails
@@ -147,6 +187,7 @@ files:
 - guides/assets/images/polymorphic.png
 - guides/assets/images/posts_index.png
 - guides/assets/images/radar.png
+- guides/assets/images/rails_guides_kindle_cover.jpg
 - guides/assets/images/rails_guides_logo.gif
 - guides/assets/images/rails_logo_remix.gif
 - guides/assets/images/rails_welcome.png
@@ -187,6 +228,7 @@ files:
 - guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
 - guides/assets/javascripts/syntaxhighlighter/shCore.js
 - guides/assets/stylesheets/fixes.css
+- guides/assets/stylesheets/kindle.css
 - guides/assets/stylesheets/main.css
 - guides/assets/stylesheets/print.css
 - guides/assets/stylesheets/reset.css
@@ -295,6 +337,9 @@ files:
 - guides/source/2_3_release_notes.textile
 - guides/source/3_0_release_notes.textile
 - guides/source/3_1_release_notes.textile
+- guides/source/3_2_release_notes.textile
+- guides/source/_license.html.erb
+- guides/source/_welcome.html.erb
 - guides/source/action_controller_overview.textile
 - guides/source/action_mailer_basics.textile
 - guides/source/action_view_overview.textile
@@ -314,6 +359,7 @@ files:
 - guides/source/contributing_to_ruby_on_rails.textile
 - guides/source/credits.html.erb
 - guides/source/debugging_rails_applications.textile
+- guides/source/documents.yaml
 - guides/source/engines.textile
 - guides/source/form_helpers.textile
 - guides/source/generators.textile
@@ -321,6 +367,13 @@ files:
 - guides/source/i18n.textile
 - guides/source/index.html.erb
 - guides/source/initialization.textile
+- guides/source/kindle/copyright.html.erb
+- guides/source/kindle/KINDLE.md
+- guides/source/kindle/layout.html.erb
+- guides/source/kindle/rails_guides.opf.erb
+- guides/source/kindle/toc.html.erb
+- guides/source/kindle/toc.ncx.erb
+- guides/source/kindle/welcome.html.erb
 - guides/source/layout.html.erb
 - guides/source/layouts_and_rendering.textile
 - guides/source/migrations.textile
@@ -550,6 +603,7 @@ files:
 - lib/rails/tasks.rb
 - lib/rails/test_help.rb
 - lib/rails/test_unit/railtie.rb
+- lib/rails/test_unit/sub_test_task.rb
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails.rb
@@ -563,30 +617,44 @@ files:
 - lib/rails/generators/rails/generator/templates/templates/.empty_directory
 - lib/rails/generators/rails/plugin_new/templates/app/mailers/.empty_directory
 - lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --exclude
 - .
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 57
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>'
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
+