jpmobile 1.0.0.pre.3 → 1.0.0.pre.4

data/Gemfile

@@ -2,9 +2,9 @@ source 'http://rubygems.org'
 
 group :development, :test do
   gem 'jeweler'
-  gem 'rails', '>= 3.0.3'
-  gem 'rspec', '>= 2.3.0'
-  gem 'rspec-rails', '>= 2.3.0'
+  gem 'rails', '>= 3.0.7'
+  gem 'rspec', '>= 2.5.0'
+  gem 'rspec-rails', '>= 2.5.0'
   gem 'webrat'
   gem 'geokit'
   gem 'sqlite3-ruby'

data/VERSION.yml

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

data/lib/jpmobile/mobile/abstract_mobile.rb

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

data/lib/jpmobile/util.rb

@@ -339,5 +339,32 @@ module Jpmobile
     def jis?(str)
       detect_encoding(str) == JIS
     end
+
+    def fold_text(str, size = 15)
+      folded_texts = []
+
+      while texts = split_text(str, size) and texts.first.size != 0
+        folded_texts << texts.first
+        str = texts.last
+      end
+
+      folded_texts
+    end
+
+    def split_text(str, size = 15)
+      return nil if str.nil? or str == ''
+
+      if Object.const_defined?(:Encoding)
+        [str[0..(size-1)], str[size..-1]]
+      else
+        str    = str.split(//u)
+        text   = str[0..(size-1)]
+        text   = text.join if text
+        remain = str[size..-1]
+        remain = remain.join if remain
+        [text, remain]
+      end
+
+    end
   end
 end

data/spec/unit/mail_spec.rb

@@ -131,10 +131,12 @@ describe "Jpmobile::Mail" do
       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==?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
       end
     end
 
@@ -146,10 +148,12 @@ describe "Jpmobile::Mail" do
       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==?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
       end
     end
 
@@ -161,10 +165,12 @@ describe "Jpmobile::Mail" do
       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==?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?lb6O0I3Ml3CJnpXlgtaCzIKokFyNnoLdkL2CyYKg?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?guiCqoLGgqSCsoK0gqKC3IK3gsaMvoKigr2CooLG?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?grGC64K+gqqCu4Kkgs2KyJJQgsmCzZWojpaCzYle?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gs6CyIKigrGCxoLwkFOCtYLEgqiCooLEguCC54Ki?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?gr2CooLGi+qMvoLwkuaCt4LpjMyCyZW+jtCCzYjb?="))
+        @mail.to_s.should match(sjis_regexp("=?Shift_JIS?B?jp2CtYLEgqKC6YLMgsWCtw==?="))
       end
     end
 
@@ -177,10 +183,12 @@ describe "Jpmobile::Mail" do
 
       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==?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCSkA8UjpOTVExfkpnJFgkTiQqPz05fiRfQD8kSyQiGyhC?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJGokLCRIJCYkNCQ2JCQkXiQ5JEg4QCQkJD8kJCRIGyhC?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJDMkbSRAJCwkPSQmJE80SkMxJEskT0oqO3YkTzE/GyhC?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJFAkSiQkJDMkSCRyPzQkNyRGJCokJCRGJGIkaSQkGyhC?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCJD8kJCRINmw4QCRyRGgkOSRrOE4kS0pAPFIkTzBdGyhC?=")))
+          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCO30kNyRGJCQkayROJEckORsoQg==?=")))
         end
       end
     end

data/spec/unit/util_spec.rb

@@ -58,4 +58,29 @@ describe Jpmobile::Util, ".deep_apply" 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 == "しからずんばこじをえず"
   end
+
+  it "fold_textでUTF-8の日本語文字列が指定文字数で折り返された配列で返ること" do
+    fold_text('長い日本語の題名で折り返されるかようにするには事前に分割していないとダメなことがわかりましたよ', 15).should == [
+      '長い日本語の題名で折り返される',
+      'かようにするには事前に分割して',
+      'いないとダメなことがわかりまし',
+      'たよ'
+    ]
+  end
+
+  it "fold_textでUTF-8の短い文字列は折り返されないこと" do
+    fold_text('短い', 15).should == ['短い']
+  end
+
+  it "split_textでUTF-8の日本語文字列が指定文字数で2つに分割されること" do
+    split_text('長い日本語の題名で折り返されるかようにするには事前に分割していないとダメなことがわかりましたよ', 15).should == [
+      '長い日本語の題名で折り返される',
+      'かようにするには事前に分割していないとダメなことがわかりましたよ'
+    ]
+  end
+
+  it "split_textでnilかblankの場合はnilが返ること" do
+    split_text('', 15).should be_nil
+    split_text(nil, 15).should be_nil
+  end
 end

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 = '30b2e525066442670f0070c3613af392261800e535c709b47d44c9a0a01ed9105a5319f62d6707d6b0f1d6f900f15bf318f517155b3443bf3c2fb16bc025563a'
+RailsRoot::Application.config.secret_token = '6773d9dbfee1e199c5f7f1cb8c7fff442792f70e3051397a9535b04258bafb009a0a566b0fe0d10a67d64aefaf7396b675ea386893c634411df09272f1f978d4'

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

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

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

@@ -339,5 +339,32 @@ module Jpmobile
     def jis?(str)
       detect_encoding(str) == JIS
     end
+
+    def fold_text(str, size = 15)
+      folded_texts = []
+
+      while texts = split_text(str, size) and texts.first.size != 0
+        folded_texts << texts.first
+        str = texts.last
+      end
+
+      folded_texts
+    end
+
+    def split_text(str, size = 15)
+      return nil if str.nil? or str == ''
+
+      if Object.const_defined?(:Encoding)
+        [str[0..(size-1)], str[size..-1]]
+      else
+        str    = str.split(//u)
+        text   = str[0..(size-1)]
+        text   = text.join if text
+        remain = str[size..-1]
+        remain = remain.join if remain
+        [text, remain]
+      end
+
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jpmobile
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.pre.3
+  version: 1.0.0.pre.4
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +09:00
+date: 2011-04-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.0.3
+        version: 3.0.7
   type: :development
   prerelease: false
   version_requirements: *id002
@@ -43,7 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id003
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.0
+        version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: *id004