log4r-mail 0.0.1 → 0.0.2

data/lib/log4r/mail_outputter.rb

@@ -4,17 +4,17 @@ require "mail"
 
 module Log4r
   class MailOutputter < Log4r::Outputter
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
     attr_accessor :host, :port, :from, :to, :subject, :body, :encoding
     def initialize(_name, hash={})
       super(_name, hash)
-      @host = hash[:host] || "localhost"
-      @port = hash[:port] || 25
-      @from = hash[:from] || ""
-      @to = hash[:to] || ""
-      @subject = hash[:subject] || ""
-      @body = hash[:body] || ""
-      @encoding = hash[:encoding] || "UTF-8"
+      @host = hash[:host] || hash["host"] || "localhost"
+      @port = hash[:port] || hash["port"] || 25
+      @from = hash[:from] || hash["from"] || ""
+      @to = hash[:to] || hash["to"] || ""
+      @subject = hash[:subject] || hash["subject"] || ""
+      @body = hash[:body] || hash["body"] || ""
+      @encoding = hash[:encoding] || hash["encoding"] || "UTF-8"
     end
     
     def write(data)
@@ -26,18 +26,18 @@ module Log4r
       add_files(mail, params)
       mail.delivery_method :smtp, {
           :enable_starttls_auto => false,
-          :address => params[:host] || @host,
-          :port => params[:port] || @port,
+          :address => params[:host] || params["host"] || @host,
+          :port => params[:port] || params["port"] || @port.to_i,
         }
       mail.deliver
     end
     
     def make_mail(params)
-      encoding = params[:encoding] || @encoding
-      from = params[:from] || @from
-      to = params[:to] || @to
-      subject = apply_encoding(encoding, params[:subject] || @subject)
-      body = apply_encoding(encoding, params[:body] || @body)
+      encoding = params[:encoding] || params["encoding"] || @encoding
+      from = params[:from] || params["from"] || @from
+      to = params[:to] || params["to"] || @to
+      subject = apply_encoding(encoding, params[:subject] || params["subject"] || @subject)
+      body = apply_encoding(encoding, params[:body] || params["body"] || @body)
       
       mail = ::Mail.new do
         from from
@@ -50,8 +50,9 @@ module Log4r
     end
     
     def add_files(mail, params)
-      return if !params[:files]
-      params[:files].each do |file|
+      files = params[:files] || params["files"]
+      return if !files
+      files.each do |file|
         mail.add_file(file)
       end
     end

data/spec/log4r-mail_spec.rb

@@ -30,6 +30,25 @@ describe Log4r::MailOutputter do
     obj.encoding.should == "ISO-2022-JP"
   end
   
+  it "initialize with hash str key" do
+    obj = Log4r::MailOutputter.new("name", {
+      "host" => "192.168.0.1",
+      "port" => 26,
+      "from" => "from@example.com",
+      "to" => "to@example.com",
+      "subject" => "hello",
+      "body" => "world",
+      "encoding" => "ISO-2022-JP",
+    })
+    obj.host.should == "192.168.0.1"
+    obj.port.should == 26
+    obj.from.should == "from@example.com"
+    obj.to.should == "to@example.com"
+    obj.subject.should == "hello"
+    obj.body.should == "world"
+    obj.encoding.should == "ISO-2022-JP"
+  end
+  
   it "write" do
     obj = Log4r::MailOutputter.new("name", {
       from: "from@example.com",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: log4r-mail
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
@@ -74,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3317884028879765247
+      hash: -3692594376885376363
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3317884028879765247
+      hash: -3692594376885376363
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24