railties 3.0.0.beta4 → 3.0.0.rc

data/lib/rails/generators/test_unit/model/model_generator.rb

@@ -16,7 +16,7 @@ module TestUnit
 
       def create_fixture_file
         if options[:fixture] && options[:fixture_replacement].nil?
-          template 'fixtures.yml', File.join('test/fixtures', "#{table_name}.yml")
+          template 'fixtures.yml', File.join('test/fixtures', class_path, "#{plural_file_name}.yml")
         end
       end
     end

data/lib/rails/generators/test_unit/scaffold/scaffold_generator.rb

@@ -6,7 +6,6 @@ module TestUnit
     class ScaffoldGenerator < Base
       include Rails::Generators::ResourceHelpers
 
-      class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
       check_class_collision :suffix => "ControllerTest"
 
       def create_test_files

data/lib/rails/generators/test_unit/scaffold/templates/functional_test.rb

@@ -2,50 +2,48 @@ require 'test_helper'
 
 class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   setup do
-    @<%= file_name %> = <%= table_name %>(:one)
+    @<%= singular_table_name %> = <%= table_name %>(:one)
   end
 
-<% unless options[:singleton] -%>
   test "should get index" do
     get :index
     assert_response :success
     assert_not_nil assigns(:<%= table_name %>)
   end
-<% end -%>
 
   test "should get new" do
     get :new
     assert_response :success
   end
 
-  test "should create <%= file_name %>" do
+  test "should create <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count') do
-      post :create, :<%= file_name %> => @<%= file_name %>.attributes
+      post :create, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
     end
 
-    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  test "should show <%= file_name %>" do
-    get :show, :id => @<%= file_name %>.to_param
+  test "should show <%= singular_table_name %>" do
+    get :show, :id => @<%= singular_table_name %>.to_param
     assert_response :success
   end
 
   test "should get edit" do
-    get :edit, :id => @<%= file_name %>.to_param
+    get :edit, :id => @<%= singular_table_name %>.to_param
     assert_response :success
   end
 
-  test "should update <%= file_name %>" do
-    put :update, :id => @<%= file_name %>.to_param, :<%= file_name %> => @<%= file_name %>.attributes
-    assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
+  test "should update <%= singular_table_name %>" do
+    put :update, :id => @<%= singular_table_name %>.to_param, :<%= singular_table_name %> => @<%= singular_table_name %>.attributes
+    assert_redirected_to <%= singular_table_name %>_path(assigns(:<%= singular_table_name %>))
   end
 
-  test "should destroy <%= file_name %>" do
+  test "should destroy <%= singular_table_name %>" do
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, :id => @<%= file_name %>.to_param
+      delete :destroy, :id => @<%= singular_table_name %>.to_param
     end
 
-    assert_redirected_to <%= table_name %>_path
+    assert_redirected_to <%= index_helper %>_path
   end
 end

data/lib/rails/info.rb

@@ -1,4 +1,3 @@
-require "active_support/core_ext/object/misc"
 require "cgi"
 require "active_support/core_ext/cgi"
 
@@ -89,7 +88,7 @@ module Rails
     end
 
     property 'Middleware' do
-      Rails.configuration.middleware.active.map(&:inspect)
+      Rails.configuration.middleware.map(&:inspect)
     end
 
     # The application's location on the filesystem.

data/lib/rails/info_routes.rb

@@ -1,3 +1,3 @@
-Rails.application.routes.draw do |map|
+Rails.application.routes.draw do
   match '/rails/info/properties' => "rails/info#properties"
 end

data/lib/rails/initializable.rb

@@ -39,11 +39,6 @@ module Rails
         select { |i| i.before == initializer.name || i.name == initializer.after }.each(&block)
       end
 
-      def initialize(initializers = [])
-        super(initializers)
-        replace(tsort)
-      end
-
       def +(other)
         Collection.new(to_a + other.to_a)
       end
@@ -51,7 +46,7 @@ module Rails
 
     def run_initializers(*args)
       return if instance_variable_defined?(:@ran)
-      initializers.each do |initializer|
+      initializers.tsort.each do |initializer|
         initializer.run(*args)
       end
       @ran = true
@@ -63,7 +58,7 @@ module Rails
 
     module ClassMethods
       def initializers
-        @initializers ||= []
+        @initializers ||= Collection.new
       end
 
       def initializers_chain
@@ -84,14 +79,6 @@ module Rails
         opts[:after] ||= initializers.last.name unless initializers.empty? || initializers.find { |i| i.name == opts[:before] }
         initializers << Initializer.new(name, nil, opts, &blk)
       end
-
-      def run_initializers(*args)
-        return if @ran
-        initializers_chain.each do |initializer|
-          instance_exec(*args, &initializer.block)
-        end
-        @ran = true
-      end
     end
   end
-end
+end

data/lib/rails/paths.rb

@@ -25,9 +25,7 @@ module Rails
 
       def initialize(path)
         raise if path.is_a?(Array)
-
         @children = {}
-
         @path = path
         @root = self
         @all_paths = []
@@ -38,14 +36,18 @@ module Rails
         @all_paths
       end
 
-      def load_once
-        filter_by(:load_once?)
+      def autoload_once
+        filter_by(:autoload_once?)
       end
 
       def eager_load
         filter_by(:eager_load?)
       end
 
+      def autoload_paths
+        filter_by(:autoload?)
+      end
+
       def load_paths
         filter_by(:load_path?)
       end
@@ -61,15 +63,17 @@ module Rails
     protected
 
       def filter_by(constraint)
-        all_paths.map do |path|
+        all = []
+        all_paths.each do |path|
           if path.send(constraint)
             paths  = path.paths
             paths -= path.children.values.map { |p| p.send(constraint) ? [] : p.paths }.flatten
-            paths
-          else
-            []
+            all.concat(paths)
           end
-        end.flatten.uniq.select { |p| File.exists?(p) }
+        end
+        all.uniq!
+        all.reject! { |p| !File.exists?(p) }
+        all
       end
     end
 
@@ -80,15 +84,16 @@ module Rails
       attr_accessor :glob
 
       def initialize(root, *paths)
-        @options  = paths.last.is_a?(::Hash) ? paths.pop : {}
+        options   = paths.last.is_a?(::Hash) ? paths.pop : {}
         @children = {}
         @root     = root
         @paths    = paths.flatten
-        @glob     = @options.delete(:glob)
+        @glob     = options[:glob]
 
-        @load_once  = @options[:load_once]
-        @eager_load = @options[:eager_load]
-        @load_path  = @options[:load_path] || @eager_load || @load_once
+        autoload_once! if options[:autoload_once]
+        eager_load!    if options[:eager_load]
+        autoload!      if options[:autoload]
+        load_path!     if options[:load_path]
 
         @root.all_paths << self
       end
@@ -111,30 +116,20 @@ module Rails
         @paths.concat paths
       end
 
-      def load_once!
-        @load_once = true
-        @load_path = true
-      end
-
-      def load_once?
-        @load_once
-      end
-
-      def eager_load!
-        @eager_load = true
-        @load_path  = true
-      end
-
-      def eager_load?
-        @eager_load
-      end
+      %w(autoload_once eager_load autoload load_path).each do |m|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{m}!
+            @#{m} = true
+          end
 
-      def load_path!
-        @load_path = true
-      end
+          def skip_#{m}!
+            @#{m} = false
+          end
 
-      def load_path?
-        @load_path
+          def #{m}?
+            @#{m}
+          end
+        RUBY
       end
 
       def paths

data/lib/rails/plugin.rb

@@ -61,6 +61,16 @@ module Rails
       @config ||= Engine::Configuration.new
     end
 
+    initializer :handle_lib_autoload, :before => :set_load_path do |app|
+      paths = if app.config.reload_plugins
+        config.autoload_paths
+      else
+        config.autoload_once_paths
+      end
+
+      paths.concat config.paths.lib.to_a
+    end
+
     initializer :load_init_rb, :before => :load_config_initializers do |app|
       files = %w(rails/init.rb init.rb).map { |path| File.expand_path path, root }
       if initrb = files.find { |path| File.file? path }
@@ -77,11 +87,5 @@ module Rails
         raise "\"#{name}\" is a Railtie/Engine and cannot be installed as plugin"
       end
     end
-
-  protected
-
-    def reloadable?(app)
-      app.config.reload_plugins
-    end
   end
 end

data/lib/rails/rack/logger.rb

@@ -1,10 +1,9 @@
-require 'rails/log_subscriber'
 require 'active_support/core_ext/time/conversions'
 
 module Rails
   module Rack
     # Log the request started and flush all loggers after it.
-    class Logger < Rails::LogSubscriber
+    class Logger < ActiveSupport::LogSubscriber
       def initialize(app)
         @app = app
       end
@@ -16,20 +15,19 @@ module Rails
         after_dispatch(env)
       end
 
-      protected
+    protected
 
-        def before_dispatch(env)
-          request = ActionDispatch::Request.new(env)
-          path = request.fullpath
+      def before_dispatch(env)
+        request = ActionDispatch::Request.new(env)
+        path = request.fullpath
 
-          info "\n\nStarted #{env["REQUEST_METHOD"]} \"#{path}\" " \
-               "for #{request.ip} at #{Time.now.to_default_s}"
-        end
-
-        def after_dispatch(env)
-          Rails::LogSubscriber.flush_all!
-        end
+        info "\n\nStarted #{env["REQUEST_METHOD"]} \"#{path}\" " \
+             "for #{request.ip} at #{Time.now.to_default_s}"
+      end
 
+      def after_dispatch(env)
+        ActiveSupport::LogSubscriber.flush_all!
+      end
     end
   end
 end

data/lib/rails/railtie.rb

@@ -10,7 +10,7 @@ module Rails
   # Every major component of Rails (Action Mailer, Action Controller,
   # Action View, Active Record and Active Resource) are all Railties, so each of
   # them is responsible to set their own initialization. This makes, for example,
-  # Rails absent of any ActiveRecord hook, allowing any other ORM framework to hook in.
+  # Rails absent of any Active Record hook, allowing any other ORM framework to hook in.
   # 
   # Developing a Rails extension does _not_ require any implementation of
   # Railtie, but if you need to interact with the Rails framework during
@@ -70,7 +70,7 @@ module Rails
   #
   #   class MyRailtie < Rails::Railtie
   #     initializer "my_railtie.configure_rails_initialization" do |app|
-  #       app.middlewares.use MyRailtie::Middleware
+  #       app.middleware.use MyRailtie::Middleware
   #     end
   #   end
   #
@@ -114,36 +114,6 @@ module Rails
   #     end
   #   end
   #
-  # == Adding your subscriber
-  #
-  # Since version 3.0, Rails ships with a notification system which is used for several
-  # purposes, including logging. If you are sending notifications in your Railtie, you may
-  # want to add a subscriber to consume such notifications for logging purposes.
-  #
-  # The subscriber is added under the railtie_name namespace and only consumes notifications
-  # under the given namespace. For example, let's suppose your railtie is publishing the
-  # following "something_expensive" instrumentation:
-  #
-  #   ActiveSupport::Notifications.instrument "my_railtie.something_expensive" do
-  #     # something expensive
-  #   end
-  #
-  # You can log this instrumentation with your own Rails::Subscriber:
-  #
-  #   class MyRailtie::Subscriber < Rails::Subscriber
-  #     def something_expensive(event)
-  #       info("Something expensive took %.1fms" % event.duration)
-  #     end
-  #   end
-  #
-  # By registering it:
-  #
-  #   class MyRailtie < Railtie
-  #     subscriber :my_gem, MyRailtie::Subscriber.new
-  #   end
-  #
-  # Take a look in Rails::Subscriber docs for more information.
-  #
   # == Application, Plugin and Engine
   #
   # A Rails::Engine is nothing more than a Railtie with some initializers already set.
@@ -176,8 +146,8 @@ module Rails
         ActiveSupport::Deprecation.warn "railtie_name is deprecated and has no effect", caller
       end
 
-      def log_subscriber(name, log_subscriber)
-        Rails::LogSubscriber.add(name, log_subscriber)
+      def log_subscriber(*)
+        ActiveSupport::Deprecation.warn "log_subscriber is deprecated and has no effect", caller
       end
 
       def rake_tasks(&blk)
@@ -186,6 +156,12 @@ module Rails
         @rake_tasks
       end
 
+      def console(&blk)
+        @load_console ||= []
+        @load_console << blk if blk
+        @load_console
+      end
+
       def generators(&blk)
         @generators ||= []
         @generators << blk if blk
@@ -200,20 +176,16 @@ module Rails
     def eager_load!
     end
 
-    def rake_tasks
-      self.class.rake_tasks
-    end
-
-    def generators
-      self.class.generators
+    def load_console
+      self.class.console.each(&:call)
     end
 
     def load_tasks
-      rake_tasks.each { |blk| blk.call }
+      self.class.rake_tasks.each(&:call)
     end
 
     def load_generators
-      generators.each { |blk| blk.call }
+      self.class.generators.each(&:call)
     end
   end
 end

data/lib/rails/ruby_version_check.rb

@@ -1,10 +1,24 @@
-min_release  = "1.8.7"
-ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
-if ruby_release < min_release
+if RUBY_VERSION < '1.8.7'
+  desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
   abort <<-end_message
 
-    Rails requires Ruby version #{min_release} or later.
-    You're running #{ruby_release}; please upgrade to continue.
+    Rails 3 requires Ruby 1.8.7 or 1.9.2.
+
+    You're running
+      #{desc}
+
+    Please upgrade to continue.
+
+  end_message
+elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2'
+  $stderr.puts <<-end_message
+
+    Rails 3 doesn't officially support Ruby 1.9.1 since recent stable
+    releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2
+    before Rails 3 is released!
+
+    You're running
+      #{RUBY_DESCRIPTION}
 
   end_message
 end