actionmailer 3.2.12 → 3.2.13.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75297ff85552a43757dd9378de201ca124163b7e
-  data.tar.gz: ca7d3dcf389b0440d827189217263a353af2137a
+  metadata.gz: c7b395230e50f870701fea19681c7ddbfea674d0
+  data.tar.gz: 328b08c8f5a1b1fc21f6063bd5627b0dfd7af2c9
 SHA512:
-  metadata.gz: e9ea60a02f5b2c18178372b1c818a0f54b47fa9a6be1c52d955d483a3daadbd05b14fbb191645487695e88963c85278932a61796f063fc456f85762d10af600d
-  data.tar.gz: ad21ada6b9aa8d14683064fd31c77c1190fdbfb214ea04842ba61a4616597c910bd87d7adbf4213d4799cddd74d754650cb890dedaa50188493b7fb08a5f14d6
+  metadata.gz: d29d77cd43e8b5ddfdb8ccbcdaa0491867a332c89055aebf60f596ddea0b0992a9392128e78f8b435d1f993e157a061f7e4c93ef1b231503989fa8899bb23269
+  data.tar.gz: 1c2b8bf7b9e5aa2b6f41e6eb621a11675d9172647d50ba6eefa1a00269cca45a69b765120bbf4b5c9e282014492a952ea5f12a39df42126f65b9c78b06e60890

data/CHANGELOG.md

@@ -1,11 +1,53 @@
-## Rails 3.2.10 ##
+## unreleased ##
+
+*   No changes.
+
+
+## Rails 3.2.13 (Feb 17, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.12 (Feb 11, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.11 (Jan 8, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.10 (Jan 2, 2013) ##
+
+*   No changes.
+
+
+## Rails 3.2.9 (Nov 12, 2012) ##
+
+*   The return value from mailer methods is no longer relevant. This fixes a bug,
+    which was introduced with 3.2.9.
+    Backport #8450
+    Fix #8448
+
+        class ExampleMailer < ActionMailer::Base
+          # in 3.2.9, returning a falsy value from a mailer action, prevented the email from beeing sent.
+          # With 3.2.10 the return value is no longer relevant. If you call mail() the email will be sent.
+          def nil_returning_mailer_action
+            mail()
+            nil
+          end
+        end
+
+    *Yves Senn*
+
 
 ## Rails 3.2.9 (Nov 12, 2012) ##
 
-* Do not render views when mail() isn't called.
-  Fix #7761
+*   Do not render views when mail() isn't called.
+    Fix #7761
 
-  *Yves Senn*
+    *Yves Senn*
 
 
 ## Rails 3.2.8 (Aug 9, 2012) ##

data/lib/action_mailer/base.rb

@@ -123,8 +123,8 @@ module ActionMailer #:nodoc:
   #
   #   <%= users_url(:host => "example.com") %>
   #
-  # You should use the <tt>named_route_url</tt> style (which generates absolute URLs) and avoid using the 
-  # <tt>named_route_path</tt> style (which generates relative URLs), since clients reading the mail will 
+  # You should use the <tt>named_route_url</tt> style (which generates absolute URLs) and avoid using the
+  # <tt>named_route_path</tt> style (which generates relative URLs), since clients reading the mail will
   # have no concept of a current URL from which to determine a relative path.
   #
   # It is also possible to set a default host that will be used in all mailers by setting the <tt>:host</tt>
@@ -133,7 +133,7 @@ module ActionMailer #:nodoc:
   #   config.action_mailer.default_url_options = { :host => "example.com" }
   #
   # When you decide to set a default <tt>:host</tt> for your mailers, then you need to make sure to use the
-  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper 
+  # <tt>:only_path => false</tt> option when using <tt>url_for</tt>. Since the <tt>url_for</tt> view helper
   # will generate relative URLs by default when a <tt>:host</tt> option isn't explicitly provided, passing
   # <tt>:only_path => false</tt> will ensure that absolute URLs are generated.
   #
@@ -150,8 +150,8 @@ module ActionMailer #:nodoc:
   #
   # = Multipart Emails
   #
-  # 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 
+  # 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.
   #
   # For example, if the following templates exist:
@@ -448,6 +448,7 @@ module ActionMailer #:nodoc:
     # method, for instance).
     def initialize(method_name=nil, *args)
       super()
+      @mail_was_called = false
       @_message = Mail.new
       process(method_name, *args) if method_name
     end
@@ -455,10 +456,8 @@ module ActionMailer #:nodoc:
     def process(*args) #:nodoc:
       lookup_context.skip_default_locale!
 
-      generated_mail = super
-      unless generated_mail
-        @_message = NullMail.new
-      end
+      super
+      @_message = NullMail.new unless @mail_was_called
     end
 
     class NullMail #:nodoc:
@@ -616,8 +615,9 @@ module ActionMailer #:nodoc:
     #   end
     #
     def mail(headers={}, &block)
-      # Guard flag to prevent both the old and the new API from firing
-      # Should be removed when old API is removed
+      # Guard flag to prevent both the old and the new API from firing.
+      # On master this flag was renamed to `@_mail_was_called`.
+      # On master there is only one API and this flag is no longer used as a guard.
       @mail_was_called = true
       m = @_message
 

data/lib/action_mailer/version.rb

@@ -2,8 +2,8 @@ module ActionMailer
   module VERSION #:nodoc:
     MAJOR = 3
     MINOR = 2
-    TINY  = 12
-    PRE   = nil
+    TINY  = 13
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 3.2.12
+  version: 3.2.13.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13.rc1
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: 2.5.3
 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
@@ -70,18 +70,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Email composition, delivery, and receiving framework (part of Rails).