actionmailer 5.0.0.beta3 → 5.0.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba408a911beb5d1832f35eff868ab9940664b197
-  data.tar.gz: 2bb6c109b95010381c56d1fac22bd60dd8ab7c71
+  metadata.gz: ce7f1a0650cd648d2156eda7d9ec89f1daa9cd31
+  data.tar.gz: fe30768e0737f6963444df1992d2404ac6f368ec
 SHA512:
-  metadata.gz: 5f6d5a01e6abe2f520204d6614e10c820a4dad08be9ea865eaebd916113ffd2decae7c82858e2cdfb4760e6e24d5b52bf0c7e500a5d9a651358b617cd33dbc04
-  data.tar.gz: 536373d714e7aebf11ee4ed1002fc48185030ef18daa1fe34e61db49ebc31f7069e10a1fc6b56af37bb613a4637d79fda379722168ee881c4ae8e1d368c430c6
+  metadata.gz: 72f6b3639202328e7660922bdadc2072392dc54673cec489fc203d556cef9b1b19fd0f897956422a7f719447848049576cdd4cf27e17a70181b8e7c1cc5a845f
+  data.tar.gz: 3313a2002c0c4eb6b262d96d9c2763b204489e63bf2bfba4089e15e370e8f08e33f5a157ee5d2dade361604dbb802af34ee081c1ac58b9771d2b811be40b5516

data/CHANGELOG.md

@@ -1,8 +1,32 @@
-## Rails 5.0.0.beta3 (February 24, 2016) ##
+## Rails 5.0.0.beta4 (April 27, 2016) ##
+
+*   Disallow calling `#deliver_later` after making local modifications to
+    the message which would be lost when the delivery job is enqueued.
+
+    Prevents a common, hard-to-find bug like:
+
+        message = Notifier.welcome(user, foo)
+        message.message_id = my_generated_message_id
+        message.deliver_later
+
+    The message_id is silently lost! *Only the mailer arguments are passed
+    to the delivery job.*
+
+    This raises an exception now. Make modifications to the message within
+    the mailer method instead, or use a custom Active Job to manage delivery
+    instead of using #deliver_later.
 
-*   Add support to fragment cache in Action Mailer.
+    *Jeremy Daer*
+
+*   Removes `-t` from default Sendmail arguments to match the underlying
+    `Mail::Sendmail` setting.
+
+    *Clayton Liggitt*
+
+
+## Rails 5.0.0.beta3 (February 24, 2016) ##
 
-    Now you can use fragment caching in your mailers views.
+*   Add support for fragment caching in Action Mailer views.
 
     *Stan Lo*
 
@@ -19,8 +43,7 @@
 
 ## Rails 5.0.0.beta1 (December 18, 2015) ##
 
-*   `config.force_ssl = true` will set
-    `config.action_mailer.default_url_options = { protocol: 'https' }`.
+*   `config.action_mailer.default_url_options[:protocol]` is now set to `https` if `config.force_ssl` is set to `true`.
 
     *Andrew Kampjes*
 
@@ -29,7 +52,7 @@
 
     *Chris McGrath*
 
-*   `assert_emails` in block form use the given number as expected value.
+*   `assert_emails` in block form, uses the given number as expected value.
     This makes the error message much easier to understand.
 
     *Yuji Yaginuma*

data/lib/action_mailer/base.rb

@@ -86,7 +86,7 @@ module ActionMailer
   # Like Action Controller, each mailer class has a corresponding view directory in which each
   # method of the class looks for a template with its name.
   #
-  # To define a template to be used with a mailing, create an <tt>.erb</tt> file with the same
+  # To define a template to be used with a mailer, create an <tt>.erb</tt> file with the same
   # name as the method in your mailer model. For example, in the mailer defined above, the template at
   # <tt>app/views/notifier_mailer/welcome.text.erb</tt> would be used to generate the email.
   #
@@ -144,7 +144,7 @@ module ActionMailer
   #   mail.deliver_now                               # generates and sends the email now
   #
   # The <tt>ActionMailer::MessageDelivery</tt> class is a wrapper around a delegate that will call
-  # your method to generate the mail. If you want direct access to delegator, or <tt>Mail::Message</tt>,
+  # your method to generate the mail. If you want direct access to the delegator, or <tt>Mail::Message</tt>,
   # you can call the <tt>message</tt> method on the <tt>ActionMailer::MessageDelivery</tt> object.
   #
   #   NotifierMailer.welcome(User.first).message     # => a Mail::Message object
@@ -163,7 +163,7 @@ module ActionMailer
   #
   # Multipart messages can also be used implicitly because Action Mailer will automatically detect and use
   # multipart templates, where each template is named after the name of the action, followed by the content
-  # type. Each such detected template will be added as a separate part to the message.
+  # type. Each such detected template will be added to the message, as a separate part.
   #
   # For example, if the following templates exist:
   # * signup_notification.text.erb
@@ -288,8 +288,8 @@ module ActionMailer
   #   end
   #
   # Note that the proc is evaluated right at the start of the mail message generation, so if you
-  # set something in the default using a proc, and then set the same thing inside of your
-  # mailer method, it will get over written by the mailer method.
+  # set something in the default hash using a proc, and then set the same thing inside of your
+  # mailer method, it will get overwritten by the mailer method.
   #
   # It is also possible to set these default options that will be used in all mailers through
   # the <tt>default_options=</tt> configuration in <tt>config/application.rb</tt>:

data/lib/action_mailer/delivery_methods.rb

@@ -36,7 +36,7 @@ module ActionMailer
 
       add_delivery_method :sendmail, Mail::Sendmail,
         location:  '/usr/sbin/sendmail',
-        arguments: '-i -t'
+        arguments: '-i'
 
       add_delivery_method :test, Mail::TestMailer
     end

data/lib/action_mailer/gem_version.rb

@@ -8,7 +8,7 @@ module ActionMailer
     MAJOR = 5
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "beta4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/inline_preview_interceptor.rb

@@ -3,7 +3,7 @@ require 'base64'
 module ActionMailer
   # Implements a mailer preview interceptor that converts image tag src attributes
   # that use inline cid: style urls to data: style urls so that they are visible
-  # when previewing a HTML email in a web browser.
+  # when previewing an HTML email in a web browser.
   #
   # This interceptor is enabled by default. To disable it, delete it from the
   # <tt>ActionMailer::Base.preview_interceptors</tt> array:

data/lib/action_mailer/message_delivery.rb

@@ -18,6 +18,7 @@ module ActionMailer
       @mailer = mailer
       @mail_method = mail_method
       @args = args
+      @obj = nil
     end
 
     def __getobj__ #:nodoc:
@@ -91,8 +92,19 @@ module ActionMailer
     private
 
       def enqueue_delivery(delivery_method, options={})
-        args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args
-        ActionMailer::DeliveryJob.set(options).perform_later(*args)
+        if @obj
+          raise "You've accessed the message before asking to deliver it " \
+            "later, so you may have made local changes that would be " \
+            "silently lost if we enqueued a job to deliver it. Why? Only " \
+            "the mailer method *arguments* are passed with the delivery job! " \
+            "Do not access the message in any way if you mean to deliver it " \
+            "later. Workarounds: 1. don't touch the message before calling " \
+            "#deliver_later, 2. only touch the message *within your mailer " \
+            "method*, or 3. use a custom Active Job instead of #deliver_later."
+        else
+          args = @mailer.name, @mail_method.to_s, delivery_method.to_s, *@args
+          ActionMailer::DeliveryJob.set(options).perform_later(*args)
+        end
       end
   end
 end

data/lib/action_mailer/railtie.rb

@@ -45,9 +45,9 @@ module ActionMailer
         register_observers(options.delete(:observers))
 
         options.each { |k,v| send("#{k}=", v) }
-
-        ActionDispatch::IntegrationTest.send :include, ActionMailer::TestCase::ClearTestDeliveries
       end
+
+      ActiveSupport.on_load(:action_dispatch_integration_test) { include ActionMailer::TestCase::ClearTestDeliveries }
     end
 
     initializer "action_mailer.compile_config_methods" do

data/lib/action_mailer/test_case.rb

@@ -15,11 +15,13 @@ module ActionMailer
       extend ActiveSupport::Concern
 
       included do
-        teardown :clear_test_deliviers
+        setup :clear_test_deliveries
+        teardown :clear_test_deliveries
       end
 
       private
-      def clear_test_deliviers
+
+      def clear_test_deliveries
         if ActionMailer::Base.delivery_method == :test
           ActionMailer::Base.deliveries.clear
         end
@@ -76,6 +78,7 @@ module ActionMailer
           set_delivery_method :test
           @old_perform_deliveries = ActionMailer::Base.perform_deliveries
           ActionMailer::Base.perform_deliveries = true
+          ActionMailer::Base.deliveries.clear
         end
 
         def restore_test_deliveries # :nodoc:
@@ -89,6 +92,7 @@ module ActionMailer
         end
 
         def restore_delivery_method # :nodoc:
+          ActionMailer::Base.deliveries.clear
           ActionMailer::Base.delivery_method = @old_delivery_method
         end
 
@@ -114,6 +118,5 @@ module ActionMailer
     end
 
     include Behavior
-    include ClearTestDeliveries
   end
 end

data/lib/rails/generators/mailer/mailer_generator.rb

@@ -9,13 +9,28 @@ module Rails
 
       def create_mailer_file
         template "mailer.rb", File.join('app/mailers', class_path, "#{file_name}_mailer.rb")
+
+        in_root do
+          if self.behavior == :invoke && !File.exist?(application_mailer_file_name)
+            template 'application_mailer.rb', application_mailer_file_name
+          end
+        end
       end
 
       hook_for :template_engine, :test_framework
 
       protected
         def file_name
-          @_file_name ||= super.gsub(/\_mailer/i, '')
+          @_file_name ||= super.gsub(/_mailer/i, '')
+        end
+
+      private
+        def application_mailer_file_name
+          @_application_mailer_file_name ||= if mountable_engine?
+                                             "app/mailers/#{namespaced_path}/application_mailer.rb"
+                                           else
+                                             "app/mailers/application_mailer.rb"
+                                           end
         end
     end
   end

data/lib/rails/generators/mailer/templates/application_mailer.rb

@@ -0,0 +1,6 @@
+<% module_namespacing do -%>
+class ApplicationMailer < ActionMailer::Base
+  default from: 'from@example.com'
+  layout 'mailer'
+end
+<% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta3
+  version: 5.0.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-24 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.beta3
+        version: 5.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - lib/action_mailer/version.rb
 - lib/rails/generators/mailer/USAGE
 - lib/rails/generators/mailer/mailer_generator.rb
+- lib/rails/generators/mailer/templates/application_mailer.rb
 - lib/rails/generators/mailer/templates/mailer.rb
 homepage: http://rubyonrails.org
 licenses:
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).