egalite 1.1.2 → 1.2.0

data/lib/egalite/helper.rb

@@ -222,15 +222,15 @@ class FormHelper
   end
   def select_by_array(name, options, opts = {})
     optionstr = options.map {|o|
-      (key,value) = if o.is_a?(Array)
+      (value,name) = if o.is_a?(Array)
         o
       else
         [o,o]
       end
-      flag = key == @data[name]
-      a = {:value => key}
+      flag = value == @data[name]
+      a = {:value => value}
       a[:selected] = 'selected' if flag
-      "#{tag_open(:option, a)}#{escape_html(value)}</option>"
+      "#{tag_open(:option, a)}#{escape_html(name)}</option>"
     }.join('')
     
     raw "<select name='#{expand_name(name)}'#{opt(opts)}>#{optionstr}</select>"

data/lib/egalite/sendmail.rb

@@ -26,13 +26,13 @@ require 'net/smtp'
 # 4. hash: { "Hoge Taro" => "hoge@example.com" }
 
 module Sendmail
-  class QualifiedMailbox < String
-  end
+ class QualifiedMailbox < String
+ end
+ @force_dkim = false
+ @mock = false
  class <<self
-  @@mock = false
-  def mock=(bool)
-    @@mock=bool
-  end
+  attr_accessor :mock, :force_dkim
+  attr_reader :lastmail
   def folding(h, s) # folding white space. see RFC5322, section 2.3.3 and 3.2.2.
     len = 78 - h.size - ": ".size
     len2nd = 78 - " ".size
@@ -207,25 +207,35 @@ module Sendmail
     addresses.flatten.compact.uniq
   end
   def _send(text, envelope_from, to, host = 'localhost')
-    if @@mock
-      @@lastmail = [text, envelope_from, to, host]
+    if @mock
+      @lastmail = [text, envelope_from, to, host]
     else
       Net::SMTP.start(host) { |smtp|
         smtp.send_message(text, envelope_from, to)
       }
     end
   end
-  def lastmail # for unit testing purpose
-    @@lastmail if @@lastmail
+  def read_private_key(pem_filename)
+    OpenSSL::PKey::RSA.new(open(pem_filename).read)
   end
-  def send(body, params, host = 'localhost')
+  def send_inner_2(body, params, host, dkim, dkim_params)
+    text = message(body, params)
+    if dkim
+      text = Dkim.sign(text,dkim_params)
+    end
     _send(
-      message(body, params),
+      text,
       _extract_addrspec(params[:envelope_from] || params[:sender] || params[:from]),
       to_addresses(params),
       host
     )
   end
+  def send(body, params, host = 'localhost')
+    send_inner_2(body, params, host, @force_dkim, {})
+  end
+  def send_with_dkim(body, params, host = 'localhost', dkim_params = {})
+    send_inner_2(body, params, host, true, dkim_params)
+  end
   def send_with_template(filename, params, host = 'localhost')
     File.open("mail/"+ filename ,"r") { |f|
       text = f.read

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
 module Egalite
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/test/test_helper.rb

@@ -237,6 +237,34 @@ class T_FormHelper < Test::Unit::TestCase
     assert_equal("fooname", i.attributes["name"])
   end
 
+  def test_select_by_array_array
+    f = FormHelper.new()
+    array = [[1,:foo],[2,:bar]]
+    d = to_doc(f.select_by_array("test", array))
+    assert_equal(1, X(d, "/select").size)
+    assert_equal(2, X(d, "/select/option").size)
+    o0 = X(d, "/select/option")[0]
+    assert_equal("foo", o0.text)
+    assert_equal("1", o0.attributes["value"])
+    o1 = X(d, "/select/option")[1]
+    assert_equal("bar", o1.text)
+    assert_equal("2", o1.attributes["value"])
+  end
+
+  def test_select_by_array_string
+    f = FormHelper.new()
+    array = [:foo,:bar]
+    d = to_doc(f.select_by_array("test", array))
+    assert_equal(1, X(d, "/select").size)
+    assert_equal(2, X(d, "/select/option").size)
+    o0 = X(d, "/select/option")[0]
+    assert_equal("foo", o0.text)
+    assert_equal("foo", o0.attributes["value"])
+    o1 = X(d, "/select/option")[1]
+    assert_equal("bar", o1.text)
+    assert_equal("bar", o1.attributes["value"])
+  end
+  
   def make_select_options
     [{:optname => "optvalue0", :id=> "id0"},
      {:optname => "optvalue1", :id=> "id1"}]

data/test/test_sendmail.rb

@@ -2,6 +2,7 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..')
 
 require 'test/unit'
 require 'lib/egalite/sendmail'
+require 'dkim'
 
 $KCODE = 'utf8'
 
@@ -144,5 +145,38 @@ class T_Sendmail < Test::Unit::TestCase
       assert a.include?(s)
     }
   end
+  def test_mock
+    Sendmail.mock = true
+    Sendmail.force_dkim = false
+    Sendmail.send("Hello",:from => "arai@example.com", :to => "to@example.com")
+    assert_match "To: to@example.com\n", Sendmail.lastmail[0]
+    assert_match "From: arai@example.com\n", Sendmail.lastmail[0]
+    assert_match "\n\nHello", Sendmail.lastmail[0]
+  end
+  def test_dkim
+    Sendmail.mock = true
+    Sendmail.force_dkim = true
+    Dkim::domain = "example.com"
+    Dkim::selector = "test"
+    Dkim::private_key = <<EOS
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQCkCI0PP7LbLEHyicGUrxGdA3ByTvdluRTEumu+AMNYIZaHL1oA
+9ShXrhRxX14f80jXSbOhzjbauuMwv0ypwuPbuxn2rDcg7qaHUu/9lzi9SJ/h5d8/
+pYyuxXcg5WRfpv1YXV7zpRzlqg4WZzMMfsxekN/Td+tw/R+SdANp0gsYFwIDAQAB
+AoGAHTgQuHimSXhWvvde7jdJMejc7N+4HfycAHccnhnQsjA5ehcrNyR0bTnrFk7g
+m1xgy0iroNT03H2R3qsU4uB+aeqVyy2v/RgsKGQla3xMcxj78aQYYlGYwIQ6GAeX
+mEgWo+9NA5A7ecYx2Kp5FzP6r2Ha9hu59ziJmMfADOt6DiECQQDV2Iadq6+HQ4c5
+hhec5fYd7ozZ87sulSFQU2ykdGmMPDq9aOu5hO7KRky7ixu0rHpKoFEnDBO8nvIh
+7JDdoIyZAkEAxF5NM3KaJQB7jaRTUoYEfiz/nCs797YGqPdm2dXH4o1GXs+Xnbj9
+SN9zyg4X4zbBe6jmpfSoltdZSOeY+eCILwJBAMWl/D3sui6eBnTvcBGvJjxiCMNF
+l8MlSQYyJR8XDZr07CG2wPDWYdKJCVDp8PCb3eftpzQc4H0ct5UNTpPZWTkCQQCu
+nkT8aP6VxNYZ4HSPv8kjApTSpMeQwXcurcHyF97FoWdgTC3A/Y2OTdZDaUDotfpc
+IpfoH6YDbMBiykAIhBfVAkEAnvNjsnUsNrH3I31/0/+00EtjVxOUM+p1zaUaxtEt
+nl+7ExHmNd0+V7EZzAePUjHWUIAOrj0p+AQQfglpCVXcvw==
+-----END RSA PRIVATE KEY-----
+EOS
+    Sendmail.send("Hello",:from => "arai@example.com", :to => "to@example.com")
+    assert_match "DKIM-Signature:", Sendmail.lastmail[0]
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: egalite
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Shunichi Arai
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-04-30 00:00:00 Z
+date: 2014-05-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler