merb-mailer 0.9.4 → 0.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/Rakefile +2 -2
- data/lib/generators/mailer_generator.rb +1 -1
- data/lib/merb-mailer/mail_controller.rb +2 -1
- metadata +3 -3
data/Rakefile
CHANGED
|
@@ -17,7 +17,7 @@ GEM_EMAIL = "ykatz@engineyard.com"
|
|
|
17
17
|
|
|
18
18
|
GEM_NAME = "merb-mailer"
|
|
19
19
|
PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
|
|
20
|
-
GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.
|
|
20
|
+
GEM_VERSION = (Merb::MORE_VERSION rescue "0.9.5") + PKG_BUILD
|
|
21
21
|
|
|
22
22
|
RELEASE_NAME = "REL #{GEM_VERSION}"
|
|
23
23
|
|
|
@@ -35,7 +35,7 @@ spec = Gem::Specification.new do |s|
|
|
|
35
35
|
s.author = GEM_AUTHOR
|
|
36
36
|
s.email = GEM_EMAIL
|
|
37
37
|
s.homepage = PROJECT_URL
|
|
38
|
-
s.add_dependency('merb-core', '>= 0.9.
|
|
38
|
+
s.add_dependency('merb-core', '>= 0.9.5')
|
|
39
39
|
s.add_dependency('mailfactory', '>= 1.2.3')
|
|
40
40
|
s.require_path = 'lib'
|
|
41
41
|
s.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec}/**/*")
|
|
@@ -9,7 +9,7 @@ module Merb::Generators
|
|
|
9
9
|
Generates a mailer
|
|
10
10
|
DESC
|
|
11
11
|
|
|
12
|
-
option :testing_framework, :desc => 'Testing framework to use (one of:
|
|
12
|
+
option :testing_framework, :desc => 'Testing framework to use (one of: rspec, test_unit)'
|
|
13
13
|
|
|
14
14
|
first_argument :name, :required => true, :desc => "mailer name"
|
|
15
15
|
|
|
@@ -231,7 +231,8 @@ module Merb
|
|
|
231
231
|
begin
|
|
232
232
|
local_opts = opts.merge(:format => fmt)
|
|
233
233
|
local_opts.merge!(:layout => false) if opts_hash[fmt].is_a?(String)
|
|
234
|
-
|
|
234
|
+
|
|
235
|
+
clear_content
|
|
235
236
|
value = render opts_hash[fmt], local_opts
|
|
236
237
|
@mail.send(meth,value) unless value.nil? || value.empty?
|
|
237
238
|
rescue Merb::ControllerExceptions::TemplateNotFound => e
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: merb-mailer
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.9.
|
|
4
|
+
version: 0.9.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Yehuda Katz
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2008-08-
|
|
12
|
+
date: 2008-08-21 00:00:00 +03:00
|
|
13
13
|
default_executable:
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
@@ -20,7 +20,7 @@ dependencies:
|
|
|
20
20
|
requirements:
|
|
21
21
|
- - ">="
|
|
22
22
|
- !ruby/object:Gem::Version
|
|
23
|
-
version: 0.9.
|
|
23
|
+
version: 0.9.5
|
|
24
24
|
version:
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: mailfactory
|