html2mail 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7585a504567c1adeebae71f5a0d8570a7114c5f
-  data.tar.gz: 718d53f3c8193a8edcbca0905b3fac9b7ff356ba
+  metadata.gz: b7c04c6648b91c849bea8bda385e88a45600556c
+  data.tar.gz: b04d6c440551d39df6a1ec78369fbcad12cf4fe4
 SHA512:
-  metadata.gz: 11d956773ad118c382742516fd8210b9b80864cff7c30d9c2c632306798c0973d0b1db031751024a45c8fe69ca655b94a849085776c202255d3978a95e8a00e4
-  data.tar.gz: 6004eb20a796a3b68c3b9d429c2fcbb1c16d236e26a831e5d4baa0f5a53818330941c1f0392938ac45e46ff64d8e7d9efb032acf598789fffb9f5a8108cc3975
+  metadata.gz: d68f0e28707f0cd4278ee03bc3b2d2a94ad810104ed03f9dc6e0ae4d5d6b524def6d17c5ed062b93eff83dd7fc72bd2d6d449c49e323f814a153507ea17b3745
+  data.tar.gz: a92ee03a0a4722df6b8dfc29b09edcf20b4730b53a2202e23cefbc5ea8a96917cbde2e1b9d50a2a84478602eaaa0e2b48a89b5778588e69cc9effef472a85054

data/bin/html2mail

@@ -28,13 +28,14 @@ desc 'Sent email from html to given adress'
 arg 'files', multiple: true, desc: "HTML-files to process"
 command :send do |c|
   c.flag [:t, :to], default_value: nil
+  c.flag [:f, :from], default_value: Mailer2.smtp_settings[:user_name]
   c.flag [:s, :subj], default_value: nil
 
   c.action do |global_options, options, args|
     args.each do |f|
       STDERR.puts "Start mail processing"
 
-      m= Mailer2.mail2 f, options[:to], options[:subj], global_options[:user]
+      m= Mailer2.mail2 f, options[:to], options[:subj], options[:from] || global_options[:smtp_user_name]
       m.deliver_now
 
       STDERR.puts "Done"
@@ -51,7 +52,7 @@ command :convert do |c|
 
   c.action do |global_options, options, args|
     args.each do |f|
-      m = Mailer2.mail2 f, options[:to], options[:subj], global_options[:user]
+      m = Mailer2.mail2 f, options[:to], options[:subj], options[:from] || global_options[:smtp_user_name]
 
       html = m.to_s.html_safe
 
@@ -117,6 +118,7 @@ command :bulksend do |c|
   c.flag [:t, :timeout], default_value: 1.0, type: Float, desc: "Wait given seconds between sending mails"
   c.flag [:s, :subj], default_value: nil, desc: "Subject for mail. If blank then use <title> tag or html-file name"
   # c.flag [:p, :pretend], default_value: nil, desc: "Run but do not make any real actions"
+  c.flag [:f, :from], default_value: Mailer2.smtp_settings[:user_name]
 
   c.action do |global_options, options, args|
     file_type = File.extname(options[:list]).gsub('.', '').strip.downcase
@@ -134,7 +136,7 @@ command :bulksend do |c|
         rows.each_with_index do |row, index|
           args.each do |f|
             email = row[email_column]
-            Mailer2.mail2(f, email, options[:subj], global_options[:user]).deliver_now
+            Mailer2.mail2(f, email, options[:subj], options[:from] || global_options[:smtp_user_name]).deliver_now
             STDERR.puts "(#{index+1}/#{total_count}) Email '#{File.basename(f)}' sent to #{email}"
             sleep(options[:timeout]) if options[:timeout].present?
           end
@@ -149,7 +151,7 @@ command :bulksend do |c|
           email = line.strip
           if email.present?
             args.each do |f|
-              Mailer2.mail2(f, email, options[:subj], global_options[:user]).deliver_now
+              Mailer2.mail2(f, email, options[:subj], options[:from] || global_options[:smtp_user_name]).deliver_now
               # STDERR.print '.'
               STDERR.puts "(#{index+1}/#{total_count}) Email '#{File.basename(f)}' sent to #{email}"
 

data/lib/html2mail/mailer2.rb

@@ -3,7 +3,7 @@ require "action_mailer/base"
 require 'premailer'
 
 class Mailer2 < ActionMailer::Base
-  def mail2(html_file, email, subject, from=nil)
+  def mail2(html_file, email, subject, from)
     premailer = Premailer.new(html_file, :warn_level => Premailer::Warnings::SAFE)
     doc = Nokogiri::HTML(premailer.to_inline_css)
 
@@ -23,7 +23,7 @@ class Mailer2 < ActionMailer::Base
 
     html = doc.to_s.html_safe
 
-    from ||= email
+    # from ||= email
 
     mail from: from, to: email, subject: subject do |format|
       format.text { render plain: premailer.to_plain_text }

data/lib/html2mail/version.rb

@@ -1,3 +1,3 @@
 module Html2mail
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: html2mail
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Egor Vakhromtsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -175,3 +175,4 @@ signing_key:
 specification_version: 4
 summary: html to mail converter
 test_files: []
+has_rdoc: