railties 4.1.0.beta2 → 4.1.0.rc1

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

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :json

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

@@ -16,5 +16,7 @@ development:
 test:
   secret_key_base: <%= app_secret %>
 
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
 production:
-  secret_key_base: <%= app_secret %>
+  secret_key_base: <%%= ENV["SECRET_KEY_BASE"] %>

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

@@ -1,11 +1,9 @@
-ENV["RAILS_ENV"] ||= "test"
+ENV['RAILS_ENV'] ||= 'test'
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
 class ActiveSupport::TestCase
 <% unless options[:skip_active_record] -%>
-  ActiveRecord::Migration.check_pending!
-
   # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests

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

@@ -23,7 +23,7 @@ module Rails
         # Will generate -
         # namespace :foo do
         #   namespace :bar do
-        #     get "baz/index"
+        #     get 'baz/index'
         #   end
         # end
         def generate_routing_code(action)
@@ -36,8 +36,8 @@ module Rails
           end.join
 
           # Create route
-          #     get "baz/index"
-          route = indent(%{get "#{file_name}/#{action}"\n}, depth * 2)
+          #     get 'baz/index'
+          route = indent(%{get '#{file_name}/#{action}'\n}, depth * 2)
 
           # Create `end` ladder
           #   end

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

@@ -185,7 +185,6 @@ task default: :test
       end
 
       public_task :set_default_accessors!
-      public_task :apply_rails_template
       public_task :create_root
 
       def create_root_files
@@ -242,6 +241,7 @@ task default: :test
         build(:leftovers)
       end
 
+      public_task :apply_rails_template, :run_bundle
 
       def name
         @name ||= begin
@@ -255,9 +255,6 @@ task default: :test
         end
       end
 
-      public_task :run_bundle
-      public_task :replay_template
-
     protected
 
       def app_templates_dir

data/lib/rails/generators/rails/plugin/templates/Gemfile

@@ -29,12 +29,10 @@ end
 
 # <%= 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/plugin/templates/bin/rails.tt

@@ -3,5 +3,9 @@
 ENGINE_ROOT = File.expand_path('../..', __FILE__)
 ENGINE_PATH = File.expand_path('../../lib/<%= name -%>/engine', __FILE__)
 
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
 require 'rails/all'
 require 'rails/engine/commands'

data/lib/rails/generators/rails/resource_route/resource_route_generator.rb

@@ -9,7 +9,7 @@ module Rails
       # should give you
       #
       #   namespace :admin do
-      #     namespace :users
+      #     namespace :users do
       #       resources :products
       #     end
       #   end

data/lib/rails/generators/resource_helpers.rb

@@ -15,12 +15,10 @@ module Rails
       # Set controller variables on initialization.
       def initialize(*args) #:nodoc:
         super
+        controller_name = name
         if options[:model_name]
-          controller_name = name
           self.name = options[:model_name]
           assign_names!(self.name)
-        else
-          controller_name = name
         end
 
         if name == name.pluralize && name.singularize != name.pluralize && !options[:force_plural]

data/lib/rails/generators/test_unit/mailer/templates/preview.rb

@@ -1,7 +1,9 @@
 <% module_namespacing do -%>
+# Preview all emails at http://localhost:3000/rails/mailers/<%= file_path %>
 class <%= class_name %>Preview < ActionMailer::Preview
 <% actions.each do |action| -%>
 
+  # Preview this email at http://localhost:3000/rails/mailers/<%= file_path %>/<%= action %>
   def <%= action %>
     <%= class_name %>.<%= action %>
   end

data/lib/rails/paths.rb

@@ -24,7 +24,7 @@ module Rails
     #
     # Notice that when you add a path using +add+, the path object created already
     # contains the path with the same path value given to +add+. In some situations,
-    # you may not want this behavior, so you can give :with as option.
+    # you may not want this behavior, so you can give <tt>:with</tt> as option.
     #
     #   root.add "config/routes", with: "config/routes.rb"
     #   root["config/routes"].inspect # => ["config/routes.rb"]

data/lib/rails/railtie.rb

@@ -22,7 +22,7 @@ module Rails
   #
   # * creating initializers
   # * configuring a Rails framework for the application, like setting a generator
-  # * +adding config.*+ keys to the environment
+  # * adding <tt>config.*</tt> keys to the environment
   # * setting up a subscriber with ActiveSupport::Notifications
   # * adding rake tasks
   #
@@ -63,8 +63,8 @@ module Rails
   #     end
   #   end
   #
-  # Finally, you can also pass :before and :after as option to initializer, in case
-  # you want to couple it with a specific step in the initialization process.
+  # Finally, you can also pass <tt>:before</tt> and <tt>:after</tt> as option to initializer,
+  # in case you want to couple it with a specific step in the initialization process.
   #
   # == Configuration
   #

data/lib/rails/test_help.rb

@@ -11,10 +11,12 @@ require 'rails/generators/test_case'
 # Config Rails backtrace in tests.
 require 'rails/backtrace_cleaner'
 if ENV["BACKTRACE"].nil?
-  MiniTest.backtrace_filter = Rails.backtrace_cleaner
+  Minitest.backtrace_filter = Rails.backtrace_cleaner
 end
 
 if defined?(ActiveRecord::Base)
+  ActiveRecord::Migration.maintain_test_schema!
+
   class ActiveSupport::TestCase
     include ActiveRecord::TestFixtures
     self.fixture_path = "#{Rails.root}/test/fixtures/"

data/lib/rails/test_unit/testing.rake

@@ -1,4 +1,3 @@
-require 'rbconfig'
 require 'rake/testtask'
 require 'rails/test_unit/sub_test_task'
 

data/lib/rails/version.rb

@@ -3,7 +3,7 @@ module Rails
     MAJOR = 4
     MINOR = 1
     TINY  = 0
-    PRE   = "beta2"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta2
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -133,6 +133,7 @@ files:
 - lib/rails/engine/railties.rb
 - lib/rails/generators.rb
 - lib/rails/generators/actions.rb
+- lib/rails/generators/actions/create_migration.rb
 - lib/rails/generators/active_model.rb
 - lib/rails/generators/app_base.rb
 - lib/rails/generators/base.rb
@@ -143,6 +144,7 @@ files:
 - lib/rails/generators/erb/controller/controller_generator.rb
 - lib/rails/generators/erb/controller/templates/view.html.erb
 - lib/rails/generators/erb/mailer/mailer_generator.rb
+- lib/rails/generators/erb/mailer/templates/view.html.erb
 - lib/rails/generators/erb/mailer/templates/view.text.erb
 - lib/rails/generators/erb/scaffold/scaffold_generator.rb
 - lib/rails/generators/erb/scaffold/templates/_form.html.erb
@@ -187,6 +189,7 @@ files:
 - lib/rails/generators/rails/app/templates/config/environments/production.rb.tt
 - lib/rails/generators/rails/app/templates/config/environments/test.rb.tt
 - lib/rails/generators/rails/app/templates/config/initializers/backtrace_silencers.rb
+- lib/rails/generators/rails/app/templates/config/initializers/cookies_serializer.rb
 - lib/rails/generators/rails/app/templates/config/initializers/filter_parameter_logging.rb
 - lib/rails/generators/rails/app/templates/config/initializers/inflections.rb
 - lib/rails/generators/rails/app/templates/config/initializers/mime_types.rb