maildis 0.0.1 → 0.0.2

data/README.md

@@ -4,7 +4,7 @@
 Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/jboursiquot/maildis) [![Dependency
 Status](https://gemnasium.com/jboursiquot/maildis.png)](https://gemnasium.com/jboursiquot/maildis) 
 
-Maildis is a command line bulk email dispatching tool. It supports HTML and plain text templates and CSVs for recipients and merge fields. It relies on SMTP information you provide through your own configuration file. Subject, sender, path to CSV and path to the templates are all configurable through YAML.
+Maildis is a command line bulk email dispatching tool. It supports HTML and plain text templates with merge tags and CSVs for specifying recipients. It relies on SMTP information you provide through your own configuration file. Subject, sender, path to CSV and path to the templates are all configurable through YAML.
 
 ## Installation
 

data/lib/maildis.rb

@@ -46,17 +46,13 @@ module Maildis
       init_logger options[:verbose]
       begin
         config = load_config mailer_path
-        subject = config['mailer']['subject']
         recipients = load_recipients config['mailer']['recipients']
-        sender = load_sender config['mailer']['sender']
-        templates = load_templates config['mailer']['templates']
-        server = load_server config['smtp']
         info "Dispatching to #{recipients.size} recipients"
-        result = Dispatcher.dispatch({subject: subject,
+        result = Dispatcher.dispatch({subject: config['mailer']['subject'],
                                       recipients: recipients,
-                                      sender: sender,
-                                      templates: templates,
-                                      server: server,
+                                      sender: load_sender(config['mailer']['sender']),
+                                      templates: load_templates(config['mailer']['templates']),
+                                      server: load_server(config['smtp']),
                                       logger: @@logger})
         info "Dispatch complete with errors" if result[:not_sent].size > 0
         info "Dispatch complete without errors" if result[:not_sent].size == 0

data/lib/maildis/dispatcher.rb

@@ -9,32 +9,36 @@ module Maildis
 
       def dispatch(options = {})
         result = {sent: [], not_sent: []}
+        init_logger options[:logger]
+
         options[:recipients].each do |recipient|
           begin
-            html_body = TemplateRenderer.render(options[:templates][:html], recipient.merge_fields)
-            plain_body = TemplateRenderer.render(options[:templates][:plain], recipient.merge_fields)
             Pony.mail({
               to: recipient.to_email,
               from: options[:sender].to_email,
               subject: options[:subject],
-              html_body: html_body,
-              body: plain_body,
+              html_body: TemplateRenderer.render(options[:templates][:html], recipient.merge_fields),
+              body: TemplateRenderer.render(options[:templates][:plain], recipient.merge_fields),
               via: :smtp,
               via_options: {address: options[:server].host,
                             port: options[:server].port,
                             user_name: options[:server].username,
                             password: options[:server].password}
             })
-            options[:logger].info "Sent: #{recipient.to_email}" if options[:logger]
+            info "Sent: #{recipient.to_email}"
             result[:sent] << recipient
           rescue => e
-            options[:logger].error "Error: #{recipient.to_email} | #{e.message}" if options[:logger]
+            error "Error: #{recipient.to_email} | #{e.message}"
             result[:not_sent] << {recipient: recipient, reason: e.message}
           end
         end
         result
       end
 
+      def init_logger(logger = nil); @@logger ||= logger; end
+      def info(msg); @@logger.info msg if @@logger; end
+      def error(msg); @@logger.error msg if @@logger; end
+
     end
 
   end

data/lib/maildis/validation_utils.rb

@@ -3,9 +3,12 @@ class ValidationUtils
   class << self
 
     def valid_hostname?(hostname)
-      return false unless hostname
-      return false if hostname.length > 255 || hostname.scan('..').any?
+      if !hostname || hostname.length > 255 || hostname.scan('..').any?
+        return false
+      end
+
       return true if hostname == 'localhost'
+
       hostname = hostname[0 ... -1] if hostname.index('.', -1)
       return hostname.split('.').collect { |i| i.size <= 63 && !(i.rindex('-', 0) || i.index('-', -1) || i.scan(/[^a-z\d-]/i).any?)}.all?
     end

data/lib/maildis/version.rb

@@ -1,3 +1,3 @@
 module Maildis
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maildis
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -253,12 +253,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1586982649754055890
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1586982649754055890
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24