Skip to content

Commit fa046f7

Browse files
committed
feat(mailer): new aws sdk for rails
1 parent 9612ca0 commit fa046f7

File tree

6 files changed

+17
-25
lines changed

6 files changed

+17
-25
lines changed

Gemfile

+1-2
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,7 @@ gem 'rollbar'
103103
gem 'devise'
104104

105105
# aws
106-
gem 'aws-sdk'
107-
gem 'aws-sdk-v1'
106+
gem 'aws-sdk-rails'
108107

109108
# unicorn
110109
gem 'unicorn'

Gemfile.lock

+10-13
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,14 @@ GEM
7070
ast (2.3.0)
7171
autoprefixer-rails (7.1.1)
7272
execjs
73-
aws-sdk (2.9.29)
74-
aws-sdk-resources (= 2.9.29)
75-
aws-sdk-core (2.9.29)
73+
aws-sdk-core (2.10.9)
7674
aws-sigv4 (~> 1.0)
7775
jmespath (~> 1.0)
78-
aws-sdk-resources (2.9.29)
79-
aws-sdk-core (= 2.9.29)
80-
aws-sdk-v1 (1.67.0)
81-
json (~> 1.4)
82-
nokogiri (~> 1)
76+
aws-sdk-rails (1.0.1)
77+
aws-sdk-resources (~> 2)
78+
railties (>= 3)
79+
aws-sdk-resources (2.10.9)
80+
aws-sdk-core (= 2.10.9)
8381
aws-sigv4 (1.0.0)
8482
bcrypt (3.1.11)
8583
binding_of_caller (0.7.2)
@@ -357,7 +355,7 @@ GEM
357355
method_source (0.8.2)
358356
mime-types (2.99.3)
359357
mini_magick (4.7.0)
360-
mini_portile2 (2.1.0)
358+
mini_portile2 (2.2.0)
361359
minitest (5.10.2)
362360
multi_json (1.12.1)
363361
multi_xml (0.6.0)
@@ -369,8 +367,8 @@ GEM
369367
net-ssh (4.1.0)
370368
netrc (0.11.0)
371369
nio4r (2.1.0)
372-
nokogiri (1.7.2)
373-
mini_portile2 (~> 2.1.0)
370+
nokogiri (1.8.0)
371+
mini_portile2 (~> 2.2.0)
374372
oauth2 (1.3.1)
375373
faraday (>= 0.8, < 0.12)
376374
jwt (~> 1.0)
@@ -612,8 +610,7 @@ DEPENDENCIES
612610
acts_as_list
613611
annotate
614612
asset_sync
615-
aws-sdk
616-
aws-sdk-v1
613+
aws-sdk-rails
617614
bootstrap-sass
618615
byebug
619616
capistrano-rails

app/mailers/base_notifier.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
class BaseNotifier < ApplicationMailer
22
def notify
3-
mail(to: 'test@5fpro.com', subject: format_subject('Hello!'))
3+
mail(to: 'hi@5fpro.com', subject: format_subject('Hello!'))
44
end
55

66
protected

config/application.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class Application < Rails::Application
2424
# Application configuration should go into files in config/initializers
2525
# -- all .rb files in that directory are automatically loaded.
2626

27-
config.action_mailer.delivery_method = :amazon_ses
27+
config.action_mailer.delivery_method = :aws_sdk
2828

2929
# Disable some file generators
3030
config.generators.stylesheets = false

config/deploy/production.rb

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@
55
forward_agent: true
66
}
77

8-
require 'aws-sdk-v1'
9-
require 'aws-sdk'
10-
aws_conf = YAML.load(IO.read('./config/application.yml'))['development']['aws'].symbolize_keys
11-
AWS.config(aws_conf)
12-
lb_name = 'lb.5fpro.com' # Config@initial
13-
servers = AWS::ELB.new.load_balancers[lb_name].instances.map(&:ip_address)
8+
servers = ['127.0.0.1']
149

1510
shadow_server = 'myapp.5fpro.com'
1611
role :app, servers
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# aws ses: https://github.com/aws/aws-sdk-ruby/
2-
AWS.config(Setting.aws)
1+
creds = Aws::Credentials.new(Setting.aws.access_key_id, Setting.aws.secret_access_key)
2+
Aws::Rails.add_action_mailer_delivery_method(:aws_sdk, credentials: creds, region: 'us-east-1')
3+
34
ActionMailer::Base.default_url_options = { host: Setting.host, protocol: Setting.default_protocol }
45
ActionMailer::Base.asset_host = "#{Setting.default_protocol}://#{Setting.carrierwave.host}"

0 commit comments

Comments
 (0)