markdown_mail_sender 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e47bd09ee5de38cd21b2c79250238d6f2ad4b44
-  data.tar.gz: 7ed7221510a648c636f46271a15dbaa69f6664e6
+  metadata.gz: 8bcc21b195e0395f38e450e9d5090080259aaeef
+  data.tar.gz: 32cfeac3bd3ccd961548d683eb8fd94804f311f7
 SHA512:
-  metadata.gz: 507b9231374792f493ea0e91a43db7ae24ecb2c99f235f47093e1ddfdcc7f410dff0b887000b4a6da3f96c7e8d6935a0b84d90bad293a7b76e3a3bbf74b3c63e
-  data.tar.gz: c9443c75400f473855e466aabe2c6cd2b164f8b28988886d3e8a3607e8e4e1f7b695aa13a5b9a032a7faa4af8684544186a4fae76e0aadbeea72173b7ddced18
+  metadata.gz: fe442f4bac88abeb32a5c985953a11f979bca690db7c316386bdf3eac8dd8c45603bcab443c533307bd0608474156bced948a9043c266f7e9b363ea6a0410091
+  data.tar.gz: 99f7f05b5607aea13bc263953066cd58c6a1bac7d5ee949acc184036ebb5edba4c3e755a55b01dc14f78ee71483a585ceaaf55bbcd07ec2d3669630c1d282484

data/lib/markdown_mail_sender.rb

@@ -9,10 +9,11 @@ require 'fileutils'
 
 class MarkdownMailSender
 
-  def initialize(user, password, compose_dir: '~/email/compose',
+  def initialize(accounts={}, compose_dir: '~/email/compose',
        sent_dir: '~/email/sent', smtp_host: nil, from_domain: smtp_host)
+    
+    @accounts = accounts
 
-    @user, @password = user, password
     @smtp_host, @mail_from_domain = smtp_host, from_domain
 
     compose_dirpath = File.expand_path(compose_dir)
@@ -21,11 +22,10 @@ class MarkdownMailSender
 
     # scan the compose directory for email files to deliver
     
-    @messages = Dir.glob(File.join(compose_dirpath, '*.md')).map \
-                                                            do |msg_filepath|
-      
+    @messages = Dir.glob(File.join(compose_dirpath, '*.md')).map do |msg_filepath|
+
       s = File.read msg_filepath
-      
+
       regex = %r{
 
         (?<email>(?:.*<)?\w+(?:\.\w+)?@\S+>?){0}
@@ -40,7 +40,7 @@ class MarkdownMailSender
       }xm =~ s
 
       files = attachments.nil? ? [] : attachments.split.map(&:strip)
-      
+
       {
         filepath: msg_filepath, from: from, to: to, attachments: files,
         subject: subject, body_txt: body, 
@@ -54,8 +54,6 @@ class MarkdownMailSender
   def deliver_all()
 
     @messages.each.with_index do |x, i|
-
-      puts 'xx: ' + x.inspect
       
       raw_marker = "AUNIQUEMARKER"
       marker = "\n--#{raw_marker}"
@@ -95,8 +93,12 @@ EOF
 
       mailtext = a.join(marker + "\n") + marker + "--"
 
-      Net::SMTP.start(@smtp_host, 25, @mail_from_domain, @user, 
-                      @password, :login) do |smtp|
+      from = x[:from][/(?:.*<)?(\w+(?:\.\w+)?@\S+)>/,1]
+
+      user, password = from[/[^@]+/], @accounts[from]      
+
+      Net::SMTP.start(@smtp_host, 25, @mail_from_domain, user, 
+                      password, :login) do |smtp|
 
         smtp.send_message mailtext, from, to 
 
@@ -133,4 +135,4 @@ EOF
 
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: markdown_mail_sender
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   /lI2nqMMq5f39gxDkuM9dlpQCTSlNYaMUH/Ygfnaqi9j9ntJiW9/yjiYUGV7wzeS
   h4yZiygx7MCysQ==
   -----END CERTIFICATE-----
-date: 2016-06-23 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount