mandrill-mailer-rails 1.0.0 → 1.1.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +1 -0
- data/Appraisals +4 -0
- data/Gemfile.lock +1 -1
- data/README.md +1 -1
- data/gemfiles/rails_30.gemfile.lock +52 -50
- data/gemfiles/rails_31.gemfile.lock +52 -50
- data/gemfiles/rails_32.gemfile.lock +52 -50
- data/gemfiles/rails_40.gemfile.lock +90 -63
- data/gemfiles/rails_41.gemfile.lock +90 -63
- data/gemfiles/rails_42.gemfile +7 -0
- data/gemfiles/rails_42.gemfile.lock +143 -0
- data/lib/mandrill_action_mailer/delivery_handler.rb +12 -3
- data/mandrill-mailer-rails.gemspec +2 -2
- data/spec/integration/delivery_handler_spec.rb +31 -1
- data/spec/rails_app/app/mailers/notifier.rb +4 -0
- metadata +6 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: a9a20dac8644ca86c6d696c9dccd9c4bc35310d9
|
|
4
|
+
data.tar.gz: b71c7eccc0c3b82aa037edc5a99dd643e886dde8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f3e12d2859e68e005097145b2c83d331af482b22bb340b64b6f10d10bd539a1ebc9822fd137ef35abc88c6d651c7f1994ae67d9d250cd27f99dacd940bf2ccde
|
|
7
|
+
data.tar.gz: 9b1241f902f2581ad2cf2cc1c64564e3c314a82b30f93b4c55c0552f4bd5b91b6dca8522527478613c40a2ffc1d1326317661ac73c7b6368253b7a993581010a
|
data/.travis.yml
CHANGED
data/Appraisals
CHANGED
data/Gemfile.lock
CHANGED
data/README.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# mandrill-mailer-rails
|
|
2
2
|
|
|
3
|
-
[](https://travis-ci.org/tinfoil/mandrill-mailer-rails)
|
|
4
4
|
|
|
5
5
|
Handler for Rails' ActionMailer to send emails through Mandrill.
|
|
6
6
|
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
mandrill-mailer-rails (
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
5
|
mandrill-api
|
|
6
6
|
rails (> 3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
actionmailer (3.2.
|
|
12
|
-
actionpack (= 3.2.
|
|
11
|
+
actionmailer (3.2.21)
|
|
12
|
+
actionpack (= 3.2.21)
|
|
13
13
|
mail (~> 2.5.4)
|
|
14
|
-
actionpack (3.2.
|
|
15
|
-
activemodel (= 3.2.
|
|
16
|
-
activesupport (= 3.2.
|
|
14
|
+
actionpack (3.2.21)
|
|
15
|
+
activemodel (= 3.2.21)
|
|
16
|
+
activesupport (= 3.2.21)
|
|
17
17
|
builder (~> 3.0.0)
|
|
18
18
|
erubis (~> 2.7.0)
|
|
19
19
|
journey (~> 1.0.4)
|
|
@@ -21,21 +21,22 @@ GEM
|
|
|
21
21
|
rack-cache (~> 1.2)
|
|
22
22
|
rack-test (~> 0.6.1)
|
|
23
23
|
sprockets (~> 2.2.1)
|
|
24
|
-
activemodel (3.2.
|
|
25
|
-
activesupport (= 3.2.
|
|
24
|
+
activemodel (3.2.21)
|
|
25
|
+
activesupport (= 3.2.21)
|
|
26
26
|
builder (~> 3.0.0)
|
|
27
|
-
activerecord (3.2.
|
|
28
|
-
activemodel (= 3.2.
|
|
29
|
-
activesupport (= 3.2.
|
|
27
|
+
activerecord (3.2.21)
|
|
28
|
+
activemodel (= 3.2.21)
|
|
29
|
+
activesupport (= 3.2.21)
|
|
30
30
|
arel (~> 3.0.2)
|
|
31
31
|
tzinfo (~> 0.3.29)
|
|
32
|
-
activeresource (3.2.
|
|
33
|
-
activemodel (= 3.2.
|
|
34
|
-
activesupport (= 3.2.
|
|
35
|
-
activesupport (3.2.
|
|
32
|
+
activeresource (3.2.21)
|
|
33
|
+
activemodel (= 3.2.21)
|
|
34
|
+
activesupport (= 3.2.21)
|
|
35
|
+
activesupport (3.2.21)
|
|
36
36
|
i18n (~> 0.6, >= 0.6.4)
|
|
37
37
|
multi_json (~> 1.0)
|
|
38
|
-
appraisal (
|
|
38
|
+
appraisal (2.0.0)
|
|
39
|
+
activesupport (>= 3.2.21)
|
|
39
40
|
bundler
|
|
40
41
|
rake
|
|
41
42
|
thor (>= 0.14.0)
|
|
@@ -43,62 +44,63 @@ GEM
|
|
|
43
44
|
builder (3.0.4)
|
|
44
45
|
diff-lcs (1.2.5)
|
|
45
46
|
erubis (2.7.0)
|
|
46
|
-
excon (0.
|
|
47
|
+
excon (0.45.1)
|
|
47
48
|
hike (1.2.3)
|
|
48
|
-
i18n (0.
|
|
49
|
+
i18n (0.7.0)
|
|
49
50
|
journey (1.0.4)
|
|
50
|
-
json (1.8.
|
|
51
|
+
json (1.8.2)
|
|
51
52
|
mail (2.5.4)
|
|
52
53
|
mime-types (~> 1.16)
|
|
53
54
|
treetop (~> 1.4.8)
|
|
54
|
-
mandrill-api (1.0.
|
|
55
|
+
mandrill-api (1.0.53)
|
|
55
56
|
excon (>= 0.16.0, < 1.0)
|
|
56
57
|
json (>= 1.7.7, < 2.0)
|
|
57
58
|
mime-types (1.25.1)
|
|
58
|
-
multi_json (1.
|
|
59
|
+
multi_json (1.11.0)
|
|
59
60
|
polyglot (0.3.5)
|
|
60
61
|
rack (1.4.5)
|
|
61
62
|
rack-cache (1.2)
|
|
62
63
|
rack (>= 0.4)
|
|
63
64
|
rack-ssl (1.3.4)
|
|
64
65
|
rack
|
|
65
|
-
rack-test (0.6.
|
|
66
|
+
rack-test (0.6.3)
|
|
66
67
|
rack (>= 1.0)
|
|
67
|
-
rails (3.2.
|
|
68
|
-
actionmailer (= 3.2.
|
|
69
|
-
actionpack (= 3.2.
|
|
70
|
-
activerecord (= 3.2.
|
|
71
|
-
activeresource (= 3.2.
|
|
72
|
-
activesupport (= 3.2.
|
|
68
|
+
rails (3.2.21)
|
|
69
|
+
actionmailer (= 3.2.21)
|
|
70
|
+
actionpack (= 3.2.21)
|
|
71
|
+
activerecord (= 3.2.21)
|
|
72
|
+
activeresource (= 3.2.21)
|
|
73
|
+
activesupport (= 3.2.21)
|
|
73
74
|
bundler (~> 1.0)
|
|
74
|
-
railties (= 3.2.
|
|
75
|
-
railties (3.2.
|
|
76
|
-
actionpack (= 3.2.
|
|
77
|
-
activesupport (= 3.2.
|
|
75
|
+
railties (= 3.2.21)
|
|
76
|
+
railties (3.2.21)
|
|
77
|
+
actionpack (= 3.2.21)
|
|
78
|
+
activesupport (= 3.2.21)
|
|
78
79
|
rack-ssl (~> 1.3.2)
|
|
79
80
|
rake (>= 0.8.7)
|
|
80
81
|
rdoc (~> 3.4)
|
|
81
82
|
thor (>= 0.14.6, < 2.0)
|
|
82
|
-
rake (10.
|
|
83
|
+
rake (10.4.2)
|
|
83
84
|
rdoc (3.12.2)
|
|
84
85
|
json (~> 1.4)
|
|
85
|
-
rspec-core (3.
|
|
86
|
-
rspec-support (~> 3.
|
|
87
|
-
rspec-expectations (3.1
|
|
86
|
+
rspec-core (3.2.3)
|
|
87
|
+
rspec-support (~> 3.2.0)
|
|
88
|
+
rspec-expectations (3.2.1)
|
|
88
89
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
89
|
-
rspec-support (~> 3.
|
|
90
|
-
rspec-mocks (3.1
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
rspec-
|
|
98
|
-
rspec-
|
|
99
|
-
rspec-
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
rspec-support (~> 3.2.0)
|
|
91
|
+
rspec-mocks (3.2.1)
|
|
92
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
93
|
+
rspec-support (~> 3.2.0)
|
|
94
|
+
rspec-rails (3.2.1)
|
|
95
|
+
actionpack (>= 3.0, < 4.3)
|
|
96
|
+
activesupport (>= 3.0, < 4.3)
|
|
97
|
+
railties (>= 3.0, < 4.3)
|
|
98
|
+
rspec-core (~> 3.2.0)
|
|
99
|
+
rspec-expectations (~> 3.2.0)
|
|
100
|
+
rspec-mocks (~> 3.2.0)
|
|
101
|
+
rspec-support (~> 3.2.0)
|
|
102
|
+
rspec-support (3.2.2)
|
|
103
|
+
sprockets (2.2.3)
|
|
102
104
|
hike (~> 1.2)
|
|
103
105
|
multi_json (~> 1.0)
|
|
104
106
|
rack (~> 1.0)
|
|
@@ -108,7 +110,7 @@ GEM
|
|
|
108
110
|
treetop (1.4.15)
|
|
109
111
|
polyglot
|
|
110
112
|
polyglot (>= 0.3.1)
|
|
111
|
-
tzinfo (0.3.
|
|
113
|
+
tzinfo (0.3.43)
|
|
112
114
|
|
|
113
115
|
PLATFORMS
|
|
114
116
|
ruby
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
mandrill-mailer-rails (
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
5
|
mandrill-api
|
|
6
6
|
rails (> 3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
actionmailer (3.2.
|
|
12
|
-
actionpack (= 3.2.
|
|
11
|
+
actionmailer (3.2.21)
|
|
12
|
+
actionpack (= 3.2.21)
|
|
13
13
|
mail (~> 2.5.4)
|
|
14
|
-
actionpack (3.2.
|
|
15
|
-
activemodel (= 3.2.
|
|
16
|
-
activesupport (= 3.2.
|
|
14
|
+
actionpack (3.2.21)
|
|
15
|
+
activemodel (= 3.2.21)
|
|
16
|
+
activesupport (= 3.2.21)
|
|
17
17
|
builder (~> 3.0.0)
|
|
18
18
|
erubis (~> 2.7.0)
|
|
19
19
|
journey (~> 1.0.4)
|
|
@@ -21,21 +21,22 @@ GEM
|
|
|
21
21
|
rack-cache (~> 1.2)
|
|
22
22
|
rack-test (~> 0.6.1)
|
|
23
23
|
sprockets (~> 2.2.1)
|
|
24
|
-
activemodel (3.2.
|
|
25
|
-
activesupport (= 3.2.
|
|
24
|
+
activemodel (3.2.21)
|
|
25
|
+
activesupport (= 3.2.21)
|
|
26
26
|
builder (~> 3.0.0)
|
|
27
|
-
activerecord (3.2.
|
|
28
|
-
activemodel (= 3.2.
|
|
29
|
-
activesupport (= 3.2.
|
|
27
|
+
activerecord (3.2.21)
|
|
28
|
+
activemodel (= 3.2.21)
|
|
29
|
+
activesupport (= 3.2.21)
|
|
30
30
|
arel (~> 3.0.2)
|
|
31
31
|
tzinfo (~> 0.3.29)
|
|
32
|
-
activeresource (3.2.
|
|
33
|
-
activemodel (= 3.2.
|
|
34
|
-
activesupport (= 3.2.
|
|
35
|
-
activesupport (3.2.
|
|
32
|
+
activeresource (3.2.21)
|
|
33
|
+
activemodel (= 3.2.21)
|
|
34
|
+
activesupport (= 3.2.21)
|
|
35
|
+
activesupport (3.2.21)
|
|
36
36
|
i18n (~> 0.6, >= 0.6.4)
|
|
37
37
|
multi_json (~> 1.0)
|
|
38
|
-
appraisal (
|
|
38
|
+
appraisal (2.0.0)
|
|
39
|
+
activesupport (>= 3.2.21)
|
|
39
40
|
bundler
|
|
40
41
|
rake
|
|
41
42
|
thor (>= 0.14.0)
|
|
@@ -43,62 +44,63 @@ GEM
|
|
|
43
44
|
builder (3.0.4)
|
|
44
45
|
diff-lcs (1.2.5)
|
|
45
46
|
erubis (2.7.0)
|
|
46
|
-
excon (0.
|
|
47
|
+
excon (0.45.1)
|
|
47
48
|
hike (1.2.3)
|
|
48
|
-
i18n (0.
|
|
49
|
+
i18n (0.7.0)
|
|
49
50
|
journey (1.0.4)
|
|
50
|
-
json (1.8.
|
|
51
|
+
json (1.8.2)
|
|
51
52
|
mail (2.5.4)
|
|
52
53
|
mime-types (~> 1.16)
|
|
53
54
|
treetop (~> 1.4.8)
|
|
54
|
-
mandrill-api (1.0.
|
|
55
|
+
mandrill-api (1.0.53)
|
|
55
56
|
excon (>= 0.16.0, < 1.0)
|
|
56
57
|
json (>= 1.7.7, < 2.0)
|
|
57
58
|
mime-types (1.25.1)
|
|
58
|
-
multi_json (1.
|
|
59
|
+
multi_json (1.11.0)
|
|
59
60
|
polyglot (0.3.5)
|
|
60
61
|
rack (1.4.5)
|
|
61
62
|
rack-cache (1.2)
|
|
62
63
|
rack (>= 0.4)
|
|
63
64
|
rack-ssl (1.3.4)
|
|
64
65
|
rack
|
|
65
|
-
rack-test (0.6.
|
|
66
|
+
rack-test (0.6.3)
|
|
66
67
|
rack (>= 1.0)
|
|
67
|
-
rails (3.2.
|
|
68
|
-
actionmailer (= 3.2.
|
|
69
|
-
actionpack (= 3.2.
|
|
70
|
-
activerecord (= 3.2.
|
|
71
|
-
activeresource (= 3.2.
|
|
72
|
-
activesupport (= 3.2.
|
|
68
|
+
rails (3.2.21)
|
|
69
|
+
actionmailer (= 3.2.21)
|
|
70
|
+
actionpack (= 3.2.21)
|
|
71
|
+
activerecord (= 3.2.21)
|
|
72
|
+
activeresource (= 3.2.21)
|
|
73
|
+
activesupport (= 3.2.21)
|
|
73
74
|
bundler (~> 1.0)
|
|
74
|
-
railties (= 3.2.
|
|
75
|
-
railties (3.2.
|
|
76
|
-
actionpack (= 3.2.
|
|
77
|
-
activesupport (= 3.2.
|
|
75
|
+
railties (= 3.2.21)
|
|
76
|
+
railties (3.2.21)
|
|
77
|
+
actionpack (= 3.2.21)
|
|
78
|
+
activesupport (= 3.2.21)
|
|
78
79
|
rack-ssl (~> 1.3.2)
|
|
79
80
|
rake (>= 0.8.7)
|
|
80
81
|
rdoc (~> 3.4)
|
|
81
82
|
thor (>= 0.14.6, < 2.0)
|
|
82
|
-
rake (10.
|
|
83
|
+
rake (10.4.2)
|
|
83
84
|
rdoc (3.12.2)
|
|
84
85
|
json (~> 1.4)
|
|
85
|
-
rspec-core (3.
|
|
86
|
-
rspec-support (~> 3.
|
|
87
|
-
rspec-expectations (3.1
|
|
86
|
+
rspec-core (3.2.3)
|
|
87
|
+
rspec-support (~> 3.2.0)
|
|
88
|
+
rspec-expectations (3.2.1)
|
|
88
89
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
89
|
-
rspec-support (~> 3.
|
|
90
|
-
rspec-mocks (3.1
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
rspec-
|
|
98
|
-
rspec-
|
|
99
|
-
rspec-
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
rspec-support (~> 3.2.0)
|
|
91
|
+
rspec-mocks (3.2.1)
|
|
92
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
93
|
+
rspec-support (~> 3.2.0)
|
|
94
|
+
rspec-rails (3.2.1)
|
|
95
|
+
actionpack (>= 3.0, < 4.3)
|
|
96
|
+
activesupport (>= 3.0, < 4.3)
|
|
97
|
+
railties (>= 3.0, < 4.3)
|
|
98
|
+
rspec-core (~> 3.2.0)
|
|
99
|
+
rspec-expectations (~> 3.2.0)
|
|
100
|
+
rspec-mocks (~> 3.2.0)
|
|
101
|
+
rspec-support (~> 3.2.0)
|
|
102
|
+
rspec-support (3.2.2)
|
|
103
|
+
sprockets (2.2.3)
|
|
102
104
|
hike (~> 1.2)
|
|
103
105
|
multi_json (~> 1.0)
|
|
104
106
|
rack (~> 1.0)
|
|
@@ -108,7 +110,7 @@ GEM
|
|
|
108
110
|
treetop (1.4.15)
|
|
109
111
|
polyglot
|
|
110
112
|
polyglot (>= 0.3.1)
|
|
111
|
-
tzinfo (0.3.
|
|
113
|
+
tzinfo (0.3.43)
|
|
112
114
|
|
|
113
115
|
PLATFORMS
|
|
114
116
|
ruby
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
mandrill-mailer-rails (
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
5
|
mandrill-api
|
|
6
6
|
rails (> 3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
actionmailer (3.2.
|
|
12
|
-
actionpack (= 3.2.
|
|
11
|
+
actionmailer (3.2.21)
|
|
12
|
+
actionpack (= 3.2.21)
|
|
13
13
|
mail (~> 2.5.4)
|
|
14
|
-
actionpack (3.2.
|
|
15
|
-
activemodel (= 3.2.
|
|
16
|
-
activesupport (= 3.2.
|
|
14
|
+
actionpack (3.2.21)
|
|
15
|
+
activemodel (= 3.2.21)
|
|
16
|
+
activesupport (= 3.2.21)
|
|
17
17
|
builder (~> 3.0.0)
|
|
18
18
|
erubis (~> 2.7.0)
|
|
19
19
|
journey (~> 1.0.4)
|
|
@@ -21,21 +21,22 @@ GEM
|
|
|
21
21
|
rack-cache (~> 1.2)
|
|
22
22
|
rack-test (~> 0.6.1)
|
|
23
23
|
sprockets (~> 2.2.1)
|
|
24
|
-
activemodel (3.2.
|
|
25
|
-
activesupport (= 3.2.
|
|
24
|
+
activemodel (3.2.21)
|
|
25
|
+
activesupport (= 3.2.21)
|
|
26
26
|
builder (~> 3.0.0)
|
|
27
|
-
activerecord (3.2.
|
|
28
|
-
activemodel (= 3.2.
|
|
29
|
-
activesupport (= 3.2.
|
|
27
|
+
activerecord (3.2.21)
|
|
28
|
+
activemodel (= 3.2.21)
|
|
29
|
+
activesupport (= 3.2.21)
|
|
30
30
|
arel (~> 3.0.2)
|
|
31
31
|
tzinfo (~> 0.3.29)
|
|
32
|
-
activeresource (3.2.
|
|
33
|
-
activemodel (= 3.2.
|
|
34
|
-
activesupport (= 3.2.
|
|
35
|
-
activesupport (3.2.
|
|
32
|
+
activeresource (3.2.21)
|
|
33
|
+
activemodel (= 3.2.21)
|
|
34
|
+
activesupport (= 3.2.21)
|
|
35
|
+
activesupport (3.2.21)
|
|
36
36
|
i18n (~> 0.6, >= 0.6.4)
|
|
37
37
|
multi_json (~> 1.0)
|
|
38
|
-
appraisal (
|
|
38
|
+
appraisal (2.0.0)
|
|
39
|
+
activesupport (>= 3.2.21)
|
|
39
40
|
bundler
|
|
40
41
|
rake
|
|
41
42
|
thor (>= 0.14.0)
|
|
@@ -43,62 +44,63 @@ GEM
|
|
|
43
44
|
builder (3.0.4)
|
|
44
45
|
diff-lcs (1.2.5)
|
|
45
46
|
erubis (2.7.0)
|
|
46
|
-
excon (0.
|
|
47
|
+
excon (0.45.1)
|
|
47
48
|
hike (1.2.3)
|
|
48
|
-
i18n (0.
|
|
49
|
+
i18n (0.7.0)
|
|
49
50
|
journey (1.0.4)
|
|
50
|
-
json (1.8.
|
|
51
|
+
json (1.8.2)
|
|
51
52
|
mail (2.5.4)
|
|
52
53
|
mime-types (~> 1.16)
|
|
53
54
|
treetop (~> 1.4.8)
|
|
54
|
-
mandrill-api (1.0.
|
|
55
|
+
mandrill-api (1.0.53)
|
|
55
56
|
excon (>= 0.16.0, < 1.0)
|
|
56
57
|
json (>= 1.7.7, < 2.0)
|
|
57
58
|
mime-types (1.25.1)
|
|
58
|
-
multi_json (1.
|
|
59
|
+
multi_json (1.11.0)
|
|
59
60
|
polyglot (0.3.5)
|
|
60
61
|
rack (1.4.5)
|
|
61
62
|
rack-cache (1.2)
|
|
62
63
|
rack (>= 0.4)
|
|
63
64
|
rack-ssl (1.3.4)
|
|
64
65
|
rack
|
|
65
|
-
rack-test (0.6.
|
|
66
|
+
rack-test (0.6.3)
|
|
66
67
|
rack (>= 1.0)
|
|
67
|
-
rails (3.2.
|
|
68
|
-
actionmailer (= 3.2.
|
|
69
|
-
actionpack (= 3.2.
|
|
70
|
-
activerecord (= 3.2.
|
|
71
|
-
activeresource (= 3.2.
|
|
72
|
-
activesupport (= 3.2.
|
|
68
|
+
rails (3.2.21)
|
|
69
|
+
actionmailer (= 3.2.21)
|
|
70
|
+
actionpack (= 3.2.21)
|
|
71
|
+
activerecord (= 3.2.21)
|
|
72
|
+
activeresource (= 3.2.21)
|
|
73
|
+
activesupport (= 3.2.21)
|
|
73
74
|
bundler (~> 1.0)
|
|
74
|
-
railties (= 3.2.
|
|
75
|
-
railties (3.2.
|
|
76
|
-
actionpack (= 3.2.
|
|
77
|
-
activesupport (= 3.2.
|
|
75
|
+
railties (= 3.2.21)
|
|
76
|
+
railties (3.2.21)
|
|
77
|
+
actionpack (= 3.2.21)
|
|
78
|
+
activesupport (= 3.2.21)
|
|
78
79
|
rack-ssl (~> 1.3.2)
|
|
79
80
|
rake (>= 0.8.7)
|
|
80
81
|
rdoc (~> 3.4)
|
|
81
82
|
thor (>= 0.14.6, < 2.0)
|
|
82
|
-
rake (10.
|
|
83
|
+
rake (10.4.2)
|
|
83
84
|
rdoc (3.12.2)
|
|
84
85
|
json (~> 1.4)
|
|
85
|
-
rspec-core (3.
|
|
86
|
-
rspec-support (~> 3.
|
|
87
|
-
rspec-expectations (3.1
|
|
86
|
+
rspec-core (3.2.3)
|
|
87
|
+
rspec-support (~> 3.2.0)
|
|
88
|
+
rspec-expectations (3.2.1)
|
|
88
89
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
89
|
-
rspec-support (~> 3.
|
|
90
|
-
rspec-mocks (3.1
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
rspec-
|
|
98
|
-
rspec-
|
|
99
|
-
rspec-
|
|
100
|
-
|
|
101
|
-
|
|
90
|
+
rspec-support (~> 3.2.0)
|
|
91
|
+
rspec-mocks (3.2.1)
|
|
92
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
93
|
+
rspec-support (~> 3.2.0)
|
|
94
|
+
rspec-rails (3.2.1)
|
|
95
|
+
actionpack (>= 3.0, < 4.3)
|
|
96
|
+
activesupport (>= 3.0, < 4.3)
|
|
97
|
+
railties (>= 3.0, < 4.3)
|
|
98
|
+
rspec-core (~> 3.2.0)
|
|
99
|
+
rspec-expectations (~> 3.2.0)
|
|
100
|
+
rspec-mocks (~> 3.2.0)
|
|
101
|
+
rspec-support (~> 3.2.0)
|
|
102
|
+
rspec-support (3.2.2)
|
|
103
|
+
sprockets (2.2.3)
|
|
102
104
|
hike (~> 1.2)
|
|
103
105
|
multi_json (~> 1.0)
|
|
104
106
|
rack (~> 1.0)
|
|
@@ -108,7 +110,7 @@ GEM
|
|
|
108
110
|
treetop (1.4.15)
|
|
109
111
|
polyglot
|
|
110
112
|
polyglot (>= 0.3.1)
|
|
111
|
-
tzinfo (0.3.
|
|
113
|
+
tzinfo (0.3.43)
|
|
112
114
|
|
|
113
115
|
PLATFORMS
|
|
114
116
|
ruby
|
|
@@ -1,105 +1,132 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
mandrill-mailer-rails (
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
5
|
mandrill-api
|
|
6
6
|
rails (> 3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
actionmailer (4.1
|
|
12
|
-
actionpack (= 4.1
|
|
13
|
-
actionview (= 4.1
|
|
11
|
+
actionmailer (4.2.1)
|
|
12
|
+
actionpack (= 4.2.1)
|
|
13
|
+
actionview (= 4.2.1)
|
|
14
|
+
activejob (= 4.2.1)
|
|
14
15
|
mail (~> 2.5, >= 2.5.4)
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
17
|
+
actionpack (4.2.1)
|
|
18
|
+
actionview (= 4.2.1)
|
|
19
|
+
activesupport (= 4.2.1)
|
|
20
|
+
rack (~> 1.6)
|
|
19
21
|
rack-test (~> 0.6.2)
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
23
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
24
|
+
actionview (4.2.1)
|
|
25
|
+
activesupport (= 4.2.1)
|
|
22
26
|
builder (~> 3.1)
|
|
23
27
|
erubis (~> 2.7.0)
|
|
24
|
-
|
|
25
|
-
|
|
28
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
29
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
30
|
+
activejob (4.2.1)
|
|
31
|
+
activesupport (= 4.2.1)
|
|
32
|
+
globalid (>= 0.3.0)
|
|
33
|
+
activemodel (4.2.1)
|
|
34
|
+
activesupport (= 4.2.1)
|
|
26
35
|
builder (~> 3.1)
|
|
27
|
-
activerecord (4.1
|
|
28
|
-
activemodel (= 4.1
|
|
29
|
-
activesupport (= 4.1
|
|
30
|
-
arel (~>
|
|
31
|
-
activesupport (4.1
|
|
32
|
-
i18n (~> 0.
|
|
36
|
+
activerecord (4.2.1)
|
|
37
|
+
activemodel (= 4.2.1)
|
|
38
|
+
activesupport (= 4.2.1)
|
|
39
|
+
arel (~> 6.0)
|
|
40
|
+
activesupport (4.2.1)
|
|
41
|
+
i18n (~> 0.7)
|
|
33
42
|
json (~> 1.7, >= 1.7.7)
|
|
34
43
|
minitest (~> 5.1)
|
|
35
|
-
thread_safe (~> 0.
|
|
44
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
|
36
45
|
tzinfo (~> 1.1)
|
|
37
|
-
appraisal (
|
|
46
|
+
appraisal (2.0.0)
|
|
47
|
+
activesupport (>= 3.2.21)
|
|
38
48
|
bundler
|
|
39
49
|
rake
|
|
40
50
|
thor (>= 0.14.0)
|
|
41
|
-
arel (
|
|
51
|
+
arel (6.0.0)
|
|
42
52
|
builder (3.2.2)
|
|
43
53
|
diff-lcs (1.2.5)
|
|
44
54
|
erubis (2.7.0)
|
|
45
|
-
excon (0.
|
|
55
|
+
excon (0.45.1)
|
|
56
|
+
globalid (0.3.5)
|
|
57
|
+
activesupport (>= 4.1.0)
|
|
46
58
|
hike (1.2.3)
|
|
47
|
-
i18n (0.
|
|
48
|
-
json (1.8.
|
|
49
|
-
|
|
59
|
+
i18n (0.7.0)
|
|
60
|
+
json (1.8.2)
|
|
61
|
+
loofah (2.0.1)
|
|
62
|
+
nokogiri (>= 1.5.9)
|
|
63
|
+
mail (2.6.3)
|
|
50
64
|
mime-types (>= 1.16, < 3)
|
|
51
|
-
mandrill-api (1.0.
|
|
65
|
+
mandrill-api (1.0.53)
|
|
52
66
|
excon (>= 0.16.0, < 1.0)
|
|
53
67
|
json (>= 1.7.7, < 2.0)
|
|
54
|
-
mime-types (2.4.
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
68
|
+
mime-types (2.4.3)
|
|
69
|
+
mini_portile (0.6.2)
|
|
70
|
+
minitest (5.5.1)
|
|
71
|
+
multi_json (1.11.0)
|
|
72
|
+
nokogiri (1.6.6.2)
|
|
73
|
+
mini_portile (~> 0.6.0)
|
|
74
|
+
rack (1.6.0)
|
|
75
|
+
rack-test (0.6.3)
|
|
59
76
|
rack (>= 1.0)
|
|
60
|
-
rails (4.1
|
|
61
|
-
actionmailer (= 4.1
|
|
62
|
-
actionpack (= 4.1
|
|
63
|
-
actionview (= 4.1
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
77
|
+
rails (4.2.1)
|
|
78
|
+
actionmailer (= 4.2.1)
|
|
79
|
+
actionpack (= 4.2.1)
|
|
80
|
+
actionview (= 4.2.1)
|
|
81
|
+
activejob (= 4.2.1)
|
|
82
|
+
activemodel (= 4.2.1)
|
|
83
|
+
activerecord (= 4.2.1)
|
|
84
|
+
activesupport (= 4.2.1)
|
|
67
85
|
bundler (>= 1.3.0, < 2.0)
|
|
68
|
-
railties (= 4.1
|
|
69
|
-
sprockets-rails
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
86
|
+
railties (= 4.2.1)
|
|
87
|
+
sprockets-rails
|
|
88
|
+
rails-deprecated_sanitizer (1.0.3)
|
|
89
|
+
activesupport (>= 4.2.0.alpha)
|
|
90
|
+
rails-dom-testing (1.0.6)
|
|
91
|
+
activesupport (>= 4.2.0.beta, < 5.0)
|
|
92
|
+
nokogiri (~> 1.6.0)
|
|
93
|
+
rails-deprecated_sanitizer (>= 1.0.1)
|
|
94
|
+
rails-html-sanitizer (1.0.2)
|
|
95
|
+
loofah (~> 2.0)
|
|
96
|
+
railties (4.2.1)
|
|
97
|
+
actionpack (= 4.2.1)
|
|
98
|
+
activesupport (= 4.2.1)
|
|
73
99
|
rake (>= 0.8.7)
|
|
74
100
|
thor (>= 0.18.1, < 2.0)
|
|
75
|
-
rake (10.
|
|
76
|
-
rspec-core (3.
|
|
77
|
-
rspec-support (~> 3.
|
|
78
|
-
rspec-expectations (3.1
|
|
101
|
+
rake (10.4.2)
|
|
102
|
+
rspec-core (3.2.3)
|
|
103
|
+
rspec-support (~> 3.2.0)
|
|
104
|
+
rspec-expectations (3.2.1)
|
|
79
105
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
80
|
-
rspec-support (~> 3.
|
|
81
|
-
rspec-mocks (3.1
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
rspec-
|
|
89
|
-
rspec-
|
|
90
|
-
rspec-
|
|
91
|
-
|
|
92
|
-
|
|
106
|
+
rspec-support (~> 3.2.0)
|
|
107
|
+
rspec-mocks (3.2.1)
|
|
108
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
109
|
+
rspec-support (~> 3.2.0)
|
|
110
|
+
rspec-rails (3.2.1)
|
|
111
|
+
actionpack (>= 3.0, < 4.3)
|
|
112
|
+
activesupport (>= 3.0, < 4.3)
|
|
113
|
+
railties (>= 3.0, < 4.3)
|
|
114
|
+
rspec-core (~> 3.2.0)
|
|
115
|
+
rspec-expectations (~> 3.2.0)
|
|
116
|
+
rspec-mocks (~> 3.2.0)
|
|
117
|
+
rspec-support (~> 3.2.0)
|
|
118
|
+
rspec-support (3.2.2)
|
|
119
|
+
sprockets (2.12.3)
|
|
93
120
|
hike (~> 1.2)
|
|
94
121
|
multi_json (~> 1.0)
|
|
95
122
|
rack (~> 1.0)
|
|
96
123
|
tilt (~> 1.1, != 1.3.0)
|
|
97
|
-
sprockets-rails (2.
|
|
124
|
+
sprockets-rails (2.2.4)
|
|
98
125
|
actionpack (>= 3.0)
|
|
99
126
|
activesupport (>= 3.0)
|
|
100
|
-
sprockets (
|
|
127
|
+
sprockets (>= 2.8, < 4.0)
|
|
101
128
|
thor (0.19.1)
|
|
102
|
-
thread_safe (0.3.
|
|
129
|
+
thread_safe (0.3.5)
|
|
103
130
|
tilt (1.4.1)
|
|
104
131
|
tzinfo (1.2.2)
|
|
105
132
|
thread_safe (~> 0.1)
|
|
@@ -1,105 +1,132 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
mandrill-mailer-rails (
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
5
|
mandrill-api
|
|
6
6
|
rails (> 3.0)
|
|
7
7
|
|
|
8
8
|
GEM
|
|
9
9
|
remote: https://rubygems.org/
|
|
10
10
|
specs:
|
|
11
|
-
actionmailer (4.1
|
|
12
|
-
actionpack (= 4.1
|
|
13
|
-
actionview (= 4.1
|
|
11
|
+
actionmailer (4.2.1)
|
|
12
|
+
actionpack (= 4.2.1)
|
|
13
|
+
actionview (= 4.2.1)
|
|
14
|
+
activejob (= 4.2.1)
|
|
14
15
|
mail (~> 2.5, >= 2.5.4)
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
17
|
+
actionpack (4.2.1)
|
|
18
|
+
actionview (= 4.2.1)
|
|
19
|
+
activesupport (= 4.2.1)
|
|
20
|
+
rack (~> 1.6)
|
|
19
21
|
rack-test (~> 0.6.2)
|
|
20
|
-
|
|
21
|
-
|
|
22
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
23
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
24
|
+
actionview (4.2.1)
|
|
25
|
+
activesupport (= 4.2.1)
|
|
22
26
|
builder (~> 3.1)
|
|
23
27
|
erubis (~> 2.7.0)
|
|
24
|
-
|
|
25
|
-
|
|
28
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
29
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
30
|
+
activejob (4.2.1)
|
|
31
|
+
activesupport (= 4.2.1)
|
|
32
|
+
globalid (>= 0.3.0)
|
|
33
|
+
activemodel (4.2.1)
|
|
34
|
+
activesupport (= 4.2.1)
|
|
26
35
|
builder (~> 3.1)
|
|
27
|
-
activerecord (4.1
|
|
28
|
-
activemodel (= 4.1
|
|
29
|
-
activesupport (= 4.1
|
|
30
|
-
arel (~>
|
|
31
|
-
activesupport (4.1
|
|
32
|
-
i18n (~> 0.
|
|
36
|
+
activerecord (4.2.1)
|
|
37
|
+
activemodel (= 4.2.1)
|
|
38
|
+
activesupport (= 4.2.1)
|
|
39
|
+
arel (~> 6.0)
|
|
40
|
+
activesupport (4.2.1)
|
|
41
|
+
i18n (~> 0.7)
|
|
33
42
|
json (~> 1.7, >= 1.7.7)
|
|
34
43
|
minitest (~> 5.1)
|
|
35
|
-
thread_safe (~> 0.
|
|
44
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
|
36
45
|
tzinfo (~> 1.1)
|
|
37
|
-
appraisal (
|
|
46
|
+
appraisal (2.0.0)
|
|
47
|
+
activesupport (>= 3.2.21)
|
|
38
48
|
bundler
|
|
39
49
|
rake
|
|
40
50
|
thor (>= 0.14.0)
|
|
41
|
-
arel (
|
|
51
|
+
arel (6.0.0)
|
|
42
52
|
builder (3.2.2)
|
|
43
53
|
diff-lcs (1.2.5)
|
|
44
54
|
erubis (2.7.0)
|
|
45
|
-
excon (0.
|
|
55
|
+
excon (0.45.1)
|
|
56
|
+
globalid (0.3.5)
|
|
57
|
+
activesupport (>= 4.1.0)
|
|
46
58
|
hike (1.2.3)
|
|
47
|
-
i18n (0.
|
|
48
|
-
json (1.8.
|
|
49
|
-
|
|
59
|
+
i18n (0.7.0)
|
|
60
|
+
json (1.8.2)
|
|
61
|
+
loofah (2.0.1)
|
|
62
|
+
nokogiri (>= 1.5.9)
|
|
63
|
+
mail (2.6.3)
|
|
50
64
|
mime-types (>= 1.16, < 3)
|
|
51
|
-
mandrill-api (1.0.
|
|
65
|
+
mandrill-api (1.0.53)
|
|
52
66
|
excon (>= 0.16.0, < 1.0)
|
|
53
67
|
json (>= 1.7.7, < 2.0)
|
|
54
|
-
mime-types (2.4.
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
68
|
+
mime-types (2.4.3)
|
|
69
|
+
mini_portile (0.6.2)
|
|
70
|
+
minitest (5.5.1)
|
|
71
|
+
multi_json (1.11.0)
|
|
72
|
+
nokogiri (1.6.6.2)
|
|
73
|
+
mini_portile (~> 0.6.0)
|
|
74
|
+
rack (1.6.0)
|
|
75
|
+
rack-test (0.6.3)
|
|
59
76
|
rack (>= 1.0)
|
|
60
|
-
rails (4.1
|
|
61
|
-
actionmailer (= 4.1
|
|
62
|
-
actionpack (= 4.1
|
|
63
|
-
actionview (= 4.1
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
77
|
+
rails (4.2.1)
|
|
78
|
+
actionmailer (= 4.2.1)
|
|
79
|
+
actionpack (= 4.2.1)
|
|
80
|
+
actionview (= 4.2.1)
|
|
81
|
+
activejob (= 4.2.1)
|
|
82
|
+
activemodel (= 4.2.1)
|
|
83
|
+
activerecord (= 4.2.1)
|
|
84
|
+
activesupport (= 4.2.1)
|
|
67
85
|
bundler (>= 1.3.0, < 2.0)
|
|
68
|
-
railties (= 4.1
|
|
69
|
-
sprockets-rails
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
86
|
+
railties (= 4.2.1)
|
|
87
|
+
sprockets-rails
|
|
88
|
+
rails-deprecated_sanitizer (1.0.3)
|
|
89
|
+
activesupport (>= 4.2.0.alpha)
|
|
90
|
+
rails-dom-testing (1.0.6)
|
|
91
|
+
activesupport (>= 4.2.0.beta, < 5.0)
|
|
92
|
+
nokogiri (~> 1.6.0)
|
|
93
|
+
rails-deprecated_sanitizer (>= 1.0.1)
|
|
94
|
+
rails-html-sanitizer (1.0.2)
|
|
95
|
+
loofah (~> 2.0)
|
|
96
|
+
railties (4.2.1)
|
|
97
|
+
actionpack (= 4.2.1)
|
|
98
|
+
activesupport (= 4.2.1)
|
|
73
99
|
rake (>= 0.8.7)
|
|
74
100
|
thor (>= 0.18.1, < 2.0)
|
|
75
|
-
rake (10.
|
|
76
|
-
rspec-core (3.
|
|
77
|
-
rspec-support (~> 3.
|
|
78
|
-
rspec-expectations (3.1
|
|
101
|
+
rake (10.4.2)
|
|
102
|
+
rspec-core (3.2.3)
|
|
103
|
+
rspec-support (~> 3.2.0)
|
|
104
|
+
rspec-expectations (3.2.1)
|
|
79
105
|
diff-lcs (>= 1.2.0, < 2.0)
|
|
80
|
-
rspec-support (~> 3.
|
|
81
|
-
rspec-mocks (3.1
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
rspec-
|
|
89
|
-
rspec-
|
|
90
|
-
rspec-
|
|
91
|
-
|
|
92
|
-
|
|
106
|
+
rspec-support (~> 3.2.0)
|
|
107
|
+
rspec-mocks (3.2.1)
|
|
108
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
109
|
+
rspec-support (~> 3.2.0)
|
|
110
|
+
rspec-rails (3.2.1)
|
|
111
|
+
actionpack (>= 3.0, < 4.3)
|
|
112
|
+
activesupport (>= 3.0, < 4.3)
|
|
113
|
+
railties (>= 3.0, < 4.3)
|
|
114
|
+
rspec-core (~> 3.2.0)
|
|
115
|
+
rspec-expectations (~> 3.2.0)
|
|
116
|
+
rspec-mocks (~> 3.2.0)
|
|
117
|
+
rspec-support (~> 3.2.0)
|
|
118
|
+
rspec-support (3.2.2)
|
|
119
|
+
sprockets (2.12.3)
|
|
93
120
|
hike (~> 1.2)
|
|
94
121
|
multi_json (~> 1.0)
|
|
95
122
|
rack (~> 1.0)
|
|
96
123
|
tilt (~> 1.1, != 1.3.0)
|
|
97
|
-
sprockets-rails (2.
|
|
124
|
+
sprockets-rails (2.2.4)
|
|
98
125
|
actionpack (>= 3.0)
|
|
99
126
|
activesupport (>= 3.0)
|
|
100
|
-
sprockets (
|
|
127
|
+
sprockets (>= 2.8, < 4.0)
|
|
101
128
|
thor (0.19.1)
|
|
102
|
-
thread_safe (0.3.
|
|
129
|
+
thread_safe (0.3.5)
|
|
103
130
|
tilt (1.4.1)
|
|
104
131
|
tzinfo (1.2.2)
|
|
105
132
|
thread_safe (~> 0.1)
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
PATH
|
|
2
|
+
remote: ../
|
|
3
|
+
specs:
|
|
4
|
+
mandrill-mailer-rails (1.1.0)
|
|
5
|
+
mandrill-api
|
|
6
|
+
rails (> 3.0)
|
|
7
|
+
|
|
8
|
+
GEM
|
|
9
|
+
remote: https://rubygems.org/
|
|
10
|
+
specs:
|
|
11
|
+
actionmailer (4.2.1)
|
|
12
|
+
actionpack (= 4.2.1)
|
|
13
|
+
actionview (= 4.2.1)
|
|
14
|
+
activejob (= 4.2.1)
|
|
15
|
+
mail (~> 2.5, >= 2.5.4)
|
|
16
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
17
|
+
actionpack (4.2.1)
|
|
18
|
+
actionview (= 4.2.1)
|
|
19
|
+
activesupport (= 4.2.1)
|
|
20
|
+
rack (~> 1.6)
|
|
21
|
+
rack-test (~> 0.6.2)
|
|
22
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
23
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
24
|
+
actionview (4.2.1)
|
|
25
|
+
activesupport (= 4.2.1)
|
|
26
|
+
builder (~> 3.1)
|
|
27
|
+
erubis (~> 2.7.0)
|
|
28
|
+
rails-dom-testing (~> 1.0, >= 1.0.5)
|
|
29
|
+
rails-html-sanitizer (~> 1.0, >= 1.0.1)
|
|
30
|
+
activejob (4.2.1)
|
|
31
|
+
activesupport (= 4.2.1)
|
|
32
|
+
globalid (>= 0.3.0)
|
|
33
|
+
activemodel (4.2.1)
|
|
34
|
+
activesupport (= 4.2.1)
|
|
35
|
+
builder (~> 3.1)
|
|
36
|
+
activerecord (4.2.1)
|
|
37
|
+
activemodel (= 4.2.1)
|
|
38
|
+
activesupport (= 4.2.1)
|
|
39
|
+
arel (~> 6.0)
|
|
40
|
+
activesupport (4.2.1)
|
|
41
|
+
i18n (~> 0.7)
|
|
42
|
+
json (~> 1.7, >= 1.7.7)
|
|
43
|
+
minitest (~> 5.1)
|
|
44
|
+
thread_safe (~> 0.3, >= 0.3.4)
|
|
45
|
+
tzinfo (~> 1.1)
|
|
46
|
+
appraisal (2.0.0)
|
|
47
|
+
activesupport (>= 3.2.21)
|
|
48
|
+
bundler
|
|
49
|
+
rake
|
|
50
|
+
thor (>= 0.14.0)
|
|
51
|
+
arel (6.0.0)
|
|
52
|
+
builder (3.2.2)
|
|
53
|
+
diff-lcs (1.2.5)
|
|
54
|
+
erubis (2.7.0)
|
|
55
|
+
excon (0.45.1)
|
|
56
|
+
globalid (0.3.5)
|
|
57
|
+
activesupport (>= 4.1.0)
|
|
58
|
+
hike (1.2.3)
|
|
59
|
+
i18n (0.7.0)
|
|
60
|
+
json (1.8.2)
|
|
61
|
+
loofah (2.0.1)
|
|
62
|
+
nokogiri (>= 1.5.9)
|
|
63
|
+
mail (2.6.3)
|
|
64
|
+
mime-types (>= 1.16, < 3)
|
|
65
|
+
mandrill-api (1.0.53)
|
|
66
|
+
excon (>= 0.16.0, < 1.0)
|
|
67
|
+
json (>= 1.7.7, < 2.0)
|
|
68
|
+
mime-types (2.4.3)
|
|
69
|
+
mini_portile (0.6.2)
|
|
70
|
+
minitest (5.5.1)
|
|
71
|
+
multi_json (1.11.0)
|
|
72
|
+
nokogiri (1.6.6.2)
|
|
73
|
+
mini_portile (~> 0.6.0)
|
|
74
|
+
rack (1.6.0)
|
|
75
|
+
rack-test (0.6.3)
|
|
76
|
+
rack (>= 1.0)
|
|
77
|
+
rails (4.2.1)
|
|
78
|
+
actionmailer (= 4.2.1)
|
|
79
|
+
actionpack (= 4.2.1)
|
|
80
|
+
actionview (= 4.2.1)
|
|
81
|
+
activejob (= 4.2.1)
|
|
82
|
+
activemodel (= 4.2.1)
|
|
83
|
+
activerecord (= 4.2.1)
|
|
84
|
+
activesupport (= 4.2.1)
|
|
85
|
+
bundler (>= 1.3.0, < 2.0)
|
|
86
|
+
railties (= 4.2.1)
|
|
87
|
+
sprockets-rails
|
|
88
|
+
rails-deprecated_sanitizer (1.0.3)
|
|
89
|
+
activesupport (>= 4.2.0.alpha)
|
|
90
|
+
rails-dom-testing (1.0.6)
|
|
91
|
+
activesupport (>= 4.2.0.beta, < 5.0)
|
|
92
|
+
nokogiri (~> 1.6.0)
|
|
93
|
+
rails-deprecated_sanitizer (>= 1.0.1)
|
|
94
|
+
rails-html-sanitizer (1.0.2)
|
|
95
|
+
loofah (~> 2.0)
|
|
96
|
+
railties (4.2.1)
|
|
97
|
+
actionpack (= 4.2.1)
|
|
98
|
+
activesupport (= 4.2.1)
|
|
99
|
+
rake (>= 0.8.7)
|
|
100
|
+
thor (>= 0.18.1, < 2.0)
|
|
101
|
+
rake (10.4.2)
|
|
102
|
+
rspec-core (3.2.3)
|
|
103
|
+
rspec-support (~> 3.2.0)
|
|
104
|
+
rspec-expectations (3.2.1)
|
|
105
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
106
|
+
rspec-support (~> 3.2.0)
|
|
107
|
+
rspec-mocks (3.2.1)
|
|
108
|
+
diff-lcs (>= 1.2.0, < 2.0)
|
|
109
|
+
rspec-support (~> 3.2.0)
|
|
110
|
+
rspec-rails (3.2.1)
|
|
111
|
+
actionpack (>= 3.0, < 4.3)
|
|
112
|
+
activesupport (>= 3.0, < 4.3)
|
|
113
|
+
railties (>= 3.0, < 4.3)
|
|
114
|
+
rspec-core (~> 3.2.0)
|
|
115
|
+
rspec-expectations (~> 3.2.0)
|
|
116
|
+
rspec-mocks (~> 3.2.0)
|
|
117
|
+
rspec-support (~> 3.2.0)
|
|
118
|
+
rspec-support (3.2.2)
|
|
119
|
+
sprockets (2.12.3)
|
|
120
|
+
hike (~> 1.2)
|
|
121
|
+
multi_json (~> 1.0)
|
|
122
|
+
rack (~> 1.0)
|
|
123
|
+
tilt (~> 1.1, != 1.3.0)
|
|
124
|
+
sprockets-rails (2.2.4)
|
|
125
|
+
actionpack (>= 3.0)
|
|
126
|
+
activesupport (>= 3.0)
|
|
127
|
+
sprockets (>= 2.8, < 4.0)
|
|
128
|
+
thor (0.19.1)
|
|
129
|
+
thread_safe (0.3.5)
|
|
130
|
+
tilt (1.4.1)
|
|
131
|
+
tzinfo (1.2.2)
|
|
132
|
+
thread_safe (~> 0.1)
|
|
133
|
+
|
|
134
|
+
PLATFORMS
|
|
135
|
+
ruby
|
|
136
|
+
|
|
137
|
+
DEPENDENCIES
|
|
138
|
+
appraisal
|
|
139
|
+
mandrill-mailer-rails!
|
|
140
|
+
rails (~> 4.2)
|
|
141
|
+
rake
|
|
142
|
+
rspec-mocks
|
|
143
|
+
rspec-rails
|
|
@@ -28,9 +28,8 @@ module MandrillActionMailer
|
|
|
28
28
|
if !(message[:from_name].nil? || message[:from_name].value.blank?)
|
|
29
29
|
# If a from name is set, use it.
|
|
30
30
|
message_payload[:from_name] = message[:from_name].value
|
|
31
|
-
elsif
|
|
32
|
-
|
|
33
|
-
message_payload[:from_name] = m[1]
|
|
31
|
+
elsif (from_name = parse_from_name(message))
|
|
32
|
+
message_payload[:from_name] = from_name
|
|
34
33
|
end
|
|
35
34
|
|
|
36
35
|
if !message.reply_to.blank?
|
|
@@ -59,5 +58,15 @@ module MandrillActionMailer
|
|
|
59
58
|
content ||= message.body if message.mime_type == MIME_TYPES.fetch(format)
|
|
60
59
|
content
|
|
61
60
|
end
|
|
61
|
+
|
|
62
|
+
def parse_from_name(message)
|
|
63
|
+
[:from_email, :from].each do |header|
|
|
64
|
+
if !message[header].nil? && (m = FULL_EMAIL_REGEX.match(message[header].value))
|
|
65
|
+
return m[1]
|
|
66
|
+
end
|
|
67
|
+
end
|
|
68
|
+
|
|
69
|
+
nil
|
|
70
|
+
end
|
|
62
71
|
end
|
|
63
72
|
end
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
Gem::Specification.new do |s|
|
|
2
2
|
s.name = 'mandrill-mailer-rails'
|
|
3
|
-
s.version = '1.
|
|
3
|
+
s.version = '1.1.0'
|
|
4
4
|
s.authors = ['Tinfoil Security, Inc.']
|
|
5
5
|
s.email = ['engineers@tinfoilsecurity.com']
|
|
6
|
-
s.homepage = 'https://www.github.com/
|
|
6
|
+
s.homepage = 'https://www.github.com/tinfoil/mandrill-mailer-rails'
|
|
7
7
|
s.summary = %q{Handler for Rails to send emails through Mandrill}
|
|
8
8
|
s.description = %q{Provides an ActionMailer delivery handler sending emails through Mandrill}
|
|
9
9
|
|
|
@@ -70,7 +70,7 @@ describe 'MandrillActionMailer::DeliveryHandler' do
|
|
|
70
70
|
Notifier.test.deliver
|
|
71
71
|
end
|
|
72
72
|
|
|
73
|
-
it 'should set the
|
|
73
|
+
it 'should set the from_email field' do
|
|
74
74
|
expect(sender).to receive(:send).with(
|
|
75
75
|
hash_including(
|
|
76
76
|
:from_email => Notifier::FROM
|
|
@@ -110,6 +110,36 @@ describe 'MandrillActionMailer::DeliveryHandler' do
|
|
|
110
110
|
|
|
111
111
|
Notifier.test_from_email_with_name.deliver
|
|
112
112
|
end
|
|
113
|
+
it 'should set the from_email field' do
|
|
114
|
+
expect(sender).to receive(:send).with(
|
|
115
|
+
hash_including(
|
|
116
|
+
:from_email => Notifier::FROM
|
|
117
|
+
)
|
|
118
|
+
)
|
|
119
|
+
|
|
120
|
+
Notifier.test_from_email_with_name.deliver
|
|
121
|
+
end
|
|
122
|
+
end
|
|
123
|
+
|
|
124
|
+
context 'when the from field contains a name and email' do
|
|
125
|
+
it 'should set the from_name field' do
|
|
126
|
+
expect(sender).to receive(:send).with(
|
|
127
|
+
hash_including(
|
|
128
|
+
:from_name => Notifier::FROM_NAME
|
|
129
|
+
)
|
|
130
|
+
)
|
|
131
|
+
|
|
132
|
+
Notifier.test_from_email_in_from.deliver
|
|
133
|
+
end
|
|
134
|
+
it 'should set the from_email field' do
|
|
135
|
+
expect(sender).to receive(:send).with(
|
|
136
|
+
hash_including(
|
|
137
|
+
:from_email => Notifier::FROM
|
|
138
|
+
)
|
|
139
|
+
)
|
|
140
|
+
|
|
141
|
+
Notifier.test_from_email_in_from.deliver
|
|
142
|
+
end
|
|
113
143
|
end
|
|
114
144
|
|
|
115
145
|
it 'should set the to field' do
|
|
@@ -30,6 +30,10 @@ class Notifier < ActionMailer::Base
|
|
|
30
30
|
mail from_email: FROM_EMAIL_WITH_NAME, template_name: 'test'
|
|
31
31
|
end
|
|
32
32
|
|
|
33
|
+
def test_from_email_in_from
|
|
34
|
+
mail from: FROM_EMAIL_WITH_NAME, template_name: 'test'
|
|
35
|
+
end
|
|
36
|
+
|
|
33
37
|
def to_many
|
|
34
38
|
mail to: MANY_TO, template_name: 'test'
|
|
35
39
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mandrill-mailer-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Tinfoil Security, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-
|
|
11
|
+
date: 2015-04-11 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: mandrill-api
|
|
@@ -119,6 +119,8 @@ files:
|
|
|
119
119
|
- gemfiles/rails_40.gemfile.lock
|
|
120
120
|
- gemfiles/rails_41.gemfile
|
|
121
121
|
- gemfiles/rails_41.gemfile.lock
|
|
122
|
+
- gemfiles/rails_42.gemfile
|
|
123
|
+
- gemfiles/rails_42.gemfile.lock
|
|
122
124
|
- lib/mandrill-mailer-rails.rb
|
|
123
125
|
- lib/mandrill_action_mailer.rb
|
|
124
126
|
- lib/mandrill_action_mailer/delivery_handler.rb
|
|
@@ -147,7 +149,7 @@ files:
|
|
|
147
149
|
- spec/rails_app/config/routes.rb
|
|
148
150
|
- spec/rails_app/config/secrets.yml
|
|
149
151
|
- spec/spec_helper.rb
|
|
150
|
-
homepage: https://www.github.com/
|
|
152
|
+
homepage: https://www.github.com/tinfoil/mandrill-mailer-rails
|
|
151
153
|
licenses: []
|
|
152
154
|
metadata: {}
|
|
153
155
|
post_install_message:
|
|
@@ -166,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
166
168
|
version: '0'
|
|
167
169
|
requirements: []
|
|
168
170
|
rubyforge_project:
|
|
169
|
-
rubygems_version: 2.4.
|
|
171
|
+
rubygems_version: 2.4.6
|
|
170
172
|
signing_key:
|
|
171
173
|
specification_version: 4
|
|
172
174
|
summary: Handler for Rails to send emails through Mandrill
|