railties 5.0.7.2 → 5.1.0.beta1

data/lib/rails/generators/migration.rb

@@ -1,5 +1,5 @@
-require 'active_support/concern'
-require 'rails/generators/actions/create_migration'
+require "active_support/concern"
+require "rails/generators/actions/create_migration"
 
 module Rails
   module Generators
@@ -35,11 +35,11 @@ module Rails
       end
 
       def set_migration_assigns!(destination)
-        destination = File.expand_path(destination, self.destination_root)
+        destination = File.expand_path(destination, destination_root)
 
         migration_dir = File.dirname(destination)
         @migration_number     = self.class.next_migration_number(migration_dir)
-        @migration_file_name  = File.basename(destination, '.rb')
+        @migration_file_name  = File.basename(destination, ".rb")
         @migration_class_name = @migration_file_name.camelize
       end
 
@@ -52,16 +52,16 @@ module Rails
       #
       #   migration_template "migration.rb", "db/migrate/add_foo_to_bar.rb"
       def migration_template(source, destination, config = {})
-        source  = File.expand_path(find_in_source_paths(source.to_s))
+        source = File.expand_path(find_in_source_paths(source.to_s))
 
         set_migration_assigns!(destination)
-        context = instance_eval('binding')
+        context = instance_eval("binding")
 
         dir, base = File.split(destination)
-        numbered_destination = File.join(dir, ["%migration_number%", base].join('_'))
+        numbered_destination = File.join(dir, ["%migration_number%", base].join("_"))
 
         create_migration numbered_destination, nil, config do
-          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+          ERB.new(::File.binread(source), nil, "-", "@output_buffer").result(context)
         end
       end
     end

data/lib/rails/generators/model_helpers.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/active_model'
+require "rails/generators/active_model"
 
 module Rails
   module Generators
@@ -8,7 +8,7 @@ module Rails
       mattr_accessor :skip_warn
 
       def self.included(base) #:nodoc:
-        base.class_option :force_plural, type: :boolean, default: false, desc: 'Forces the use of the given model name'
+        base.class_option :force_plural, type: :boolean, default: false, desc: "Forces the use of the given model name"
       end
 
       def initialize(args, *_options)

data/lib/rails/generators/named_base.rb

@@ -1,6 +1,6 @@
-require 'active_support/core_ext/module/introspection'
-require 'rails/generators/base'
-require 'rails/generators/generated_attribute'
+require "active_support/core_ext/module/introspection"
+require "rails/generators/base"
+require "rails/generators/generated_attribute"
 
 module Rails
   module Generators
@@ -14,7 +14,7 @@ module Rails
         # 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
-        assign_names!(self.name)
+        assign_names!(name)
         parse_attributes! if respond_to?(:attributes)
       end
 
@@ -28,53 +28,57 @@ module Rails
         end
 
         def js_template(source, destination)
-          template(source + '.js', destination + '.js')
+          template(source + ".js", destination + ".js")
         end
       end
 
+      # TODO Change this to private once we've dropped Ruby 2.2 support.
+      # Workaround for Ruby 2.2 "private attribute?" warning.
       protected
         attr_reader :file_name
 
+      private
+
         # FIXME: We are avoiding to use alias because a bug on thor that make
         # this method public and add it to the task list.
-        def singular_name
+        def singular_name # :doc:
           file_name
         end
 
         # Wrap block with namespace of current application
         # if namespace exists and is not skipped
-        def module_namespacing(&block)
+        def module_namespacing(&block) # :doc:
           content = capture(&block)
           content = wrap_with_namespace(content) if namespaced?
           concat(content)
         end
 
-        def indent(content, multiplier = 2)
+        def indent(content, multiplier = 2) # :doc:
           spaces = " " * multiplier
-          content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
+          content.each_line.map { |line| line.blank? ? line : "#{spaces}#{line}" }.join
         end
 
-        def wrap_with_namespace(content)
+        def wrap_with_namespace(content) # :doc:
           content = indent(content).chomp
           "module #{namespace.name}\n#{content}\nend\n"
         end
 
-        def inside_template
+        def inside_template # :doc:
           @inside_template = true
           yield
         ensure
           @inside_template = false
         end
 
-        def inside_template?
+        def inside_template? # :doc:
           @inside_template
         end
 
-        def namespace
+        def namespace # :doc:
           Rails::Generators.namespace
         end
 
-        def namespaced?
+        def namespaced? # :doc:
           !options[:skip_namespace] && namespace
         end
 
@@ -82,132 +86,128 @@ module Rails
           @namespace_dirs ||= namespace.name.split("::").map(&:underscore)
         end
 
-        def file_path
-          @file_path ||= (class_path + [file_name]).join('/')
+        def file_path # :doc:
+          @file_path ||= (class_path + [file_name]).join("/")
         end
 
-        def class_path
+        def class_path # :doc:
           inside_template? || !namespaced? ? regular_class_path : namespaced_class_path
         end
 
-        def regular_class_path
+        def regular_class_path # :doc:
           @class_path
         end
 
-        def namespaced_file_path
-          @namespaced_file_path ||= namespaced_class_path.join("/")
-        end
-
-        def namespaced_class_path
+        def namespaced_class_path # :doc:
           @namespaced_class_path ||= namespace_dirs + @class_path
         end
 
-        def namespaced_path
+        def namespaced_path # :doc:
           @namespaced_path ||= namespace_dirs.join("/")
         end
 
-        def class_name
-          (class_path + [file_name]).map!(&:camelize).join('::')
+        def class_name # :doc:
+          (class_path + [file_name]).map!(&:camelize).join("::")
         end
 
-        def human_name
+        def human_name # :doc:
           @human_name ||= singular_name.humanize
         end
 
-        def plural_name
+        def plural_name # :doc:
           @plural_name ||= singular_name.pluralize
         end
 
-        def i18n_scope
-          @i18n_scope ||= file_path.tr('/', '.')
+        def i18n_scope # :doc:
+          @i18n_scope ||= file_path.tr("/", ".")
         end
 
-        def table_name
+        def table_name # :doc:
           @table_name ||= begin
             base = pluralize_table_names? ? plural_name : singular_name
-            (class_path + [base]).join('_')
+            (class_path + [base]).join("_")
           end
         end
 
-        def uncountable?
+        def uncountable? # :doc:
           singular_name == plural_name
         end
 
-        def index_helper
+        def index_helper # :doc:
           uncountable? ? "#{plural_table_name}_index" : plural_table_name
         end
 
-        def show_helper
+        def show_helper # :doc:
           "#{singular_table_name}_url(@#{singular_table_name})"
         end
 
-        def edit_helper
+        def edit_helper # :doc:
           "edit_#{show_helper}"
         end
 
-        def new_helper
+        def new_helper # :doc:
           "new_#{singular_table_name}_url"
         end
 
-        def singular_table_name
+        def singular_table_name # :doc:
           @singular_table_name ||= (pluralize_table_names? ? table_name.singularize : table_name)
         end
 
-        def plural_table_name
+        def plural_table_name # :doc:
           @plural_table_name ||= (pluralize_table_names? ? table_name : table_name.pluralize)
         end
 
-        def plural_file_name
+        def plural_file_name # :doc:
           @plural_file_name ||= file_name.pluralize
         end
 
-        def fixture_file_name
+        def fixture_file_name # :doc:
           @fixture_file_name ||= (pluralize_table_names? ? plural_file_name : file_name)
         end
 
-        def route_url
-          @route_url ||= class_path.collect {|dname| "/" + dname }.join + "/" + plural_file_name
+        def route_url # :doc:
+          @route_url ||= class_path.collect { |dname| "/" + dname }.join + "/" + plural_file_name
         end
 
-        def url_helper_prefix
-          @url_helper_prefix ||= (class_path + [file_name]).join('_')
+        def url_helper_prefix # :doc:
+          @url_helper_prefix ||= (class_path + [file_name]).join("_")
         end
 
         # Tries to retrieve the application name or simply return application.
-        def application_name
+        def application_name # :doc:
           if defined?(Rails) && Rails.application
-            Rails.application.class.name.split('::').first.underscore
+            Rails.application.class.name.split("::").first.underscore
           else
             "application"
           end
         end
 
-        def assign_names!(name) #:nodoc:
-          @class_path = name.include?('/') ? name.split('/') : name.split('::')
+        def assign_names!(name)
+          @class_path = name.include?("/") ? name.split("/") : name.split("::")
           @class_path.map!(&:underscore)
           @file_name = @class_path.pop
         end
 
         # Convert attributes array into GeneratedAttribute objects.
-        def parse_attributes! #:nodoc:
+        def parse_attributes!
           self.attributes = (attributes || []).map do |attr|
             Rails::Generators::GeneratedAttribute.parse(attr)
           end
         end
 
-        def attributes_names
+        def attributes_names # :doc:
           @attributes_names ||= attributes.each_with_object([]) do |a, names|
             names << a.column_name
-            names << 'password_confirmation' if a.password_digest?
+            names << "password_confirmation" if a.password_digest?
             names << "#{a.name}_type" if a.polymorphic?
           end
         end
 
-        def pluralize_table_names?
+        def pluralize_table_names? # :doc:
           !defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names
         end
 
-        def mountable_engine?
+        def mountable_engine? # :doc:
           defined?(ENGINE_ROOT) && namespaced?
         end
 
@@ -221,9 +221,9 @@ module Rails
         # If the generator is invoked with class name Admin, it will check for
         # the presence of "AdminDecorator".
         #
-        def self.check_class_collision(options={})
+        def self.check_class_collision(options = {}) # :doc:
           define_method :check_class_collision do
-            name = if self.respond_to?(:controller_class_name) # for ScaffoldBase
+            name = if respond_to?(:controller_class_name) # for ScaffoldBase
               controller_class_name
             else
               class_name

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

@@ -1,4 +1,4 @@
-require 'rails/generators/app_base'
+require "rails/generators/app_base"
 
 module Rails
   module ActionMethods # :nodoc:
@@ -53,14 +53,20 @@ module Rails
       template "gitignore", ".gitignore"
     end
 
+    def version_control
+      if !options[:skip_git] && !options[:pretend]
+        run "git init"
+      end
+    end
+
     def app
-      directory 'app'
+      directory "app"
 
-      keep_file  'app/assets/images'
-      empty_directory_with_keep_file 'app/assets/javascripts/channels' unless options[:skip_action_cable]
+      keep_file "app/assets/images"
+      empty_directory_with_keep_file "app/assets/javascripts/channels" unless options[:skip_action_cable]
 
-      keep_file  'app/controllers/concerns'
-      keep_file  'app/models/concerns'
+      keep_file  "app/controllers/concerns"
+      keep_file  "app/models/concerns"
     end
 
     def bin
@@ -89,24 +95,24 @@ module Rails
     end
 
     def config_when_updating
-      cookie_serializer_config_exist = File.exist?('config/initializers/cookies_serializer.rb')
-      action_cable_config_exist = File.exist?('config/cable.yml')
-      rack_cors_config_exist = File.exist?('config/initializers/cors.rb')
+      cookie_serializer_config_exist = File.exist?("config/initializers/cookies_serializer.rb")
+      action_cable_config_exist = File.exist?("config/cable.yml")
+      rack_cors_config_exist = File.exist?("config/initializers/cors.rb")
 
       config
 
-      gsub_file 'config/environments/development.rb', /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
+      gsub_file "config/environments/development.rb", /^(\s+)config\.file_watcher/, '\1# config.file_watcher'
 
       unless cookie_serializer_config_exist
-        gsub_file 'config/initializers/cookies_serializer.rb', /json(?!,)/, 'marshal'
+        gsub_file "config/initializers/cookies_serializer.rb", /json(?!,)/, "marshal"
       end
 
       unless action_cable_config_exist
-        template 'config/cable.yml'
+        template "config/cable.yml"
       end
 
       unless rack_cors_config_exist
-        remove_file 'config/initializers/cors.rb'
+        remove_file "config/initializers/cors.rb"
       end
     end
 
@@ -119,13 +125,13 @@ module Rails
     end
 
     def lib
-      empty_directory 'lib'
-      empty_directory_with_keep_file 'lib/tasks'
-      empty_directory_with_keep_file 'lib/assets'
+      empty_directory "lib"
+      empty_directory_with_keep_file "lib/tasks"
+      empty_directory_with_keep_file "lib/assets"
     end
 
     def log
-      empty_directory_with_keep_file 'log'
+      empty_directory_with_keep_file "log"
     end
 
     def public_directory
@@ -133,15 +139,21 @@ module Rails
     end
 
     def test
-      empty_directory_with_keep_file 'test/fixtures'
-      empty_directory_with_keep_file 'test/fixtures/files'
-      empty_directory_with_keep_file 'test/controllers'
-      empty_directory_with_keep_file 'test/mailers'
-      empty_directory_with_keep_file 'test/models'
-      empty_directory_with_keep_file 'test/helpers'
-      empty_directory_with_keep_file 'test/integration'
-
-      template 'test/test_helper.rb'
+      empty_directory_with_keep_file "test/fixtures"
+      empty_directory_with_keep_file "test/fixtures/files"
+      empty_directory_with_keep_file "test/controllers"
+      empty_directory_with_keep_file "test/mailers"
+      empty_directory_with_keep_file "test/models"
+      empty_directory_with_keep_file "test/helpers"
+      empty_directory_with_keep_file "test/integration"
+
+      template "test/test_helper.rb"
+    end
+
+    def system_test
+      empty_directory_with_keep_file "test/system"
+
+      template "test/application_system_test_case.rb"
     end
 
     def tmp
@@ -151,19 +163,12 @@ module Rails
     end
 
     def vendor
-      vendor_javascripts
-      vendor_stylesheets
-    end
+      empty_directory_with_keep_file "vendor"
 
-    def vendor_javascripts
-      unless options[:skip_javascript]
-        empty_directory_with_keep_file 'vendor/assets/javascripts'
+      unless options[:skip_yarn]
+        template "package.json"
       end
     end
-
-    def vendor_stylesheets
-      empty_directory_with_keep_file 'vendor/assets/stylesheets'
-    end
   end
 
   module Generators
@@ -182,20 +187,21 @@ module Rails
       class_option :api, type: :boolean,
                          desc: "Preconfigure smaller stack for API only apps"
 
+      class_option :skip_bundle, type: :boolean, aliases: "-B", default: false,
+                                 desc: "Don't run bundle install"
+
       def initialize(*args)
         super
 
-        unless app_path
-          raise Error, "Application name should be provided in arguments. For details run: rails --help"
-        end
-
         if !options[:skip_active_record] && !DATABASES.include?(options[:database])
           raise Error, "Invalid value for --database option. Supported for preconfiguration are: #{DATABASES.join(", ")}."
         end
 
-        # Force sprockets to be skipped when generating API only apps.
+        # Force sprockets and yarn to be skipped when generating API only apps.
         # Can't modify options hash as it's frozen by default.
-        self.options = options.merge(skip_sprockets: true, skip_javascript: true).freeze if options[:api]
+        if options[:api]
+          self.options = options.merge(skip_sprockets: true, skip_javascript: true, skip_yarn: true).freeze
+        end
       end
 
       public_task :set_default_accessors!
@@ -205,8 +211,9 @@ module Rails
         build(:readme)
         build(:rakefile)
         build(:configru)
-        build(:gitignore) unless options[:skip_git]
-        build(:gemfile)   unless options[:skip_gemfile]
+        build(:gitignore)   unless options[:skip_git]
+        build(:gemfile)     unless options[:skip_gemfile]
+        build(:version_control)
       end
 
       def create_app_files
@@ -241,6 +248,7 @@ module Rails
       end
 
       def create_db_files
+        return if options[:skip_active_record]
         build(:db)
       end
 
@@ -260,68 +268,74 @@ module Rails
         build(:test) unless options[:skip_test]
       end
 
+      def create_system_test_files
+        build(:system_test) unless options[:skip_system_test] || options[:skip_test] || options[:api]
+      end
+
       def create_tmp_files
         build(:tmp)
       end
 
       def create_vendor_files
         build(:vendor)
+
+        if options[:skip_yarn]
+          remove_file "package.json"
+        end
       end
 
       def delete_app_assets_if_api_option
         if options[:api]
-          remove_dir 'app/assets'
-          remove_dir 'lib/assets'
-          remove_dir 'tmp/cache/assets'
-          remove_dir 'vendor/assets'
+          remove_dir "app/assets"
+          remove_dir "lib/assets"
+          remove_dir "tmp/cache/assets"
         end
       end
 
       def delete_app_helpers_if_api_option
         if options[:api]
-          remove_dir 'app/helpers'
-          remove_dir 'test/helpers'
+          remove_dir "app/helpers"
+          remove_dir "test/helpers"
         end
       end
 
       def delete_application_layout_file_if_api_option
         if options[:api]
-          remove_file 'app/views/layouts/application.html.erb'
+          remove_file "app/views/layouts/application.html.erb"
         end
       end
 
       def delete_public_files_if_api_option
         if options[:api]
-          remove_file 'public/404.html'
-          remove_file 'public/422.html'
-          remove_file 'public/500.html'
-          remove_file 'public/apple-touch-icon-precomposed.png'
-          remove_file 'public/apple-touch-icon.png'
-          remove_file 'public/favicon.ico'
+          remove_file "public/404.html"
+          remove_file "public/422.html"
+          remove_file "public/500.html"
+          remove_file "public/apple-touch-icon-precomposed.png"
+          remove_file "public/apple-touch-icon.png"
+          remove_file "public/favicon.ico"
         end
       end
 
       def delete_js_folder_skipping_javascript
         if options[:skip_javascript]
-          remove_dir 'app/assets/javascripts'
+          remove_dir "app/assets/javascripts"
         end
       end
 
       def delete_assets_initializer_skipping_sprockets
         if options[:skip_sprockets]
-          remove_file 'config/initializers/assets.rb'
+          remove_file "config/initializers/assets.rb"
         end
       end
 
       def delete_application_record_skipping_active_record
         if options[:skip_active_record]
-          remove_file 'app/models/application_record.rb'
+          remove_file "app/models/application_record.rb"
         end
       end
 
       def delete_action_mailer_files_skipping_action_mailer
         if options[:skip_action_mailer]
-          remove_file "app/mailers/application_mailer.rb"
           remove_file "app/views/layouts/mailer.html.erb"
           remove_file "app/views/layouts/mailer.text.erb"
           remove_dir "app/mailers"
@@ -331,49 +345,52 @@ module Rails
 
       def delete_action_cable_files_skipping_action_cable
         if options[:skip_action_cable]
-          remove_file 'config/cable.yml'
-          remove_file 'app/assets/javascripts/cable.js'
-          remove_dir 'app/channels'
+          remove_file "config/cable.yml"
+          remove_file "app/assets/javascripts/cable.js"
+          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/cookies_serializer.rb"
         end
       end
 
       def delete_api_initializers
         unless options[:api]
-          remove_file 'config/initializers/cors.rb'
+          remove_file "config/initializers/cors.rb"
         end
       end
 
+      def delete_bin_yarn_if_skip_yarn_option
+        remove_file "bin/yarn" if options[:skip_yarn]
+      end
+
       def finish_template
         build(:leftovers)
       end
 
       public_task :apply_rails_template, :run_bundle
-      public_task :generate_spring_binstubs
+      public_task :run_webpack, :generate_spring_binstubs
 
       def run_after_bundle_callbacks
         @after_bundle_callbacks.each(&:call)
       end
 
-    protected
-
       def self.banner
-        "rails new #{self.arguments.map(&:usage).join(' ')} [options]"
+        "rails new #{arguments.map(&:usage).join(' ')} [options]"
       end
 
+    private
+
       # Define file as an alias to create_file for backwards compatibility.
       def file(*args, &block)
         create_file(*args, &block)
       end
 
       def app_name
-        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', '').tr(". ", "_")
+        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', "").tr(". ", "_")
       end
 
       def defined_app_name
@@ -388,7 +405,7 @@ module Rails
       alias :defined_app_const_base? :defined_app_const_base
 
       def app_const_base
-        @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, '_').squeeze('_').camelize
+        @app_const_base ||= defined_app_const_base || app_name.gsub(/\W/, "_").squeeze("_").camelize
       end
       alias :camelized :app_const_base
 
@@ -423,7 +440,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 RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
+        ].find { |f| File.exist?(f) } unless Gem.win_platform?
       end
 
       def get_builder_class
@@ -451,14 +468,14 @@ module Rails
       end
 
       def self.default_rc_file
-        File.expand_path('~/.railsrc')
+        File.expand_path("~/.railsrc")
       end
 
       private
 
         def handle_version_request!(argument)
-          if ['--version', '-v'].include?(argument)
-            require 'rails/version'
+          if ["--version", "-v"].include?(argument)
+            require "rails/version"
             puts "Rails #{Rails::VERSION::STRING}"
             exit(0)
           end
@@ -468,20 +485,20 @@ module Rails
           if argument == "new"
             yield
           else
-            ['--help'] + argv.drop(1)
+            ["--help"] + argv.drop(1)
           end
         end
 
         def handle_rails_rc!(argv)
-          if argv.find { |arg| arg == '--no-rc' }
-            argv.reject { |arg| arg == '--no-rc' }
+          if argv.find { |arg| arg == "--no-rc" }
+            argv.reject { |arg| arg == "--no-rc" }
           else
             railsrc(argv) { |rc_argv, rc| insert_railsrc_into_argv!(rc_argv, rc) }
           end
         end
 
         def railsrc(argv)
-          if (customrc = argv.index{ |x| x.include?("--rc=") })
+          if (customrc = argv.index { |x| x.include?("--rc=") })
             fname = File.expand_path(argv[customrc].gsub(/--rc=/, ""))
             yield(argv.take(customrc) + argv.drop(customrc + 1), fname)
           else