railties 5.0.1 → 5.0.2.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d7a4c18e24342d824a551fd8029c9adf817608
-  data.tar.gz: 166c7a90d852bfa1e38bbda766cbb486b1410a0f
+  metadata.gz: a62a5797f3d9d5c6a2152ebcec3c66845eff8059
+  data.tar.gz: 79b8be66916fbd1293b029d9e48eeae591068eec
 SHA512:
-  metadata.gz: b2a91f269c9e33fe5fb40ca05f3817fac0aae0d724c4dbe030e01162114f49f14e3932bfaa017f7ffcafa10c3dd8dfdfdc1bd670377a6a3b72b8e09f4e5c1945
-  data.tar.gz: 7065ea82a79dba7659ad1d7e1c10166362ce1bd57bd2f069141b7a05cae0b52364a6b18f062f8857bae52e9cabedd7c6f786555ced8737662a83a581ccaaaeca
+  metadata.gz: b38d3f134f20246d559987770e65f7d045737378a55f31457829dc814ab9cdfe43da32907c50ebf2479db7dbbdb8289f6d701000b13e6d374bd6e028d64012b1
+  data.tar.gz: 837a247f17fc3ca04dfdc90fb4b6f584d81e152fc13bd2367e9ab49a19ba9a035d011b5b90435e81bd7044fea6e033d1db895ea53fbeaf16104496e0e137dbdf

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+## Rails 5.0.2.rc1 (February 24, 2017) ##
+
+*   Fix running multiple tests in one `rake` command
+
+    e.g. `bin/rake test:models test:controllers`
+
+    *Dominic Cleal*
+
+*   Don't generate HTML/ERB templates for scaffold controller with `--api` flag.
+
+    Fixes #27591.
+
+    *Prathamesh Sonpatki*
+
+*   Make `Rails.env` fall back to `development` when `RAILS_ENV` and `RACK_ENV` is an empty string.
+
+    *Daniel Deng*
+
+*   Reset a new session directly after its creation in ActionDispatch::IntegrationTest#open_session
+
+    Fixes Issue #22742
+
+    *Tawan Sierek*
+
+
 ## Rails 5.0.1 (December 21, 2016) ##
 
 *   No changes.

data/lib/rails.rb

@@ -7,6 +7,7 @@ require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/object/blank'
 
 require 'rails/application'
 require 'rails/version'
@@ -67,7 +68,7 @@ module Rails
     #   Rails.env.development? # => true
     #   Rails.env.production? # => false
     def env
-      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"].presence || ENV["RACK_ENV"].presence || "development")
     end
 
     # Sets the Rails environment.

data/lib/rails/commands/test.rb

@@ -6,6 +6,6 @@ else
   $LOAD_PATH << File.expand_path("../../test", APP_PATH)
 end
 
-Minitest.run_via[:rails] = true
+Minitest.run_via = :rails
 
 require "active_support/testing/autorun"

data/lib/rails/gem_version.rb

@@ -7,8 +7,8 @@ module Rails
   module VERSION
     MAJOR = 5
     MINOR = 0
-    TINY  = 1
-    PRE   = nil
+    TINY  = 2
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/named_base.rb

@@ -78,6 +78,10 @@ module Rails
           !options[:skip_namespace] && namespace
         end
 
+        def namespace_dirs
+          @namespace_dirs ||= namespace.name.split("::").map(&:underscore)
+        end
+
         def file_path
           @file_path ||= (class_path + [file_name]).join('/')
         end
@@ -95,11 +99,11 @@ module Rails
         end
 
         def namespaced_class_path
-          @namespaced_class_path ||= [namespaced_path] + @class_path
+          @namespaced_class_path ||= namespace_dirs + @class_path
         end
 
         def namespaced_path
-          @namespaced_path ||= namespace.name.split("::").first.underscore
+          @namespaced_path ||= namespace_dirs.join("/")
         end
 
         def class_name

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

@@ -1,4 +1,4 @@
-# SQL Server (2005 or higher recommended)
+# SQL Server (2012 or higher recommended)
 #
 # Install the adapters and driver
 #   gem install tiny_tds
@@ -8,28 +8,12 @@
 #   gem 'tiny_tds'
 #   gem 'activerecord-sqlserver-adapter'
 #
-# You should make sure freetds is configured correctly first.
-# freetds.conf contains host/port/protocol_versions settings.
-# http://freetds.schemamania.org/userguide/freetdsconf.htm
-#
-# A typical Microsoft server
-#   [mssql]
-#   host = mssqlserver.yourdomain.com
-#   port = 1433
-#   tds version = 7.1
-
-# If you can connect with "tsql -S servername", your basic FreeTDS installation is working.
-# 'man tsql' for more info
-# Set timeout to a larger number if valid queries against a live db fail
-#
 default: &default
   adapter: sqlserver
   encoding: utf8
-  reconnect: false
-  username: <%= app_name %>
-  password:
-  timeout: 25
-  dataserver: from_freetds.conf
+  username: sa
+  password: <%= ENV['SA_PASSWORD'] %>
+  host: localhost
 
 development:
   <<: *default

data/lib/rails/generators/rails/plugin/templates/bin/test.tt

@@ -5,6 +5,6 @@ require 'rails/test_unit/minitest_plugin'
 
 Rails::TestUnitReporter.executable = 'bin/test'
 
-Minitest.run_via[:rails] = true
+Minitest.run_via = :rails
 
 require "active_support/testing/autorun"

data/lib/rails/generators/rails/scaffold_controller/scaffold_controller_generator.rb

@@ -20,7 +20,12 @@ module Rails
         template template_file, File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       end
 
-      hook_for :template_engine, :test_framework, as: :scaffold
+
+      hook_for :template_engine, as: :scaffold do |template_engine|
+        invoke template_engine unless options.api?
+      end
+
+      hook_for :test_framework, as: :scaffold
 
       # Invoke the helper using the controller name (pluralized)
       hook_for :helper, as: :scaffold do |invoked|

data/lib/rails/generators/test_unit/integration/templates/integration_test.rb

@@ -1,7 +1,9 @@
 require 'test_helper'
 
+<% module_namespacing do -%>
 class <%= class_name %>Test < ActionDispatch::IntegrationTest
   # test "the truth" do
   #   assert true
   # end
 end
+<% end -%>

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

@@ -22,7 +22,7 @@ module TestUnit # :nodoc:
       def fixture_name
         @fixture_name ||=
           if mountable_engine?
-            "%s_%s" % [namespaced_path, table_name]
+            (namespace_dirs + [table_name]).join("_")
           else
             table_name
           end

data/lib/rails/test_unit/minitest_plugin.rb

@@ -54,19 +54,18 @@ module Minitest
 
     options[:color] = true
     options[:output_inline] = true
-    options[:patterns] = defined?(@rake_patterns) ? @rake_patterns : opts.order!
+    options[:patterns] = opts.order! unless run_via.rake?
   end
 
-  # Running several Rake tasks in a single command would trip up the runner,
-  # as the patterns would also contain the other Rake tasks.
   def self.rake_run(patterns) # :nodoc:
-    @rake_patterns = patterns
+    self.run_via = :rake unless run_via.set?
+    ::Rails::TestRequirer.require_files(patterns)
     autorun
   end
 
   module RunRespectingRakeTestopts
     def run(args = [])
-      if defined?(@rake_patterns)
+      if run_via.rake?
         args = Shellwords.split(ENV["TESTOPTS"] || "")
       end
 
@@ -81,8 +80,9 @@ module Minitest
   def self.plugin_rails_init(options)
     ENV["RAILS_ENV"] = options[:environment] || "test"
 
-    # If run via `ruby` we've been passed the files to run directly.
-    unless run_via[:ruby]
+    # If run via `ruby` we've been passed the files to run directly, or if run
+    # via `rake` then they have already been eagerly required.
+    unless run_via.ruby? || run_via.rake?
       ::Rails::TestRequirer.require_files(options[:patterns])
     end
 
@@ -97,7 +97,33 @@ module Minitest
     reporter << ::Rails::TestUnitReporter.new(options[:io], options)
   end
 
-  mattr_accessor(:run_via) { Hash.new }
+  def self.run_via=(runner)
+    if run_via.set?
+      raise ArgumentError, "run_via already assigned"
+    else
+      run_via.runner = runner
+    end
+  end
+
+  class RunVia
+    attr_accessor :runner
+    alias set? runner
+
+    # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
+    def []=(runner, *)
+      @runner = runner
+    end
+
+    def ruby?
+      runner == :ruby
+    end
+
+    def rake?
+      runner == :rake
+    end
+  end
+
+  mattr_reader(:run_via) { RunVia.new }
 end
 
 # Put Rails as the first plugin minitest initializes so other plugins

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 5.0.1
+  version: 5.0.2.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.1
+        version: 5.0.2.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -399,14 +399,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
-has_rdoc: