egalite 0.0.6 → 0.0.7

data/lib/egalite/sendmail.rb

@@ -5,10 +5,10 @@ require 'time'
 # mailheaders
 # {
 #   :date => Time.new,
-#   :from => 'ARAI Shunichi <arai@example.com>', # encoded by Sendmail.address
+#   :from => {'ARAI Shunichi' => 'arai@example.com'},
 #   :reply_to => ,
-#   :to => 'tanaka@example.com', # encoded by Sendmail.address
-#   :cc => '', # encoded by Sendmail.address
+#   :to => 'tanaka@example.com',
+#   :cc => '',
 #   :bcc => '',
 #   :message_id => '',
 #   :in_reply_to => '',
@@ -16,6 +16,14 @@ require 'time'
 #   :subject => '',
 # }
 
+# many ways to designate mail addresses.
+# 1. array: you can put multiple addresses (string) into array.
+# 1b array of array: 
+#  [["hoge@example.com","Hoge Taro"]]
+# 2. simple string: "mailaddress@example.com" works just fine.
+# 3. encoded string: Sendmail.address("hoge@example.com", "Hoge Taro")
+# 4. hash: { "Hoge Taro" => "hoge@example.com" }
+
 module Sendmail
   class QualifiedMailbox < String
   end
@@ -124,9 +132,14 @@ module Sendmail
   end
   def mailboxlist(value, header = 'Reply-to')
     case value
-      when QualifiedMailbox: value
-      when String: parse_addrspec(value) ? value : nil
-      when Hash: address(value[:address],value[:name],header)
+      when QualifiedMailbox
+        value
+      when String
+        parse_addrspec(value) ? value : nil
+      when Hash
+        folding(header, value.map { |name, address|
+          address(address,name)
+        }.join(', '))
       when Array
         folding(header, value.map { |v|
           v.is_a?(Array) ? address(v[0],v[1]) : mailboxlist(v,header)
@@ -168,8 +181,12 @@ module Sendmail
       when QualifiedMailbox
         value =~ /<(#{atext_loose}+?@#{atext_loose}+?)>\Z/
         $1
-      when String: parse_addrspec(value) ? value : nil
-      when Hash: parse_addrspec(value[:address]) ? value[:address] : nil
+      when String
+        parse_addrspec(value) ? value : nil
+      when Hash
+        value.values.map { |s|
+          parse_addrspec(s) ? s : nil
+        }
       when Array
         value.map { |v|
           if v.is_a?(Array)
@@ -197,7 +214,7 @@ module Sendmail
       }
     end
   end
-  def lastmail
+  def lastmail # for unit testing purpose
     @@lastmail if @@lastmail
   end
   def send(body, params, host = 'localhost')

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/egalite.rb

@@ -1,6 +1,6 @@
 $LOAD_PATH << File.dirname(__FILE__)
 
-require "egalite/version"
+require "egalite/version"
 
 require 'rack'
 require 'egalite/blank'
@@ -117,7 +117,7 @@ module Egalite
 
 class Controller
   attr_accessor :env, :req, :params, :template_file, :log_values
-  undef id
+  undef id if defined? id
 
   # filters
   def before_filter

data/test/test_sendmail.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'test/unit'
-require 'sendmail'
+require 'lib/egalite/sendmail'
 
 $KCODE = 'utf8'
 
@@ -97,10 +97,11 @@ class T_Sendmail < Test::Unit::TestCase
       :from => 'hoge@example.com',
       :to   => [Sendmail.address('arai@example.com','新井俊一'),
                 ['tanaka@example.com','田中太郎'],
-                {:address => 'takeda@example.com', :name => '武田一郎'},
+                ['takeda@example.com','武田一郎'],
                 'ueno@example.com'
                ],
-      :cc   => Sendmail.address('foo@example.com', 'Foo Bar'),
+      :cc   => {'Foo Bar' => 'foo@example.com',
+                'Foo Who' => 'who@example.com'},
       :bcc  => Sendmail.address('zzz@example.com', 'zzz'),
       :reply_to=> Sendmail.address('baz@example.com', 'Baz Bzz'),
       :subject => 'こんにちは',
@@ -133,12 +134,13 @@ class T_Sendmail < Test::Unit::TestCase
     assert_match '田中太郎', b
     assert_match '武田一郎', c
     assert_match '"Foo Bar" <foo@example.com>', h['Cc']
+    assert_match '"Foo Who" <who@example.com>', h['Cc']
     assert_match '"Baz Bzz" <baz@example.com>', h['Reply-To']
     assert_nil h['Bcc']
   end
   def test_to_addresses
     a = Sendmail.to_addresses(params)
-    %w[foo@example.com arai@example.com tanaka@example.com takeda@example.com ueno@example.com zzz@example.com].each { |s|
+    %w[foo@example.com who@example.com arai@example.com tanaka@example.com takeda@example.com ueno@example.com zzz@example.com].each { |s|
       assert a.include?(s)
     }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: egalite
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Shunichi Arai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-06-27 00:00:00 Z
+date: 2013-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler