letter_opener_web_s3 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da29ab99c2d5074b4aae47528f0945f139eb6a3e
-  data.tar.gz: 830d53bb6d680174f115ecdb753cbd818cf3c49e
+  metadata.gz: c4d2ee027cb4672c22ec4bbdc1220fa574069afe
+  data.tar.gz: 24d66eafe77e990241f6b0f5e2fdb182d1b30e4f
 SHA512:
-  metadata.gz: 36b3dc3272f2a2c5d771854c195e4a712df308b41006151989cf2b1bcd86fa65ebe155f9330feec82d744bd63b308231b8c50e4ff26f5d64874557669c576510
-  data.tar.gz: 9fe31c3cb6c741e20a249f7b9407acd6dbd81054b6887dd7ee786f59b0c1a02e8b5257baf25d616e4db31990a66f15661f02b677d300741079f8c502518f5bbf
+  metadata.gz: 1ac29c6819882269722d6ee0b178729074ca19e0ca861876e8c7ab83983aac7e52a0beed240d6c203289dd4c23c87d6a7228a0237a73d27ecb38b50324f5cc07
+  data.tar.gz: f84fe23b63bae9f96e7d8705b1129cfc9a132dad92a653d9d54775a3a1beeaea96903d032a498e422588855f20919151605100ddac56d8844393574323366aa3

data/README.md

@@ -37,10 +37,6 @@ To support application assets need configure `action_mailer.asset_host`
 
 Without configuration, gem works like `letter_opener_web` use local file storage
 
-## TODO
-
-Need check letters with attachments 
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/letter_opener_web_s3. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.

data/lib/letter_opener_web_s3/letter_extension.rb

@@ -26,7 +26,7 @@ module LetterOpenerWebS3::LetterExtension
     def attachments
       @attachments ||= LetterOpenerWebS3.bucket.objects(prefix: File.join(base_dir, 'attachments'))
                            .each_with_object({}) do |file, hash|
-        hash[File.basename(file)] = File.expand_path(file)
+        hash[File.basename(file.key)] = LetterOpenerWebS3.bucket.object(file.key).public_url
       end
     end
 

data/lib/letter_opener_web_s3/message_extension.rb

@@ -12,14 +12,13 @@ module LetterOpenerWebS3::MessageExtension
     def render
       if mail.attachments.any?
         attachments_dir = File.join(@location, 'attachments')
-        # TODO: need check render with attachment
         mail.attachments.each do |attachment|
           filename = attachment.filename.gsub(/[^\w.]/, '_')
           path = File.join(attachments_dir, filename)
 
           object(path).put(body: attachment.body.raw_source, content_length: attachment.body.raw_source.size)
 
-          @attachments << [attachment.filename, "attachments/#{URI.escape(filename)}"]
+          @attachments << [attachment.filename, URI.escape(object(path).public_url)]
         end
       end
 
@@ -32,6 +31,19 @@ module LetterOpenerWebS3::MessageExtension
       File.read(File.join(letter_opener_path.gsub('message.rb', ''), 'message.html.erb'))
     end
 
+    def body
+      @body ||= begin
+        body = (@part || @mail).decoded
+
+        mail.attachments.each do |attachment|
+          item = @attachments.select{|filename, _| filename == attachment.filename}.first
+          body.gsub!(attachment.url, item.last)
+        end
+
+        body
+      end
+    end
+
     private
 
     def object(filepath)

data/lib/letter_opener_web_s3/version.rb

@@ -1,3 +1,3 @@
 module LetterOpenerWebS3
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: letter_opener_web_s3
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Vital Ryabchinskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-16 00:00:00.000000000 Z
+date: 2017-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler