actionmailer 4.2.0.beta3 → 4.2.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8456e86cb336eb60e851b99265b03b1cb5c8723
-  data.tar.gz: 5bffa7a4df3bf621b5c6c41c4559b894ae2f2a76
+  metadata.gz: bcb1c9b3e5d724b79972d86938bb122153250793
+  data.tar.gz: ddb546981d14586d13807d3ca1981b79762ce4a4
 SHA512:
-  metadata.gz: f65c4887fe5c6dd0277131356aec82a7e1f59291d5ab2ff1b115cb26ae68dff26bd0944d6cb3a83252e921682c638a98cf4f0027be00745bda6b110342fc486b
-  data.tar.gz: e3b969ed46646611812b2a7bfdba77f505c032cec2ecf717085fea346eaa234843e854f9bad24cdc421d2054d554af041987dfb5cb3318dd643ef19f4c2b0c50
+  metadata.gz: a09fc1e03f6b257904225ae25bfd2a02f99326e5deb03a90fd858a797fd5ba015b4d32e916f383ccd9cf41f335d4539e2084e39c05d914f9fc881fde4c87e643
+  data.tar.gz: b487d6808a402484d7d4f836a53503f5149bdcd1c94334ca98ecf6fbdb7716079aa13745c0a556c88fbcfd2af074681798e96de700586d23c6db70cbccc1413a

data/CHANGELOG.md

@@ -10,7 +10,7 @@
     using the new Active Job framework in Rails, and will use whatever queue is
     configured for Rails.
 
-    *DHH/Abdelkader Boudih/Cristian Bica*
+    *DHH*, *Abdelkader Boudih*, *Cristian Bica*
 
 *   Make `ActionMailer::Previews` methods class methods. Previously they were
     instance methods and `ActionMailer` tries to render a message when they

data/lib/action_mailer/base.rb

@@ -39,11 +39,8 @@ module ActionMailer
   #   in the same manner as <tt>attachments[]=</tt>
   #
   # * <tt>headers[]=</tt> - Allows you to specify any header field in your email such
-  #   as <tt>headers['X-No-Spam'] = 'True'</tt>. Note, while most fields like <tt>To:</tt>
-  #   <tt>From:</tt> can only appear once in an email header, other fields like <tt>X-Anything</tt>
-  #   can appear multiple times. If you want to change a field that can appear multiple times,
-  #   you need to set it to nil first so that Mail knows you are replacing it and not adding
-  #   another field of the same name.
+  #   as <tt>headers['X-No-Spam'] = 'True'</tt>. Note that declaring a header multiple times
+  #   will add many fields of the same name. Read #headers doc for more information.
   #
   # * <tt>headers(hash)</tt> - Allows you to specify multiple headers in your email such
   #   as <tt>headers({'X-No-Spam' => 'True', 'In-Reply-To' => '1234@message.id'})</tt>
@@ -87,7 +84,8 @@ module ActionMailer
   # name as the method in your mailer model. For example, in the mailer defined above, the template at
   # <tt>app/views/notifier/welcome.text.erb</tt> would be used to generate the email.
   #
-  # Variables defined in the model are accessible as instance variables in the view.
+  # Variables defined in the methods of your mailer model are accessible as instance variables in their 
+  # corresponding view.
   #
   # Emails by default are sent in plain text, so a sample view for our model example might look like this:
   #
@@ -625,6 +623,26 @@ module ActionMailer
     # The resulting <tt>Mail::Message</tt> will have the following in its header:
     #
     #   X-Special-Domain-Specific-Header: SecretValue
+    #
+    # Note about replacing already defined headers:
+    #
+    # * +subject+
+    # * +sender+
+    # * +from+
+    # * +to+
+    # * +cc+
+    # * +bcc+
+    # * +reply-to+
+    # * +orig-date+
+    # * +message-id+
+    # * +references+
+    #
+    # Fields can only appear once in email headers while other fields such as
+    # <tt>X-Anything</tt> can appear multiple times.
+    #
+    # If you want to replace any header which already exists, first set it to
+    # +nil+ in order to reset the value otherwise another field will be added
+    # for the same header.
     def headers(args = nil)
       if args
         @_message.headers(args)
@@ -685,8 +703,8 @@ module ActionMailer
     # The main method that creates the message and renders the email templates. There are
     # two ways to call this method, with a block, or without a block.
     #
-    # Both methods accept a headers hash. This hash allows you to specify the most used headers
-    # in an email message, these are:
+    # It accepts a headers hash. This hash allows you to specify 
+    # the most used headers in an email message, these are:
     #
     # * +:subject+ - The subject of the message, if this is omitted, Action Mailer will
     #   ask the Rails I18n class for a translated +:subject+ in the scope of

data/lib/action_mailer/delivery_job.rb

@@ -1,6 +1,8 @@
 require 'active_job'
 
 module ActionMailer
+  # The <tt>ActionMailer::DeliveryJob</tt> class is used when you
+  # want to send emails outside of the request-response cycle.
   class DeliveryJob < ActiveJob::Base #:nodoc:
     queue_as :mailers
 

data/lib/action_mailer/gem_version.rb

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

data/lib/action_mailer/message_delivery.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'active_support/core_ext/string/filters'
 
 module ActionMailer
 
@@ -46,6 +47,7 @@ module ActionMailer
     #
     # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
     # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
+    # * <tt>:queue</tt> - Enqueue the email on the specified queue
     def deliver_later!(options={})
       enqueue_delivery :deliver_now!, options
     end
@@ -61,6 +63,7 @@ module ActionMailer
     #
     # * <tt>:wait</tt> - Enqueue the email to be delivered with a delay
     # * <tt>:wait_until</tt> - Enqueue the email to be delivered at (after) a specific date / time
+    # * <tt>:queue</tt> - Enqueue the email on the specified queue
     def deliver_later(options={})
       enqueue_delivery :deliver_now, options
     end
@@ -83,14 +86,22 @@ module ActionMailer
     end
 
     def deliver! #:nodoc:
-      ActiveSupport::Deprecation.warn "#deliver! is deprecated and will be removed in Rails 5. " \
-        "Use #deliver_now! to deliver immediately or #deliver_later! to deliver through Active Job."
+      ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        `#deliver!` is deprecated and will be removed in Rails 5. Use
+        `#deliver_now!` to deliver immediately or `#deliver_later!` to
+        deliver through Active Job.
+      MSG
+
       deliver_now!
     end
 
     def deliver #:nodoc:
-      ActiveSupport::Deprecation.warn "#deliver is deprecated and will be removed in Rails 5. " \
-        "Use #deliver_now to deliver immediately or #deliver_later to deliver through Active Job."
+      ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        `#deliver` is deprecated and will be removed in Rails 5. Use
+        `#deliver_now` to deliver immediately or `#deliver_later` to
+        deliver through Active Job.
+      MSG
+
       deliver_now
     end
 

data/lib/action_mailer/test_case.rb

@@ -17,6 +17,7 @@ module ActionMailer
       include ActiveSupport::Testing::ConstantLookup
       include TestHelper
       include Rails::Dom::Testing::Assertions::SelectorAssertions
+      include Rails::Dom::Testing::Assertions::DomAssertions
 
       included do
         class_attribute :_mailer_class

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 4.2.0.beta3
+  version: 4.2.0.beta4
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,82 +16,82 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0.beta3
+        version: 4.2.0.beta4
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.5'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: rails-dom-testing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.0.4
 description: Email on Rails. Compose, deliver, receive, and test emails using the
   familiar controller/view pattern. First-class support for multipart email and attachments.
 email: david@loudthinking.com
@@ -129,18 +129,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).