railties 3.1.0.rc4 → 3.1.0.rc5

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

@@ -8,12 +8,14 @@ require 'rails/all'
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
+<%= comment_if :skip_sprockets %> require "sprockets/railtie"
 <%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
 <% end -%>
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+# If you have a Gemfile, require the default gems, the ones in the
+# current environment and also include :assets gems if in development
+# or test environments.
+Bundler.require *Rails.groups(:assets) if defined?(Bundler)
 
 module <%= app_const_base %>
   class Application < Rails::Application
@@ -45,7 +47,9 @@ module <%= app_const_base %>
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+<% unless options.skip_sprockets? -%>
     # Enable the asset pipeline
     config.assets.enabled = true
+<% end -%>
   end
 end

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

@@ -0,0 +1,62 @@
+# If you are using mssql, derby, hsqldb, or h2 with one of the
+# ActiveRecord JDBC adapters, install the appropriate driver, e.g.,:
+#   gem install activerecord-jdbcmssql-adapter
+#
+# Configure using Gemfile:
+#   gem 'activerecord-jdbcmssql-adapter'
+#
+#development:
+#  adapter: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_development
+#
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+#
+#test:
+#  adapter: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_test
+#
+#production:
+#  adapter: mssql
+#  username: <%= app_name %>
+#  password:
+#  host: localhost
+#  database: <%= app_name %>_production
+
+# If you are using oracle, db2, sybase, informix or prefer to use the plain
+# JDBC adapter, configure your database setting as the example below (requires
+# you to download and manually install the database vendor's JDBC driver .jar
+# file). See your driver documentation for the apropriate driver class and
+# connection string:
+
+development:
+  adapter: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_development
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+
+test:
+  adapter: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_test
+
+production:
+  adapter: jdbc
+  username: <%= app_name %>
+  password:
+  driver:
+  url: jdbc:db://localhost/<%= app_name %>_production

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

@@ -9,7 +9,7 @@
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
-  adapter: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_development
   username: root
   password:
@@ -19,14 +19,14 @@ 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: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_test
   username: root
   password:
   host: localhost
 
 production:
-  adapter: jdbcmysql
+  adapter: mysql
   database: <%= app_name %>_production
   username: root
   password:

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

@@ -1,19 +1,10 @@
 # PostgreSQL. Versions 7.4 and 8.x are supported.
 #
-# Install the pg driver:
-#   gem install pg
-# On Mac OS X with macports:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
 # Configure Using Gemfile
 # gem 'activerecord-jdbcpostgresql-adapter'
 
 development:
-  adapter: jdbcpostgresql
+  adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_development
   username: <%= app_name %>
@@ -38,14 +29,14 @@ 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: jdbcpostgresql
+  adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_test
   username: <%= app_name %>
   password:
 
 production:
-  adapter: jdbcpostgresql
+  adapter: postgresql
   encoding: unicode
   database: <%= app_name %>_production
   username: <%= app_name %>

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

@@ -5,16 +5,16 @@
 # gem 'activerecord-jdbcsqlite3-adapter'
 #
 development:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/development.sqlite3
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".
 # Do not set this db to the same as development or production.
 test:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/test.sqlite3
 
 production:
-  adapter: jdbcsqlite3
+  adapter: sqlite3
   database: db/production.sqlite3

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

@@ -14,9 +14,6 @@
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
-  # Specify the default JavaScript compressor
-  config.assets.js_compressor  = :uglifier
-
   # Specifies the header that your server uses for sending files
   # (comment out if your front-end server doesn't support this)
   config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx

data/lib/rails/generators/rails/assets/assets_generator.rb

@@ -7,21 +7,14 @@ module Rails
       class_option :javascript_engine, :desc => "Engine for JavaScripts"
       class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
 
-      def create_javascript_files
-        return unless options.javascripts?
-        copy_file "javascript.#{javascript_extension}",
-          File.join('app/assets/javascripts', class_path, "#{asset_name}.#{javascript_extension}")
-      end
-
       protected
 
       def asset_name
         file_name
       end
 
-      def javascript_extension
-        options.javascript_engine.present? ?
-          "js.#{options.javascript_engine}" : "js"
+      hook_for :javascript_engine do |javascript_engine|
+        invoke javascript_engine, [name] if options[:javascripts]
       end
 
       hook_for :stylesheet_engine do |stylesheet_engine|

data/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb

@@ -11,15 +11,15 @@ module Rails
     def app
       if mountable?
         directory "app"
-        template "#{app_templates_dir}/app/views/layouts/application.html.erb.tt",
+        template "app/views/layouts/application.html.erb.tt",
                  "app/views/layouts/#{name}/application.html.erb"
-        empty_directory_with_gitkeep "app/assets/images"
+        empty_directory_with_gitkeep "app/assets/images/#{name}"
       elsif full?
         empty_directory_with_gitkeep "app/models"
         empty_directory_with_gitkeep "app/controllers"
         empty_directory_with_gitkeep "app/views"
         empty_directory_with_gitkeep "app/helpers"
-        empty_directory_with_gitkeep "app/assets/images"
+        empty_directory_with_gitkeep "app/assets/images/#{name}"
       end
     end
 
@@ -108,9 +108,9 @@ task :default => :test
     def stylesheets
       if mountable?
         copy_file "#{app_templates_dir}/app/assets/stylesheets/application.css",
-                  "app/assets/stylesheets/application.css"
+                  "app/assets/stylesheets/#{name}/application.css"
       elsif full?
-        empty_directory_with_gitkeep "app/assets/stylesheets"
+        empty_directory_with_gitkeep "app/assets/stylesheets/#{name}"
       end
     end
 
@@ -118,14 +118,16 @@ task :default => :test
       return if options.skip_javascript?
 
       if mountable?
-        copy_file "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
-                  "app/assets/javascripts/application.js"
+        template "#{app_templates_dir}/app/assets/javascripts/application.js.tt",
+                  "app/assets/javascripts/#{name}/application.js"
       elsif full?
-        empty_directory_with_gitkeep "app/assets/javascripts"
+        empty_directory_with_gitkeep "app/assets/javascripts/#{name}"
       end
     end
 
     def script(force = false)
+      return unless full?
+
       directory "script", :force => force do |content|
         "#{shebang}\n" + content
       end
@@ -202,7 +204,7 @@ task :default => :test
       end
 
       def create_test_dummy_files
-        return if options[:skip_test_unit]
+        return if options[:skip_test_unit] && options[:dummy_path] == 'test/dummy'
         create_dummy_app
       end
 
@@ -258,7 +260,7 @@ task :default => :test
         elsif RESERVED_NAMES.include?(name)
           raise Error, "Invalid plugin name #{name}. Please give a name which does not match one of the reserved rails words."
         elsif Object.const_defined?(camelized)
-          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another application name."
+          raise Error, "Invalid plugin name #{name}, constant #{camelized} is already in use. Please choose another plugin name."
         end
       end
 

data/lib/rails/generators/rails/plugin_new/templates/%name%.gemspec

@@ -4,6 +4,9 @@ Gem::Specification.new do |s|
   s.name = "<%= name %>"
   s.summary = "Insert <%= camelized %> summary."
   s.description = "Insert <%= camelized %> description."
-  s.files = Dir["lib/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
+<% unless options.skip_test_unit? -%>
+  s.test_files = Dir["test/**/*"]
+<% end -%>
   s.version = "0.0.1"
-end
+end

data/lib/rails/generators/rails/plugin_new/templates/Gemfile

@@ -6,6 +6,9 @@ source "http://rubygems.org"
 <%= database_gemfile_entry -%>
 <% end -%>
 
-if RUBY_VERSION < '1.9'
-  gem "ruby-debug", ">= 0.10.3"
-end
+<% if mountable? -%>
+<%= javascript_gemfile_entry -%>
+<% end -%>
+
+# To use debugger
+# <%= ruby_debugger_gemfile_entry %>

data/lib/rails/generators/rails/plugin_new/templates/Rakefile

@@ -15,7 +15,7 @@ end
 RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = '<%= camelized %>'
-  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.options << '--line-numbers'
   rdoc.rdoc_files.include('README.rdoc')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
@@ -24,3 +24,7 @@ end
 APP_RAKEFILE = File.expand_path("../<%= dummy_path -%>/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 <% end %>
+<% unless options[:skip_gemspec] -%>
+
+Bundler::GemHelper.install_tasks
+<% end %>

data/lib/rails/generators/rails/plugin_new/templates/app/views/layouts/application.html.erb.tt

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title><%= camelized %></title>
+  <%%= stylesheet_link_tag    "<%= name %>/application" %>
+  <%%= javascript_include_tag "<%= name %>/application" %>
+  <%%= csrf_meta_tags %>
+</head>
+<body>
+
+<%%= yield %>
+
+</body>
+</html>

data/lib/rails/generators/rails/plugin_new/templates/rails/application.rb

@@ -1,13 +1,15 @@
 require File.expand_path('../boot', __FILE__)
 
-<% unless options[:skip_active_record] -%>
+<% if include_all_railties? -%>
 require 'rails/all'
 <% else -%>
-# require "active_record/railtie"
+# Pick the frameworks you want:
+<%= comment_if :skip_active_record %> require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "active_resource/railtie"
-require "rails/test_unit/railtie"
+<%= comment_if :skip_sprockets %> require "sprockets/railtie"
+<%= comment_if :skip_test_unit %> require "rails/test_unit/railtie"
 <% end -%>
 
 Bundler.require

data/lib/rails/info.rb

@@ -78,6 +78,10 @@ module Rails
       Rails::VERSION::STRING
     end
 
+    property 'JavaScript Runtime' do
+      ExecJS.runtime.name
+    end
+
     # Versions of each Rails framework (Active Record, Action Pack,
     # Active Resource, Action Mailer, and Active Support).
     frameworks.each do |framework|

data/lib/rails/paths.rb

@@ -7,8 +7,8 @@ module Rails
         match = id.to_s.match(/^(.*)=$/)
         full  = [@current, $1 || id].compact.join("/")
 
-        ActiveSupport::Deprecation.warn 'config.paths.app.controller API is deprecated in ' <<
-          'favor of config.paths["app/controller"] API.'
+        ActiveSupport::Deprecation.warn 'Accessing paths using dot style as in `config.paths.app.controller` is deprecated. Please use ' <<
+          '`config.paths["app/controller"]` style instead.'
 
         if match || args.any?
           @root[full] = Path.new(@root, full, *args)
@@ -49,8 +49,8 @@ module Rails
     #   root.add "config/routes", :with => "config/routes.rb"
     #   root["config/routes"].inspect # => ["config/routes.rb"]
     #
-    # #add also accepts the following options as argument: eager_load, autoload,
-    # autoload_once and glob.
+    # The #add method accepts the following options as arguments:
+    # eager_load, autoload, autoload_once and glob.
     #
     # Finally, the Path object also provides a few helpers:
     #
@@ -179,7 +179,7 @@ module Rails
           path = File.expand_path(p, @root.path)
 
           if @glob
-            result.concat Dir[File.join(path, @glob)]
+            result.concat Dir[File.join(path, @glob)].sort
           else
             result << path
           end

data/lib/rails/railtie.rb

@@ -83,7 +83,7 @@ module Rails
   # == Loading rake tasks and generators
   #
   # If your railtie has rake tasks, you can tell Rails to load them through the method
-  # rake tasks:
+  # rake_tasks:
   #
   #   class MyRailtie < Rails::Railtie
   #     rake_tasks do
@@ -173,11 +173,11 @@ module Rails
     def eager_load!
     end
 
-    def load_console(app)
+    def load_console(app=self)
       self.class.console.each { |block| block.call(app) }
     end
 
-    def load_tasks(app)
+    def load_tasks(app=self)
       extend Rake::DSL if defined? Rake::DSL
       self.class.rake_tasks.each { |block| block.call(app) }
 
@@ -189,7 +189,7 @@ module Rails
       end
     end
 
-    def load_generators(app)
+    def load_generators(app=self)
       self.class.generators.each { |block| block.call(app) }
     end
   end

data/lib/rails/tasks.rb

@@ -3,7 +3,6 @@ $VERBOSE = nil
 # Load Rails rakefile extensions
 %w(
   annotations
-  assets
   documentation
   framework
   log

data/lib/rails/tasks/documentation.rake

@@ -47,7 +47,7 @@ namespace :doc do
     rdoc.rdoc_dir = 'doc/app'
     rdoc.template = ENV['template'] if ENV['template']
     rdoc.title    = ENV['title'] || "Rails Application Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.options << '--line-numbers'
     rdoc.options << '--charset' << 'utf-8'
     rdoc.rdoc_files.include('doc/README_FOR_APP')
     rdoc.rdoc_files.include('app/**/*.rb')
@@ -60,7 +60,7 @@ namespace :doc do
     rdoc.rdoc_dir = 'doc/api'
     rdoc.template = "#{ENV['template']}.rb" if ENV['template']
     rdoc.title    = "Rails Framework Documentation"
-    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.options << '--line-numbers'
     rdoc.rdoc_files.include('README')
 
     gem_path('actionmailer') do |actionmailer|
@@ -133,7 +133,7 @@ namespace :doc do
         files         = Rake::FileList.new
         options << "-o doc/plugins/#{plugin}"
         options << "--title '#{plugin.titlecase} Plugin Documentation'"
-        options << '--line-numbers' << '--inline-source'
+        options << '--line-numbers'
         options << '--charset' << 'utf-8'
         options << '-T html'