railties 3.1.0.beta1 → 3.1.0.rc1

data/lib/rails/generators/base.rb

@@ -117,8 +117,8 @@ module Rails
       #
       # ==== Switches
       #
-      # All hooks come with switches for user interface. If the user don't want
-      # to use any test framework, he can do:
+      # All hooks come with switches for user interface. If you do not want
+      # to use any test framework, you can do:
       #
       #   rails generate controller Account --skip-test-framework
       #

data/lib/rails/generators/erb/scaffold/templates/_form.html.erb

@@ -11,7 +11,7 @@
     </div>
   <%% end %>
 
-<% for attribute in attributes -%>
+<% attributes.each do |attribute| -%>
   <div class="field">
     <%%= f.label :<%= attribute.name %> %><br />
     <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>

data/lib/rails/generators/erb/scaffold/templates/index.html.erb

@@ -2,7 +2,7 @@
 
 <table>
   <tr>
-<% for attribute in attributes -%>
+<% attributes.each do |attribute| -%>
     <th><%= attribute.human_name %></th>
 <% end -%>
     <th></th>
@@ -12,7 +12,7 @@
 
 <%% @<%= plural_table_name %>.each do |<%= singular_table_name %>| %>
   <tr>
-<% for attribute in attributes -%>
+<% attributes.each do |attribute| -%>
     <td><%%= <%= singular_table_name %>.<%= attribute.name %> %></td>
 <% end -%>
     <td><%%= link_to 'Show', <%= singular_table_name %> %></td>

data/lib/rails/generators/erb/scaffold/templates/show.html.erb

@@ -1,6 +1,6 @@
 <p id="notice"><%%= notice %></p>
 
-<% for attribute in attributes -%>
+<% attributes.each do |attribute| -%>
 <p>
   <b><%= attribute.human_name %>:</b>
   <%%= @<%= singular_table_name %>.<%= attribute.name %> %>

data/lib/rails/generators/generated_attribute.rb

@@ -13,12 +13,13 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer, :float, :decimal then :text_field
-          when :time                      then :time_select
-          when :datetime, :timestamp      then :datetime_select
-          when :date                      then :date_select
-          when :text                      then :text_area
-          when :boolean                   then :check_box
+          when :integer              then :number_field
+          when :float, :decimal      then :text_field
+          when :time                 then :time_select
+          when :datetime, :timestamp then :datetime_select
+          when :date                 then :date_select
+          when :text                 then :text_area
+          when :boolean              then :check_box
           else
             :text_field
         end

data/lib/rails/generators/named_base.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/module/introspection'
 require 'rails/generators/base'
 require 'rails/generators/generated_attribute'
 
@@ -12,6 +13,7 @@ module Rails
                                     :desc => "Force using old style hash (:foo => 'bar') on Ruby >= 1.9"
 
       def initialize(args, *options) #:nodoc:
+        @inside_template = nil
         # Unfreeze name in case it's given as a frozen string
         args[0] = args[0].dup if args[0].is_a?(String) && args[0].frozen?
         super

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

@@ -9,11 +9,20 @@ module Rails
       @options   = generator.options
     end
 
-  private
+    private
+      %w(template copy_file directory empty_directory inside
+         empty_directory_with_gitkeep create_file chmod shebang).each do |method|
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def #{method}(*args, &block)
+            @generator.send(:#{method}, *args, &block)
+          end
+        RUBY
+      end
 
-    def method_missing(meth, *args, &block)
-      @generator.send(meth, *args, &block)
-    end
+      # TODO: Remove once this is fully in place
+      def method_missing(meth, *args, &block)
+        @generator.send(meth, *args, &block)
+      end
   end
 
   # The application builder allows you to override elements of the application
@@ -21,7 +30,7 @@ module Rails
   # generator.
   #
   # This allows you to override entire operations, like the creation of the
-  # Gemfile, README, or javascript files, without needing to know exactly
+  # Gemfile, README, or JavaScript files, without needing to know exactly
   # what those operations do so you can create another template action.
   class AppBuilder
     def rakefile
@@ -215,7 +224,7 @@ module Rails
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :bundle_if_dev_or_edge
+      public_task :apply_rails_template, :run_bundle
 
     protected
 

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

@@ -4,6 +4,7 @@ source 'http://rubygems.org'
 
 <%= database_gemfile_entry -%>
 
+<%= "gem 'jruby-openssl'\n" if defined?(JRUBY_VERSION) && JRUBY_VERSION < "1.6" -%>
 # Asset template engines
 <%= "gem 'json'\n" if RUBY_VERSION < "1.9.2" -%>
 gem 'sass'
@@ -21,4 +22,4 @@ gem 'uglifier'
 # To use debugger
 # <%= gem_for_ruby_debugger %>
 
-<%= gem_for_turn -%>
+<%= gem_for_turn -%>

data/lib/rails/generators/rails/app/templates/README

@@ -156,6 +156,10 @@ PostgreSQL and SQLite 3.
 The default directory structure of a generated Ruby on Rails application:
 
   |-- app
+  |   |-- assets
+  |       |-- images
+  |       |-- javascripts
+  |       `-- stylesheets
   |   |-- controllers
   |   |-- helpers
   |   |-- mailers
@@ -172,9 +176,6 @@ The default directory structure of a generated Ruby on Rails application:
   |   `-- tasks
   |-- log
   |-- public
-  |   |-- images
-  |   |-- javascripts
-  |   `-- stylesheets
   |-- script
   |-- test
   |   |-- fixtures
@@ -188,11 +189,16 @@ The default directory structure of a generated Ruby on Rails application:
   |   |-- sessions
   |   `-- sockets
   `-- vendor
+      |-- assets
+          `-- stylesheets
       `-- plugins
 
 app
   Holds all the code that's specific to this particular application.
 
+app/assets
+  Contains subdirectories for images, stylesheets, and JavaScript files.
+
 app/controllers
   Holds controllers that should be named like weblogs_controller.rb for
   automated URL mapping. All controllers should descend from
@@ -237,8 +243,7 @@ lib
   the load path.
 
 public
-  The directory available for the web server. Contains subdirectories for
-  images, stylesheets, and javascripts. Also contains the dispatchers and the
+  The directory available for the web server. Also contains the dispatchers and the
   default HTML files. This should be set as the DOCUMENT_ROOT of your web
   server.
 

data/lib/rails/generators/rails/app/templates/app/assets/javascripts/application.js.tt

@@ -1,5 +1,8 @@
-// FIXME: Tell people that this is a manifest file, real code should go into discrete files
-// FIXME: Tell people how Sprockets and CoffeeScript works
+// This is a manifest file that'll be compiled into including all the files listed below.
+// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// be included in the compiled file accessible from http://example.com/assets/application.js
+// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+// the compiled file.
 //
 <% unless options[:skip_javascript] -%>
 //= require <%= options[:javascript] %>

data/lib/rails/generators/rails/app/templates/app/assets/stylesheets/application.css

@@ -1,5 +1,7 @@
 /*
- * FIXME: Introduce SCSS & Sprockets
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require_tree . 
 */

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

@@ -1,14 +1,14 @@
 require File.expand_path('../boot', __FILE__)
 
-<% unless options[:skip_active_record] -%>
+<% if include_all_railties? -%>
 require 'rails/all'
 <% else -%>
 # Pick the frameworks you want:
-# require "active_record/railtie"
+<%= 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_test_unit %> require "rails/test_unit/railtie"
 <% end -%>
 
 # If you have a Gemfile, require the gems listed there, including any gems
@@ -50,21 +50,12 @@ module <%= app_const_base %>
     # config.action_view.javascript_expansions[:defaults] = %w(prototype prototype_ujs)
 <% end -%>
 
-<% if options[:skip_test_unit] -%>
-    config.generators.test_framework = false
-<% end -%>
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
-<% unless options[:skip_active_record] -%>
-    # Enable IdentityMap for Active Record, to disable set to false or remove the line below.
-    config.active_record.identity_map = true
-<% end -%>
-
     # Enable the asset pipeline
     config.assets.enabled = true
   end

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

@@ -2,7 +2,10 @@
 #
 # Get the bindings:
 #   gem install ruby-frontbase
-
+#
+# Configure Using Gemfile
+# gem 'ruby-frontbase'
+#
 development:
   adapter: frontbase
   host: localhost

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

@@ -28,6 +28,9 @@
 #   On Windows:
 #       Issue the command: gem install ibm_db
 #
+# Configure Using Gemfile
+# gem 'ibm_db'
+#
 # For more details on the installation and the connection parameters below,
 # please refer to the latest documents at http://rubyforge.org/docman/?group_id=2361
 

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

@@ -3,6 +3,9 @@
 # Install the MySQL driver:
 #   gem install activerecord-jdbcmysql-adapter
 #
+# Configure Using Gemfile
+# gem 'activerecord-jdbcmysql-adapter'
+#
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:

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

@@ -8,6 +8,10 @@
 #   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
   encoding: unicode

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

@@ -1,6 +1,9 @@
 # SQLite version 3.x
 #   gem 'activerecord-jdbcsqlite3-adapter'
-
+#
+# Configure Using Gemfile
+# gem 'activerecord-jdbcsqlite3-adapter'
+#
 development:
   adapter: jdbcsqlite3
   database: db/development.sqlite3

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

@@ -1,8 +1,11 @@
 # MySQL.  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
+# 
+# Install the MYSQL driver
 #   gem install mysql2
 #
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
 # And be sure to use new-style password hashing:
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:

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

@@ -8,6 +8,10 @@
 #   gem install pg
 #       Choose the win32 build.
 #       Install PostgreSQL and put its /bin directory on your path.
+#
+# Configure Using Gemfile
+# gem 'pg'
+#
 development:
   adapter: postgresql
   encoding: unicode

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

@@ -1,5 +1,8 @@
 # SQLite version 3.x
 #   gem install sqlite3
+#
+#   Ensure the SQLite 3 gem is defined in your Gemfile
+#   gem 'sqlite3'
 development:
   adapter: sqlite3
   database: db/development.sqlite3

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

@@ -22,4 +22,3 @@
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 end
-

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

@@ -31,7 +31,7 @@
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)

data/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt

@@ -3,8 +3,8 @@
 # This file contains the settings for ActionController::ParametersWrapper
 # which will be enabled by default in the upcoming version of Ruby on Rails.
 
-# Enable parameter wrapping for JSON. You can disable this by set :format to empty array.
-ActionController::Base.wrap_parameters :format => [:json]
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActionController::Base.wrap_parameters <%= key_value :format, "[:json]" %>
 
 # Disable root element in JSON by default.
 if defined?(ActiveRecord)

data/lib/rails/generators/rails/app/templates/db/seeds.rb.tt

@@ -4,4 +4,4 @@
 # Examples:
 #
 #   cities = City.create([{ <%= key_value :name, "'Chicago'" %> }, { <%= key_value :name, "'Copenhagen'" %> }])
-#   Mayor.create(<%= key_value :name, "'Daley'" %>, <%= key_value :city, "cities.first" %>)
+#   Mayor.create(<%= key_value :name, "'Emanuel'" %>, <%= key_value :city, "cities.first" %>)

data/lib/rails/generators/rails/app/templates/gitignore

@@ -2,3 +2,4 @@
 db/*.sqlite3
 log/*.log
 tmp/
+.sass-cache/

data/lib/rails/generators/rails/app/templates/test/performance/browsing_test.rb

@@ -1,8 +1,11 @@
 require 'test_helper'
 require 'rails/performance_test_help'
 
-# Profiling results for each test method are written to tmp/performance.
 class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+  
   def test_homepage
     get '/'
   end

data/lib/rails/generators/rails/assets/USAGE

@@ -1,8 +1,8 @@
 Description:
-    Stubs out a new asset placeholders. Pass the asset name, either CamelCased
+    Stubs out new asset placeholders. Pass the asset name, either CamelCased
     or under_scored.
 
-    To create assets within a folder, specify the assets name as a
+    To create an asset within a folder, specify the asset's name as a
     path like 'parent/name'.
 
     This generates a JavaScript stub in app/assets/javascripts and a stylesheet
@@ -15,6 +15,6 @@ Example:
     `rails generate assets posts`
 
     Posts assets.
-        Javascript:     app/assets/javascripts/posts.js
+        JavaScript:     app/assets/javascripts/posts.js
         Stylesheet:     app/assets/stylesheets/posts.css
 

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

@@ -1,11 +1,11 @@
 module Rails
   module Generators
     class AssetsGenerator < NamedBase
-      class_option :javascripts, :type => :boolean, :desc => "Generate javascripts"
-      class_option :stylesheets, :type => :boolean, :desc => "Generate stylesheets"
+      class_option :javascripts, :type => :boolean, :desc => "Generate JavaScripts"
+      class_option :stylesheets, :type => :boolean, :desc => "Generate Stylesheets"
 
-      class_option :javascript_engine, :desc => "Engine for javascripts"
-      class_option :stylesheet_engine, :desc => "Engine for stylesheets"
+      class_option :javascript_engine, :desc => "Engine for JavaScripts"
+      class_option :stylesheet_engine, :desc => "Engine for Stylesheets"
 
       def create_javascript_files
         return unless options.javascripts?

data/lib/rails/generators/rails/controller/templates/controller.rb

@@ -1,6 +1,6 @@
 <% module_namespacing do -%>
 class <%= class_name %>Controller < ApplicationController
-<% for action in actions -%>
+<% actions.each do |action| -%>
   def <%= action %>
   end
 

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

@@ -75,6 +75,7 @@ task :default => :test
     def generate_test_dummy(force = false)
       opts = (options || {}).slice(*PASSTHROUGH_OPTIONS)
       opts[:force] = force
+      opts[:skip_bundle] = true
 
       invoke Rails::Generators::AppGenerator,
         [ File.expand_path(dummy_path, destination_root) ], opts
@@ -209,7 +210,7 @@ task :default => :test
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :bundle_if_dev_or_edge
+      public_task :apply_rails_template, :run_bundle
 
     protected