aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/actionmailer.gemspec32
-rw-r--r--actionmailer/lib/action_mailer/version.rb2
-rw-r--r--actionmailer/test/old_base/asset_host_test.rb1
3 files changed, 18 insertions, 17 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index abbb542293..c3b1c96832 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -1,22 +1,22 @@
Gem::Specification.new do |s|
- s.platform = Gem::Platform::RUBY
- s.name = 'actionmailer'
- s.summary = "Service layer for easy email delivery and testing."
- s.description = %q{Makes it trivial to test and deliver emails sent from a single service layer.}
- s.version = '3.0.pre'
+ s.platform = Gem::Platform::RUBY
+ s.name = 'actionmailer'
+ s.version = '3.0.0.beta'
+ s.summary = 'Email composition, delivery, and recieval framework (part of Rails).'
+ s.description = 'Email composition, delivery, and recieval framework (part of Rails).'
- s.author = "David Heinemeier Hansson"
- s.email = "david@loudthinking.com"
- s.rubyforge_project = "actionmailer"
- s.homepage = "http://www.rubyonrails.org"
+ s.author = 'David Heinemeier Hansson'
+ s.email = 'david@loudthinking.com'
+ s.homepage = 'http://www.rubyonrails.org'
+ s.rubyforge_project = 'actionmailer'
- s.add_dependency('actionpack', '= 3.0.pre')
- s.add_dependency('mail', '~> 2.1.2')
- s.add_dependency('text-format', '~> 1.0.0')
+ s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
+ s.require_path = 'lib'
+ s.requirements << 'none'
- s.files = Dir['CHANGELOG', 'README', 'MIT-LICENSE', 'lib/**/*']
s.has_rdoc = true
- s.requirements << 'none'
- s.require_path = 'lib'
- s.autorequire = 'action_mailer'
+
+ s.add_dependency('actionpack', '= 3.0.0.beta')
+ s.add_dependency('mail', '~> 2.1.2')
+ s.add_dependency('text-format', '~> 1.0.0')
end
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 0f2b58552b..b11c6ef055 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,7 +2,7 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 0
- TINY = "pre"
+ TINY = "0.beta"
STRING = [MAJOR, MINOR, TINY].join('.')
end
diff --git a/actionmailer/test/old_base/asset_host_test.rb b/actionmailer/test/old_base/asset_host_test.rb
index 124032f1d9..aa9cfd88dd 100644
--- a/actionmailer/test/old_base/asset_host_test.rb
+++ b/actionmailer/test/old_base/asset_host_test.rb
@@ -1,4 +1,5 @@
require 'abstract_unit'
+require 'action_controller'
class AssetHostMailer < ActionMailer::Base
def email_with_asset