railties 4.1.0.beta2 → 4.1.0.rc1

data/lib/rails/generators/base.rb

@@ -296,7 +296,7 @@ module Rails
           end
         end
 
-        # Return the default value for the option name given doing a lookup in
+        # Returns the default value for the option name given doing a lookup in
         # Rails::Generators.options.
         def self.default_value_for_option(name, options)
           default_for_option(Rails::Generators.options, name, options, options[:default])

data/lib/rails/generators/erb.rb

@@ -5,6 +5,10 @@ module Erb # :nodoc:
     class Base < Rails::Generators::NamedBase #:nodoc:
       protected
 
+      def formats
+        format
+      end
+
       def format
         :html
       end
@@ -13,7 +17,7 @@ module Erb # :nodoc:
         :erb
       end
 
-      def filename_with_extensions(name)
+      def filename_with_extensions(name, format)
         [name, format, handler].compact.join(".")
       end
     end

data/lib/rails/generators/erb/controller/controller_generator.rb

@@ -11,8 +11,10 @@ module Erb # :nodoc:
 
         actions.each do |action|
           @action = action
-          @path = File.join(base_path, filename_with_extensions(action))
-          template filename_with_extensions(:view), @path
+          Array(formats).each do |format|
+            @path = File.join(base_path, filename_with_extensions(action, format))
+            template filename_with_extensions(:view, format), @path
+          end
         end
       end
     end

data/lib/rails/generators/erb/mailer/mailer_generator.rb

@@ -5,8 +5,8 @@ module Erb # :nodoc:
     class MailerGenerator < ControllerGenerator # :nodoc:
       protected
 
-      def format
-        :text
+      def formats
+        [:text, :html]
       end
     end
   end

data/lib/rails/generators/erb/mailer/templates/view.html.erb

@@ -0,0 +1,5 @@
+<h1><%= class_name %>#<%= @action %></h1>
+
+<p>
+  <%%= @greeting %>, find me in <%= @path %>
+</p>

data/lib/rails/generators/erb/mailer/templates/view.text.erb

@@ -1,3 +1,3 @@
 <%= class_name %>#<%= @action %>
 
-<%%= @greeting %>, find me in app/views/<%= @path %>
+<%%= @greeting %>, find me in <%= @path %>

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

@@ -14,8 +14,10 @@ module Erb # :nodoc:
 
       def copy_view_files
         available_views.each do |view|
-          filename = filename_with_extensions(view)
-          template filename, File.join("app/views", controller_file_path, filename)
+          Array(formats).each do |format|
+            filename = filename_with_extensions(view, format)
+            template filename, File.join("app/views", controller_file_path, filename)
+          end
         end
       end
 

data/lib/rails/generators/migration.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'rails/generators/actions/create_migration'
 
 module Rails
   module Generators
@@ -29,6 +30,19 @@ module Rails
         end
       end
 
+      def create_migration(destination, data, config = {}, &block)
+        action Rails::Generators::Actions::CreateMigration.new(self, destination, block || data.to_s, config)
+      end
+
+      def set_migration_assigns!(destination)
+        destination = File.expand_path(destination, self.destination_root)
+
+        migration_dir = File.dirname(destination)
+        @migration_number     = self.class.next_migration_number(migration_dir)
+        @migration_file_name  = File.basename(destination, '.rb')
+        @migration_class_name = @migration_file_name.camelize
+      end
+
       # Creates a migration template at the given destination. The difference
       # to the default template method is that the migration version is appended
       # to the destination file name.
@@ -37,26 +51,18 @@ module Rails
       # available as instance variables in the template to be rendered.
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
-      def migration_template(source, destination=nil, config={})
-        destination = File.expand_path(destination || source, self.destination_root)
+      def migration_template(source, destination, config = {})
+        source  = File.expand_path(find_in_source_paths(source.to_s))
 
-        migration_dir = File.dirname(destination)
-        @migration_number     = self.class.next_migration_number(migration_dir)
-        @migration_file_name  = File.basename(destination).sub(/\.rb$/, '')
-        @migration_class_name = @migration_file_name.camelize
+        set_migration_assigns!(destination)
+        context = instance_eval('binding')
 
-        destination = self.class.migration_exists?(migration_dir, @migration_file_name)
+        dir, base = File.split(destination)
+        numbered_destination = File.join(dir, ["%migration_number%", base].join('_'))
 
-        if !(destination && options[:skip]) && behavior == :invoke
-          if destination && options.force?
-            remove_file(destination)
-          elsif destination
-            raise Error, "Another migration is already named #{@migration_file_name}: #{destination}. Use --force to remove the old migration file and replace it."
-          end
-          destination = File.join(migration_dir, "#{@migration_number}_#{@migration_file_name}.rb")
+        create_migration numbered_destination, nil, config do
+          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
         end
-
-        template(source, destination, config)
       end
     end
   end

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

@@ -166,7 +166,6 @@ module Rails
       end
 
       public_task :set_default_accessors!
-      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -226,18 +225,17 @@ module Rails
         build(:vendor)
       end
 
-      def finish_template
-        build(:leftovers)
-      end
-
       def delete_js_folder_skipping_javascript
         if options[:skip_javascript]
           remove_dir 'app/assets/javascripts'
         end
       end
 
-      public_task :run_bundle
-      public_task :replay_template
+      def finish_template
+        build(:leftovers)
+      end
+
+      public_task :apply_rails_template, :run_bundle
       public_task :generate_spring_binstubs
 
     protected

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

@@ -6,12 +6,10 @@ source 'https://rubygems.org'
 
 # <%= gem.comment %>
 <% end -%>
-<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
-, '<%= gem.version %>'
-<% elsif gem.options.any? -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<%= %(, '#{gem.version}') if gem.version -%>
+<% if gem.options.any? -%>
 ,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
   "#{k}: #{v.inspect}" }.join(', ') %>
-<% else %>
 <% end -%>
 <% end -%>
 

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

@@ -3,14 +3,14 @@
 <head>
   <title><%= camelized %></title>
   <%- if options[:skip_javascript] -%>
-  <%%= stylesheet_link_tag    "application", media: "all" %>
+  <%%= stylesheet_link_tag    'application', media: 'all' %>
   <%- else -%>
-    <%- if gemfile_entries.any? { |m| m.name == "turbolinks" } -%>
-  <%%= stylesheet_link_tag    "application", media: "all", "data-turbolinks-track" => true %>
-  <%%= javascript_include_tag "application", "data-turbolinks-track" => true %>
+    <%- if gemfile_entries.any? { |m| m.name == 'turbolinks' } -%>
+  <%%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
+  <%%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
     <%- else -%>
-  <%%= stylesheet_link_tag    "application", media: "all" %>
-  <%%= javascript_include_tag "application" %>
+  <%%= stylesheet_link_tag    'application', media: 'all' %>
+  <%%= javascript_include_tag 'application' %>
     <%- end -%>
   <%- end -%>
   <%%= csrf_meta_tags %>

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

@@ -23,6 +23,7 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -61,6 +61,7 @@ test:
   <<: *default
   database: <%= app_name[0,4] %>_tst
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: <%= app_name[0,8] %>
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -53,6 +53,7 @@ test:
   <<: *default
   url: jdbc:db://localhost/<%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  url: jdbc:db://localhost/<%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -26,6 +26,6 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
-production:
-  <<: *default
-  database: <%= app_name %>_production
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+production: <%%= ENV["DATABASE_URL"] %>

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

@@ -6,13 +6,20 @@
 default: &default
   adapter: postgresql
   encoding: unicode
-  username: <%= app_name %>
-  password:
 
 development:
   <<: *default
   database: <%= app_name %>_development
 
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: <%= app_name %>
+
+  # The password associated with the postgres role (username).
+  #password:
+
   # Connect on a TCP socket. Omitted by default since the client uses a
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
@@ -35,6 +42,7 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -18,6 +18,7 @@ test:
   <<: *default
   database: db/test.sqlite3
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: db/production.sqlite3
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -1,4 +1,4 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
+# MySQL.  Versions 5.0+ are recommended.
 #
 # Install the MYSQL driver
 #   gem install mysql2
@@ -32,6 +32,11 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Avoid production credentials in the repository,
+# instead read the configuration from the environment.
+#
+# Example:
+#   mysql2://myuser:mypass@localhost/somedatabase
+#
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -32,6 +32,7 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -20,13 +20,20 @@ default: &default
   # For details on connection pooling, see rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: 5
-  username: <%= app_name %>
-  password:
 
 development:
   <<: *default
   database: <%= app_name %>_development
 
+  # The specified database role being used to connect to postgres.
+  # To create additional roles in postgres see `$ createuser --help`.
+  # When left blank, postgres will use the default role. This is
+  # the same name as the operating system user that initialized the database.
+  #username: <%= app_name %>
+
+  # The password associated with the postgres role (username).
+  #password:
+
   # Connect on a TCP socket. Omitted by default since the client uses a
   # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
@@ -52,6 +59,11 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+#
+# Example:
+#   postgres://myuser:mypass@localhost/somedatabase
+#
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -20,6 +20,11 @@ test:
   <<: *default
   database: db/test.sqlite3
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
+#
+# Example:
+#   sqlite3://myuser:mypass@localhost/full/path/to/somedatabase
+#
 production:
-  <<: *default
-  database: db/production.sqlite3
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -42,6 +42,7 @@ test:
   <<: *default
   database: <%= app_name %>_test
 
+# Do not keep production credentials in the repository,
+# instead read the configuration from the environment.
 production:
-  <<: *default
-  database: <%= app_name %>_production
+  url: <%%= ENV["DATABASE_URL"] %>

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

@@ -29,5 +29,13 @@ Rails.application.configure do
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
   <%- end -%>
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end

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

@@ -5,7 +5,7 @@ Rails.application.configure do
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -70,7 +70,7 @@ Rails.application.configure do
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
@@ -81,4 +81,9 @@ Rails.application.configure do
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
+  <%- unless options.skip_active_record? -%>
+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
+  <%- end -%>
 end

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

@@ -14,7 +14,7 @@ Rails.application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance.
   config.serve_static_assets  = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
@@ -33,4 +33,7 @@ Rails.application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end