jreport 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db1cd2a36206b50c30fb79c039b47e816a13cc65
-  data.tar.gz: a257095bc4af0811eadf2af61a022100012cf91c
+  metadata.gz: 4477c77b82b085035148ada4786c0940e0f3dd57
+  data.tar.gz: 5676630c7eeb0faafd5ea398dd7b189ba3a0eafa
 SHA512:
-  metadata.gz: 142474ce6e052aaeb96d77330399c23f379c0b945d7d6e0dc4e8c88a39a4e36ae1778e272ba018ee47baa55def0b8df76ff27b02732eb117544fb3fc65217d52
-  data.tar.gz: 6c75afc8ff78294a70900f7c8079d617876a1b413c27c4d34fd2271e3df94ed9ea50d2b741a5e8b0a023597f4d3c1ab42f54e6b4e73c62c4580c525021f704a9
+  metadata.gz: 7ef6b600e35520f66781c720afe3ada873d2763eea951ecf90ff30f8514d31356e997dbd51162d55dd95d8d86f76a202191ce4810496922bf726b3e8da553869
+  data.tar.gz: 2710d3b107057a326f8265c7ca07d9011bc1e87ae7256e5eb209e8dbfe6ce9849791e3e48e90df7705f89915f99ee092fb3ffd2f7e3243281b78e76eea4b69d9

data/README.md

@@ -124,10 +124,27 @@ P.S. See all available rake command:
 
 	rake -T
 	
+### Mail configuration example(from [mail](https://github.com/mikel/mail))
+
+1. Change default delivery method
+
+	Change global delivery method it in `example/config/mail_config.rb`, or just change for this report:
+
+		mail.delivery_method :smtp,address: "localhost", port: 1025
+	
+2. Add attachment file
+
+		mail.add_file '/path/to/file'
+		# or
+		mail.add_file :filename=>'somefile.png',:content=>'/path/to/f.png'
+		
+3. Add cc
+
+		mail.cc="other@example.com"
 
 ### Others
 
-* Email detail configurations, please check [mail](https://github.com/mikel/mail).
+* More email detail configurations, please check [mail](https://github.com/mikel/mail).
 * View template details, please check [erubis](https://github.com/genki/erubis).
 
 ## Contributing

data/jreport.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency 'mail'
-  spec.add_runtime_dependency 'inline-style'
+  spec.add_runtime_dependency 'premailer'
   spec.add_runtime_dependency 'erubis'
   spec.add_runtime_dependency 'activerecord'
 end

data/lib/jreport/assembler.rb

@@ -1,6 +1,6 @@
 # -*- coding: UTF-8 -*-
 require 'erubis'
-require 'inline-style'
+require 'premailer'
 require 'mail'
 
 module Jreport
@@ -34,10 +34,7 @@ module Jreport
 		      File.open(ctrl.save_to,'w'){|fi| fi.write(html) } if ctrl.save_to
           # send out report
           mail.body=html
-          if mail.to
-            mail.deliver!
-            puts "Mail sent!"
-          end
+	  send_mail(mail)
         rescue=>e
           puts e
           puts e.backtrace
@@ -51,11 +48,19 @@ module Jreport
       html=Erubis::Eruby.new(File.read("#{base}.eruby")).result(bindings)
       if File.exist?("#{base}.css")
   		css=File.read "#{base}.css"
-  		html<<%Q{<style type="text/css" media="screen">#{css}</style>}
-  		html=InlineStyle.process(html)
+		p=Premailer.new(html,:with_html_string=>true,:css_string=>css)
+  		html=p.to_inline_css
       end
       html
     end
-    
+    def send_mail(mail)
+	lost=mail.from.nil? ? 'from' : mail.to.nil? ? 'to' : mail.subject.nil? ? 'subject' : nil
+	if  lost
+		puts "Mail '#{lost}' empty, mail wouldn't be sent!"
+		return
+	end
+	mail.deliver!
+	puts "Mail sent!"
+    end    
   end
 end

data/lib/jreport/version.rb

@@ -1,3 +1,3 @@
 module Jreport
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/skel/Gemfile

@@ -2,7 +2,8 @@ source 'https://rubygems.org'
 
 gem 'thor'
 gem 'mail'
-gem 'inline-style'
+gem 'premailer'
+gem 'hpricot'
 gem 'erubis'
 gem 'sqlite3'
 #gem 'activerecord-jdbcsqlite3-adapter'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jreport
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - qjpcpu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inline-style
+  name: premailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="