jpmobile 1.0.12 → 2.0.0.pre.1

data/spec/unit/encoding_spec.rb

@@ -59,7 +59,7 @@ describe "Jpmobile::Mobile" do
       end
 
       it "should convert emoticon  to \x75\x41 in B-Encoding" do
-        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMnVBGyhC?="
+        @mobile.to_mail_subject("ほげ").should == "=?ISO-2022-JP?B?GyRCJFskMhsoQhskQnVBGyhC?="
       end
     end
 
@@ -69,7 +69,7 @@ describe "Jpmobile::Mobile" do
       end
 
       it "should convert emoticon  to \x75\x41" do
-        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(jis("\e\x24\x42\x24\x5B\x24\x32\x75\x41\x1b\x28\x42"))
+        ascii_8bit(@mobile.to_mail_body("ほげ")).should == ascii_8bit(utf8_to_jis("ほげ") + jis("\x1b\x24\x42\x75\x41\x1b\x28\x42"))
       end
     end
   end

data/spec/unit/mail_spec.rb

@@ -19,31 +19,6 @@ describe "Jpmobile::Mail" do
     end
   end
 
-  describe "Non-mobile" do
-    before(:each) do
-      @mail = Mail.new do
-        subject "万葉"
-        from "ちはやふる <info@jpmobile-rails.org>"
-      end
-    end
-    context "has multipart body" do
-      before(:each) do
-        @mail.parts << Mail::Part.new { body "ほげ" }
-        @mail.parts << Mail::Part.new { body "ほげほげ" }
-        @mail.parts.each{|p| p.charset = "ISO-2022-JP" }
-      end
-      context "to_s" do
-        subject {
-          Mail.new ascii_8bit(@mail.to_s)
-        }
-        it "should be able to decode bodies" do
-          subject.parts[0].body == "ほげ"
-          subject.parts[1].body == "ほげほげ"
-        end
-      end
-    end
-  end
-
   describe "AbstractMobile" do
     before(:each) do
       @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
@@ -136,8 +111,8 @@ describe "Jpmobile::Mail" do
         @mail.subject += "&#xe63e;"
         @mail.body = "#{@mail.body}&#xe63e;"
 
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVXVBGyhC?=")))
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x24\x5B\x24\x32\x75\x41\e\x28\x42"))))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCS3xNVRsoQhskQnVBGyhC?=")))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x75\x41\x1b\x28\x42"))))
       end
     end
   end
@@ -254,136 +229,4 @@ describe "Jpmobile::Mail" do
       end
     end
   end
-
-  describe "long subject with half-characters" do
-    before(:each) do
-      @mail         = Mail.new
-      @mail.subject = "西暦2012年09月03日は今日になるわけだが10時16分現在のこの時間ではどうかな"
-      @mail.body    = "株式会社・・"
-      @mail.from    = "info@jpmobile-rails.org"
-    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?GyRCQD5OcRsoQjIwMTIbJEJHLxsoQjA5GyRCN24bKEIwMxskQkZ8JE86IxsoQg==?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCRnwkSyRKJGskbyQxJEAkLBsoQjEwGyRCO34bKEIxNhskQkosOD0bKEI=?=")))
-          ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape("=?ISO-2022-JP?B?GyRCOl8kTiQzJE47fjRWJEckTyRJJCYkKyRKGyhC?=")))
-        end
-      end
-    end
-  end
-
-  context "with attachments" do
-    before(:each) do
-      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
-      @mail.mobile = @mobile
-      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
-      @photo = open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/photo.jpg")).read
-    end
-
-    it "should encodes itself successfully" do
-      @mail.attachments['photo.jpg'] = @photo
-
-      lambda {
-        @mail.to_s
-      }.should_not raise_error
-    end
-
-    it "should encodes itself successfully with an inline attachment" do
-      @mail.attachments.inline['photo.jpg'] = @photo
-
-      lambda {
-        @mail.to_s
-      }.should_not raise_error
-    end
-
-    it "should encodes itself successfully with an UTF-8 filename attachment" do
-      @mail.attachments.inline['日本語のファイル名です.jpg'] = @photo
-
-      lambda {
-        @mail.to_s
-      }.should_not raise_error
-    end
-  end
-
-  context "encoding conversion" do
-    before(:each) do
-      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
-      @mail.mobile = @mobile
-      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
-      @photo = open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/photo.jpg")).read
-    end
-
-    it "wave dash converting correctly" do
-      @mail.body = '10:00〜12:00'
-
-      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
-    end
-
-    it "full width tilde converting correctly" do
-      @mail.body = "10:00#{[0xff5e].pack("U")}12:00"
-
-      ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x31\x30\x3a\x30\x30\x1b\x24\x42\x21\x41\x1b\x28\x42\x31\x32\x3a\x30\x30"))))
-    end
-  end
-
-  context "delivering" do
-    before(:each) do
-      @mobile = Jpmobile::Mobile::AbstractMobile.new(nil, nil)
-      @mail.mobile = @mobile
-      @mail.to = "むすめふさほせ <info+to@jpmobile-rails.org>"
-    end
-
-    it "delivers through SMTP" do
-      @mail.delivery_method :smtp, {:enable_starttls_auto => false}
-      lambda {
-        @mail.deliver
-      }.should_not raise_error
-
-      Mail::TestMailer.deliveries.size
-    end
-  end
-
-  context 'sending with carrier from' do
-    before do
-      @mail         = Mail.new
-      @mail.subject = "万葉"
-      @mail.to      = "ちはやふる <info@jpmobile-rails.org>"
-    end
-
-    it 'should convert content-transfer-encoding' do
-      mobile = Jpmobile::Mobile::Au.new(nil, nil)
-      @mail.content_transfer_encoding = 'base64'
-      @mail.body = ['ほげ'].pack('m')
-      @mail.charset = 'UTF-8'
-
-      @mail.mobile = mobile
-      @mail.from = '<えーゆー> au@ezweb.ne.jp'
-
-      @mail.encoded.should match(/content-transfer-encoding: 7bit/i)
-    end
-
-    it 'should not convert content-transfer-encoding with BINARY' do
-      mobile = Jpmobile::Mobile::Au.new(nil, nil)
-      data = ['ほげ'].pack('m').strip
-
-      @mail.content_transfer_encoding = 'base64'
-      @mail.content_type = 'image/jpeg'
-      @mail.body = data
-      @mail.charset = 'UTF-8'
-
-      @mail.mobile = mobile
-      @mail.from = '<えーゆー> au@ezweb.ne.jp'
-
-      @mail.encoded.should match(/content-transfer-encoding: base64/i)
-      @mail.encoded.should match(data)
-    end
-  end
 end

data/spec/unit/receive_mail_spec.rb

@@ -105,7 +105,7 @@ describe "Jpmobile::Mail#receive" do
       end
 
       it "should encode correctly" do
-        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCJUYlOSVIdk8bKEI="))
+        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCJUYlOSVIGyhCGyRCdk8bKEI="))
       end
     end
 
@@ -148,14 +148,6 @@ describe "Jpmobile::Mail#receive" do
         end
       end
     end
-
-    context 'bounced mail' do
-      it 'should parse sub-part charset correctly' do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/bounce_with_utf8_part.eml")).read)
-        @mail.parts.first.charset.should match(/iso-2022-jp/i)
-        @mail.parts.last.charset.should  match(/utf-8/i)
-      end
-    end
   end
 
   describe "Docomo" do
@@ -209,49 +201,23 @@ describe "Jpmobile::Mail#receive" do
 
     context "to_s" do
       it "should have subject which is same as original" do
-        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCQmpMPnZeGyhC"))
+        ascii_8bit(@mail.to_s).should match(Regexp.escape("GyRCQmpMPhsoQhskQnZeGyhC"))
       end
 
       it "should have body which is same as original" do
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\e\x24\x42\x4B\x5C\x4A\x38\x76\x7D\e\x28\x42"))))
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit(utf8_to_jis("本文")))))
       end
     end
 
     context "modify and to_s" do
       it "should encode subject correctly" do
         @mail.subject = "大江戸"
-        ascii_8bit(@mail.to_s).should match(/\?GyRCQmc5PjhNdUEbKEI=/)
+        ascii_8bit(@mail.to_s).should match("GyRCQmc5PjhNGyhCGyRCdUEbKEI=")
       end
 
       it "should encode body correctly" do
         @mail.body = "会議が開催"
-        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x32\x71\x35\x44\x24\x2C\x33\x2B\x3A\x45\x75\x48\x1b\x28\x42"))))
-      end
-    end
-
-    context 'From au iPhone' do
-      it 'charset should be UTF-8' do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
-        @mail.mobile.should be_a(Jpmobile::Mobile::Au)
-        @mail.charset.should match(/utf-8/i)
-      end
-
-      it 'should be encoded correctly' do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-message.eml")).read)
-        @mail.encoded
-      end
-    end
-
-    context 'From iPad' do
-      it 'charset should be UTF-8' do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
-        @mail.mobile.should be_a(Jpmobile::Mobile::AbstractMobile)
-        @mail.charset.should match(/utf-8/i)
-      end
-
-      it 'should be encoded correctly' do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "email-fixtures/iphone-mail3.eml")).read)
-        @mail.encoded
+        ascii_8bit(@mail.to_s).should match(Regexp.compile(Regexp.escape(ascii_8bit("\x1b\x24\x42\x32\x71\x35\x44\x24\x2C\x33\x2B\x3A\x45\x1b\x28\x42\x1b\x24\x42\x75\x48\x1b\x28\x42"))))
       end
     end
   end
@@ -322,18 +288,6 @@ describe "Jpmobile::Mail#receive" do
     end
   end
 
-  describe 'bounced mail' do
-    context "has jp address" do
-      before(:each) do
-        @mail = Mail.new(open(File.join(File.expand_path(File.dirname(__FILE__)), "../../test/rails/overrides/spec/fixtures/mobile_mailer/bounced-jp.eml")).read)
-      end
-
-      it "mobile should abstract mobile" do
-        @mail.mobile.should be_a Jpmobile::Mobile::AbstractMobile
-      end
-    end
-  end
-
   describe "non-Japanese mail" do
     context "us-ascii" do
       before(:each) do

data/spec/unit/spec_helper.rb

@@ -18,5 +18,5 @@ RSpec.configure do |c|
   c.run_all_when_everything_filtered = true
   c.color_enabled = true
   c.filter_run_excluding :broken => true
-  c.full_backtrace = true
+  # c.full_backtrace = true
 end

data/spec/unit/util_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'stringio'
 require 'nkf'
 
-describe Jpmobile::Util do
+describe Jpmobile::Util, ".deep_apply" do
   include Jpmobile::Util
 
   it 'nilのときはnilを返すこと' do
@@ -34,8 +34,8 @@ describe Jpmobile::Util do
     utf8_to_sjis("اللغة العربية").should == sjis("????? ???????")
   end
 
-  it "utf8_to_sjis ですべての改行コードが CRLF に変更されること" do
-    utf8_to_sjis("UTF8\rSAMPLE\nTEXT\r\n").should == sjis("UTF8\r\nSAMPLE\r\nTEXT\r\n")
+  it "utf8_to_sjis で改行コードが CRLF に変更されること" do
+    utf8_to_sjis("UTF8\nTEXT\n").should == sjis("UTF8\r\nTEXT\r\n")
   end
 
   it "0x8150がU+FFE3に変換されること" do
@@ -63,22 +63,6 @@ describe Jpmobile::Util do
     jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42")).should == "しからずんばこじをえず"
   end
 
-  it "sjis_to_utf8 ですべての改行コードが LF に変更されること" do
-    sjis_to_utf8("SJIS\rSAMPLE\nTEXT\r\n").should == utf8("SJIS\nSAMPLE\nTEXT\n")
-  end
-
-  it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
-    utf8_to_jis("اللغة العربية").should == jis("????? ???????")
-  end
-
-  it "utf8_to_jis ですべての改行コードが CRLF に変更されること" do
-    utf8_to_jis("UTF8\rSAMPLE\nTEXT\r\n").should == jis("UTF8\r\nSAMPLE\r\nTEXT\r\n")
-  end
-
-  it "jis_to_utf8 ですべての改行コードが LF に変更されること" do
-    jis_to_utf8("JIS\rSAMPLE\nTEXT\r\n").should == utf8("JIS\nSAMPLE\nTEXT\n")
-  end
-
   it "fold_textでUTF-8の日本語文字列が指定文字数で折り返された配列で返ること" do
     fold_text('長い日本語の題名で折り返されるかようにするには事前に分割していないとダメなことがわかりましたよ', 15).should == [
       '長い日本語の題名で折り返される',
@@ -103,47 +87,4 @@ describe Jpmobile::Util do
     split_text('', 15).should be_nil
     split_text(nil, 15).should be_nil
   end
-
-  it "全角チルダがjisに適切に変換されること" do
-    ascii_8bit(utf8_to_jis("\xef\xbd\x9e")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
-    ascii_8bit(encode("\xef\xbd\x9e", "ISO-2022-JP")).should == ascii_8bit("\x1b\x24\x42\x21\x41\x1b\x28\x42")
-  end
-
-  describe 'invert_table' do
-    it 'pickups the first(least) of duplicated values when inverting hash table' do
-      hash = invert_table({
-          0xFE009 => 0xE63E,
-          0xFE00A => 0xE63E,
-          0xFE00B => 0x3013,
-          0xFE010 => 0xE6B3,
-          0xFE038 => 0xE73F})
-      hash[0xE63E].should == 0xFE009
-      hash[0x3013].should == 0xFE00B
-    end
-
-    it 'should not raise error when hash has Array keys' do
-      hash = invert_table({
-          [0x1F1E8, 0x1F1F3] => 0x3013,
-          0x1F1FF            => 0x3013,
-          0x1F526            => 0xE6FB,
-          [0x0023, 0x20E3]   => 0xE6E0,
-          0x1F354            => 0xE673})
-      hash[0x3013].should == [0x1F1E8, 0x1F1F3]
-      hash[0xE6FB].should == 0x1F526
-    end
-  end
-
-  describe 'check_charset' do
-    it 'returns true if compatible' do
-      str = ascii_8bit('ABC')
-      check_charset(str, 'UTF-8').should be_true
-    end
-  end
-
-  describe 'correct_encoding' do
-    it 'updates encoding correctly' do
-      str = jis('再現')
-      utf8?(correct_encoding(str)).should be_true
-    end
-  end
 end

data/test/rails/overrides/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '>= 3.0.17'
+gem 'rails', '>= 3.0.3'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

data/test/rails/overrides/app/controllers/filter_controller_base.rb

@@ -22,7 +22,4 @@ class FilterControllerBase < ApplicationController
   def input_tag
     render :text => '<input hoge="fuu" value="アブラカダブラ" />'
   end
-  def nbsp_char
-    render :text => '<a>アブラ&nbsp;カダブラ</a>'
-  end
 end

data/test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb

@@ -4,7 +4,4 @@ class HankakuInputFilterController < FilterControllerBase
   def index_xhtml
     render "index_xhtml", :layout => "xhtml"
   end
-
-  def with_charset
-  end
 end

data/test/rails/overrides/app/controllers/template_path_controller.rb

@@ -13,17 +13,5 @@ class TemplatePathController < ApplicationController
   def optioned_index
     render :action => "index"
   end
-
-  def full_path_partial
-  end
-
-  def smart_phone_only
-  end
-
-  def with_tblt
-  end
-
-  def with_ipd
-  end
 end
 

data/test/rails/overrides/app/{mailers → models}/mobile_mailer.rb

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
 class MobileMailer < Jpmobile::Mailer::Base
   default :from => "info@jp.mobile"
-  default :to   => "info@jp.mobile"
 
   def view_selection(to_mail, subject_text, text)
     @text = text
@@ -15,11 +14,6 @@ class MobileMailer < Jpmobile::Mailer::Base
   def multi_message(to_mail, subject_text, text, html)
     @html = html
     @text = text
-    mail(:to => to_mail, :subject => subject)
-  end
-
-  def default_to_mail(subject_text, text)
-    @text = text
-    mail(:subject => subject_text)
+    mail(:to => to_mail, :subject => subject_text)
   end
 end