Fixed messages not being saved and retrieved

letter_opener_web_s3.gemspec

@@ -27,5 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-rails", '~> 3.5'
   spec.add_development_dependency "activesupport", ">= 4.0"
   spec.add_dependency "letter_opener_web", "~> 1.3"
-  spec.add_dependency "aws-sdk", "~> 2"
+  spec.add_dependency "aws-sdk-s3", "~> 1.96.1"
 end

lib/letter_opener_web_s3.rb

@@ -1,5 +1,5 @@
 require 'active_support'
-require 'aws-sdk'
+require 'aws-sdk-s3'
 require 'letter_opener'
 require 'letter_opener_web'
 require "letter_opener_web_s3/version"

lib/letter_opener_web_s3/letter_extension.rb

@@ -1,3 +1,5 @@
+require 'net/http'
+
 module LetterOpenerWebS3::LetterExtension
   extend ActiveSupport::Concern
 
@@ -34,6 +36,10 @@ def delete
       LetterOpenerWebS3.bucket.objects(prefix: base_dir).each(&:delete)
     end
 
+    def valid?
+      exists?
+    end
+
     def exists?
       LetterOpenerWebS3.bucket.objects(prefix: base_dir).count > 0
     end
@@ -44,16 +50,16 @@ def base_dir
       "#{letters_location}#{id}"
     end
 
+    def url(style)
+      LetterOpenerWebS3.bucket.object(File.join(base_dir, "#{style}.html")).presigned_url(:get)
+    end
+
     def read_file(style)
-      Kernel.open(LetterOpenerWebS3.bucket
-                      .object(File.join(base_dir, "#{style}.html")).presigned_url(:get)).read
-    rescue
-      ''
+      Net::HTTP.get_response(URI.parse(url(style))).body
     end
 
     def style_exists?(style)
       LetterOpenerWebS3.bucket.object(File.join(base_dir, "#{style}.html")).exists?
     end
-
   end
 end

lib/letter_opener_web_s3/message_extension.rb

@@ -2,10 +2,12 @@ module LetterOpenerWebS3::MessageExtension
   extend ActiveSupport::Concern
 
   included do
-    def initialize(location, mail, part = nil)
+    def initialize(mail, options = {})
+      location = options[:location]
       @location = location.gsub("#{Rails.root.to_s}/", '')
       @mail = mail
-      @part = part
+      @part = options[:part]
+      @template = options[:message_template] || LetterOpener.configuration.message_template
       @attachments = []
     end
 
@@ -26,11 +28,6 @@ def render
       object(filepath).put(body: str, content_length: str.size)
     end
 
-    def template
-      letter_opener_path = $".select{|f| f.match(/letter_opener\/message.rb/)}.first
-      File.read(File.join(letter_opener_path.gsub('message.rb', ''), 'message.html.erb'))
-    end
-
     def body
       @body ||= begin
         body = (@part || @mail).decoded