railties 4.0.13 → 4.1.0.beta1

data/lib/rails/generators/base.rb

@@ -7,8 +7,6 @@ rescue LoadError
   exit
 end
 
-require 'rails/generators/actions'
-
 module Rails
   module Generators
     class Error < Thor::Error # :nodoc:
@@ -168,15 +166,15 @@ module Rails
         as_hook = options.delete(:as) || generator_name
 
         names.each do |name|
-          defaults = if options[:type] == :boolean
-            { }
-          elsif [true, false].include?(default_value_for_option(name, options))
-            { banner: "" }
-          else
-            { desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
-          end
-
           unless class_options.key?(name)
+            defaults = if options[:type] == :boolean
+              { }
+            elsif [true, false].include?(default_value_for_option(name, options))
+              { banner: "" }
+            else
+              { desc: "#{name.to_s.humanize} to be invoked", banner: "NAME" }
+            end
+
             class_option(name, defaults.merge!(options))
           end
 
@@ -255,12 +253,7 @@ module Rails
             # Split the class from its module nesting
             nesting = class_name.split('::')
             last_name = nesting.pop
-
-            # Extract the last Module in the nesting
-            last = nesting.inject(Object) do |last_module, nest|
-              break unless last_module.const_defined?(nest, false)
-              last_module.const_get(nest)
-            end
+            last = extract_last_module(nesting)
 
             if last && last.const_defined?(last_name.camelize, false)
               raise Error, "The name '#{class_name}' is either already used in your application " <<
@@ -270,6 +263,14 @@ module Rails
           end
         end
 
+        # Takes in an array of nested modules and extracts the last module
+        def extract_last_module(nesting)
+          nesting.inject(Object) do |last_module, nest|
+            break unless last_module.const_defined?(nest, false)
+            last_module.const_get(nest)
+          end
+        end
+
         # Use Rails default banner.
         def self.banner
           "rails generate #{namespace.sub(/^rails:/,'')} #{self.arguments.map{ |a| a.usage }.join(' ')} [options]".gsub(/\s+/, ' ')

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

@@ -17,7 +17,7 @@
     <%%= f.label :password %><br>
     <%%= f.password_field :password %>
   </div>
-  <div class="field">
+  <div>
     <%%= f.label :password_confirmation %><br>
     <%%= f.password_field :password_confirmation %>
 <% else -%>

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

@@ -6,9 +6,7 @@
 <% attributes.reject(&:password_digest?).each do |attribute| -%>
       <th><%= attribute.human_name %></th>
 <% end -%>
-      <th></th>
-      <th></th>
-      <th></th>
+      <th colspan="3"></th>
     </tr>
   </thead>
 

data/lib/rails/generators/migration.rb

@@ -1,4 +1,4 @@
-require 'rails/generators/actions/create_migration'
+require 'active_support/concern'
 
 module Rails
   module Generators
@@ -6,12 +6,9 @@ module Rails
     # [0-9]*_name format and can be used by another frameworks (like Sequel)
     # just by implementing the next migration version method.
     module Migration
+      extend ActiveSupport::Concern
       attr_reader :migration_number, :migration_file_name, :migration_class_name
 
-      def self.included(base) #:nodoc:
-        base.extend ClassMethods
-      end
-
       module ClassMethods
         def migration_lookup_at(dirname) #:nodoc:
           Dir.glob("#{dirname}/[0-9]*_*.rb")
@@ -32,19 +29,6 @@ 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.
@@ -53,18 +37,26 @@ 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, config = {})
-        source  = File.expand_path(find_in_source_paths(source.to_s))
+      def migration_template(source, destination=nil, config={})
+        destination = File.expand_path(destination || source, self.destination_root)
 
-        set_migration_assigns!(destination)
-        context = instance_eval('binding')
+        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
 
-        dir, base = File.split(destination)
-        numbered_destination = File.join(dir, ["%migration_number%", base].join('_'))
+        destination = self.class.migration_exists?(migration_dir, @migration_file_name)
 
-        create_migration numbered_destination, nil, config do
-          ERB.new(::File.binread(source), nil, '-', '@output_buffer').result(context)
+        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")
         end
+
+        template(source, destination, config)
       end
     end
   end

data/lib/rails/generators/named_base.rb

@@ -18,6 +18,8 @@ module Rails
         parse_attributes! if respond_to?(:attributes)
       end
 
+      # Defines the template that would be used for the migration file.
+      # The arguments include the source template file, the migration filename etc.
       no_tasks do
         def template(source, *args, &block)
           inside_template do
@@ -28,12 +30,7 @@ module Rails
 
       protected
         attr_reader :file_name
-
-        # 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
-          file_name
-        end
+        alias :singular_name :file_name
 
         # Wrap block with namespace of current application
         # if namespace exists and is not skipped
@@ -93,7 +90,7 @@ module Rails
         end
 
         def namespaced_path
-          @namespaced_path ||= namespace.name.split("::").map {|m| m.underscore }[0]
+          @namespaced_path ||= namespace.name.split("::").first.underscore
         end
 
         def class_name

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

@@ -78,6 +78,7 @@ module Rails
         template "routes.rb"
         template "application.rb"
         template "environment.rb"
+        template "secrets.yml"
 
         directory "environments"
         directory "initializers"
@@ -129,7 +130,9 @@ module Rails
     end
 
     def vendor_javascripts
-      empty_directory_with_keep_file 'vendor/assets/javascripts'
+      unless options[:skip_javascript]
+        empty_directory_with_keep_file 'vendor/assets/javascripts'
+      end
     end
 
     def vendor_stylesheets
@@ -151,15 +154,19 @@ module Rails
                              desc: "Show Rails version number and quit"
 
       def initialize(*args)
-        raise Error, "Options should be given after the application name. For details run: rails --help" if args[0].blank?
-
         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
       end
 
+      public_task :set_default_accessors!
+      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -223,7 +230,15 @@ module Rails
         build(:leftovers)
       end
 
-      public_task :apply_rails_template, :run_bundle
+      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
+      public_task :generate_spring_binstubs
 
     protected
 
@@ -237,7 +252,7 @@ module Rails
       end
 
       def app_name
-        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr(".", "_")
+        @app_name ||= (defined_app_const_base? ? defined_app_name : File.basename(destination_root)).tr('\\', '').tr(". ", "_")
       end
 
       def defined_app_name
@@ -292,5 +307,76 @@ module Rails
         defined?(::AppBuilder) ? ::AppBuilder : Rails::AppBuilder
       end
     end
+
+    # This class handles preparation of the arguments before the AppGenerator is
+    # called. The class provides version or help information if they were
+    # requested, and also constructs the railsrc file (used for extra configuration
+    # options).
+    #
+    # This class should be called before the AppGenerator is required and started
+    # since it configures and mutates ARGV correctly.
+    class ARGVScrubber # :nodoc
+      def initialize(argv = ARGV)
+        @argv = argv
+      end
+
+      def prepare!
+        handle_version_request!(@argv.first)
+        handle_invalid_command!(@argv.first, @argv) do
+          handle_rails_rc!(@argv.drop(1))
+        end
+      end
+
+      def self.default_rc_file
+        File.expand_path('~/.railsrc')
+      end
+
+      private
+
+        def handle_version_request!(argument)
+          if ['--version', '-v'].include?(argument)
+            require 'rails/version'
+            puts "Rails #{Rails::VERSION::STRING}"
+            exit(0)
+          end
+        end
+
+        def handle_invalid_command!(argument, argv)
+          if argument == "new"
+            yield
+          else
+            ['--help'] + argv.drop(1)
+          end
+        end
+
+        def handle_rails_rc!(argv)
+          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=") })
+            fname = File.expand_path(argv[customrc].gsub(/--rc=/, ""))
+            yield(argv.take(customrc) + argv.drop(customrc + 1), fname)
+          else
+            yield argv, self.class.default_rc_file
+          end
+        end
+
+        def read_rc_file(railsrc)
+          extra_args = File.readlines(railsrc).flat_map(&:split)
+          puts "Using #{extra_args.join(" ")} from #{railsrc}"
+          extra_args
+        end
+
+        def insert_railsrc_into_argv!(argv, railsrc)
+          return argv unless File.exist?(railsrc)
+          extra_args = read_rc_file railsrc
+          argv.take(1) + extra_args + argv.drop(1)
+        end
+    end
   end
 end

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

@@ -1,30 +1,35 @@
 source 'https://rubygems.org'
 
-<%= rails_gemfile_entry -%>
+<% max_width = gemfile_entries.map { |g| g.name.length }.max -%>
+<% gemfile_entries.each do |gem| -%>
+<% if gem.comment -%>
 
-<%= database_gemfile_entry -%>
-
-<%= assets_gemfile_entry %>
-<%= javascript_gemfile_entry -%>
-
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-gem 'jbuilder', '~> 1.2'
-
-group :doc do
-  # bundle exec rake doc:rails generates the API under doc/api.
-  gem 'sdoc', require: false
-end
+# <%= gem.comment %>
+<% end -%>
+<%= gem.commented_out ? '# ' : '' %>gem '<%= gem.name %>'<% if gem.version -%>
+, '<%= gem.version %>'
+<% elsif gem.options.any? -%>
+,<%= gem.padding(max_width) %><%= gem.options.map { |k,v|
+  "#{k}: #{v.inspect}" }.join(', ') %>
+<% else %>
+<% end -%>
+<% end -%>
 
 # Use ActiveModel has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
+# gem 'bcrypt-ruby', '~> 3.1.2'
 
 # Use unicorn as the app server
 # gem 'unicorn'
 
 # Use Capistrano for deployment
-# gem 'capistrano', group: :development
+# gem 'capistrano-rails', group: :development
 
 <% unless defined?(JRUBY_VERSION) -%>
 # Use debugger
 # gem 'debugger', group: [:development, :test]
 <% end -%>
+
+<% if RUBY_PLATFORM.match(/bccwin|cygwin|emx|mingw|mswin|wince/) -%>
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin]
+<% end -%>

data/lib/rails/generators/rails/app/templates/Rakefile

@@ -3,4 +3,4 @@
 
 require File.expand_path('../config/application', __FILE__)
 
-<%= app_const %>.load_tasks
+Rails.application.load_tasks

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

@@ -13,6 +13,8 @@
 <% unless options[:skip_javascript] -%>
 //= require <%= options[:javascript] %>
 //= require <%= options[:javascript] %>_ujs
+<% if gemfile_entries.any? { |m| m.name == "turbolinks" } -%>
 //= require turbolinks
 <% end -%>
+<% end -%>
 //= require_tree .

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

@@ -5,9 +5,11 @@
  * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
  * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
  *
- * 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.
+ * You're free to add application-wide styles to this file and they'll appear at the bottom of the
+ * compiled file so the styles you add here take precedence over styles defined in any styles
+ * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
+ * file per style scope.
  *
- *= require_self
  *= require_tree .
+ *= require_self
  */

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

@@ -4,10 +4,14 @@
   <title><%= camelized %></title>
   <%- if options[:skip_javascript] -%>
   <%%= stylesheet_link_tag    "application", media: "all" %>
-  <%%= javascript_include_tag "application" %>
   <%- 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 %>
+    <%- else -%>
+  <%%= stylesheet_link_tag    "application", media: "all" %>
+  <%%= javascript_include_tag "application" %>
+    <%- end -%>
   <%- end -%>
   <%%= csrf_meta_tags %>
 </head>

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

@@ -4,9 +4,11 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 <% else -%>
 # Pick the frameworks you want:
+require "active_model/railtie"
 <%= comment_if :skip_active_record %>require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"
+<%= comment_if :skip_action_view %>require "action_view/railtie"
 <%= comment_if :skip_sprockets %>require "sprockets/railtie"
 <%= comment_if :skip_test_unit %>require "rails/test_unit/railtie"
 <% end -%>

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

@@ -6,26 +6,23 @@
 # Configure Using Gemfile
 # gem 'ruby-frontbase'
 #
-development:
+default: &default
   adapter: frontbase
   host: localhost
-  database: <%= app_name %>_development
   username: <%= app_name %>
   password: ''
 
+development:
+  <<: *default
+  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: frontbase
-  host: localhost
+  <<: *default
   database: <%= app_name %>_test
-  username: <%= app_name %>
-  password: ''
 
 production:
-  adapter: frontbase
-  host: localhost
+  <<: *default
   database: <%= app_name %>_production
-  username: <%= app_name %>
-  password: ''