Merge pull request rubygems#1888 from sonalkr132/email-style

Add style to confirmation email

Gemfile

@@ -27,6 +27,7 @@ gem 'rack-utf8_sanitizer'
 gem 'rbtrace', '~> 0.4.8'
 gem 'rdoc'
 gem 'rest-client', require: 'rest_client'
+gem 'roadie-rails', '~> 1.3.0'
 gem 'sass', require: false
 gem 'shoryuken', '~> 2.1.0', require: false
 gem 'statsd-instrument', '~> 2.3.0'

Gemfile.lock

@@ -99,6 +99,8 @@ GEM
     compact_index (0.11.0)
     concurrent-ruby (1.1.4)
     crass (1.0.4)
+    css_parser (1.6.0)
+      addressable
     daemons (1.2.6)
     dalli (2.7.9)
     delayed_job (4.1.5)
@@ -313,6 +315,12 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    roadie (3.4.0)
+      css_parser (~> 1.4)
+      nokogiri (~> 1.5)
+    roadie-rails (1.3.0)
+      railties (>= 3.0, < 5.3)
+      roadie (~> 3.1)
     rotp (3.3.1)
     rqrcode (0.10.1)
       chunky_png (~> 1.0)
@@ -424,6 +432,7 @@ DEPENDENCIES
   rbtrace (~> 0.4.8)
   rdoc
   rest-client
+  roadie-rails (~> 1.3.0)
   rotp
   rqrcode
   rubocop

app/mailers/mailer.rb

@@ -1,4 +1,6 @@
 class Mailer < ActionMailer::Base
+  include Roadie::Rails::Automatic
+
   default_url_options[:host] = Gemcutter::HOST
   default_url_options[:protocol] = Gemcutter::PROTOCOL
 

config/initializers/assets.rb

@@ -11,4 +11,4 @@
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+Rails.application.config.assets.precompile += %w[*.png *.jpg *.jpeg *.gif *.svg]

test/helpers/email_helpers.rb

@@ -1,8 +1,8 @@
 module EmailHelpers
   def last_email_link
     Delayed::Worker.new.work_off
-    body = ActionMailer::Base.deliveries.last.to_s
-    link = /href="([^"]*)"/.match(body)
-    link[1]
+    body = ActionMailer::Base.deliveries.last.body.decoded.to_s
+    link = %r{http://localhost/email_confirmations([^";]*)}.match(body)
+    link[0]
   end
 end

vendor/assets/stylesheets/github_buttons.css

@@ -71,7 +71,7 @@
   width: 14px;
   height: 14px;
   margin-right: 4px;
-  background-image: url('/github_icon.svg');
+  background-image: url('/images/github_icon.svg');
   background-size: 100% 100%;
   background-repeat: no-repeat;
 }