From cefc136ec332e5e065a2f4dd184d6fec0ea3c2ba Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 22 Feb 2010 12:17:08 +1100 Subject: Adding options to register observers and interceptors through ActionMailer::Base.register_observer and ActionMailer::Base.register_interceptor. These hook into Mail.register_interceptor and Mail.register_observer. Also bumped Mail requirement to 2.1.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Valim --- actionmailer/actionmailer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/actionmailer.gemspec') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 31d8efc7bf..13983aa663 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -18,6 +18,6 @@ Gem::Specification.new do |s| s.has_rdoc = true s.add_dependency('actionpack', '= 3.0.0.beta1') - s.add_dependency('mail', '~> 2.1.2') + s.add_dependency('mail', '~> 2.1.3') s.add_dependency('text-format', '~> 1.0.0') end -- cgit v1.2.3 From f221a6f19f4cee31e2d103ea9a1930f59223fc25 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Mon, 1 Mar 2010 23:36:54 -0500 Subject: Leverage VERSION constants from gemspecs to avoid tedious updates when releasing --- actionmailer/actionmailer.gemspec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'actionmailer/actionmailer.gemspec') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 13983aa663..c7a363575b 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -1,7 +1,10 @@ +$:.unshift "lib" +require "action_mailer/version" + Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'actionmailer' - s.version = '3.0.0.beta1' + s.version = ActionMailer::VERSION::STRING s.summary = 'Email composition, delivery, and recieval framework (part of Rails).' s.description = 'Email composition, delivery, and recieval framework (part of Rails).' s.required_ruby_version = '>= 1.8.7' @@ -17,7 +20,7 @@ Gem::Specification.new do |s| s.has_rdoc = true - s.add_dependency('actionpack', '= 3.0.0.beta1') + s.add_dependency('actionpack', "= #{ActionMailer::VERSION::STRING}") s.add_dependency('mail', '~> 2.1.3') s.add_dependency('text-format', '~> 1.0.0') end -- cgit v1.2.3 From 56ea20605a54386158e90e290caa6d15e7623ade Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Tue, 2 Mar 2010 10:32:09 -0800 Subject: Wordsmith gem descriptions --- actionmailer/actionmailer.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer/actionmailer.gemspec') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index c7a363575b..fc7f3f1e5f 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -5,8 +5,8 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'actionmailer' s.version = ActionMailer::VERSION::STRING - s.summary = 'Email composition, delivery, and recieval framework (part of Rails).' - s.description = 'Email composition, delivery, and recieval framework (part of Rails).' + s.summary = 'Email composition, delivery, and receiving framework (part of Rails).' + s.description = 'Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.' s.required_ruby_version = '>= 1.8.7' s.author = 'David Heinemeier Hansson' -- cgit v1.2.3 From deb00bcb8cf88eb6420282c9af0af64fb69aeed4 Mon Sep 17 00:00:00 2001 From: Bryan Helmkamp Date: Thu, 4 Mar 2010 22:41:39 -0500 Subject: Read Rails version from a file instead of modifying the load path and doing requires Signed-off-by: Jeremy Kemper --- actionmailer/actionmailer.gemspec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'actionmailer/actionmailer.gemspec') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index fc7f3f1e5f..3c9ffd1749 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -1,10 +1,9 @@ -$:.unshift "lib" -require "action_mailer/version" +version = File.read("../RAILS_VERSION").strip Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'actionmailer' - s.version = ActionMailer::VERSION::STRING + s.version = version s.summary = 'Email composition, delivery, and receiving framework (part of Rails).' s.description = 'Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.' s.required_ruby_version = '>= 1.8.7' @@ -20,7 +19,7 @@ Gem::Specification.new do |s| s.has_rdoc = true - s.add_dependency('actionpack', "= #{ActionMailer::VERSION::STRING}") + s.add_dependency('actionpack', version) s.add_dependency('mail', '~> 2.1.3') s.add_dependency('text-format', '~> 1.0.0') end -- cgit v1.2.3 From 4bc2cbc3cfa231b3dea0dce38a6fa2723c7ed94d Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Sat, 6 Mar 2010 13:30:25 -0600 Subject: Load RAILS_VERSION relative to the gemspec file. --- actionmailer/actionmailer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionmailer/actionmailer.gemspec') diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 3c9ffd1749..a7a2599105 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -1,4 +1,4 @@ -version = File.read("../RAILS_VERSION").strip +version = File.read(File.expand_path("../../RAILS_VERSION", __FILE__)).strip Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY -- cgit v1.2.3