railties 4.2.4 → 4.2.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f725c1bab90e9f8d503dc9c916b6e5f9acf2936b
-  data.tar.gz: 9592837a9026153e8799606ed7690005a8b1c11c
+  metadata.gz: 91b3faab53d51e64b39ad4d719898dbbd1dc07f9
+  data.tar.gz: e2b016c9c350418779a820ac81c3b17a1e83ae98
 SHA512:
-  metadata.gz: 4843301d6a9f1233da5bd136482bb748c72fb637ebed1596521c8eb90fd455a11d3eeba8f5956a3159b5ed56ff405f381b1c46a6ac02bd9c91e82ba60d6100b0
-  data.tar.gz: f5f8874d3f8f0387744eb7e4e33a897a13f25f1b63f9837add6e464284c049f1aac0dadb504e0ec230ae3b407d5da19a927a2750fdf73857f101843034c40010
+  metadata.gz: d560700d7067eaa982864dd341540be764c9eb1f6b79f5f2be661746861f1bc482f3e89c6b562eb1cae37634513354c8a5c83444e12a2b9bbb452061688fc9b3
+  data.tar.gz: 06cacc5613fadd13f1c0e6921036d83e1c0a7ef1454995bed85bb9aef6b018932b7a810e9911430bc85f1a268317c36faa5a40a705e490a3b3a98fe8c5126ac7

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Rails 4.2.5.rc1 (October 30, 2015) ##
+
+*   Fix displaying mailer previews on non local requests when config
+    `action_mailer.show_previews` is set
+
+    *Wojciech Wnętrzak*
+
+
 ## Rails 4.2.4 (August 24, 2015) ##
 
 *   Fix STATS_DIRECTORIES already defined warning when running rake from within

data/lib/rails/engine/configuration.rb

@@ -29,7 +29,7 @@ module Rails
       #
       #   config.generators.colorize_logging = false
       #
-      def generators #:nodoc:
+      def generators
         @generators ||= Rails::Configuration::Generators.new
         yield(@generators) if block_given?
         @generators

data/lib/rails/gem_version.rb

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

data/lib/rails/generators/app_base.rb

@@ -159,7 +159,8 @@ module Rails
 
       def database_gemfile_entry
         return [] if options[:skip_active_record]
-        GemfileEntry.version gem_for_database, nil,
+        gem_name, gem_version = gem_for_database
+        GemfileEntry.version gem_name, gem_version,
                             "Use #{options[:database]} as the database for Active Record"
       end
 
@@ -195,6 +196,16 @@ module Rails
         def self.path(name, path, comment = nil)
           new(name, nil, comment, path: path)
         end
+
+        def version
+          version = super
+
+          if version.is_a?(Array)
+            version.join("', '")
+          else
+            version
+          end
+        end
       end
 
       def rails_gemfile_entry
@@ -212,16 +223,16 @@ module Rails
       def gem_for_database
         # %w( mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql )
         case options[:database]
-        when "oracle"         then "ruby-oci8"
-        when "postgresql"     then "pg"
-        when "frontbase"      then "ruby-frontbase"
-        when "mysql"          then "mysql2"
-        when "sqlserver"      then "activerecord-sqlserver-adapter"
-        when "jdbcmysql"      then "activerecord-jdbcmysql-adapter"
-        when "jdbcsqlite3"    then "activerecord-jdbcsqlite3-adapter"
-        when "jdbcpostgresql" then "activerecord-jdbcpostgresql-adapter"
-        when "jdbc"           then "activerecord-jdbc-adapter"
-        else options[:database]
+        when "oracle"         then ["ruby-oci8", nil]
+        when "postgresql"     then ["pg", ["~> 0.15"]]
+        when "frontbase"      then ["ruby-frontbase", nil]
+        when "mysql"          then ["mysql2", [">= 0.3.13", "< 0.5"]]
+        when "sqlserver"      then ["activerecord-sqlserver-adapter", nil]
+        when "jdbcmysql"      then ["activerecord-jdbcmysql-adapter", nil]
+        when "jdbcsqlite3"    then ["activerecord-jdbcsqlite3-adapter", nil]
+        when "jdbcpostgresql" then ["activerecord-jdbcpostgresql-adapter", nil]
+        when "jdbc"           then ["activerecord-jdbc-adapter", nil]
+        else [options[:database], nil]
         end
       end
 

data/lib/rails/generators/rails/plugin/templates/%name%.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   <%= '# ' if options.dev? || options.edge? -%>s.add_dependency "rails", "~> <%= Rails::VERSION::STRING %>"
 <% unless options[:skip_active_record] -%>
 
-  s.add_development_dependency "<%= gem_for_database %>"
+  s.add_development_dependency "<%= gem_for_database[0] %>"
 <% end -%>
 end

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

@@ -11,7 +11,7 @@ gemspec
 
 <% if options[:skip_gemspec] -%>
 group :development do
-  gem '<%= gem_for_database %>'
+  gem '<%= gem_for_database[0] %>'
 end
 <% else -%>
 # Declare any dependencies that are still in development here instead of in

data/lib/rails/generators/rails/scaffold_controller/templates/controller.rb

@@ -1,5 +1,5 @@
 <% if namespaced? -%>
-require_dependency "<%= namespaced_file_path %>/application_controller"
+require_dependency "<%= namespaced_path %>/application_controller"
 
 <% end -%>
 <% module_namespacing do -%>

data/lib/rails/mailers_controller.rb

@@ -3,7 +3,7 @@ require 'rails/application_controller'
 class Rails::MailersController < Rails::ApplicationController # :nodoc:
   prepend_view_path ActionDispatch::DebugExceptions::RESCUES_TEMPLATE_PATH
 
-  before_action :require_local!
+  before_action :require_local!, unless: :show_previews?
   before_action :find_preview, only: :preview
 
   def index
@@ -41,6 +41,10 @@ class Rails::MailersController < Rails::ApplicationController # :nodoc:
   end
 
   protected
+    def show_previews?
+      ActionMailer::Base.show_previews
+    end
+
     def find_preview
       candidates = []
       params[:path].to_s.scan(%r{/|$}){ candidates << $` }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.2.5.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.4
+        version: 4.2.5.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -352,14 +352,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Tools for creating, working with, and running Rails applications.
 test_files: []
-has_rdoc: