railties 3.0.0.beta3 → 3.0.0.beta4

data/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt

@@ -39,4 +39,8 @@
 
   # Enable threaded mode
   # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
 end

data/lib/rails/generators/rails/app/templates/script/rails

@@ -1,8 +1,5 @@
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENV_PATH  = File.expand_path('../../config/environment',  __FILE__)
-BOOT_PATH = File.expand_path('../../config/boot',  __FILE__)
-APP_PATH  = File.expand_path('../../config/application',  __FILE__)
-
-require BOOT_PATH
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require File.expand_path('../../config/boot',  __FILE__)
 require 'rails/commands'

data/lib/rails/generators/rails/generator/templates/%file_name%_generator.rb.tt

@@ -1,5 +1,3 @@
 class <%= class_name %>Generator < Rails::Generators::NamedBase
-  def self.source_root
-    @source_root ||= File.expand_path('../templates', __FILE__)
-  end
+  source_root File.expand_path('../templates', __FILE__)
 end

data/lib/rails/generators/rails/stylesheets/templates/scaffold.css

@@ -20,21 +20,17 @@ div.field, div.actions {
   margin-bottom: 10px;
 }
 
-.notice {
+#notice {
   color: green;
 }
 
-.alert {
-  color: red;
-}
-
-.fieldWithErrors {
+.field_with_errors {
   padding: 2px;
   background-color: red;
   display: table;
 }
 
-#errorExplanation {
+#error_explanation {
   width: 450px;
   border: 2px solid red;
   padding: 7px;
@@ -43,7 +39,7 @@ div.field, div.actions {
   background-color: #f0f0f0;
 }
 
-#errorExplanation h2 {
+#error_explanation h2 {
   text-align: left;
   font-weight: bold;
   padding: 5px 5px 5px 15px;
@@ -54,7 +50,7 @@ div.field, div.actions {
   color: #fff;
 }
 
-#errorExplanation ul li {
+#error_explanation ul li {
   font-size: 12px;
   list-style: square;
 }

data/lib/rails/generators/test_case.rb

@@ -189,6 +189,18 @@ module Rails
       end
       alias :assert_method :assert_instance_method
 
+      # Asserts the given field name gets translated to an attribute type 
+      # properly.
+      #
+      #   assert_field_type :date, :date_select
+      #
+      def assert_field_type(name, attribute_type)
+        assert_equal(
+          Rails::Generators::GeneratedAttribute.new('test', name.to_s).field_type,
+          attribute_type
+        )
+      end
+      
       # Runs the generator configured for this class. The first argument is an array like
       # command line arguments:
       #

data/lib/rails/generators/test_unit/integration/templates/integration_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class <%= class_name %>Test < ActionController::IntegrationTest
+class <%= class_name %>Test < ActionDispatch::IntegrationTest
   fixtures :all
 
   # Replace this with your real tests.

data/lib/rails/generators/test_unit/performance/templates/performance_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'rails/performance_test_help'
 
-class <%= class_name %>Test < ActionController::PerformanceTest
+class <%= class_name %>Test < ActionDispatch::PerformanceTest
   # Replace this with your real tests.
   def test_homepage
     get '/'

data/lib/rails/info.rb

@@ -35,20 +35,6 @@ module Rails
         end
       end
 
-      def edge_rails_revision(info = git_info)
-        info[/commit ([a-z0-9-]+)/, 1] || freeze_edge_version
-      end
-
-      def freeze_edge_version
-        if File.exist?(rails_vendor_root)
-          begin
-            Dir[File.join(rails_vendor_root, 'REVISION_*')].first.scan(/_(\d+)$/).first.first
-          rescue
-            Dir[File.join(rails_vendor_root, 'TAG_*')].first.scan(/_(.+)$/).first.first rescue 'unknown'
-          end
-        end
-      end
-
       def to_s
         column_width = properties.names.map {|name| name.length}.max
         info = properties.map do |name, value|
@@ -75,20 +61,6 @@ module Rails
           table << '</table>'
         end
       end
-
-      protected
-        def rails_vendor_root
-          @rails_vendor_root ||= "#{Rails.root}/vendor/rails"
-        end
-
-        def git_info
-          env_lang, ENV['LC_ALL'] = ENV['LC_ALL'], 'C'
-          Dir.chdir(rails_vendor_root) do
-            silence_stderr { `git log -n 1` }
-          end
-        ensure
-          ENV['LC_ALL'] = env_lang
-        end
     end
 
     # The Ruby version and platform, e.g. "1.8.2 (powerpc-darwin8.2.0)".
@@ -120,11 +92,6 @@ module Rails
       Rails.configuration.middleware.active.map(&:inspect)
     end
 
-    # The Rails Git revision, if it's checked out into vendor/rails.
-    property 'Edge Rails revision' do
-      edge_rails_revision
-    end
-
     # The application's location on the filesystem.
     property 'Application root' do
       File.expand_path(Rails.root)

data/lib/rails/log_subscriber.rb

@@ -22,7 +22,7 @@ module Rails
   #
   #   Rails::LogSubscriber.add :active_record, ActiveRecord::Railtie::LogSubscriber.new
   #
-  # So whenever a "active_record.sql" notification arrive to Rails::LogSubscriber,
+  # So whenever a "sql.active_record" notification arrive to Rails::LogSubscriber,
   # it will properly dispatch the event (ActiveSupport::Notifications::Event) to
   # the sql method.
   #
@@ -52,9 +52,10 @@ module Rails
 
     def self.add(namespace, log_subscriber, notifier = ActiveSupport::Notifications)
       log_subscribers << log_subscriber
+      @flushable_loggers = nil
 
       log_subscriber.public_methods(false).each do |event|
-        notifier.subscribe("#{namespace}.#{event}") do |*args|
+        notifier.subscribe("#{event}.#{namespace}") do |*args|
           next if log_subscriber.logger.nil?
 
           begin
@@ -70,11 +71,17 @@ module Rails
       @log_subscribers ||= []
     end
 
+    def self.flushable_loggers
+      @flushable_loggers ||= begin
+        loggers = log_subscribers.map(&:logger)
+        loggers.uniq!
+        loggers.select { |l| l.respond_to?(:flush) }
+      end
+    end
+
     # Flush all log_subscribers' logger.
     def self.flush_all!
-      loggers = log_subscribers.map(&:logger)
-      loggers.uniq!
-      loggers.each { |l| l.flush if l.respond_to?(:flush) }
+      flushable_loggers.each(&:flush)
     end
 
     # By default, we use the Rails.logger for logging.
@@ -105,4 +112,4 @@ module Rails
       "#{bold}#{color}#{text}#{CLEAR}"
     end
   end
-end
+end

data/lib/rails/rack/logger.rb

@@ -1,4 +1,5 @@
 require 'rails/log_subscriber'
+require 'active_support/core_ext/time/conversions'
 
 module Rails
   module Rack
@@ -19,10 +20,10 @@ module Rails
 
         def before_dispatch(env)
           request = ActionDispatch::Request.new(env)
-          path = request.fullpath.inspect rescue "unknown"
+          path = request.fullpath
 
-          info "\n\nStarted #{request.method.to_s.upcase} #{path} " <<
-                      "for #{request.remote_ip} at #{Time.now.to_s(:db)}"
+          info "\n\nStarted #{env["REQUEST_METHOD"]} \"#{path}\" " \
+               "for #{request.ip} at #{Time.now.to_default_s}"
         end
 
         def after_dispatch(env)

data/lib/rails/railtie.rb

@@ -1,6 +1,7 @@
 require 'rails/initializable'
 require 'rails/configuration'
 require 'active_support/inflector'
+require 'active_support/deprecation'
 
 module Rails
   # Railtie is the core of the Rails Framework and provides several hooks to extend
@@ -196,6 +197,9 @@ module Rails
       end
     end
 
+    def eager_load!
+    end
+
     def rake_tasks
       self.class.rake_tasks
     end

data/lib/rails/railtie/configuration.rb

@@ -7,6 +7,15 @@ module Rails
         @@options ||= {}
       end
 
+      # This allows you to modify the application's middlewares from Engines.
+      #
+      # All operations you run on the app_middleware will be replayed on the
+      # application once it is defined and the default_middlewares are
+      # created
+      def app_middleware
+        @@app_middleware ||= Rails::Configuration::MiddlewareStackProxy.new
+      end
+
       # Holds generators configuration:
       #
       #   config.generators do |g|
@@ -28,12 +37,20 @@ module Rails
         end
       end
 
-      def after_initialize_blocks
-        @@after_initialize_blocks ||= []
+      def before_configuration(&block)
+        ActiveSupport.on_load(:before_configuration, :yield => true, &block)
+      end
+
+      def before_eager_load(&block)
+        ActiveSupport.on_load(:before_eager_load, :yield => true, &block)
+      end
+
+      def before_initialize(&block)
+        ActiveSupport.on_load(:before_initialize, :yield => true, &block)
       end
 
-      def after_initialize(&blk)
-        after_initialize_blocks << blk if blk
+      def after_initialize(&block)
+        ActiveSupport.on_load(:after_initialize, :yield => true, &block)
       end
 
       def to_prepare_blocks

data/lib/rails/tasks/documentation.rake

@@ -1,3 +1,5 @@
+require 'rake/rdoctask'
+
 namespace :doc do
   def gem_path(gem_name)
     path = $LOAD_PATH.grep(/#{gem_name}[\w.-]*\/lib$/).first

data/lib/rails/tasks/framework.rake

@@ -30,6 +30,28 @@ namespace :rails do
     generator.apply template, :verbose => false
   end
 
+  namespace :templates do
+    desc "Copy all the templates from rails to the application directory for customization. Already existing local copies will be overwritten"
+    task :copy do
+      generators_lib = File.expand_path("../../generators", __FILE__)
+      project_templates = "#{Rails.root}/lib/templates"
+
+      default_templates = { "erb"   => %w{controller mailer scaffold},
+                            "rails" => %w{controller helper scaffold_controller stylesheets} }
+
+      default_templates.each do |type, names|
+        local_template_type_dir = File.join(project_templates, type)
+        FileUtils.mkdir_p local_template_type_dir
+
+        names.each do |name|
+          dst_name = File.join(local_template_type_dir, name)
+          src_name = File.join(generators_lib, type, name, "templates")
+          FileUtils.cp_r src_name, dst_name
+        end
+      end
+     end
+  end
+
   namespace :update do
     def invoke_from_app_generator(method)
       app_generator.invoke(method)

data/lib/rails/tasks/middleware.rake

@@ -1,6 +1,6 @@
 desc 'Prints out your Rack middleware stack'
 task :middleware => :environment do
-  Rails.configuration.middleware.active.each do |middleware|
+  Rails.configuration.middleware.each do |middleware|
     puts "use #{middleware.inspect}"
   end
   puts "run #{Rails::Application.instance.class.name}.routes"

data/lib/rails/tasks/routes.rake

@@ -3,7 +3,11 @@ task :routes => :environment do
   Rails::Application.reload_routes!
   all_routes = ENV['CONTROLLER'] ? Rails.application.routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : Rails.application.routes.routes
   routes = all_routes.collect do |route|
-    name = Rails.application.routes.named_routes.routes.index(route).to_s
+    # TODO: The :index method is deprecated in 1.9 in favor of :key
+    # but we don't have :key in 1.8.7. We can remove this check when
+    # stop supporting 1.8.x
+    key_method = Hash.method_defined?('key') ? 'key' : 'index'
+    name = Rails.application.routes.named_routes.routes.send(key_method, route).to_s
     reqs = route.requirements.empty? ? "" : route.requirements.inspect
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end

data/lib/rails/test_help.rb

@@ -35,7 +35,9 @@ class ActionController::TestCase
 end
 
 class ActionDispatch::IntegrationTest
-  include Rails.application.routes.url_helpers
+  setup do
+    @routes = Rails.application.routes
+  end
 end
 
 begin

data/lib/rails/test_unit/testing.rake

@@ -1,3 +1,5 @@
+require 'rake/testtask'
+
 TEST_CHANGES_SINCE = Time.now - 600
 
 # Look up tests for recently modified sources.
@@ -30,7 +32,7 @@ end
 module Kernel
   def silence_stderr
     old_stderr = STDERR.dup
-    STDERR.reopen(RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'NUL:' : '/dev/null')
+    STDERR.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
     STDERR.sync = true
     yield
   ensure

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 3
     MINOR = 0
     TINY  = 0
-    BUILD = "beta3"
+    BUILD = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
   end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 0
   - 0
-  - beta3
-  version: 3.0.0.beta3
+  - beta4
+  version: 3.0.0.beta4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,8 +42,8 @@ dependencies:
         segments: 
         - 0
         - 13
-        - 4
-        version: 0.13.4
+        - 6
+        version: 0.13.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,8 +57,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -72,8 +72,8 @@ dependencies:
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
   type: :runtime
   version_requirements: *id004
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."
@@ -205,12 +205,12 @@ files:
 - guides/source/routing.textile
 - guides/source/security.textile
 - guides/source/testing.textile
+- 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/metal_loader.rb
 - lib/rails/application/railties.rb
 - lib/rails/application/routes_reloader.rb
 - lib/rails/application.rb
@@ -218,13 +218,13 @@ files:
 - lib/rails/cli.rb
 - lib/rails/code_statistics.rb
 - lib/rails/commands/application.rb
+- lib/rails/commands/benchmarker.rb
 - lib/rails/commands/console.rb
 - lib/rails/commands/dbconsole.rb
 - lib/rails/commands/destroy.rb
 - lib/rails/commands/generate.rb
-- lib/rails/commands/performance/benchmarker.rb
-- lib/rails/commands/performance/profiler.rb
 - lib/rails/commands/plugin.rb
+- lib/rails/commands/profiler.rb
 - lib/rails/commands/runner.rb
 - lib/rails/commands/server.rb
 - lib/rails/commands/update.rb
@@ -234,7 +234,6 @@ files:
 - lib/rails/console/helpers.rb
 - lib/rails/console/sandbox.rb
 - lib/rails/deprecation.rb
-- lib/rails/dispatcher.rb
 - lib/rails/engine/configurable.rb
 - lib/rails/engine/configuration.rb
 - lib/rails/engine.rb
@@ -314,12 +313,6 @@ files:
 - lib/rails/generators/rails/helper/USAGE
 - lib/rails/generators/rails/integration_test/integration_test_generator.rb
 - lib/rails/generators/rails/integration_test/USAGE
-- lib/rails/generators/rails/mailer/mailer_generator.rb
-- lib/rails/generators/rails/mailer/templates/mailer.rb
-- lib/rails/generators/rails/mailer/USAGE
-- lib/rails/generators/rails/metal/metal_generator.rb
-- lib/rails/generators/rails/metal/templates/metal.rb
-- lib/rails/generators/rails/metal/USAGE
 - lib/rails/generators/rails/migration/migration_generator.rb
 - lib/rails/generators/rails/migration/USAGE
 - lib/rails/generators/rails/model/model_generator.rb