jpmobile 2.0.11 → 3.0.0

data/spec/rack/jpmobile/mobile_by_ua_spec.rb

@@ -19,12 +19,8 @@ describe Jpmobile::Rack::MobileCarrier do
     [ Jpmobile::Mobile::Iphone       , 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16' ],
     [ Jpmobile::Mobile::Android      , 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1' ],
     [ Jpmobile::Mobile::WindowsPhone , 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)' ],
-    [ Jpmobile::Mobile::BlackBerry, 'BlackBerry9000/4.6.0.224 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/220' ],
-    [ Jpmobile::Mobile::Ipad         , 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'],
-    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'],
-    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 3.2; ja-jp; Sony Tablet S Build/THMAS11002) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'],
   ].each do |carrier, user_agent|
-    it "#mobile should return #{carrier} when take #{user_agent} as UserAgent" do
+    it '#mobile should return #{carrier} when take #{user_agent} as UserAgent' do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => user_agent)

data/spec/unit/emoticon_spec.rb

@@ -30,38 +30,6 @@ describe Jpmobile::Emoticon do
         Jpmobile::Emoticon::unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true).should == [0xe04a, 0xe049].pack('U*')
       end
     end
-
-    it 'should convert docomo unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x2600].pack('U')
-    end
-
-    it 'should convert au unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x26C5].pack('U')
-    end
-
-    it 'should convert Softbank unicodecr to Unicode 6.0 emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == [0x1F466].pack('U')
-    end
-
-    it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_UNICODE_EMOTICON, false).should == '〓'
-    end
-
-    it 'should convert docomo unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE000].pack('U')
-    end
-
-    it 'should convert au unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE00F].pack('U')
-    end
-
-    it 'should convert Softbank unicodecr to Google emoticon' do
-      Jpmobile::Emoticon.unicodecr_to_external("", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == [0xFE19B].pack('U')
-    end
-
-    it 'should not convert 〓' do
-      Jpmobile::Emoticon.unicodecr_to_external("〓", Jpmobile::Emoticon::CONVERSION_TABLE_TO_GOOGLE_EMOTICON, false).should == '〓'
-    end
   end
 
   describe "unicodecr_to_utf8" do
@@ -102,34 +70,6 @@ describe Jpmobile::Emoticon do
     it "should not convert docomo encoding of koukai-sjis emoticons to unicodecr" do
       Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a")).should == sjis("\x8c\xf6\x8a\x4a")
     end
-
-    context 'at iPhone emoticon' do
-      it 'should convert iPhone Unicode emoticon to SoftBank emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\230\200").should == ""
-      end
-
-      it 'should convert iPhone Unicode emoticon to multi SoftBank emoticons' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60("\342\233\205").should == ","
-      end
-
-      it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_unicode60('〓').should == "〓"
-      end
-    end
-
-    context 'at Android emoticon' do
-      it 'should convert Android Google Unicode emoticon to Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\200").should == ""
-      end
-
-      it 'should convert Android Google Unicode emoticon to multi Docomo emoticon' do
-        Jpmobile::Emoticon::external_to_unicodecr_google("\363\276\200\217").should == ""
-      end
-
-      it 'should not convert 〓' do
-        Jpmobile::Emoticon::external_to_unicodecr_google('〓').should == "〓"
-      end
-    end
   end
 
   context "for email" do

data/spec/unit/mail_spec.rb

@@ -255,31 +255,6 @@ describe "Jpmobile::Mail" do
     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)
@@ -303,14 +278,6 @@ describe "Jpmobile::Mail" do
         @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
@@ -333,57 +300,4 @@ describe "Jpmobile::Mail" do
       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

@@ -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
@@ -228,32 +220,6 @@ describe "Jpmobile::Mail#receive" do
         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
-      end
-    end
   end
 
   describe "Softbank" do
@@ -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/util_spec.rb

@@ -108,47 +108,4 @@ describe Jpmobile::Util 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 = 'ABC'.force_encoding('ASCII-8BIT')
-      check_charset(str, 'UTF-8').should be_true
-    end
-
-    it 'returns false if incompatible' do
-      str = '再現'.encode('ISO-2022-JP')
-      check_charset(str, 'UTF-8').should be_false
-    end
-  end
-
-  describe 'correct_encoding' do
-    it 'updates encoding correctly' do
-      str = '再現'.force_encoding('ISO-2022-JP')
-      correct_encoding(str).encoding.should == Encoding::UTF_8
-    end
-  end
 end

