jpmobile 0.0.2 → 0.0.3

data/test/autoload_test.rb

@@ -0,0 +1,49 @@
+require 'test/unit'
+module Jpmobile
+  module Mobile
+    require 'jpmobile/mobile/abstract_mobile'
+  end
+end
+
+class TestAutoLoad < Test::Unit::TestCase
+  def test_ip_addresses_docomo
+    require 'jpmobile/mobile/docomo'
+    assert_nothing_raised { Jpmobile::Mobile::Docomo::IP_ADDRESSES }
+    assert_kind_of(Array, Jpmobile::Mobile::Docomo::IP_ADDRESSES)
+  end
+
+  def test_display_info_docomo
+    require 'jpmobile/mobile/docomo'
+    assert_nothing_raised { Jpmobile::Mobile::Docomo::DISPLAY_INFO }
+    assert_kind_of(Hash, Jpmobile::Mobile::Docomo::DISPLAY_INFO)
+  end
+
+  def test_ip_addresses_au
+    require 'jpmobile/mobile/au'
+    assert_nothing_raised { Jpmobile::Mobile::Au::IP_ADDRESSES }
+    assert_kind_of(Array, Jpmobile::Mobile::Au::IP_ADDRESSES)
+  end
+
+  def test_ip_addresses_softbank
+    require 'jpmobile/mobile/softbank'
+    assert_nothing_raised { Jpmobile::Mobile::Softbank::IP_ADDRESSES }
+    assert_nothing_raised { Jpmobile::Mobile::Vodafone::IP_ADDRESSES }
+    assert_nothing_raised { Jpmobile::Mobile::Jphone::IP_ADDRESSES }
+    assert_kind_of(Array, Jpmobile::Mobile::Softbank::IP_ADDRESSES)
+    assert_kind_of(Array, Jpmobile::Mobile::Vodafone::IP_ADDRESSES)
+    assert_kind_of(Array, Jpmobile::Mobile::Jphone::IP_ADDRESSES)
+  end
+
+  def test_ip_addresses_willcom
+    require 'jpmobile/mobile/willcom'
+    assert_nothing_raised { Jpmobile::Mobile::Willcom::IP_ADDRESSES }
+    assert_kind_of(Array, Jpmobile::Mobile::Willcom::IP_ADDRESSES)
+  end
+
+  def test_ip_addresses_emobile
+    require 'jpmobile/mobile/emobile'
+    assert_nothing_raised { Jpmobile::Mobile::Emobile::IP_ADDRESSES }
+    assert_kind_of(Array, Jpmobile::Mobile::Emobile::IP_ADDRESSES)
+  end
+
+end

data/test/docomo_test.rb

@@ -3,113 +3,146 @@ require File.dirname(__FILE__)+'/helper'
 class DocomoTest < Test::Unit::TestCase
   # DoCoMo, 端末種別の識別
   def test_docomo_sh902i
-    req = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Docomo, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal(nil, req.mobile.areacode)
-    assert_equal(nil, req.mobile.serial_number)
-    assert_equal(nil, req.mobile.icc)
-    assert_equal(nil, req.mobile.ident)
-    assert_equal(nil, req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
-    assert(!req.mobile.supports_cookie?)
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Docomo, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal(nil, req.mobile.areacode)
+      assert_equal(nil, req.mobile.serial_number)
+      assert_equal(nil, req.mobile.icc)
+      assert_equal(nil, req.mobile.ident)
+      assert_equal(nil, req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+      assert(!req.mobile.supports_cookie?)
+    end
   end
 
   # DoCoMo, 端末種別の識別
   def test_docomo_so506i
-    req = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Docomo, req.mobile)
-    assert_equal(nil, req.mobile.position)
-    assert_equal(nil, req.mobile.areacode)
-    assert_equal(nil, req.mobile.serial_number)
-    assert_equal(nil, req.mobile.icc)
-    assert_equal(nil, req.mobile.ident)
-    assert_equal(nil, req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
+    reqs = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Docomo, req.mobile)
+      assert_equal(nil, req.mobile.position)
+      assert_equal(nil, req.mobile.areacode)
+      assert_equal(nil, req.mobile.serial_number)
+      assert_equal(nil, req.mobile.icc)
+      assert_equal(nil, req.mobile.ident)
+      assert_equal(nil, req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+    end
   end
 
   # DoCoMo, iarea
   def test_docomo_iarea
-    req = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10",
+    reqs = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10",
                           {"QUERY_STRING"=>"AREACODE=00100&ACTN=OK"})
-    assert_equal("00100", req.mobile.areacode)
+    reqs.each do |req|
+      assert_equal("00100", req.mobile.areacode)
+    end
+  end
+
+  # DoCoMo, iarea
+  def test_docomo_iarea_with_posinfo
+    reqs = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10",
+                          {"QUERY_STRING"=>"LAT=%2B35.00.35.600&LON=%2B135.41.35.600&GEO=wgs84&POSINFO=2&AREACODE=00100&ACTN=OK"})
+    reqs.each do |req|
+      assert_equal("00100", req.mobile.areacode)
+      assert_in_delta(35.00988889, req.mobile.position.lat, 1e-7)
+      assert_in_delta(135.6932222, req.mobile.position.lon, 1e-7)
+    end
   end
 
   # DoCoMo, gps
   # http://www.nttdocomo.co.jp/service/imode/make/content/html/outline/gps.html
   def test_docomo_gps_sa702i
-    req = request_with_ua("DoCoMo/2.0 SA702i(c100;TB;W30H15)",
+    reqs = request_with_ua("DoCoMo/2.0 SA702i(c100;TB;W30H15)",
                           {"QUERY_STRING"=>"lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=wgs84&x-acc=3"})
-    assert_in_delta(35.00988889, req.mobile.position.lat, 1e-7)
-    assert_in_delta(135.6932222, req.mobile.position.lon, 1e-7)
+    reqs.each do |req|
+      assert_in_delta(35.00988889, req.mobile.position.lat, 1e-7)
+      assert_in_delta(135.6932222, req.mobile.position.lon, 1e-7)
+    end
   end
 
   # DoCoMo, 903i, GPS
   # "WGS84"が大文字。altで高度が取得できているようだ。どちらも仕様書には記述がない。
   # http://www.nttdocomo.co.jp/service/imode/make/content/html/outline/gps.html
   def test_docomo_gps_sh903i
-    req = request_with_ua("DoCoMo/2.0 SH903i(c100;TB;W24H16)",
+    reqs = request_with_ua("DoCoMo/2.0 SH903i(c100;TB;W24H16)",
                           {"QUERY_STRING"=>
                            "lat=%2B35.00.35.600&lon=%2B135.41.35.600&geo=WGS84&alt=%2B64.000&x-acc=1"})
-    assert_in_delta(35.00988889, req.mobile.position.lat, 1e-7)
-    assert_in_delta(135.6932222, req.mobile.position.lon, 1e-7)
+    reqs.each do |req|
+      assert_in_delta(35.00988889, req.mobile.position.lat, 1e-7)
+      assert_in_delta(135.6932222, req.mobile.position.lon, 1e-7)
+    end
   end
 
   # DoCoMo, utn, mova
   def test_docomo_utn_mova
-    req = request_with_ua("DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000")
-    assert_equal("XXXXX000000", req.mobile.serial_number)
-    assert_equal("XXXXX000000", req.mobile.ident)
-    assert_equal(nil, req.mobile.icc)
-    assert_equal("XXXXX000000", req.mobile.ident_device)
-    assert_equal(nil, req.mobile.ident_subscriber)
+    reqs = request_with_ua("DoCoMo/1.0/SO505iS/c20/TC/W30H16/serXXXXX000000")
+    reqs.each do |req|
+      assert_equal("XXXXX000000", req.mobile.serial_number)
+      assert_equal("XXXXX000000", req.mobile.ident)
+      assert_equal(nil, req.mobile.icc)
+      assert_equal("XXXXX000000", req.mobile.ident_device)
+      assert_equal(nil, req.mobile.ident_subscriber)
+    end
   end
 
   # DoCoMo, utn, foma
   def test_docomo_utn_foma
-    req = request_with_ua("DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)")
-    assert_equal("999999999999999", req.mobile.serial_number)
-    assert_equal("0000000000000000000f", req.mobile.icc)
-    assert_equal("0000000000000000000f", req.mobile.ident)
-    assert_equal("999999999999999", req.mobile.ident_device)
-    assert_equal("0000000000000000000f", req.mobile.ident_subscriber)
+    reqs = request_with_ua("DoCoMo/2.0 D902i(c100;TB;W23H16;ser999999999999999;icc0000000000000000000f)")
+    reqs.each do |req|
+      assert_equal("999999999999999", req.mobile.serial_number)
+      assert_equal("0000000000000000000f", req.mobile.icc)
+      assert_equal("0000000000000000000f", req.mobile.ident)
+      assert_equal("999999999999999", req.mobile.ident_device)
+      assert_equal("0000000000000000000f", req.mobile.ident_subscriber)
+    end
   end
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_docomo_valid_ip_address
-    req = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)",
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)",
                           {"REMOTE_ADDR"=>"210.153.84.1"})
-    assert_equal(true, req.mobile.valid_ip?)
+    reqs.each do |req|
+      assert_equal(true, req.mobile.valid_ip?)
+    end
   end
 
   # 正しくないIPアドレス空間からのアクセスを判断できるか。
   def test_docomo_invalid_ip_address
-    req = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)",
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)",
                           {"REMOTE_ADDR"=>"127.0.0.1"})
-    assert_equal(false, req.mobile.valid_ip?)
+    reqs.each do |req|
+      assert_equal(false, req.mobile.valid_ip?)
+    end
   end
 
   # 端末の画面サイズを正しく取得できるか。
   def test_docomo_so506ic_display
-    req = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10")
-    assert_equal(240, req.mobile.display.browser_width)
-    assert_equal(256, req.mobile.display.browser_height)
-    assert_equal(240, req.mobile.display.width)
-    assert_equal(256, req.mobile.display.height)
-    assert_equal(true, req.mobile.display.color?)
-    assert_equal(262144, req.mobile.display.colors)
+    reqs = request_with_ua("DoCoMo/1.0/SO506iC/c20/TB/W20H10")
+    reqs.each do |req|
+      assert_equal(240, req.mobile.display.browser_width)
+      assert_equal(256, req.mobile.display.browser_height)
+      assert_equal(240, req.mobile.display.width)
+      assert_equal(256, req.mobile.display.height)
+      assert_equal(true, req.mobile.display.color?)
+      assert_equal(262144, req.mobile.display.colors)
+    end
   end
 
   # 端末の画面サイズを正しく取得できるか。
   def test_docomo_sh902i_display
-    req = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
-    assert_equal(240, req.mobile.display.browser_width)
-    assert_equal(240, req.mobile.display.browser_height)
-    assert_equal(240, req.mobile.display.width)
-    assert_equal(240, req.mobile.display.height)
-    assert_equal(true, req.mobile.display.color?)
-    assert_equal(262144, req.mobile.display.colors)
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
+    reqs.each do |req|
+      assert_equal(240, req.mobile.display.browser_width)
+      assert_equal(240, req.mobile.display.browser_height)
+      assert_equal(240, req.mobile.display.width)
+      assert_equal(240, req.mobile.display.height)
+      assert_equal(true, req.mobile.display.color?)
+      assert_equal(262144, req.mobile.display.colors)
+    end
   end
 end

data/test/emoticon_functional_test.rb

@@ -33,13 +33,16 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
   def setup
     init EmoticonTestController
   end
-  def test_docomo
+
+  def test_docomo_from_pc
     # PC
     get :docomo_cr
     assert_equal "&#xE63E;", @response.body
     get :docomo_utf8
     assert_equal "\xee\x98\xbe", @response.body
+  end
 
+  def test_docomo_from_docomo
     # DoCoMo携帯
     user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
     get :docomo_cr
@@ -52,7 +55,9 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
 
     get :docomo_docomopoint
     assert_equal "\xf9\x79", @response.body
+  end
 
+  def test_docomo_from_au
     # Au携帯電話での閲覧
     user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
     get :docomo_cr
@@ -61,7 +66,9 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     assert_equal "\xf6\x60", @response.body
     get :docomo_docomopoint
     assert_equal "［ドコモポイント］".tosjis, @response.body
+  end
 
+  def test_docomo_from_softbank
     # SoftBank携帯電話での閲覧
     user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
     get :docomo_cr
@@ -70,7 +77,9 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     assert_equal "\e$Gj\x0f", @response.body
     get :docomo_docomopoint
     assert_equal "［ドコモポイント］", @response.body
+  end
 
+  def test_docomo_from_jphone
     # J-PHONE携帯電話での閲覧
     user_agent "J-PHONE/3.0/V301D"
     get :docomo_cr
@@ -81,13 +90,16 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     assert_equal "Shift_JIS", @response.charset
     assert_equal "［ドコモポイント］".tosjis, @response.body
   end
-  def test_au
+
+  def test_au_from_pc
     # PC
     get :au_cr
     assert_equal "&#xE488;", @response.body
     get :au_utf8
     assert_equal [0xe488].pack("U"), @response.body
+  end
 
+  def test_au_from_au
     # Au
     user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
     get :au_cr
@@ -97,14 +109,18 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     get :query, :q=>"\xf6\x60"
     assert_equal [0xe488].pack("U"), assigns["q"]
     assert_equal "\xf6\x60", @response.body
+  end
 
+  def test_au_from_docomo
     # DoCoMo携帯電話での閲覧
     user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
     get :au_cr
     assert_equal "\xf8\x9f", @response.body
     get :au_utf8
     assert_equal "\xf8\x9f", @response.body
+  end
 
+  def test_au_from_softbank
     # SoftBank携帯電話での閲覧
     user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
     get :au_cr
@@ -112,13 +128,16 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     get :au_utf8
     assert_equal "\e$Gj\x0f", @response.body
   end
-  def test_softbank
+
+  def test_softbank_from_pc
     # PCから
     get :softbank_cr
     assert_equal "&#xF04A;", @response.body
     get :softbank_utf8
     assert_equal [0xf04a].pack("U"), @response.body
+  end
 
+  def test_softbank_from_softbank
     # SoftBank携帯電話から
     user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
     get :softbank_cr
@@ -128,7 +147,9 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     get :query, :q=>[0xe04A].pack("U") # 3G端末はUTF-8で絵文字を送ってくる
     assert_equal [0xf04a].pack("U"), assigns["q"]
     assert_equal "\e$Gj\x0f", @response.body
+  end
 
+  def test_softbank_from_vodafone3g
     # Vodafone3G携帯電話から
     user_agent "Vodafone/1.0/V705SH/SHJ001/SN000000000000000 Browser/VF-NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
     get :softbank_cr
@@ -138,7 +159,9 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     get :query, :q=>[0xe04A].pack("U") # 3G端末はUTF-8で絵文字を送ってくる
     assert_equal [0xf04a].pack("U"), assigns["q"]
     assert_equal "\e$Gj\x0f", @response.body
+  end
 
+  def test_softbank_from_jphone
     # J-PHONE携帯電話から
     user_agent "J-PHONE/3.0/V301D"
     get :softbank_cr
@@ -148,14 +171,18 @@ class EmoticonFunctionalTest < Test::Unit::TestCase
     get :query, :q=>"\e$Gj\x0f" # J-PHONE端末はWebcodeで絵文字を送ってくる
     assert_equal [0xf04a].pack("U"), assigns["q"]
     assert_equal "\e$Gj\x0f", @response.body
+  end
 
+  def test_softbank_from_docomo
     # DoCoMo携帯電話での閲覧
     user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
     get :softbank_cr
     assert_equal "\xf8\x9f", @response.body
     get :softbank_utf8
     assert_equal "\xf8\x9f", @response.body
+  end
 
+  def test_softbank_from_au
     # Au携帯電話での閲覧
     user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
     get :softbank_cr

data/test/filter_test.rb

@@ -2,9 +2,6 @@ require File.dirname(__FILE__)+'/helper'
 
 class FilterTest < Test::Unit::TestCase
   def setup
-    @controller = ActionController::Base.new
-    @controller.response = ActionController::AbstractResponse.new
-
     @aiu_sjis = "\202\240\202\242\202\244" # あいう
     @aiu_utf8 = "\343\201\202\343\201\204\343\201\206" # あいう
 
@@ -32,65 +29,4 @@ class FilterTest < Test::Unit::TestCase
     assert_equal(@abracadabra_z_utf8, filter.to_internal(@abracadabra_h_utf8, nil))
     assert_equal(@abracadabra_h_utf8, filter.to_external(@abracadabra_z_utf8, nil))
   end
-  def test_sjis_filter_for_docomo
-    @controller.request = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)", "QUERY_STRING"=>"test=test&abra=%83A%83u%83%89%83J%83_%83u%83%89") # アブラカダブラ, Shift_JIS, urlencoded
-    @controller.params = @controller.request.params
-
-    # before filter のテスト(携帯電話からのパラメータがutf-8で格納されているか)
-    filter = Jpmobile::Filter::Sjis.new
-    filter.before(@controller)
-    assert_equal(@abracadabra_z_utf8, @controller.params["abra"].first)
-
-    # after filter のテスト(携帯電話に向けてsjisで送出しているか)
-    @controller.response.body = @abracadabra_z_utf8
-    filter.after(@controller)
-    assert_equal('Shift_JIS', @controller.response.charset)
-    assert_equal(@abracadabra_z_sjis, @controller.response.body)
-  end
-
-  def test_sjis_filter_for_jphone
-    @controller.request = request_with_ua("J-PHONE/3.0/V401SH", "QUERY_STRING"=>"test=test&abra=%83A%83u%83%89%83J%83_%83u%83%89") # アブラカダブラ, Shift_JIS, urlencoded
-    @controller.params = @controller.request.params
-
-    # before filter のテスト(携帯電話からのパラメータがutf-8で格納されているか)
-    filter = Jpmobile::Filter::Sjis.new
-    filter.before(@controller)
-    assert_equal(@abracadabra_z_utf8, @controller.params["abra"].first)
-
-    # after filter のテスト(携帯電話に向けてsjisで送出しているか)
-    @controller.response.body = @abracadabra_z_utf8
-    filter.after(@controller)
-    assert_equal('Shift_JIS', @controller.response.charset)
-    assert_equal(@abracadabra_z_sjis, @controller.response.body)
-  end
-
-  def test_sjis_filter_does_not_work_for_vodafone
-    # VodafoneにはShift_JIS変換を行わないことをテスト
-    @controller.request = request_with_ua("Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0", "QUERY_STRING"=>"test=test&abra=%83A%83u%83%89%83J%83_%83u%83%89") # アブラカダブラ, Shift_JIS, urlencoded
-    @controller.params = @controller.request.params
-
-    filter = Jpmobile::Filter::Sjis.new
-    filter.before(@controller) # 実行しておかないとカウンタが狂う
-
-    # after filter のテスト(携帯電話に向けてsjisで送出していないことを確認)
-    filter.after(@controller)
-    @controller.response.body = @abracadabra_z_utf8
-    assert_not_equal('Shift_JIS', @controller.response.charset)
-    assert_equal(@abracadabra_z_utf8, @controller.response.body)
-  end
-
-  def test_sjis_filter_does_not_work_for_softbank
-    # VodafoneにはShift_JIS変換を行わないことをテスト
-    @controller.request = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "QUERY_STRING"=>"test=test&abra=%83A%83u%83%89%83J%83_%83u%83%89") # アブラカダブラ, Shift_JIS, urlencoded
-    @controller.params = @controller.request.params
-
-    filter = Jpmobile::Filter::Sjis.new
-    filter.before(@controller) # 実行しておかないとカウンタが狂う
-
-    # after filter のテスト(携帯電話に向けてsjisで送出していないことを確認)
-    filter.after(@controller)
-    @controller.response.body = @abracadabra_z_utf8
-    assert_not_equal('Shift_JIS', @controller.response.charset)
-    assert_equal(@abracadabra_z_utf8, @controller.response.body)
-  end
 end