action_mailer-logged_smtp_delivery 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d781ad070664a975fffad82071e7aeedf7ed601
-  data.tar.gz: 761658d0f91601a056abe97f9a3abdddfb51e4b4
+  metadata.gz: 7651e5af7c2a110d7f7fc8994118df3a1216d7e4
+  data.tar.gz: e81810d05d35b5b9ab7f0db2ef7ce22b0ea770ad
 SHA512:
-  metadata.gz: ff13c8e7ee92190f904e893d3a10cca6605a6b9cecff368d71a016289990619b76fa5ddffa18f0909e366a710811e44ed05ff2034f5656d170870b0f82b8ba4b
-  data.tar.gz: 1c9f076ced8d21c1b81183feb3821748acedc71722f8f063631c1eab5ce0cdd13320b294357000c3c849dead56add05484d426f654e535c2f5285e11bff3bd0f
+  metadata.gz: 425765706313e3931e1c6ef65cc8865e3dec2a9fee4d08f7c8b75fd0add33052834ba1a43cbf82c3ac21a0d5f7cdd415db35ed4bb9b4b377c4e3fa0dbd7cf9b2
+  data.tar.gz: 8599fbf140a19b58decf53aaa357022fabbed53d9c6571a6d9231f958c8cc55dff59e6a7ddb0d4f31eed56791f8f99f17d7d48e761b313a1f545088c9d444bb7

data/README.md

@@ -5,7 +5,7 @@ require 'action_mailer/logged_smtp_delivery'
 config.action_mailer.logged_smtp_settings = {
   ... normal smtp settings ...,
   logger: Logger.new, # progress info
-  mail_file_logger: Logger.new # log full encoded mails for storage
+  mail_file_logger: FileLogger.new # write encoded mails for storage, must return path they were stored in
 }
 
 

data/lib/action_mailer/logged_smtp_delivery.rb

@@ -1,86 +1,54 @@
 require 'action_mailer'
-require 'net/smtp'
-
-module ActionMailer::LoggedSMTPDelivery
-  class Mailer
-    def initialize(settings)
-      @settings = settings
-    end
-
-    def deliver!(mail)
-      delivery = SMTPDelivery.new(mail, @settings, @settings.fetch(:logger))
+require 'mail/network/delivery_methods/smtp'
+
+class ActionMailer::LoggedSMTPDelivery < Mail::SMTP
+  def initialize(settings)
+    super
+    self.settings[:tls] = (settings[:tls] != false)
+    self.settings[:return_response] = true
+    self.logger = settings[:logger]
+  end
 
-      if logger = @settings[:mail_file_logger]
+  def deliver!(mail)
+    without_bcc(mail) do |mail|
+      if logger = settings[:mail_file_logger]
         path = logger.log(mail.encoded)
-        delivery.log "stored at #{path}"
+        log mail, "stored at #{path}"
       end
 
-      delivery.perform
-    end
-  end
-
-  class SMTPDelivery
-    attr_reader   :mail, :settings, :logger
+      log_headers(mail)
+      log mail, "sender: #{mail.sender}"
+      log mail, "destinations: #{mail.destinations.inspect}"
 
-    def initialize(mail, settings, logger)
-      @mail         = mail
-      @settings     = settings
-      @logger       = logger
-    end
-
-    def perform
-      log_headers
-      log "sender: #{sender}"
-      log "destinations: #{destinations.inspect}"
-
-      smtp.start(*settings.values_at(:domain, :user_name, :password, :authentication)) do |session|
-        response = session.send_message(message, sender, destinations)
-        log "done #{response.inspect}"
-      end
-    end
-
-    def destinations
-      mail.destinations
-    end
+      response = super
 
-    def message
-      original_bcc = mail.bcc
-      mail.bcc     = nil
-      mail.encoded
-    ensure
-      mail.bcc = original_bcc
+      log mail, "done #{response.inspect}"
     end
+  end
 
-    def sender
-      mail.from.first
-    end
+  private
 
-    def log_header
-      settings[:log_header]
-    end
+  attr_accessor :logger
 
-    def smtp
-      smtp_adaptor.new(settings[:address], settings[:port]).tap do |smtp|
-        smtp.enable_starttls_auto if enable_tls?
-      end
-    end
-
-    def log_headers
-      log "#{log_header}: [#{mail[log_header]}]" if log_header
-    end
+  def without_bcc(mail)
+    original_bcc = mail.bcc
+    mail.bcc     = nil
+    yield mail
+  ensure
+    mail.bcc = original_bcc
+  end
 
-    def log(message)
-      logger.info("#{mail.message_id} #{message}")
-    end
+  def log_headers(mail)
+    log mail, "#{log_header}: [#{mail[log_header]}]" if log_header
+  end
 
-    def enable_tls?
-      settings[:tls] != false
-    end
+  def log_header
+    settings[:log_header]
+  end
 
-    def smtp_adaptor
-      settings[:adaptor] || Net::SMTP
-    end
+  def log(mail, message)
+    logger.info("#{mail.message_id} #{message}")
   end
 end
 
-ActionMailer::Base.add_delivery_method :logged_smtp, ActionMailer::LoggedSMTPDelivery::Mailer
+ActionMailer::Base.add_delivery_method :logged_smtp, ActionMailer::LoggedSMTPDelivery

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: action_mailer-logged_smtp_delivery
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Eric Chapweske
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-24 00:00:00.000000000 Z
+date: 2014-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.19
-  type: :development
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.19
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest-rg
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +86,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mailcrate
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ActionMailer SMTP delivery strategy with advanced logging and Bcc support
 email: 
 executables: []
@@ -88,7 +136,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/action_mailer/logged_smtp_delivery.rb
-homepage: https://github.com/grosser/action_mailer-logged_smtp_delivery
+homepage: https://github.com/zendesk/action_mailer-logged_smtp_delivery
 licenses:
 - Apache V2
 metadata: {}