data/test/rails/overrides/Gemfile

@@ -1,30 +1,15 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1.8'
-gem 'mail', '~> 2.3.0'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+gem 'rails', '~> 3.2.0'
 
 gem 'sqlite3-ruby', :require => 'sqlite3'
 
 gem 'geokit'
 gem 'hpricot'
 
-# Use unicorn as the web server
-# gem 'unicorn'
-
-# Deploy with Capistrano
-# gem 'capistrano'
-
-# To use debugger
-# gem 'ruby-debug'
-
-# Bundle the extra gems:
-# gem 'bj'
-# gem 'nokogiri', '1.4.1'
-# gem 'sqlite3-ruby', :require => 'sqlite3'
-# gem 'aws-s3', :require => 'aws/s3'
+gem 'jpmobile',             :path => '../../../'
+gem 'jpmobile-terminfo',    :path => '../../../vendor/jpmobile-terminfo'
+gem 'jpmobile-ipaddresses', :path => '../../../vendor/jpmobile-ipaddresses'
 
 # Bundle gems for certain environments:
 group :development, :test do

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/spec/mailers/mobile_mailer_spec.rb

@@ -78,7 +78,6 @@ describe MobileMailer do
       raw_mail.should match(/iso-2022-jp/i)
       raw_mail.should match(Regexp.compile(Regexp.escape(ascii_8bit([utf8_to_jis("題名")].pack('m').strip))))
       raw_mail.should match(Regexp.compile(Regexp.escape(ascii_8bit(utf8_to_jis("本文")))))
-      raw_mail.should match(/For PC/)
     end
   end
 
@@ -664,15 +663,6 @@ describe MobileMailer, "receiving" do
         parts.first.body.should match(/テストです/)
         parts.last.body.raw_source.should match(/テストです/)
       end
-
-      context 'iPhone' do
-        it 'should parse correctly' do
-          lambda {
-            @mail = MobileMailer.receive(open(File.join(Rails.root, "../../../spec/unit/email-fixtures/iphone-message.eml")).read)
-            @mail.encoded
-          }.should_not raise_error
-        end
-      end
     end
 
     describe "softbank(sjis) の場合" do

data/test/rails/overrides/spec/requests/template_path_spec.rb

@@ -169,78 +169,6 @@ describe TemplatePathController, "integrated_views" do
     end
   end
 
-  context 'only smart_phone view' do
-    context 'iPadからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
-      end
-      it 'smart_phone_only.html.erbが使用されること' do
-        get '/template_path/smart_phone_only', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'smart_phone_only_smart_phone.html.erb')
-      end
-    end
-
-    context 'Android Tabletからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
-      end
-      it 'smart_phone_only.html.erbが使用されること' do
-        get '/template_path/smart_phone_only', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'smart_phone_only_smart_phone.html.erb')
-      end
-    end
-  end
-
-  context 'with_tblt view' do
-    context 'iPadからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
-      end
-      it 'with_tblt_tablet.html.erbが使用されること' do
-        get '/template_path/with_tblt', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'with_tblt_tablet.html.erb')
-      end
-    end
-
-    context 'Android Tabletからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
-      end
-      it 'with_tblt_tablet.html.erbが使用されること' do
-        get '/template_path/with_tblt', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'with_tblt_tablet.html.erb')
-      end
-    end
-  end
-
-  context 'with_ipd view' do
-    context 'iPadからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
-      end
-      it 'with_ipd_tablet_ipad.html.erbが使用されること' do
-        get '/template_path/with_ipd', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'with_ipd_tablet_ipad.html.erb')
-      end
-    end
-
-    context 'Android Tabletからのアクセスの場合' do
-      before do
-        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
-      end
-      it 'with_ipd.html.erbが使用されること' do
-        get '/template_path/with_ipd', {}, {'HTTP_USER_AGENT' => @user_agent}
-
-        response.should have_tag('h1', :content => 'with_ipd.html.erb')
-      end
-    end
-  end
-
   context "partial" do
     context "PCからのアクセスの場合" do
       before do