From b5ef2be021d84d8e05575d1569bacd3446d148db Mon Sep 17 00:00:00 2001 From: Herve Saint-Amand Date: Sun, 1 Jan 2017 22:11:56 +0000 Subject: [PATCH] Better loading of attached images Got rid of that big ugly base64 blob which was only a temporary crutch anyway. Added a png file instead. Use File.read rather than File.open for a 66% reduction in verbosity. --- app/assets/images/osm_logo_30.png | Bin 0 -> 2771 bytes app/models/notifier.rb | 66 +----------------- .../changeset_comment_notification.html.erb | 2 +- 3 files changed, 3 insertions(+), 65 deletions(-) create mode 100644 app/assets/images/osm_logo_30.png diff --git a/app/assets/images/osm_logo_30.png b/app/assets/images/osm_logo_30.png new file mode 100644 index 0000000000000000000000000000000000000000..c963f4f4a5bd97b3d6ceef0aa1b417926e8502c2 GIT binary patch literal 2771 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 literal 0 HcmV?d00001 diff --git a/app/models/notifier.rb b/app/models/notifier.rb index ea10eeb7b..bfcdc499e 100644 --- a/app/models/notifier.rb +++ b/app/models/notifier.rb @@ -173,15 +173,8 @@ class Notifier < ActionMailer::Base I18n.t("notifier.changeset_comment_notification.commented.subject_other", :commenter => @commenter) end - attachments.inline['osm_logo_30x30.png'] = { - mime_type: 'image/png', - encoding: 'base64', - content: @@osm_logo_png_bytes, - } - - File.open(user_avatar_file_path(comment.author), 'rb') do |file| - attachments.inline['avatar.png'] = file.read() - end + attachments.inline['logo.png'] = File.read(Rails.root.join('app', 'assets', 'images', 'osm_logo_30.png')) + attachments.inline['avatar.png'] = File.read(user_avatar_file_path(comment.author)) mail :to => recipient.email, :subject => subject end @@ -216,59 +209,4 @@ class Notifier < ActionMailer::Base end end - # FIXME - 2016-12-28 - saintamh - someone please show me a better way to - # include this blob in here. If I save it under app/assets, how do I get a - # path to it in a portable way? - @@osm_logo_png_bytes = < - <%= image_tag attachments["osm_logo_30x30.png"].url, alt: "OpenStreetMap logo", title: "OpenStreetMap", height: "30", width: "30", border: "0" %> + <%= image_tag attachments["logo.png"].url, alt: "OpenStreetMap logo", title: "OpenStreetMap", height: "30", width: "30", border: "0" %> -- 2.43.2