railties 3.0.20 → 3.1.0.beta1

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 => :environment do
+task :about do
   puts Rails::Info
 end
 

data/lib/rails/tasks/routes.rake

@@ -16,7 +16,8 @@ task :routes => :environment do
     {:name => route.name.to_s, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end
 
-  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties} } # Skip the route if it's internal info route
+   # Skip the route if it's internal info route
+  routes.reject! { |r| r[:path] =~ %r{/rails/info/properties|/assets} }
 
   name_width = routes.map{ |r| r[:name].length }.max
   verb_width = routes.map{ |r| r[:verb].length }.max

data/lib/rails/test_help.rb

@@ -13,15 +13,31 @@ if defined?(Test::Unit::Util::BacktraceFilter) && ENV['BACKTRACE'].nil?
   Test::Unit::Util::BacktraceFilter.module_eval { include Rails::BacktraceFilterForTestUnit }
 end
 
+if defined?(MiniTest)
+  # Enable turn if it is available
+  begin
+    require 'turn'
+
+    if MiniTest::Unit.respond_to?(:use_natural_language_case_names=)
+      MiniTest::Unit.use_natural_language_case_names = true
+    end
+  rescue LoadError
+  end
+end
+
 if defined?(ActiveRecord)
   require 'active_record/test_case'
 
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"
+
+    setup do
+      ActiveRecord::IdentityMap.clear
+    end
   end
 
-  ActionController::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
+  ActionDispatch::IntegrationTest.fixture_path = ActiveSupport::TestCase.fixture_path
 
   def create_fixtures(*table_names, &block)
     Fixtures.create_fixtures(ActiveSupport::TestCase.fixture_path, table_names, {}, &block)

data/lib/rails/test_unit/railtie.rb

@@ -1,6 +1,6 @@
 module Rails
   class TestUnitRailtie < Rails::Railtie
-    config.generators do |c|
+    config.app_generators do |c|
       c.test_framework :test_unit, :fixture => true,
                                    :fixture_replacement => nil
 

data/lib/rails/test_unit/testing.rake

@@ -73,7 +73,8 @@ end
 
 desc 'Runs test:units, test:functionals, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
 task :test do
-  errors = %w(test:units test:functionals test:integration).collect do |task|
+  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
@@ -103,9 +104,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` }.split.map { |path| path.chomp[7 .. -1] }
+        changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
       elsif File.directory?(".git")
-        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.split.map { |path| path.chomp }
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.map { |path| path.chomp }
       else
         abort "Not a Subversion or Git checkout."
       end
@@ -123,6 +124,10 @@ namespace :test do
   end
   Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
+  Rake::TestTask.new(:single => "test:prepare") do |t|
+    t.libs << "test"
+  end
+
   TestTaskWithoutDescription.new(:units => "test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'

data/lib/rails/version.rb

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

metadata

@@ -1,92 +1,82 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: railties
-version: !ruby/object:Gem::Version
-  version: 3.0.20
+version: !ruby/object:Gem::Version 
+  prerelease: 6
+  version: 3.1.0.beta1
 platform: ruby
-authors:
+authors: 
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-04 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: thor
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.4
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.14.4
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.14.6
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack-ssl
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.2
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-- !ruby/object:Gem::Dependency
-  name: actionpack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
   type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: actionpack
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.0.20
-description: ! 'Rails internals: application bootup, plugins, generators, and rake
-  tasks.'
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 3.1.0.beta1
+  type: :runtime
+  version_requirements: *id005
+description: "Rails internals: application bootup, plugins, generators, and rake tasks."
 email: david@loudthinking.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - CHANGELOG
 - README.rdoc
 - guides/assets/images/belongs_to.png
@@ -184,6 +174,7 @@ files:
 - guides/assets/javascripts/syntaxhighlighter/shBrushVb.js
 - guides/assets/javascripts/syntaxhighlighter/shBrushXml.js
 - guides/assets/javascripts/syntaxhighlighter/shCore.js
+- guides/assets/stylesheets/fixes.css
 - guides/assets/stylesheets/main.css
 - guides/assets/stylesheets/print.css
 - guides/assets/stylesheets/reset.css
@@ -253,10 +244,10 @@ files:
 - guides/w3c_validator.rb
 - lib/rails/all.rb
 - lib/rails/application/bootstrap.rb
-- lib/rails/application/configurable.rb
 - lib/rails/application/configuration.rb
 - lib/rails/application/finisher.rb
 - lib/rails/application/railties.rb
+- lib/rails/application/routes_reloader.rb
 - lib/rails/application.rb
 - lib/rails/backtrace_cleaner.rb
 - lib/rails/cli.rb
@@ -268,6 +259,7 @@ files:
 - lib/rails/commands/destroy.rb
 - lib/rails/commands/generate.rb
 - lib/rails/commands/plugin.rb
+- lib/rails/commands/plugin_new.rb
 - lib/rails/commands/profiler.rb
 - lib/rails/commands/runner.rb
 - lib/rails/commands/server.rb
@@ -276,13 +268,12 @@ files:
 - lib/rails/configuration.rb
 - lib/rails/console/app.rb
 - lib/rails/console/helpers.rb
-- lib/rails/console/sandbox.rb
-- lib/rails/deprecation.rb
-- lib/rails/engine/configurable.rb
 - lib/rails/engine/configuration.rb
+- lib/rails/engine/railties.rb
 - lib/rails/engine.rb
 - lib/rails/generators/actions.rb
 - lib/rails/generators/active_model.rb
+- lib/rails/generators/app_base.rb
 - lib/rails/generators/base.rb
 - lib/rails/generators/erb/controller/controller_generator.rb
 - lib/rails/generators/erb/controller/templates/view.html.erb
@@ -299,6 +290,9 @@ files:
 - lib/rails/generators/migration.rb
 - lib/rails/generators/named_base.rb
 - lib/rails/generators/rails/app/app_generator.rb
+- lib/rails/generators/rails/app/templates/app/assets/images/rails.png
+- lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt
+- lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css
 - lib/rails/generators/rails/app/templates/app/controllers/application_controller.rb
 - lib/rails/generators/rails/app/templates/app/helpers/application_helper.rb
 - lib/rails/generators/rails/app/templates/app/views/layouts/application.html.erb.tt
@@ -306,7 +300,6 @@ 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
@@ -323,10 +316,11 @@ files:
 - lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb
 - lib/rails/generators/rails/app/templates/config/initializers/secret_token.rb.tt
 - lib/rails/generators/rails/app/templates/config/initializers/session_store.rb.tt
+- lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
 - lib/rails/generators/rails/app/templates/config/locales/en.yml
 - lib/rails/generators/rails/app/templates/config/routes.rb
 - lib/rails/generators/rails/app/templates/config.ru
-- lib/rails/generators/rails/app/templates/db/seeds.rb
+- lib/rails/generators/rails/app/templates/db/seeds.rb.tt
 - lib/rails/generators/rails/app/templates/doc/README_FOR_APP
 - lib/rails/generators/rails/app/templates/Gemfile
 - lib/rails/generators/rails/app/templates/gitignore
@@ -334,21 +328,20 @@ files:
 - lib/rails/generators/rails/app/templates/public/422.html
 - lib/rails/generators/rails/app/templates/public/500.html
 - lib/rails/generators/rails/app/templates/public/favicon.ico
-- lib/rails/generators/rails/app/templates/public/images/rails.png
 - lib/rails/generators/rails/app/templates/public/index.html
-- lib/rails/generators/rails/app/templates/public/javascripts/application.js
-- lib/rails/generators/rails/app/templates/public/javascripts/controls.js
-- lib/rails/generators/rails/app/templates/public/javascripts/dragdrop.js
-- lib/rails/generators/rails/app/templates/public/javascripts/effects.js
-- lib/rails/generators/rails/app/templates/public/javascripts/prototype.js
-- lib/rails/generators/rails/app/templates/public/javascripts/rails.js
 - lib/rails/generators/rails/app/templates/public/robots.txt
 - lib/rails/generators/rails/app/templates/Rakefile
 - lib/rails/generators/rails/app/templates/README
 - lib/rails/generators/rails/app/templates/script/rails
 - lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb
-- lib/rails/generators/rails/app/templates/test/test_helper.rb.tt
+- lib/rails/generators/rails/app/templates/test/test_helper.rb
 - lib/rails/generators/rails/app/USAGE
+- lib/rails/generators/rails/assets/assets_generator.rb
+- lib/rails/generators/rails/assets/templates/javascript.js
+- lib/rails/generators/rails/assets/templates/javascript.js.coffee
+- lib/rails/generators/rails/assets/templates/stylesheet.css
+- lib/rails/generators/rails/assets/templates/stylesheet.css.scss
+- lib/rails/generators/rails/assets/USAGE
 - lib/rails/generators/rails/controller/controller_generator.rb
 - lib/rails/generators/rails/controller/templates/controller.rb
 - lib/rails/generators/rails/controller/USAGE
@@ -379,18 +372,38 @@ files:
 - lib/rails/generators/rails/plugin/templates/README.tt
 - lib/rails/generators/rails/plugin/templates/uninstall.rb
 - lib/rails/generators/rails/plugin/USAGE
+- lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+- lib/rails/generators/rails/plugin_new/templates/%name%.gemspec
+- lib/rails/generators/rails/plugin_new/templates/app/controllers/%name%/application_controller.rb.tt
+- lib/rails/generators/rails/plugin_new/templates/app/helpers/%name%/application_helper.rb.tt
+- lib/rails/generators/rails/plugin_new/templates/config/routes.rb
+- lib/rails/generators/rails/plugin_new/templates/Gemfile
+- lib/rails/generators/rails/plugin_new/templates/gitignore
+- lib/rails/generators/rails/plugin_new/templates/lib/%name%/engine.rb
+- lib/rails/generators/rails/plugin_new/templates/lib/%name%.rb
+- lib/rails/generators/rails/plugin_new/templates/lib/tasks/%name%_tasks.rake
+- lib/rails/generators/rails/plugin_new/templates/MIT-LICENSE
+- lib/rails/generators/rails/plugin_new/templates/rails/application.rb
+- lib/rails/generators/rails/plugin_new/templates/rails/boot.rb
+- lib/rails/generators/rails/plugin_new/templates/rails/routes.rb
+- lib/rails/generators/rails/plugin_new/templates/Rakefile
+- lib/rails/generators/rails/plugin_new/templates/README.rdoc
+- lib/rails/generators/rails/plugin_new/templates/script/rails.tt
+- lib/rails/generators/rails/plugin_new/templates/test/%name%_test.rb
+- lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb
+- lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+- lib/rails/generators/rails/plugin_new/USAGE
 - lib/rails/generators/rails/resource/resource_generator.rb
 - lib/rails/generators/rails/resource/USAGE
 - lib/rails/generators/rails/scaffold/scaffold_generator.rb
+- lib/rails/generators/rails/scaffold/templates/scaffold.css
+- lib/rails/generators/rails/scaffold/templates/scaffold.css.scss
 - lib/rails/generators/rails/scaffold/USAGE
 - lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb
 - lib/rails/generators/rails/scaffold_controller/templates/controller.rb
 - lib/rails/generators/rails/scaffold_controller/USAGE
 - lib/rails/generators/rails/session_migration/session_migration_generator.rb
 - lib/rails/generators/rails/session_migration/USAGE
-- lib/rails/generators/rails/stylesheets/stylesheets_generator.rb
-- lib/rails/generators/rails/stylesheets/templates/scaffold.css
-- lib/rails/generators/rails/stylesheets/USAGE
 - lib/rails/generators/resource_helpers.rb
 - lib/rails/generators/test_case.rb
 - lib/rails/generators/test_unit/controller/controller_generator.rb
@@ -417,7 +430,6 @@ files:
 - lib/rails/generators.rb
 - lib/rails/info.rb
 - lib/rails/info_controller.rb
-- lib/rails/info_routes.rb
 - lib/rails/initializable.rb
 - lib/rails/paths.rb
 - lib/rails/performance_test_help.rb
@@ -435,7 +447,9 @@ files:
 - lib/rails/script_rails_loader.rb
 - lib/rails/source_annotation_extractor.rb
 - lib/rails/tasks/annotations.rake
+- lib/rails/tasks/assets.rake
 - lib/rails/tasks/documentation.rake
+- lib/rails/tasks/engine.rake
 - lib/rails/tasks/framework.rake
 - lib/rails/tasks/log.rake
 - lib/rails/tasks/middleware.rake
@@ -449,29 +463,43 @@ files:
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails.rb
+- lib/rails/generators/rails/app/templates/app/mailers/.empty_directory
+- lib/rails/generators/rails/app/templates/app/models/.empty_directory
+- lib/rails/generators/rails/app/templates/public/stylesheets/.empty_directory
+- lib/rails/generators/rails/app/templates/test/fixtures/.empty_directory
+- lib/rails/generators/rails/app/templates/test/functional/.empty_directory
+- 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
+- lib/rails/generators/rails/plugin_new/templates/app/models/.empty_directory
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
-metadata: {}
+
 post_install_message: 
-rdoc_options:
-- "--exclude"
-- "."
-require_paths:
+rdoc_options: 
+- --exclude
+- .
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
+    - !ruby/object:Gem::Version 
       version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: rails
-rubygems_version: 2.0.0.preview3.1
+rubygems_version: 1.6.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
+