mailgun-ruby 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7a3d2306cc5f23a9f5b198bbcef7767be64f1bc
-  data.tar.gz: aa73b428690d284c293a89e848359a9f7617476a
+  metadata.gz: 55f7b59eef02feab663dbffa1a3da56692c37737
+  data.tar.gz: 2d6ad04ff6ee6607554fcffea4453bb751a0162a
 SHA512:
-  metadata.gz: 56e7617f35b16862fee5b06a428d45925447edb12f1d721fdc87e8c382b8db140f40d1de4a5c63de59c96904e1f4322c80097aac7dc3cab838dc2d945922ab42
-  data.tar.gz: ce165c6784831eed9240ef7b51b3ba855bea5066a5b294cbf3450eef321ddc33dd3d879d477b7c23cb8f80f4ac02f9125e26e3432f2273f69ec68ab9483aa928
+  metadata.gz: 70292ac10f56e185894bf288861c861dcb16a03157bba9fe6bb4498f074ad56521fbe8ced7d2b609275742650293304fd26f3ec276fcca7f103e3e6d030c1c7c
+  data.tar.gz: 919717c8e88c1d8671be798a9ce53c4db246dd11927b74d0bb555b6bc2b34c00315c13337570197a7fdf2b84e13f9d2550013abd15e04574ec2f1e7df9f58c96

data/lib/mailgun/messages/message_builder.rb

@@ -117,7 +117,7 @@ module Mailgun
 
     # Adds a series of attachments, when called upon.
     #
-    # @param [String] attachment A file object for attaching as an attachment.
+    # @param [String|File] attachment A file object for attaching as an attachment.
     # @param [String] filename The filename you wish the attachment to be.
     # @return [void]
     def add_attachment(attachment, filename = nil)
@@ -126,7 +126,7 @@ module Mailgun
 
     # Adds an inline image to the mesage object.
     #
-    # @param [String] inline_image A file object for attaching an inline image.
+    # @param [String|File] inline_image A file object for attaching an inline image.
     # @param [String] filename The filename you wish the inline image to be.
     # @return [void]
     def add_inline_image(inline_image, filename = nil)
@@ -381,7 +381,7 @@ module Mailgun
     # Private: Adds a file to the message.
     #
     # @param [Symbol] disposition The type of file: :attachment or :inline
-    # @param [String] attachment A file object for attaching as an attachment.
+    # @param [String|File] attachment A file object for attaching as an attachment.
     # @param [String] filename The filename you wish the attachment to be.
     # @return [void]
     #

data/lib/mailgun/version.rb

@@ -1,4 +1,4 @@
 # It's the version. Yeay!
 module Mailgun
-  VERSION = '1.1.4'
+  VERSION = '1.1.5'
 end

data/lib/railgun/attachment.rb

@@ -2,20 +2,55 @@ module Railgun
 
   class Attachment < StringIO
 
-    attr_reader :source_filename, :content_type, :path
+    attr_reader :filename, :content_type, :path,
+                :original_filename, :overwritten_filename
 
     def initialize(attachment, *args)
       @path = ''
-      if args.detect { |opt| opt[:inline] }
-        basename = @source_filename = attachment.cid
+      @inline = args.detect { |opt| opt[:inline] }
+
+      if @inline
+        @filename = attachment.cid
       else
-        basename = @source_filename = attachment.filename
+        @filename = attachment.filename
       end
 
+      @original_filename = @filename
+
+      if args.detect { |opt| opt[:filename] }
+        @filename = opt[:filename]
+      end
+
+      @overwritten_filename = @filename
+
       @content_type = attachment.content_type.split(';')[0]
 
       super attachment.body.decoded
     end
 
+    def inline?
+      @inline
+    end
+
+    def is_original_filename
+      @original_filename == @overwritten_filename
+    end
+
+    def source_filename
+      @filename
+    end
+
+    def attach_to_message!(mb)
+      if mb.nil?
+        nil
+      end
+
+      if inline?
+        mb.add_inline_image self, @filename
+      else
+        mb.add_attachment self, @filename
+      end
+    end
+
   end
 end

data/lib/railgun/mailer.rb

@@ -119,11 +119,8 @@ module Railgun
     return mb.message if mail.attachments.empty?
 
     mail.attachments.each do |attach|
-      if attach.inline?
-        mb.add_inline_image Attachment.new(attach, encoding: 'ascii-8bit', inline: true)
-      else
-        mb.add_attachment Attachment.new(attach, encoding: 'ascii-8bit')
-      end
+      attach = Attachment.new(attach, encoding: 'ascii-8bit', inline: attach.inline?)
+      attach.attach_to_message! mb
     end
 
     return mb.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailgun-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - Mailgun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-18 00:00:00.000000000 Z
+date: 2017-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler