railties 5.0.0.beta1.1 → 5.0.0.beta2

data/lib/rails/generators/generated_attribute.rb

@@ -23,8 +23,9 @@ module Rails
           type = type.to_sym if type
 
           if type && reference?(type)
-            references_index = UNIQ_INDEX_OPTIONS.include?(has_index) ? { unique: true } : true
-            attr_options[:index] = references_index
+            if UNIQ_INDEX_OPTIONS.include?(has_index)
+              attr_options[:index] = { unique: true }
+            end
           end
 
           new(name, type, has_index, attr_options)

data/lib/rails/generators/named_base.rb

@@ -161,6 +161,10 @@ module Rails
           @route_url ||= class_path.collect {|dname| "/" + dname }.join + "/" + plural_file_name
         end
 
+        def url_helper_prefix
+          @url_helper_prefix ||= (class_path + [file_name]).join('_')
+        end
+
         # Tries to retrieve the application name or simply return application.
         def application_name
           if defined?(Rails) && Rails.application

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

@@ -57,7 +57,7 @@ module Rails
       directory 'app'
 
       keep_file  'app/assets/images'
-      keep_file  'app/assets/javascripts/channels' unless options[:skip_action_cable]
+      empty_directory_with_keep_file 'app/assets/javascripts/channels' unless options[:skip_action_cable]
 
       keep_file  'app/controllers/concerns'
       keep_file  'app/models/concerns'
@@ -78,11 +78,12 @@ module Rails
         template "application.rb"
         template "environment.rb"
         template "secrets.yml"
+        template "cable.yml" unless options[:skip_action_cable]
+        template "puma.rb"   unless options[:skip_puma]
 
         directory "environments"
         directory "initializers"
         directory "locales"
-        directory "redis" unless options[:skip_action_cable]
       end
     end
 
@@ -313,11 +314,26 @@ module Rails
         end
       end
 
+      def delete_action_cable_files_skipping_action_cable
+        if options[:skip_action_cable]
+          remove_file 'config/cable.yml'
+          remove_file 'app/assets/javascripts/cable.coffee'
+          remove_dir 'app/channels'
+        end
+      end
+
       def delete_non_api_initializers_if_api_option
         if options[:api]
           remove_file 'config/initializers/session_store.rb'
           remove_file 'config/initializers/cookies_serializer.rb'
           remove_file 'config/initializers/request_forgery_protection.rb'
+          remove_file 'config/initializers/per_form_csrf_tokens.rb'
+        end
+      end
+
+      def delete_api_initializers
+        unless options[:api]
+          remove_file 'config/initializers/cors.rb'
         end
       end
 

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

@@ -12,9 +12,6 @@ source 'https://rubygems.org'
 <% end -%>
 <% end -%>
 
-# Use Puma as the app server
-gem 'puma'
-
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
 

data/lib/rails/generators/rails/app/templates/app/assets/javascripts/cable.coffee

@@ -1,4 +1,4 @@
-# Action Cable provides the framework to deal with WebSockets in Rails. 
+# Action Cable provides the framework to deal with WebSockets in Rails.
 # You can generate new channels where WebSocket features live using the rails generate channel command.
 #
 # Turn on the cable connection by removing the comments after the require statements (and ensure it's also on in config/routes.rb).

data/lib/rails/generators/rails/app/templates/app/channels/application_cable/channel.rb

@@ -1,4 +1,4 @@
-# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading.
+# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
 module ApplicationCable
   class Channel < ActionCable::Channel::Base
   end

data/lib/rails/generators/rails/app/templates/app/channels/application_cable/connection.rb

@@ -1,4 +1,4 @@
-# Be sure to restart your server when you modify this file. Action Cable runs in an EventMachine loop that does not support auto reloading.
+# Be sure to restart your server when you modify this file. Action Cable runs in a loop that does not support auto reloading.
 module ApplicationCable
   class Connection < ActionCable::Connection::Base
   end

data/lib/rails/generators/rails/app/templates/config.ru.tt

@@ -1,11 +1,10 @@
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment', __FILE__)
-
 <%- unless options[:skip_action_cable] -%>
-# Action Cable uses EventMachine which requires that all classes are loaded in advance
+
+# Action Cable requires that all classes are loaded in advance
 Rails.application.eager_load!
-require 'action_cable/process/logging'
 <%- end -%>
 
 run Rails.application

data/lib/rails/generators/rails/app/templates/config/cable.yml

@@ -0,0 +1,10 @@
+# Action Cable uses Redis by default to administer connections, channels, and sending/receiving messages over the WebSocket.
+production:
+  adapter: redis
+  url: redis://localhost:6379/1
+
+development:
+  adapter: async
+
+test:
+  adapter: async

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

@@ -54,7 +54,7 @@ Rails.application.configure do
   config.log_level = :debug
 
   # Prepend all log lines with the following tags.
-  # config.log_tags = [ :subdomain, :request_id ]
+  config.log_tags = [ :request_id ]
 
   # Use a different logger for distributed setups.
   # require 'syslog/logger'

data/lib/rails/generators/rails/app/templates/config/initializers/active_record_belongs_to_required_by_default.rb

@@ -1,5 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Require `belongs_to` associations by default. This is a new Rails 5.0 default, 
-# so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading.
+# Require `belongs_to` associations by default. This is a new Rails 5.0
+# default, so it is introduced as a configuration option to ensure that apps
+# made on earlier versions of Rails are not affected when upgrading.
 Rails.application.config.active_record.belongs_to_required_by_default = true

data/lib/rails/generators/rails/app/templates/config/initializers/callback_terminator.rb

@@ -1,5 +1,6 @@
 # Be sure to restart your server when you modify this file.
 
-# Do not halt callback chains when a callback returns false. This is a new Rails 5.0 default, 
-# so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading.
+# Do not halt callback chains when a callback returns false. This is a new
+# Rails 5.0 default, so it is introduced as a configuration option to ensure
+# that apps made with earlier versions of Rails are not affected when upgrading.
 ActiveSupport.halt_callback_chains_on_return_false = false

data/lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb

@@ -1,4 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
-# This is a new Rails 5.0 default, so introduced as a config to ensure apps made with earlier versions of Rails aren't affected when upgrading.
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/lib/rails/generators/rails/app/templates/config/initializers/per_form_csrf_tokens.rb

@@ -0,0 +1,4 @@
+# Be sure to restart your server when you modify this file.
+
+# Enable per-form CSRF tokens.
+Rails.application.config.action_controller.per_form_csrf_tokens = true

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

@@ -0,0 +1,44 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum, this matches the default thread size of Active Record.
+#
+threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }.to_i
+threads threads_count, threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests, default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked webserver processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
+
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory. If you use this option
+# you need to make sure to reconnect any threads in the `on_worker_boot`
+# block.
+#
+# preload_app!
+
+# The code in the `on_worker_boot` will be called if you are using
+# clustered mode by specifying a number of `workers`. After each worker
+# process is booted this block will be run, if you are using `preload_app!`
+# option you will want to use this block to reconnect to any threads
+# or connections that may have been created at application boot, Ruby
+# cannot share connections between processes.
+#
+# on_worker_boot do
+#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
+# end

data/lib/rails/generators/rails/app/templates/config/secrets.yml

@@ -5,7 +5,7 @@
 
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-# You can use `rake secret` to generate a secure secret key.
+# You can use `rails secret` to generate a secure secret key.
 
 # Make sure the secrets in this file are kept private
 # if you're sharing your code publicly.

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

@@ -1,5 +1,5 @@
 # This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rails db:seed (or created alongside the db with db:setup).
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
 #
 # Examples:
 #

data/lib/rails/generators/rails/model/USAGE

@@ -8,14 +8,14 @@ Description:
 
     As a special case, specifying 'password:digest' will generate a
     password_digest field of string type, and configure your generated model and
-    tests for use with ActiveModel has_secure_password (assuming the default ORM
+    tests for use with Active Model has_secure_password (assuming the default ORM
     and test framework are being used).
 
     You don't have to think up every attribute up front, but it helps to
     sketch out a few so you can start working with the model immediately.
 
     This generator invokes your configured ORM and test framework, which
-    defaults to ActiveRecord and TestUnit.
+    defaults to Active Record and TestUnit.
 
     Finally, if --parent option is given, it's used as superclass of the
     created model. This allows you create Single Table Inheritance models.
@@ -91,7 +91,7 @@ Available field types:
 Examples:
     `rails generate model account`
 
-        For ActiveRecord and TestUnit it creates:
+        For Active Record and TestUnit it creates:
 
             Model:      app/models/account.rb
             Test:       test/models/account_test.rb
@@ -104,7 +104,7 @@ Examples:
 
     `rails generate model admin/account`
 
-        For ActiveRecord and TestUnit it creates:
+        For Active Record and TestUnit it creates:
 
             Module:     app/models/admin.rb
             Model:      app/models/admin/account.rb

data/lib/rails/generators/rails/plugin/plugin_generator.rb

@@ -259,6 +259,12 @@ task default: :test
 
       public_task :apply_rails_template, :run_bundle
 
+      def run_after_bundle_callbacks
+        @after_bundle_callbacks.each do |callback|
+          callback.call
+        end
+      end
+
       def name
         @name ||= begin
           # same as ActiveSupport::Inflector#underscore except not replacing '-'
@@ -337,7 +343,7 @@ task default: :test
       end
 
       def wrap_in_modules(unwrapped_code)
-        unwrapped_code = "#{unwrapped_code}".strip.gsub(/\W$\n/, '')
+        unwrapped_code = "#{unwrapped_code}".strip.gsub(/\s$\n/, '')
         modules.reverse.inject(unwrapped_code) do |content, mod|
           str = "module #{mod}\n"
           str += content.lines.map { |line| "  #{line}" }.join

data/lib/rails/generators/rails/plugin/templates/README.md

@@ -1,3 +1,28 @@
 # <%= camelized_modules %>
+Short description and motivation.
 
-This project rocks and uses MIT-LICENSE.
+## Usage
+How to use my plugin.
+
+## Installation
+Add this line to your application's Gemfile:
+
+```ruby
+gem '<%= name %>'
+```
+
+And then execute:
+```bash
+$ bundle
+```
+
+Or install it yourself as:
+```bash
+$ gem install <%= name %>
+```
+
+## Contributing
+Contribution directions go here.
+
+## License
+The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).

data/lib/rails/generators/rails/plugin/templates/app/mailers/%namespaced_name%/application_mailer.rb.tt

@@ -0,0 +1,7 @@
+<%= wrap_in_modules <<-rb.strip_heredoc
+  class ApplicationMailer < ActionMailer::Base
+    default from: 'from@example.com'
+    layout 'mailer'
+  end
+rb
+%>

data/lib/rails/generators/rails/plugin/templates/test/test_helper.rb

@@ -1,7 +1,7 @@
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 
-require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb",  __FILE__)
+require File.expand_path("../../<%= options[:dummy_path] -%>/config/environment.rb", __FILE__)
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../<%= options[:dummy_path] -%>/db/migrate", __FILE__)]
 <% if options[:mountable] -%>

data/lib/rails/generators/rails/scaffold/USAGE

@@ -16,7 +16,7 @@ Description:
 
     As a special case, specifying 'password:digest' will generate a
     password_digest field of string type, and configure your generated model,
-    controller, views, and test suite for use with ActiveModel
+    controller, views, and test suite for use with Active Model
     has_secure_password (assuming they are using Rails defaults).
 
     Timestamps are added by default, so you don't have to specify them by hand

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

@@ -13,7 +13,7 @@ class <%= class_name %>ControllerTest < ActionDispatch::IntegrationTest
 <% else -%>
 <% actions.each do |action| -%>
   test "should get <%= action %>" do
-    get <%= file_name %>_<%= action %>_url
+    get <%= url_helper_prefix %>_<%= action %>_url
     assert_response :success
   end
 

data/lib/rails/generators/test_unit/model/templates/fixtures.yml

@@ -17,7 +17,7 @@
 <% end -%>
 <% else -%>
 
-# This model initially had no columns defined.  If you add columns to the
+# This model initially had no columns defined. If you add columns to the
 # model remove the '{}' from the fixture names and add the columns immediately
 # below each fixture, per the syntax in the comments below
 #
@@ -25,5 +25,5 @@ one: {}
 # column: value
 #
 two: {}
-#  column: value
+# column: value
 <% end -%>

data/lib/rails/rack/logger.rb

@@ -30,12 +30,6 @@ module Rails
     protected
 
       def call_app(request, env)
-        # Put some space between requests in development logs.
-        if development?
-          logger.debug ''
-          logger.debug ''
-        end
-
         instrumenter = ActiveSupport::Notifications.instrumenter
         instrumenter.start 'request.action_dispatch', request: request
         logger.info { started_request_message(request) }

data/lib/rails/tasks/engine.rake

@@ -4,8 +4,8 @@ task "load_app" do
   end
   task :environment => "app:environment"
 
-  if !defined?(ENGINE_PATH) || !ENGINE_PATH
-    ENGINE_PATH = find_engine_path(APP_RAKEFILE)
+  if !defined?(ENGINE_ROOT) || !ENGINE_ROOT
+    ENGINE_ROOT = find_engine_path(APP_RAKEFILE)
   end
 end
 

data/lib/rails/tasks/log.rake

@@ -1,5 +1,12 @@
 namespace :log do
-  desc "Truncates all *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
+  
+  ## 
+  # Truncates all/specified log files
+  # ENV['LOGS'] 
+  #   - defaults to standard environment log files i.e. 'development,test,production'
+  #   - ENV['LOGS']=all truncates all files i.e. log/*.log
+  #   - ENV['LOGS']='test,development' truncates only specified files
+  desc "Truncates all/specified *.log files in log/ to zero bytes (specify which logs with LOGS=test,development)"
   task :clear do
     log_files.each do |file|
       clear_log_file(file)
@@ -7,15 +14,21 @@ namespace :log do
   end
 
   def log_files
-    if ENV['LOGS']
-      ENV['LOGS'].split(',')
-                  .map    { |file| "log/#{file.strip}.log" }
-                  .select { |file| File.exist?(file) }
-    else
+    if ENV['LOGS'] == 'all'
       FileList["log/*.log"]
+    elsif ENV['LOGS']
+      log_files_to_truncate(ENV['LOGS'])
+    else
+      log_files_to_truncate("development,test,production")
     end
   end
 
+  def log_files_to_truncate(envs)
+    envs.split(',')
+        .map    { |file| "log/#{file.strip}.log" }
+        .select { |file| File.exist?(file) }
+  end
+  
   def clear_log_file(file)
     f = File.open(file, "w")
     f.close