jreport 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ae098da68e76d1ec098964073b15d82e97d7033
-  data.tar.gz: caeeffb61ff055814868db6112c3be1dd320d70e
+  metadata.gz: db1cd2a36206b50c30fb79c039b47e816a13cc65
+  data.tar.gz: a257095bc4af0811eadf2af61a022100012cf91c
 SHA512:
-  metadata.gz: 18723152e117c79d845695f1f7fd23933a60c9dd09b51e76bfeb24e5df409da48292e82f172ea24153e79be52690982be2f02c9d9a9406bc9f5ff945752761b1
-  data.tar.gz: 4e9c00d7692fe50081915da9c005aeaf6c8a7ebb7849257bd6c1f459d801e1bca06f1fc41389c6eacdfb9b8492450a74d24c4b70c30e6025fe9970a1dce4548f
+  metadata.gz: 142474ce6e052aaeb96d77330399c23f379c0b945d7d6e0dc4e8c88a39a4e36ae1778e272ba018ee47baa55def0b8df76ff27b02732eb117544fb3fc65217d52
+  data.tar.gz: 6c75afc8ff78294a70900f7c8079d617876a1b413c27c4d34fd2271e3df94ed9ea50d2b741a5e8b0a023597f4d3c1ab42f54e6b4e73c62c4580c525021f704a9

data/README.md

@@ -65,26 +65,28 @@ Besides, if you use active-record to store the data you get, you can even return
 
 Below the controllers folder, jreport create weather_controller.rb, with the last two arguments of 'jreport generate scaffold' command, WeatherController has two methods: daily_report and weekly_report. In this method, you can filter the data as you like(with data and data= method). 
 
-But it's important to specify email configurations(from,to,subject). You can use options to cover this.
+But it's important to specify email configurations(from,to,subject). You can use the mail argument to cover this.
 
 And you can save final html string to 'save_to'.
 
 	class WeatherController
 	# The method looks like xxx_report would be used to generate report
-		def daily_report
-		# TODO: add code here
-	    self.data=self.data.first
-    	self.options['from']='from@example.com'
-    	self.options['to']='to@example.com'
-	    self.options['subject']='example daily report'
+		def daily_report(mail)
+			# TODO: add code here
+	    	self.data=self.data.first
+    		mail.from='from@example.com'
+    		mail.to='to@example.com'
+	    	mail.subject='example daily report'
+			mail.content_type="text/html;charset=UTF-8"
 		end
-		def weekly_report
-		# TODO: add code here
-	    self.options['from']='from@example.com'
-	    self.options['to']='to@example.com'
-	    self.options['subject']='example weekly report'
+		def weekly_report(mail)
+			# TODO: add code here
+	    	mail.from='from@example.com'
+	    	mail.to='to@example.com;to1@example.com'
+	    	mail.subject='example weekly report'
+			mail.content_type="text/html;charset=UTF-8"
     
-    	self.save_to='/home/jreport/example_w.html'
+    		self.save_to='/home/jreport/example_w.html'
 		end
 	end
 

data/lib/jreport/assembler.rb

@@ -23,23 +23,21 @@ module Jreport
         begin
           ctrl=ctrl_klas.new
           class << ctrl
-            attr_accessor :data,:options,:save_to
+            attr_accessor :data,:save_to
           end
-          ctrl.data,ctrl.options=fetch_data,{}
-          ctrl.send m
+          ctrl.data=fetch_data
+          # initialize a mail object
+          mail=Mail.new
+          ctrl.send m,mail
           dir="#{@root}/views/#{@_report}"
           html=render_html(dir,m.to_s,:data=>ctrl.data)
-	  if ctrl.save_to
-		File.open(ctrl.save_to,'w'){|fi| fi.write(html) }
-	  end
-          ops=ctrl.options.merge!('body'=>html,'content-type'=>"text/html;charset=UTF-8")
-          puts "Sending #{m}..."
-	  if ctrl.respond_to? :send_mail
-	    ctrl.send :send_mail,ops
-	  else
-	    puts "Send with default mail client"
-            send_mail ops
-	  end
+		      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
         rescue=>e
           puts e
           puts e.backtrace
@@ -59,27 +57,5 @@ module Jreport
       html
     end
     
-    def send_mail(options)
-      begin
-        m=Mail.new do
-          from    options['from']
-          to      options['to']
-          subject options['subject']
-          html_part do
-            body options['body']
-            content_type options['content-type']
-          end
- 	  if options['files']
-	    options.split(';').each{|f| add_file f }
-	  end	  
-        end
-        m.deliver!
-	puts 'Report sent!'
-      rescue=>e
-        puts "Send mail faild!"
-        puts e.backtrace
-      end
-    end
-    
   end
 end

data/lib/jreport/version.rb

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

data/skel/config/mail_config.rb

@@ -0,0 +1,3 @@
+Mail.defaults do
+  delivery_method :sendmail
+end

data/skel/controllers/template.eruby

@@ -2,7 +2,7 @@
 class <%= controller.split('_').map{|x| x.capitalize }.join %>Controller
 	# The method looks like xxx_report would be used to generate report
     <% methods.each do |m| %>
-	def <%=m%>_report
+	def <%=m%>_report(mail)
 		# TODO: add code here
 	end
 	<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jreport
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - qjpcpu
@@ -144,6 +144,7 @@ files:
 - skel/boot.rb
 - skel/collectors/template.eruby
 - skel/config/.gitkeep
+- skel/config/mail_config.rb
 - skel/controllers/template.eruby
 - skel/db/connection.rb
 - skel/db/database.yml