egalite 1.5.2 → 1.5.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: db514bb6d9faeb6cfabbca789a9a763836dc3632
+  data.tar.gz: 38c947f91c01a9af375e5483c82ef85692b08c13
+SHA512:
+  metadata.gz: 2f17b9cbf57d51b09832e288b388a1344cc0a51ed48fa6c614922da74142df8baf03b9dd431049553021bbb0552b8de30d8375a3143830849cdffd753cb581da
+  data.tar.gz: 8b7099b961b735179af768fe91a6612fa3fdbb0960c3638f1cdd7e19810c66373c0b2e20cdaafd6722cd52e1229a9c18f2f6950e8b7d723bbbf8d81992e040db

data/README.md

@@ -190,3 +190,9 @@ UserErrorとSystemError例外が追加されました。これによりユーザ
 ### 1.5.1
 
 Egalite::ErrorLogger.catch_exception(sendmail) {}が追加されました。これを使うと、任意のブロックで発生した例外をキャッチして、管理者へのメール送信やログの出力を行います。重要なエラーが発生する可能性がある場所への利用に適しています。
+
+## 1.5.6
+
+Sendmailに添付ファイルを送信するためのメソッド二つが追加されました。send_with_uploaded_filesとsend_multipartです。send_with_uploaded_filesは、HTMLフォームで送信されたファイルを指定するだけでそのまま送信することができます。
+
+testがRuby 2.1で動くようになり、Ruby 1.8.7では動かなくなりました。

data/lib/egalite/m17n.rb

@@ -136,9 +136,12 @@ module Egalite
         h2 = {}
         h.each { |k,v|
           h2[k] = case v
-            when String: t_string(list,v)
-            when Array: v.map { |x| t_hash(list,x) }
-            when Hash: t_hash(list, v)
+            when String
+              t_string(list,v)
+            when Array
+              v.map { |x| t_hash(list,x) }
+            when Hash
+              t_hash(list, v)
             else v
           end
         }
@@ -186,7 +189,7 @@ module Egalite
           end
         end
         string = string.dup
-        placeholders.each_with_index { |s2,i| string.gsub!(/\{#{i}\}/, s2) }
+        placeholders.split(/\n/).each_with_index { |s2,i| string.gsub!(/\{#{i}\}/, s2) }
         string
       end
     end

data/lib/egalite/sendmail.rb

@@ -27,6 +27,8 @@ require 'resolv'
 # 4. hash: { "Hoge Taro" => "hoge@example.com" }
 
 module Sendmail
+ class AttachmentsTooLarge < RuntimeError
+ end
  class QualifiedMailbox < String
  end
  @force_dkim = false
@@ -166,15 +168,20 @@ module Sendmail
     headers["MIME-Version"] = "1.0"
     date = params[:date] || Time.now
     headers["Date"] = date.is_a?(Time) ? date.rfc822 : date
-    headers["Content-Type"] = "text/plain; charset=UTF-8"
+    headers["Content-Type"] = params[:content_type]
+    headers["Content-Type"] ||= "text/plain; charset=UTF-8"
     
-    if multibyte?(body)
+    if params[:content_type] =~ /multipart/
+      body = body
+    elsif multibyte?(body)
       headers["Content-Transfer-Encoding"] = "base64"
       body = [body].pack('m')
     else
       headers["Content-Transfer-Encoding"] = "7bit"
     end
-    
+
+    params[:headers].each_pair { |k,v| headers[k] = v unless headers.key?(k)} if params.key?(:headers)
+
     text = [headers.map{|k,v| "#{k}: #{v}"}.join("\n"),body].join("\n\n")
   end
   private
@@ -224,9 +231,11 @@ module Sendmail
     if dkim
       text = Dkim.sign(text,dkim_params)
     end
+    envelope_from = _extract_addrspec(params[:envelope_from] || params[:sender] || params[:from])
+    envelope_from = envelope_from[0] if envelope_from.is_a?(Array)
     _send(
       text,
-      _extract_addrspec(params[:envelope_from] || params[:sender] || params[:from]),
+      envelope_from,
       to_addresses(params),
       host
     )
@@ -237,6 +246,23 @@ module Sendmail
   def send_with_dkim(body, params, host = 'localhost', dkim_params = {})
     send_inner_2(body, params, host, true, dkim_params)
   end
+  def send_multipart(parts, params, host = 'localhost')
+    (body, content_type) = mime_combine(parts)
+    params[:content_type] = content_type
+    send_inner_2(body, params, host, @force_dkim, {})
+  end
+  def send_with_uploaded_files(body, files, params, host = 'localhost')
+    # files should be Rack uploaded files.
+    sum_size = 0
+    parts = [mime_part(body)]
+    parts += files.map { |f|
+      binary = f[:tempfile].read
+      sum_size += binary.size
+      raise AttachmentsTooLarge if sum_size >= 25 * 1000 * 1000
+      mime_part(binary, f[:type], f[:filename])
+    }
+    send_multipart(parts, params, host)
+  end
   def send_with_template(filename, params, host = 'localhost')
     File.open("mail/"+ filename ,"r") { |f|
       text = f.read
@@ -261,5 +287,50 @@ module Sendmail
     return true if aaaa
     false
   end
+  
+  #
+  # create MIME multipart
+  #
+  
+  def mime_combine(parts, type = "mixed")
+    boundary = OpenSSL::Random.random_bytes(10).unpack('h*')[0]
+    content_type = "multipart/#{type}; boundary=\"#{boundary}\""
+    
+    body = ""
+    parts.each { |part|
+      body << "--" + boundary
+      body << "\n"
+      body << part
+    }
+    body << "--" + boundary
+    body << "--\n"
+    [body, content_type]
+  end
+  def mime_header(header,s)
+    if multibyte?(s)
+      header + '"' + multibyte_folding(header, s) + '"'
+    else
+      header + folding(header, quote_string(s))
+    end
+  end
+  def mime_part(body, content_type = nil, filename = nil)
+    content_type = "text/plain; charset=UTF-8" unless content_type
+    part = ""
+    if filename
+      part << "Content-Type: #{content_type};\n"
+      part << mime_header(" name=", filename)
+      part << "\n"
+      part << "Content-Disposition: attachment;\n"
+      part << mime_header(" filename=", filename)
+      part << "\n"
+      part << "Content-Transfer-Encoding: base64\n"
+    else
+      part << "Content-Type: #{content_type}\n"
+      part << "Content-Transfer-Encoding: base64\n"
+    end
+    part << "\n"
+    part << [body].pack('m')
+  end
+  
  end
 end

data/lib/egalite/session.rb

@@ -94,7 +94,7 @@ class SessionSequel < Session
     @loaded = true
     @cookies[@cookie_name] = cookie
     
-    @db[@table].filter(:id => sid).update(:updated_at => 'now')
+    @db[@table].filter(:id => sid).update(:updated_at => Time.now)
 
     true
   end

data/lib/egalite/template.rb

@@ -106,11 +106,13 @@ class HTMLTemplate
       (colons, noncolons) = attr_colon(attrs)
       next s if colons.empty?
       # when :hoge=$foo, expand hash parameter ['foo']
+      c2 = colons.dup
       colons.each { |k,v|
         next if v[0,1] != '$'
         val = params[v[1..-1]]
-        colons[k] = val
+        c2[k] = val
       }
+      colons = c2
       colons = StringifyHash.create(colons)
       link = @controller.url_for(colons)
       "<a href='#{link}' #{noncolons}>"
@@ -160,8 +162,11 @@ class HTMLTemplate
     if block_given?
       html.gsub!(RE_INCLUDE) {
         attrs = parse_tag_attributes($1)
-        attrs.each { |k,v| attrs[k[1..-1]] = v if k =~ /^\:/ }
-        yield(attrs)
+        new_attrs = attrs.dup
+        attrs.each { |k,v| 
+          new_attrs[k[1..-1]] = v if k =~ /^\:/
+        }
+        yield(new_attrs)
       }
       parent = nil
       md = RE_PARENT.match(html)
@@ -205,7 +210,11 @@ class HTMLTemplate
   public
   
   def escapeHTML(s)
-    s.to_s.gsub(/&/n, '&amp;').gsub(/'/n,'&#039;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+    if RUBY_VERSION < '1.9.0'
+      s.to_s.gsub(/&/n, '&amp;').gsub(/'/n,'&#039;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
+    else
+      s.to_s.gsub(/&/, '&amp;').gsub(/'/,'&#039;').gsub(/\"/, '&quot;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
+    end
   end
   
   def handleTemplate(html, orig_values, parent_params={}, &block)

data/lib/egalite/version.rb

@@ -1,3 +1,3 @@
-module Egalite
-  VERSION = "1.5.2"
-end
+module Egalite
+  VERSION = "1.5.6"
+end

data/lib/egalite.rb

@@ -223,7 +223,7 @@ class Controller
          "Last-Modified"  => File.mtime(path).rfc822,
          "Content-Type"   => content_type || MIME_TYPES[ext] || "text/plain",
          "Content-Length" => File.size(path).to_s
-       }, s]
+       }, [s]]
     else
       return [404, {"Content-Type" => "text/plain"}, ["File not found\n"]]
     end

data/run_test.rb

@@ -0,0 +1,13 @@
+base_dir = File.expand_path(File.join(File.dirname(__FILE__)))
+lib_dir  = File.join(base_dir, "lib")
+test_dir = File.join(base_dir, "test")
+
+$LOAD_PATH.unshift(lib_dir)
+
+require 'rubygems'
+require 'test/unit'
+require 'simplecov'
+
+SimpleCov.start
+
+exit Test::Unit::AutoRunner.run(true, test_dir)

data/test/test_handler.rb

@@ -47,9 +47,12 @@ end
 class BeforefilterController < TestController
   def before_filter
     case params[:test]
-      when /notfound/: notfound
-      when /delegate/: delegate(:controller => :test,:action => :test)
-      when /forbidden/: false
+      when /notfound/
+        notfound
+      when /delegate/
+        delegate(:controller => :test,:action => :test)
+      when /forbidden/
+        false
       else redirect(:action => :test)
     end
   end

data/test/test_sendmail.rb

@@ -4,8 +4,6 @@ require 'test/unit'
 require 'lib/egalite/sendmail'
 require 'dkim'
 
-$KCODE = 'utf8'
-
 class T_Sendmail < Test::Unit::TestCase
   def test_folding
     s = Sendmail.folding('To', "012345678  \n\n  "*20)
@@ -56,7 +54,7 @@ class T_Sendmail < Test::Unit::TestCase
       assert e.size < 77
       assert_match /\A\s?\=\?UTF-8\?B\?(.+?)\?\=\Z/, e
       e =~ /\=\?UTF-8\?B\?(.+?)\?\=/
-      $1.unpack('m')[0]
+      $1.unpack('m')[0].force_encoding('UTF-8')
     }.join
     assert_equal 'あいうえお'*20, s2
   end
@@ -86,7 +84,7 @@ class T_Sendmail < Test::Unit::TestCase
   def test_message_multibyte
     s = Sendmail.message('あいうえお',:from=>'hoge@example.com')
     (h,b) = parse_message(s)
-    assert_equal 'あいうえお', b.unpack('m')[0]
+    assert_equal 'あいうえお', b.unpack('m')[0].force_encoding('UTF-8')
     assert_equal '1.0', h['MIME-Version']
     assert Time.rfc822(h['Date'])
     assert_equal 'base64', h['Content-Transfer-Encoding']
@@ -94,7 +92,7 @@ class T_Sendmail < Test::Unit::TestCase
   end
   def params
     {
-      :date => Time.local(0),
+      :date => Time.at(0),
       :from => 'hoge@example.com',
       :to   => [Sendmail.address('arai@example.com','新井俊一'),
                 ['tanaka@example.com','田中太郎'],
@@ -114,15 +112,15 @@ class T_Sendmail < Test::Unit::TestCase
     assert_raise(RuntimeError) { Sendmail.message('',{:from => [1,2,3]}) }
     s = Sendmail.message('あいうえお',params)
     (h,b) = parse_message(s)
-    assert_equal 'あいうえお', b.unpack('m')[0]
+    assert_equal 'あいうえお', b.unpack('m')[0].force_encoding('UTF-8')
     assert_equal '1.0', h['MIME-Version']
-    assert_equal Time.local(0), Time.rfc822(h['Date'])
+    assert_equal Time.at(0), Time.rfc822(h['Date'])
     assert_equal 'base64', h['Content-Transfer-Encoding']
     assert_equal 'text/plain; charset=UTF-8', h['Content-Type']
     assert_equal 'hoge@example.com', h['From']
     assert_match /\A\=\?UTF-8\?B\?(.+?)\?\=\n?\Z/, h['Subject']
     h['Subject'] =~ /\A\=\?UTF-8\?B\?(.+?)\?\=/
-    assert_equal 'こんにちは', $1.unpack('m')[0]
+    assert_equal 'こんにちは', $1.unpack('m')[0].force_encoding('UTF-8')
     to = h['To']
     tos = to.split(/\s*,\s+/)
     assert_match /\A\=\?UTF-8\?B\?(.+?)\?\= <arai@example.com>\Z/, tos[0]
@@ -130,7 +128,7 @@ class T_Sendmail < Test::Unit::TestCase
     assert_match /\A\=\?UTF-8\?B\?(.+?)\?\= <takeda@example.com>\Z/, tos[2]
     assert_match /\Aueno@example.com\Z/, tos[3]
     to =~ /\A\=\?UTF-8\?B\?(.+?)\?\=.+?\=\?UTF-8\?B\?(.+?)\?\=.+?\=\?UTF-8\?B\?(.+?)\?\=/
-    (a,b,c) = [$1,$2,$3].map { |s| s.unpack('m')[0] }
+    (a,b,c) = [$1,$2,$3].map { |s| s.unpack('m')[0].force_encoding('UTF-8') }
     assert_match '新井俊一', a
     assert_match '田中太郎', b
     assert_match '武田一郎', c
@@ -183,5 +181,27 @@ EOS
     assert_equal false, Sendmail.verify_address("test@example.jp")
     assert_equal true, Sendmail.verify_address("test@example.com")
   end
+  def test_attachment
+    Sendmail.mock = true
+    Sendmail.force_dkim = false
+    tf = Tempfile.open("z")
+    tf.print "piyo"
+    tf.rewind
+    file = {
+      :filename => File.basename("test/static/test.txt"),
+      :type => "text/plain",
+      :name => "test.txt",
+      :tempfile => tf,
+      :head => "Content-Disposition: form-data; name=\"test.txt\"; filename=\"#{File.basename("test/static/test.txt")}\"\r\n" +
+               "Content-Type: text/plain\r\n" +
+               "Content-Length: 4\r\n"
+    }
+    Sendmail.send_with_uploaded_files("test",[file],:from => "arai@example.com", :to => "to@example.com")
+    Sendmail.lastmail[0] =~ /boundary="(.+?)"/
+    boundary = $1
+    assert_match "dGVzdA==", Sendmail.lastmail[0]
+    assert_match "cGl5bw==", Sendmail.lastmail[0]
+    assert_match "--#{boundary}--", Sendmail.lastmail[0]
+  end
 end
 

data/test.bat

@@ -1,2 +1,3 @@
 
-rcov -x rack test/*.rb
+ruby run_test.rb
+

metadata

@@ -1,76 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: egalite
-version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: 
-  segments: 
-  - 1
-  - 5
-  - 2
-  version: 1.5.2
+version: !ruby/object:Gem::Version
+  version: 1.5.6
 platform: ruby
-authors: 
+authors:
 - Shunichi Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2015-01-31 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-03-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Egalite - yet another web application framework. see description at https://github.com/araipiyo/egalite
-email: 
+email:
 - arai@mellowtone.co.jp
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
+files:
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,6 +101,7 @@ files:
 - lib/egalite/support.rb
 - lib/egalite/template.rb
 - lib/egalite/version.rb
+- run_test.rb
 - sendmail.md
 - test.bat
 - test/cache.html
@@ -136,7 +126,6 @@ files:
 - test/test_errortemplate.rb
 - test/test_handler.rb
 - test/test_helper.rb
-- test/test_keitai.rb
 - test/test_m17n.rb
 - test/test_route.rb
 - test/test_sendmail.rb
@@ -144,39 +133,30 @@ files:
 - test/test_stringify_hash.rb
 - test/test_template.rb
 homepage: https://github.com/araipiyo/egalite
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Egalite - yet another web application framework.
-test_files: 
+test_files:
 - test/cache.html
 - test/cache_cache.html
 - test/cache_nocache.html
@@ -199,7 +179,6 @@ test_files:
 - test/test_errortemplate.rb
 - test/test_handler.rb
 - test/test_helper.rb
-- test/test_keitai.rb
 - test/test_m17n.rb
 - test/test_route.rb
 - test/test_sendmail.rb

data/test/test_keitai.rb

@@ -1,107 +0,0 @@
-#!ruby -Ku
-
-$KCODE = 'UTF8'
-
-$LOAD_PATH << File.join(File.dirname(__FILE__))
-
-require 'rubygems'
-require 'test/unit'
-require 'egalite'
-require 'egalite/keitai/keitai'
-
-require 'rack'
-require 'rack/multipart'
-require 'rack/test'
-require 'rack/ketai'
-
-require 'kconv'
-
-require 'setup'
-
-class KeitaiController < Egalite::Keitai::Controller
-  def post(id)
-    return "false" unless params[:foo][:bar] == "あいうえお" # utf8
-    "foobar:#{params[:foo][:bar]}"
-  end
-  def login(id)
-    session.create(:user_id => id)
-    redirect_to :controller => :mobile
-  end
-end
-class MobileController < Egalite::Keitai::Controller
-  def before_filter
-    super
-
-    return redirect_to :controller => :keitai, :action => :login unless session[:user_id].to_i > 0
-    true
-  end
-  def get
-    {}
-  end
-  def get_userid
-    session[:user_id].to_s
-  end
-end
-
-class RedirectorController < Egalite::Keitai::Redirector
-end
-
-class T_Keitai < Test::Unit::TestCase
-  include Rack::Test::Methods
-  
-  def app
-    db = Sequel.sqlite
-    Egalite::SessionSequel.create_table(db)
-    db.alter_table :sessions do
-      add_column :user_id, :integer
-    end
-
-    Rack::Builder.new {
-      use Rack::Ketai
-      run Egalite::Handler.new(
-        :db => db,
-        :session_handler => Egalite::SessionSequel,
-        :template_path => File.dirname(__FILE__)
-      )
-    }
-  end
-    
-  def test_ctler_should_see_utf8_for_sjis_query_parameter
-    s = "あいうえお".tosjis
-    post("/keitai", {"foo[bar]" => s}, {'HTTP_USER_AGENT' => 'DoCoMo/2.0 P903i'})
-    assert last_response.ok?
-    assert_equal("foobar:#{s}", last_response.body)
-  end
-  def test_session
-    get("/keitai/login/1234")
-    assert last_response.redirect?
-    assert_match(%r|/mobile\?sessionid=[0-9]+_[0-9a-f]+|,last_response.location)
-    location = last_response.location
-    
-    clear_cookies
-    
-    get(location)
-    assert last_response.ok?
-    assert_match(%r|<a\s+href='mailto:arai\@example\.com'\s*>mail</a>|,last_response.body)
-    assert_match(%r|<a\s+href='tel:03-1234-5678'\s*>tel</a>|,last_response.body)
-    assert_match(%r|<a\s+href='(/mobile/get_userid\?sessionid=[0-9]+_[0-9a-f]+)'\s*>hoge</a>|,last_response.body)
-    %r|<a\s+href='(/mobile/get_userid\?sessionid=[0-9]+_[0-9a-f]+)'\s*>hoge</a>| =~ last_response.body
-    get_userid = $1
-    assert_match(%r|<a\s+href='(/redirector/[0-9a-zA-Z._-]+)'\s*>yahoo</a>|,last_response.body)
-    %r|<a\s+href='(/redirector/[0-9a-zA-Z._-]+)'\s*>yahoo</a>| =~ last_response.body
-    redirector = $1
- 	assert_match(%r|<input.+?value='[0-9]+_[0-9a-f]+'.+?>|, last_response.body)
- 	
-    clear_cookies
-    
- 	get(get_userid)
-    assert last_response.ok?
-    assert_equal("1234", last_response.body)
-
-    clear_cookies
-
-    get(redirector)
-    assert last_response.ok?
-    assert_match(%r|http://www.yahoo.com|, last_response.body)
-  end
-end