railties 3.0.0.rc → 3.0.0.rc2

data/lib/rails/generators/rails/resource/resource_generator.rb

@@ -16,9 +16,9 @@ module Rails
 
       def add_resource_route
         return if options[:actions].present?
-        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ") 
+        route_config =  class_path.collect{|namespace| "namespace :#{namespace} do " }.join(" ")
         route_config << "resources :#{file_name.pluralize}"
-        route_config << " end" * class_path.size 
+        route_config << " end" * class_path.size
         route route_config
       end
     end

data/lib/rails/generators/test_case.rb

@@ -68,7 +68,7 @@ module Rails
       # Captures the given stream and returns it:
       #
       #   stream = capture(:stdout){ puts "Cool" }
-      #   stream #=> "Cool\n"
+      #   stream # => "Cool\n"
       #
       def capture(stream)
         begin

data/lib/rails/info_controller.rb

@@ -1,6 +1,6 @@
 class Rails::InfoController < ActionController::Base
   def properties
-    if consider_all_requests_local? || local_request?
+    if consider_all_requests_local? || request.local?
       render :inline => Rails::Info.to_html
     else
       render :text => '<p>For security purposes, this information is only available to local requests.</p>', :status => :forbidden

data/lib/rails/plugin.rb

@@ -16,7 +16,7 @@ module Rails
   # Besides this conceptual difference, the only difference between Rails::Engine and
   # Rails::Plugin is that plugins automatically load the file "init.rb" at the plugin
   # root during the boot process.
-  # 
+  #
   class Plugin < Engine
     def self.inherited(base)
       raise "You cannot inherit from Rails::Plugin"

data/lib/rails/rack/log_tailer.rb

@@ -6,7 +6,6 @@ module Rails
 
         path = Pathname.new(log || "#{File.expand_path(Rails.root)}/log/#{Rails.env}.log").cleanpath
         @cursor = ::File.size(path)
-        @last_checked = Time.now.to_f
 
         @file = ::File.open(path, 'r')
       end
@@ -20,11 +19,9 @@ module Rails
       def tail!
         @file.seek @cursor
 
-        mod = @file.mtime.to_f
-        if mod > @last_checked
+        if !@file.eof?
           contents = @file.read
-          @last_checked = mod
-          @cursor += contents.size
+          @cursor = @file.tell
           $stdout.print contents
         end
       end

data/lib/rails/railtie.rb

@@ -6,53 +6,53 @@ require 'active_support/deprecation'
 module Rails
   # Railtie is the core of the Rails Framework and provides several hooks to extend
   # Rails and/or modify the initialization process.
-  # 
+  #
   # 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 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
   # or after boot, then Railtie is what you need to do that interaction.
-  # 
+  #
   # For example, the following would need you to implement Railtie in your
   # plugin:
-  # 
+  #
   # * creating initializers
   # * configuring a Rails framework or the Application, like setting a generator
   # * adding Rails config.* keys to the environment
   # * setting up a subscriber to the Rails +ActiveSupport::Notifications+
   # * adding rake tasks into rails
-  # 
+  #
   # == Creating your Railtie
   #
   # Implementing Railtie in your Rails extension is done by creating a class
   # Railtie that has your extension name and making sure that this gets loaded
   # during boot time of the Rails stack.
-  # 
+  #
   # You can do this however you wish, but here is an example if you want to provide
   # it for a gem that can be used with or without Rails:
-  # 
+  #
   # * Create a file (say, lib/my_gem/railtie.rb) which contains class Railtie inheriting from
   #   Rails::Railtie and is namespaced to your gem:
   #
-  #   # lib/my_gem/railtie.rb
-  #   module MyGem
-  #     class Railtie < Rails::Railtie
+  #     # lib/my_gem/railtie.rb
+  #     module MyGem
+  #       class Railtie < Rails::Railtie
+  #       end
   #     end
-  #   end
-  # 
+  #
   # * Require your own gem as well as rails in this file:
-  # 
-  #   # lib/my_gem/railtie.rb
-  #   require 'my_gem'
-  #   require 'rails'
-  # 
-  #   module MyGem
-  #     class Railtie < Rails::Railtie
+  #
+  #     # lib/my_gem/railtie.rb
+  #     require 'my_gem'
+  #     require 'rails'
+  #
+  #     module MyGem
+  #       class Railtie < Rails::Railtie
+  #       end
   #     end
-  #   end
   #
   # == Initializers
   #
@@ -65,7 +65,7 @@ module Rails
   #     end
   #   end
   #
-  # If specified, the block can also receive the application object, in case you 
+  # If specified, the block can also receive the application object, in case you
   # need to access some application specific configuration, like middleware:
   #
   #   class MyRailtie < Rails::Railtie
@@ -121,7 +121,7 @@ module Rails
   # described here can be used in all three.
   #
   # Be sure to look at the documentation of those specific classes for more information.
-  # 
+  #
   class Railtie
     autoload :Configurable,  "rails/railtie/configurable"
     autoload :Configuration, "rails/railtie/configuration"

data/lib/rails/script_rails_loader.rb

@@ -17,11 +17,11 @@ module Rails
     rescue SystemCallError
       # could not chdir, no problem just return
     end
-    
+
     def self.in_rails_application?
       File.exists?(SCRIPT_RAILS)
     end
-    
+
     def self.in_rails_application_subdirectory?(path = Pathname.new(Dir.pwd))
       File.exists?(File.join(path, SCRIPT_RAILS)) || !path.root? && in_rails_application_subdirectory?(path.parent)
     end

data/lib/rails/tasks/documentation.rake

@@ -4,15 +4,15 @@ require 'rake/rdoctask'
 class RDocTaskWithoutDescriptions < Rake::RDocTask
   def define
     task rdoc_task_name
-    
+
     task rerdoc_task_name => [clobber_task_name, rdoc_task_name]
-    
+
     task clobber_task_name do
       rm_r rdoc_dir rescue nil
     end
-    
+
     task :clobber => [clobber_task_name]
-    
+
     directory @rdoc_dir
     task rdoc_task_name => [rdoc_target]
     file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
@@ -55,7 +55,7 @@ namespace :doc do
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
     rdoc.options << '--line-numbers' << '--inline-source'
-    rdoc.rdoc_files.include('README.rdoc')
+    rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
       %w(README.rdoc CHANGELOG MIT-LICENSE lib/action_mailer/base.rb).each do |file|

data/lib/rails/tasks/framework.rake

@@ -54,7 +54,7 @@ namespace :rails do
 
   namespace :update do
     def invoke_from_app_generator(method)
-      app_generator.invoke(method)
+      app_generator.send(method)
     end
 
     def app_generator

data/lib/rails/tasks/routes.rake

@@ -1,21 +1,35 @@
 desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 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
+
+  all_routes   = Rails.application.routes.routes
+  named_routes = Rails.application.routes.named_routes.routes
+
+  if ENV['CONTROLLER']
+    all_routes = all_routes.select{ |route| route.defaults[:controller] == ENV['CONTROLLER'] }
+  end
+
   routes = all_routes.collect do |route|
     # 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
+    key  = Hash.method_defined?('key') ? 'key' : 'index'
+    name = named_routes.send(key, route).to_s
+
+    reqs = route.requirements.dup
+    reqs[:to] = route.app unless route.app.is_a?(ActionDispatch::Routing::RouteSet::Dispatcher)
+    reqs = reqs.empty? ? "" : reqs.inspect
+
     {:name => name, :verb => route.verb.to_s, :path => route.path, :reqs => reqs}
   end
-  routes.reject!{ |r| r[:path] == "/rails/info/properties" } # skip the route if it's internal info route
-  name_width = routes.collect {|r| r[:name]}.collect {|n| n.length}.max
-  verb_width = routes.collect {|r| r[:verb]}.collect {|v| v.length}.max
-  path_width = routes.collect {|r| r[:path]}.collect {|s| s.length}.max
+
+  routes.reject! { |r| r[:path] == "/rails/info/properties" } # Skip the route if it's internal info route
+
+  name_width = routes.map{ |r| r[:name] }.map(&:length).max
+  verb_width = routes.map{ |r| r[:verb] }.map(&:length).max
+  path_width = routes.map{ |r| r[:path] }.map(&:length).max
+
   routes.each do |r|
     puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:path].ljust(path_width)} #{r[:reqs]}"
   end
-end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,3 +1,4 @@
+require 'rbconfig'
 require 'rake/testtask'
 
 # Monkey-patch to silence the description from Rake::TestTask to cut down on rake -T noise
@@ -62,7 +63,7 @@ end
 module Kernel
   def silence_stderr
     old_stderr = STDERR.dup
-    STDERR.reopen(Config::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
+    STDERR.reopen(RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ? 'NUL:' : '/dev/null')
     STDERR.sync = true
     yield
   ensure
@@ -70,7 +71,7 @@ module Kernel
   end
 end
 
-desc 'Runs test:unit, test:functional, test:integration together (also available: test:benchmark, test:profile, test:plugins)'
+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|
     begin

data/lib/rails/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: railties
 version: !ruby/object:Gem::Version 
-  hash: 7712042
+  hash: 977940607
   prerelease: true
   segments: 
   - 3
   - 0
   - 0
-  - rc
-  version: 3.0.0.rc
+  - rc2
+  version: 3.0.0.rc2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-26 00:00:00 -05:00
+date: 2010-08-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,13 +59,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712042
+        hash: 977940607
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -76,13 +76,13 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 7712042
+        hash: 977940607
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id004
 description: "Rails internals: application bootup, plugins, generators, and rake tasks."