jpmobile 1.0.0.pre.2 → 1.0.0.pre.3

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 1
 :minor: 0
 :patch: 0
-:build: pre.2
+:build: pre.3

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -94,7 +94,7 @@ module Jpmobile::Mobile
 
     # メール送信用
     def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
+      [to_mail_encoding(str)].pack('m').strip.split(/\n|\r\n/).map{|subj| "=?#{mail_charset}?B?#{subj}?="}.join("\n ")
     end
     def to_mail_body(str)
       to_mail_encoding(str)

data/lib/jpmobile/mobile/au.rb

@@ -105,9 +105,6 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_mail_encoding(str)
     end

data/lib/jpmobile/mobile/docomo.rb

@@ -97,13 +97,12 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      str = to_external(str, nil, nil).first
-      "=?#{mail_charset}?B?" + [str].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_external(str, nil, nil).first
     end
+    def to_mail_encoding(str)
+      to_external(str, nil, nil).first
+    end
     def to_mail_internal(str, charset)
       if Jpmobile::Util.shift_jis?(str) or Jpmobile::Util.ascii_8bit?(str) or charset == mail_charset
         # 絵文字を数値参照に変換

data/lib/jpmobile/mobile/softbank.rb

@@ -62,9 +62,6 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_mail_encoding(str)
     end

data/lib/jpmobile/util.rb

@@ -14,6 +14,12 @@ module Jpmobile
     OVERLINE = [0x203e].pack("U")
     FULLWIDTH_MACRON = [0xffe3].pack("U")
 
+    EM_DASH = [0x2014].pack("U")
+    HORIZONTAL_BAR = [0x2015].pack("U")
+
+    MINUS_SIGN = [0x2212].pack("U")
+    FULLWIDTH_HYPHEN_MINUS = [0xFF0D].pack("U")
+
     module_function
     def deep_apply(obj, &proc)
       case obj
@@ -90,6 +96,10 @@ module Jpmobile
       utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
       # オーバーライン対策(不可逆的)
       utf8_str = overline_to_fullwidth_macron(utf8_str)
+      # ダッシュ対策（不可逆的）
+      utf8_str = emdash_to_horizontal_bar(utf8_str)
+      # マイナス対策（不可逆的）
+      utf8_str = minus_sign_to_fullwidth_pyphen_minus(utf8_str)
 
       if utf8_str.respond_to?(:encode)
         utf8_str.encode(SJIS, :crlf_newline => true)
@@ -210,6 +220,18 @@ module Jpmobile
       utf8_str.gsub(FULLWIDTH_MACRON, OVERLINE)
     end
 
+    def emdash_to_horizontal_bar(utf8_str)
+      utf8_str.gsub(EM_DASH, HORIZONTAL_BAR)
+    end
+
+    def minus_sign_to_fullwidth_pyphen_minus(utf8_str)
+      utf8_str.gsub(MINUS_SIGN, FULLWIDTH_HYPHEN_MINUS)
+    end
+
+    def fullwidth_pyphen_minus_to_minus_sign(utf8_str)
+      utf8_str.gsub(FULLWIDTH_HYPHEN_MINUS, MINUS_SIGN)
+    end
+
     def force_encode(str, from, to)
       s = str.dup
       return str if detect_encoding(str) == to

data/spec/unit/mail_spec.rb

@@ -114,4 +114,75 @@ describe "Jpmobile::Mail" do
       end
     end
   end
+
+  describe "long subject" do
+    before(:each) do
+      @mail         = Mail.new
+      @mail.subject = "弊社採用応募へのお申込み誠にありがとうございますと言いたいところだがそうは簡単には物事は運ばないことを心しておいてもらいたいと苦言を呈する故に弊社は維持しているのです"
+      @mail.body    = "株式会社・・"
+      @mail.from    = "info@jpmobile-rails.org"
+    end
+
+    describe "Docomo" do
+      before(:each) do
+        @mobile = Jpmobile::Mobile::Docomo.new(nil, nil)
+        @mail.mobile = @mobile
+        @mail.to = "info+to@jpmobile-rails.org"
+      end
+
+      it "should contain encoded subject" do
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKgguiCqoLGgqSCsoK0gqKC?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?3IK3gsaMvoKigr2CooLGgrGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Kigr2CooLGi+qMvoLwkuaC?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?t4LpjMyCyZW+jtCCzYjbjp2CtYLEgqKC6YLMgsWCtw==?="))
+      end
+    end
+
+    describe "Au" do
+      before(:each) do
+        @mobile = Jpmobile::Mobile::Au.new(nil, nil)
+        @mail.mobile = @mobile
+        @mail.to = "info+to@jpmobile-rails.org"
+      end
+
+      it "should contain encoded subject" do
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiJGokLCRIJCYkNCQ2?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?JCQkXiQ5JEg4QCQkJD8kJCRIJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3Yk?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?TzE/JFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkJD8kJCRINmw4QCRy?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?RGgkOSRrOE4kS0pAPFIkTzBdO30kNyRGJCQkayROJEckORsoQg==?=")))
+      end
+    end
+
+    describe "Softbank" do
+      before(:each) do
+        @mobile = Jpmobile::Mobile::Softbank.new(nil, nil)
+        @mail.mobile = @mobile
+        @mail.to = "info+to@jpmobile-rails.org"
+      end
+
+      it "should contain encoded subject" do
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKgguiCqoLGgqSCsoK0gqKC?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?3IK3gsaMvoKigr2CooLGgrGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Kigr2CooLGi+qMvoLwkuaC?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?t4LpjMyCyZW+jtCCzYjbjp2CtYLEgqKC6YLMgsWCtw==?="))
+      end
+    end
+
+    describe "AbstractMobile" do
+      before(:each) do
+        @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
+        @mail.mobile = @mobile
+        @mail.to = "info+to@jpmobile-rails.org"
+      end
+
+      context "to_s" do
+        it "should contain encoded subject" do
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiJGokLCRIJCYkNCQ2?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?JCQkXiQ5JEg4QCQkJD8kJCRIJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3Yk?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?TzE/JFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkJD8kJCRINmw4QCRy?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?RGgkOSRrOE4kS0pAPFIkTzBdO30kNyRGJCQkayROJEckORsoQg==?=")))
+        end
+      end
+    end
+  end
 end

data/spec/unit/util_spec.rb

@@ -46,6 +46,14 @@ describe Jpmobile::Util, ".deep_apply" do
     utf8_to_sjis([0x203e].pack("U")).should == sjis("\x81\x50")
   end
 
+  it "U+2014が0x815Cに変換されること" do
+    utf8_to_sjis([0x2014].pack("U")).should == sjis("\x81\x5C")
+  end
+
+  it "U+2212が0x817Cに変換されること" do
+    utf8_to_sjis([0x2212].pack("U")).should == sjis("\x81\x7C")
+  end
+
   it "jis_string_regexpでISO-2022-JPの文字列がマッチすること" do
     jis_string_regexp.match(ascii_8bit(utf8_to_jis("abcしからずんばこじをえずdef"))).should_not be_nil
     jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42")).should == "しからずんばこじをえず"

data/test/rails/rails_root/config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-RailsRoot::Application.config.secret_token = 'cd4376c24b0c709240272ca3e6e9da688833c2a1a7ca1228bb68f8f7767e9da43b6d309f825fa18cc80c8f0a5e6d009a5cd9d5246ba5277ca64040469a1d2e96'
+RailsRoot::Application.config.secret_token = '30b2e525066442670f0070c3613af392261800e535c709b47d44c9a0a01ed9105a5319f62d6707d6b0f1d6f900f15bf318f517155b3443bf3c2fb16bc025563a'

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb

@@ -94,7 +94,7 @@ module Jpmobile::Mobile
 
     # メール送信用
     def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
+      [to_mail_encoding(str)].pack('m').strip.split(/\n|\r\n/).map{|subj| "=?#{mail_charset}?B?#{subj}?="}.join("\n ")
     end
     def to_mail_body(str)
       to_mail_encoding(str)

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb

@@ -105,9 +105,6 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_mail_encoding(str)
     end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/docomo.rb

@@ -97,13 +97,12 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      str = to_external(str, nil, nil).first
-      "=?#{mail_charset}?B?" + [str].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_external(str, nil, nil).first
     end
+    def to_mail_encoding(str)
+      to_external(str, nil, nil).first
+    end
     def to_mail_internal(str, charset)
       if Jpmobile::Util.shift_jis?(str) or Jpmobile::Util.ascii_8bit?(str) or charset == mail_charset
         # 絵文字を数値参照に変換

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/softbank.rb

@@ -62,9 +62,6 @@ module Jpmobile::Mobile
     end
 
     # メール送信用
-    def to_mail_subject(str)
-      "=?#{mail_charset}?B?" + [to_mail_encoding(str)].pack('m').strip + "?="
-    end
     def to_mail_body(str)
       to_mail_encoding(str)
     end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb

@@ -14,6 +14,12 @@ module Jpmobile
     OVERLINE = [0x203e].pack("U")
     FULLWIDTH_MACRON = [0xffe3].pack("U")
 
+    EM_DASH = [0x2014].pack("U")
+    HORIZONTAL_BAR = [0x2015].pack("U")
+
+    MINUS_SIGN = [0x2212].pack("U")
+    FULLWIDTH_HYPHEN_MINUS = [0xFF0D].pack("U")
+
     module_function
     def deep_apply(obj, &proc)
       case obj
@@ -90,6 +96,10 @@ module Jpmobile
       utf8_str = wavedash_to_fullwidth_tilde(utf8_str)
       # オーバーライン対策(不可逆的)
       utf8_str = overline_to_fullwidth_macron(utf8_str)
+      # ダッシュ対策（不可逆的）
+      utf8_str = emdash_to_horizontal_bar(utf8_str)
+      # マイナス対策（不可逆的）
+      utf8_str = minus_sign_to_fullwidth_pyphen_minus(utf8_str)
 
       if utf8_str.respond_to?(:encode)
         utf8_str.encode(SJIS, :crlf_newline => true)
@@ -210,6 +220,18 @@ module Jpmobile
       utf8_str.gsub(FULLWIDTH_MACRON, OVERLINE)
     end
 
+    def emdash_to_horizontal_bar(utf8_str)
+      utf8_str.gsub(EM_DASH, HORIZONTAL_BAR)
+    end
+
+    def minus_sign_to_fullwidth_pyphen_minus(utf8_str)
+      utf8_str.gsub(MINUS_SIGN, FULLWIDTH_HYPHEN_MINUS)
+    end
+
+    def fullwidth_pyphen_minus_to_minus_sign(utf8_str)
+      utf8_str.gsub(FULLWIDTH_HYPHEN_MINUS, MINUS_SIGN)
+    end
+
     def force_encode(str, from, to)
       s = str.dup
       return str if detect_encoding(str) == to

metadata

@@ -2,7 +2,7 @@
 name: jpmobile
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.pre.2
+  version: 1.0.0.pre.3
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +09:00
+date: 2011-04-18 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency