[DRE-commits] [SCM] ruby-actionmailer-3.2.git branch, master-experimental, updated. debian/3.2.6-2-24-g2df2dc3
Ondřej Surý
ondrej at sury.org
Thu Mar 21 14:24:06 UTC 2013
The following commit has been merged in the master-experimental branch:
commit f85b198f6ccdfc24dc0d35fac97d6ea2de7fc8de
Author: Ondřej Surý <ondrej at sury.org>
Date: Tue Mar 19 10:25:54 2013 +0100
Imported Upstream version 3.2.13
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fffadd1..3bc15fd 100644
--- a/CHANGELOG.md
+++ b/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) ##
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
index 01fa669..ade850f 100644
Binary files a/checksums.yaml.gz and b/checksums.yaml.gz differ
diff --git a/lib/action_mailer/base.rb b/lib/action_mailer/base.rb
index a9fb49a..9e2f640 100644
--- a/lib/action_mailer/base.rb
+++ b/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
diff --git a/lib/action_mailer/version.rb b/lib/action_mailer/version.rb
index 6c361b3..00f0516 100644
--- a/lib/action_mailer/version.rb
+++ b/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 12
+ TINY = 13
PRE = nil
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
diff --git a/metadata.yml b/metadata.yml
index 9fb37b9..f58a3c9 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
--- !ruby/object:Gem::Specification
name: actionmailer
version: !ruby/object:Gem::Version
- version: 3.2.12
+ version: 3.2.13
platform: ruby
authors:
- David Heinemeier Hansson
autorequire:
bindir: bin
cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-03-18 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
type: :runtime
prerelease: false
version_requirements: !ruby/object:Gem::Requirement
requirements:
- - '='
- !ruby/object:Gem::Version
- version: 3.2.12
+ version: 3.2.13
- !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 at 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'
requirements:
- none
rubyforge_project:
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.2
signing_key:
specification_version: 4
summary: Email composition, delivery, and receiving framework (part of Rails).
--
ruby-actionmailer-3.2.git
More information about the Pkg-ruby-extras-commits
mailing list