railties 3.0.0.rc → 3.0.0.rc2

data/lib/rails/deprecation.rb

@@ -1,62 +1,41 @@
 require "active_support/string_inquirer"
-require "active_support/deprecation"
-
-RAILS_ROOT = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
-  cattr_accessor :warned
-  self.warned = false
-
-  def target
-    Rails.root
-  end
-
-  def replace(*args)
-    warn(caller, :replace, *args)
-  end
-
-  def warn(callstack, called, args)
-    unless warned
-      ActiveSupport::Deprecation.warn("RAILS_ROOT is deprecated! Use Rails.root instead", callstack)
-      self.warned = true
+require "active_support/basic_object"
+
+module Rails
+  module Initializer
+    def self.run(&block)
+      klass = Class.new(Rails::Application)
+      klass.instance_exec(klass.config, &block)
+      klass.initialize!
     end
   end
-end).new
-
-RAILS_ENV = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
-  cattr_accessor :warned
-  self.warned = false
-
-  def target
-    Rails.env
-  end
 
-  def replace(*args)
-    warn(caller, :replace, *args)
-  end
-
-  def warn(callstack, called, args)
-    unless warned
-      ActiveSupport::Deprecation.warn("RAILS_ENV is deprecated! Use Rails.env instead", callstack)
-      self.warned = true
+  class DeprecatedConstant < ActiveSupport::BasicObject
+    def self.deprecate(old, new)
+      constant = self.new(old, new)
+      eval "::#{old} = constant"
     end
-  end
-end).new
-
-RAILS_DEFAULT_LOGGER = (Class.new(ActiveSupport::Deprecation::DeprecationProxy) do
-  cattr_accessor :warned
-  self.warned = false
 
-  def target
-    Rails.logger
-  end
+    def initialize(old, new)
+      @old, @new = old, new
+      @target = ::Kernel.eval "proc { #{@new} }"
+      @warned = false
+    end
 
-  def replace(*args)
-    warn(caller, :replace, *args)
-  end
+    def method_missing(meth, *args, &block)
+      ::ActiveSupport::Deprecation.warn("#{@old} is deprecated. Please use #{@new}") unless @warned
+      @warned = true
 
-  def warn(callstack, called, args)
-    unless warned
-      ActiveSupport::Deprecation.warn("RAILS_DEFAULT_LOGGER is deprecated! Use Rails.logger instead", callstack)
-      self.warned = true
+      target = @target.call
+      if target.respond_to?(meth)
+        target.send(meth, *args, &block)
+      else
+        super
+      end
     end
   end
-end).new
+
+  DeprecatedConstant.deprecate("RAILS_ROOT",           "Rails.root.to_s")
+  DeprecatedConstant.deprecate("RAILS_ENV",            "Rails.env")
+  DeprecatedConstant.deprecate("RAILS_DEFAULT_LOGGER", "Rails.logger")
+end

data/lib/rails/engine.rb

@@ -119,7 +119,7 @@ module Rails
         root = File.exist?("#{root_path}/#{flag}") ? root_path : default
         raise "Could not find root path for #{self}" unless root
 
-        Config::CONFIG['host_os'] =~ /mswin|mingw/ ?
+        RbConfig::CONFIG['host_os'] =~ /mswin|mingw/ ?
           Pathname.new(root).expand_path : Pathname.new(root).realpath
       end
     end

data/lib/rails/engine/configuration.rb

@@ -48,6 +48,33 @@ module Rails
       def autoload_paths
         @autoload_paths ||= paths.autoload_paths
       end
+
+      def load_paths
+        ActiveSupport::Deprecation.warn "config.load_paths is deprecated. Please use config.autoload_paths instead."
+        autoload_paths
+      end
+
+      def load_paths=(paths)
+        ActiveSupport::Deprecation.warn "config.load_paths= is deprecated. Please use config.autoload_paths instead."
+        self.autoload_paths = paths
+      end
+
+      # Rails 3, by default, uses bundler, which shims the Kernel#gem method so that it should
+      # behave correctly for this deprecation.
+      def gem(name, options = {})
+        super name, options[:version] || ">= 0"
+        require options[:lib] || name
+      rescue Gem::LoadError
+        msg = "config.gem is deprecated, and you tried to activate the '#{name}' gem (#{options.inspect}) using it.\n"
+
+        if File.exist?("#{Rails.root}/Gemfile")
+          msg << "Please add '#{name}' to your Gemfile."
+        else
+          msg << "Please update your application to use bundler."
+        end
+        ActiveSupport::Deprecation.warn(msg, caller)
+        exit
+      end
     end
   end
-end
+end

data/lib/rails/generators.rb

@@ -218,11 +218,11 @@ module Rails
       puts "Usage: rails #{command} GENERATOR [args] [options]"
       puts
       puts "General options:"
-      puts "  -h, [--help]     # Print generators options and usage"
+      puts "  -h, [--help]     # Print generator's options and usage"
       puts "  -p, [--pretend]  # Run but do not make any changes"
       puts "  -f, [--force]    # Overwrite files that already exist"
       puts "  -s, [--skip]     # Skip files that already exist"
-      puts "  -q, [--quiet]    # Supress status output"
+      puts "  -q, [--quiet]    # Suppress status output"
       puts
       puts "Please choose a generator below."
       puts

data/lib/rails/generators/actions.rb

@@ -242,7 +242,7 @@ module Rails
       def rake(command, options={})
         log :rake, command
         env  = options[:env] || 'development'
-        sudo = options[:sudo] && Config::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
+        sudo = options[:sudo] && RbConfig::CONFIG['host_os'] !~ /mswin|mingw/ ? 'sudo ' : ''
         in_root { run("#{sudo}#{extify(:rake)} #{command} RAILS_ENV=#{env}", :verbose => false) }
       end
 
@@ -275,7 +275,7 @@ module Rails
       #
       def route(routing_code)
         log :route, routing_code
-        sentinel = /\.routes\.draw do(\s*\|map\|)?\s*$/
+        sentinel = /\.routes\.draw do(?:\s*\|map\|)?\s*$/
 
         in_root do
           inject_into_file 'config/routes.rb', "\n  #{routing_code}\n", { :after => sentinel, :verbose => false }
@@ -309,7 +309,7 @@ module Rails
         # Add an extension to the given name based on the platform.
         #
         def extify(name)
-          if Config::CONFIG['host_os'] =~ /mswin|mingw/
+          if RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
             "#{name}.bat"
           else
             name

data/lib/rails/generators/active_model.rb

@@ -9,16 +9,16 @@ module Rails
     # For example:
     #
     #   ActiveRecord::Generators::ActiveModel.find(Foo, "params[:id]")
-    #   #=> "Foo.find(params[:id])"
+    #   # => "Foo.find(params[:id])"
     #
     #   Datamapper::Generators::ActiveModel.find(Foo, "params[:id]")
-    #   #=> "Foo.get(params[:id])"
+    #   # => "Foo.get(params[:id])"
     #
     # On initialization, the ActiveModel accepts the instance name that will
     # receive the calls:
     #
     #   builder = ActiveRecord::Generators::ActiveModel.new "@foo"
-    #   builder.save #=> "@foo.save"
+    #   builder.save # => "@foo.save"
     #
     # The only exception in ActiveModel for ActiveRecord is the use of self.build
     # instead of self.new.

data/lib/rails/generators/base.rb

@@ -81,7 +81,7 @@ module Rails
       # guessed based on class invokes hook_for, as noticed in the example above.
       # This can be customized with two options: :base and :as.
       #
-      # Let's suppose you are creating a generator that needs to invoke the 
+      # Let's suppose you are creating a generator that needs to invoke the
       # controller generator from test unit. Your first attempt is:
       #
       #   class AwesomeGenerator < Rails::Generators::Base

data/lib/rails/generators/rails/app/app_generator.rb

@@ -216,7 +216,7 @@ module Rails
 
         empty_directory '.'
         set_default_accessors!
-        FileUtils.cd(destination_root)
+        FileUtils.cd(destination_root) unless options[:pretend]
       end
 
       def create_root_files
@@ -356,8 +356,13 @@ module Rails
         @app_name ||= File.basename(destination_root)
       end
 
+      def defined_app_const_base
+        Rails.respond_to?(:application) && defined?(Rails::Application) &&
+          Rails.application.is_a?(Rails::Application) && Rails.application.class.name.sub(/::Application$/, "")
+      end
+
       def app_const_base
-        @app_const_base ||= app_name.gsub(/\W/, '_').squeeze('_').camelize
+        @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize
       end
 
       def app_const
@@ -389,6 +394,7 @@ module Rails
         when "postgresql" then "pg"
         when "sqlite3"    then "sqlite3-ruby"
         when "frontbase"  then "ruby-frontbase"
+        when "mysql"      then "mysql2"
         else options[:database]
         end
       end
@@ -410,7 +416,7 @@ module Rails
           "/opt/local/var/run/mysql4/mysqld.sock",  # mac + darwinports + mysql4
           "/opt/local/var/run/mysql5/mysqld.sock",  # mac + darwinports + mysql5
           "/opt/lampp/var/mysql/mysql.sock"         # xampp for linux
-        ].find { |f| File.exist?(f) } unless Config::CONFIG['host_os'] =~ /mswin|mingw/
+        ].find { |f| File.exist?(f) } unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
       end
 
       def empty_directory_with_gitkeep(destination, config = {})

data/lib/rails/generators/rails/app/templates/Gemfile

@@ -13,7 +13,7 @@ gem 'rails', '<%= Rails::VERSION::STRING %>'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 <%- end -%>
 
-<% unless options[:skip_activerecord] -%>
+<% unless options[:skip_active_record] -%>
 gem '<%= gem_for_database %>'<% if require_for_database %>, :require => '<%= require_for_database %>'<% end %>
 <% end -%>
 
@@ -28,7 +28,7 @@ gem '<%= gem_for_database %>'<% if require_for_database %>, :require => '<%= req
 
 # Bundle the extra gems:
 # gem 'bj'
-# gem 'nokogiri', '1.4.1'
+# gem 'nokogiri'
 # gem 'sqlite3-ruby', :require => 'sqlite3'
 # gem 'aws-s3', :require => 'aws/s3'
 

data/lib/rails/generators/rails/app/templates/config/databases/mysql.yml

@@ -1,21 +1,12 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
 #
 # Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
+#   gem install mysql2
 #
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: <%= app_name %>_development
@@ -32,7 +23,7 @@ development:
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: <%= app_name %>_test
@@ -46,7 +37,7 @@ test:
 <% end -%>
 
 production:
-  adapter: mysql
+  adapter: mysql2
   encoding: utf8
   reconnect: false
   database: <%= app_name %>_production

data/lib/rails/generators/rails/app/templates/config/databases/oracle.yml

@@ -4,7 +4,7 @@
 #  http://rubyforge.org/projects/ruby-oci8/
 #
 # Specify your database using any valid connection syntax, such as a
-# tnsnames.ora service name, or a SQL connect url string of the form:
+# tnsnames.ora service name, or an SQL connect string of the form:
 #
 #   //host:[port][/service name]
 #

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

@@ -19,4 +19,8 @@
 
   # Print deprecation notices to the Rails logger
   config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
 end
+

data/lib/rails/generators/rails/app/templates/config/routes.rb

@@ -16,12 +16,12 @@
   # Sample resource route with options:
   #   resources :products do
   #     member do
-  #       get :short
-  #       post :toggle
+  #       get 'short'
+  #       post 'toggle'
   #     end
   #
   #     collection do
-  #       get :sold
+  #       get 'sold'
   #     end
   #   end
 
@@ -35,7 +35,7 @@
   #   resources :products do
   #     resources :comments
   #     resources :sales do
-  #       get :recent, :on => :collection
+  #       get 'recent', :on => :collection
   #     end
   #   end
 

data/lib/rails/generators/rails/app/templates/public/index.html

@@ -151,19 +151,6 @@
       }
 
 
-      #search {
-        margin: 0;
-        padding-top: 10px;
-        padding-bottom: 10px;
-        font-size: 11px;
-      }
-      #search input {
-        font-size: 11px;
-        margin: 2px;
-      }
-      #search-text {width: 170px}
-
-
       #sidebar ul {
         margin-left: 0;
         padding-left: 0;
@@ -194,16 +181,6 @@
         info.innerHTML = xhr.responseText;
         info.style.display = 'block'
       }
-
-      function prepend() {
-        search = document.getElementById('search-text');
-        text = search.value;
-        search.value = 'site:rubyonrails.org ' + text;
-      }
-
-      window.onload = function() {
-        document.getElementById('search-text').value = '';
-      }
     </script>
   </head>
   <body>

data/lib/rails/generators/rails/app/templates/public/javascripts/effects.js

@@ -150,7 +150,7 @@ var Effect = {
   toggle: function(element, effect, options) {
     element = $(element);
     effect  = (effect || 'appear').toLowerCase();
-    
+
     return Effect[ Effect.PAIRS[ effect ][ element.visible() ? 1 : 0 ] ](element, Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
     }, options || {}));

data/lib/rails/generators/rails/generator/USAGE

@@ -1,6 +1,6 @@
 Description:
-    Stubs out a new generator at lib/generators. Pass the generator name, either
-    CamelCased or under_scored, as an argument. 
+    Stubs out a new generator at lib/generators. Pass the generator name as an argument,
+    either CamelCased or snake_cased.
 
 Example:
     `rails generate generator Awesome`
@@ -8,4 +8,5 @@ Example:
     creates a standard awesome generator:
         lib/generators/awesome/
         lib/generators/awesome/awesome_generator.rb
+        lib/generators/awesome/USAGE
         lib/generators/awesome/templates/

data/lib/rails/generators/rails/migration/USAGE

@@ -18,12 +18,12 @@ Example:
     This will create the AddTitleBodyToPost in db/migrate/20080514090912_add_title_body_to_post.rb with
     this in the Up migration:
 
-      add_column :posts, :title, :string  
-      add_column :posts, :body, :text  
+      add_column :posts, :title, :string
+      add_column :posts, :body, :text
       add_column :posts, :published, :boolean
 
     And this in the Down migration:
 
-      remove_column :posts, :published  
-      remove_column :posts, :body  
+      remove_column :posts, :published
+      remove_column :posts, :body
       remove_column :posts, :title

data/lib/rails/generators/rails/plugin/USAGE

@@ -1,6 +1,6 @@
 Description:
     Stubs out a new plugin at vendor/plugins. Pass the plugin name, either
-    CamelCased or under_scored, as an argument. 
+    CamelCased or under_scored, as an argument.
 
 Example:
     `rails generate plugin BrowserFilters`