jpmobile 0.0.1 → 0.0.2

data/lib/jpmobile/mobile/z_ip_addresses.rb

@@ -1,10 +1,10 @@
 # = IPアドレス帯域テーブル(手動更新分)
 # == DoCoMo
-# http://www.nttdocomo.co.jp/service/imode/make/content/ip/about/
+# http://www.nttdocomo.co.jp/service/imode/make/content/ip/index.html
 # 2006/09現在
 # == SoftBank
 # http://developers.softbankmobile.co.jp/dp/tech_svc/web/ip.php
-# 2006/11/17現在
+# 2007/10/09現在
 
 #:enddoc:
 Jpmobile::Mobile::Docomo::IP_ADDRESSES = <<EOF
@@ -14,14 +14,14 @@ Jpmobile::Mobile::Docomo::IP_ADDRESSES = <<EOF
 EOF
 
 Jpmobile::Mobile::Softbank::IP_ADDRESSES=<<EOF
+123.108.236.0/24
+123.108.237.0/27
 202.179.204.0/24
-202.253.96.248/29
+202.253.96.224/27
 210.146.7.192/26
 210.146.60.192/26
 210.151.9.128/26
-210.169.130.112/29
-210.169.130.120/29
-210.169.176.0/24
+210.169.130.112/28
 210.175.1.128/25
 210.228.189.0/24
 211.8.159.128/25

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -25,4 +25,5 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "59.135.38.128/25",
  "219.108.157.0/25",
  "219.125.151.128/25",
- "219.125.145.0/25"]
+ "219.125.145.0/25",
+ "121.111.231.0/25"]

data/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -71,4 +71,9 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "219.108.10.0/24",
  "61.198.138.100/32",
  "61.198.138.101/32",
- "61.198.138.102/32"]
+ "61.198.138.102/32",
+ "61.198.139.160/28",
+ "61.198.139.128/27",
+ "61.198.138.103/32",
+ "61.198.139.0/29",
+ "219.108.15.0/24"]

data/lib/jpmobile/trans_sid.rb

@@ -21,7 +21,7 @@ module Jpmobile::TransSid #:nodoc:
   protected
   # URLにsession_idを追加する。
   def default_url_options(options)
-    return unless request # for test process 
+    return unless request # for test process
     return unless apply_transit_sid?
     { session_key => session.session_id }
   end
@@ -29,7 +29,9 @@ module Jpmobile::TransSid #:nodoc:
   private
   # session_keyを返す。
   def session_key
-    session_key = request.session_options[:session_key] || '_session_id'
+    if session_enabled?
+      session_key = request.session_options[:session_key] || '_session_id'
+    end
   end
   # session_idを埋め込むためのhidden fieldを出力する。
   def sid_hidden_field_tag
@@ -43,6 +45,7 @@ module Jpmobile::TransSid #:nodoc:
   end
   # transit_sidを適用すべきかを返す。
   def apply_transit_sid?
+    return false unless session_enabled?
     return false if transit_sid_mode == :none
     return true if transit_sid_mode == :always
     if transit_sid_mode == :mobile

data/lib/jpmobile/version.rb

@@ -2,7 +2,7 @@ module Jpmobile #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/au_test.rb

@@ -9,6 +9,7 @@ class AuTest < Test::Unit::TestCase
     assert_instance_of(Jpmobile::Mobile::Au, req.mobile)
     assert_equal("00000000000000_mj.ezweb.ne.jp", req.mobile.subno)
     assert_equal("00000000000000_mj.ezweb.ne.jp", req.mobile.ident)
+    assert_equal("00000000000000_mj.ezweb.ne.jp", req.mobile.ident_subscriber)
     assert_equal(nil, req.mobile.position)
     assert(req.mobile.supports_cookie?)
   end

data/test/docomo_test.rb

@@ -11,6 +11,8 @@ class DocomoTest < Test::Unit::TestCase
     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
 
@@ -24,6 +26,8 @@ class DocomoTest < Test::Unit::TestCase
     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
 
   # DoCoMo, iarea
@@ -59,6 +63,8 @@ class DocomoTest < Test::Unit::TestCase
     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
 
   # DoCoMo, utn, foma
@@ -67,6 +73,8 @@ class DocomoTest < Test::Unit::TestCase
     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
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。

data/test/emoticon_functional_test.rb

@@ -0,0 +1,166 @@
+require File.dirname(__FILE__)+'/helper'
+
+class EmoticonTestController < ActionController::Base
+  mobile_filter
+  def docomo_cr
+    render :text=>"&#xE63E;"
+  end
+  def docomo_utf8
+    render :text=>[0xe63e].pack("U")
+  end
+  def docomo_docomopoint
+    render :text=>"&#xE6D5;"
+  end
+  def au_cr
+    render :text=>"&#xE488;"
+  end
+  def au_utf8
+    render :text=>[0xe488].pack("U")
+  end
+  def softbank_cr
+    render :text=>"&#xF04A;"
+  end
+  def softbank_utf8
+    render :text=>[0xf04a].pack("U")
+  end
+  def query
+    @q = params[:q]
+    render :text=>@q
+  end
+end
+
+class EmoticonFunctionalTest < Test::Unit::TestCase
+  def setup
+    init EmoticonTestController
+  end
+  def test_docomo
+    # PC
+    get :docomo_cr
+    assert_equal "&#xE63E;", @response.body
+    get :docomo_utf8
+    assert_equal "\xee\x98\xbe", @response.body
+
+    # DoCoMo携帯
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :docomo_cr
+    assert_equal "\xf8\x9f", @response.body
+    get :docomo_utf8
+    assert_equal "\xf8\x9f", @response.body
+    get :query, :q=>"\xf8\x9f"
+    assert_equal "\xee\x98\xbe", assigns["q"]
+    assert_equal "\xf8\x9f", @response.body
+
+    get :docomo_docomopoint
+    assert_equal "\xf9\x79", @response.body
+
+    # Au携帯電話での閲覧
+    user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+    get :docomo_cr
+    assert_equal "\xf6\x60", @response.body
+    get :docomo_utf8
+    assert_equal "\xf6\x60", @response.body
+    get :docomo_docomopoint
+    assert_equal "［ドコモポイント］".tosjis, @response.body
+
+    # SoftBank携帯電話での閲覧
+    user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+    get :docomo_cr
+    assert_equal "\e$Gj\x0f", @response.body
+    get :docomo_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+    get :docomo_docomopoint
+    assert_equal "［ドコモポイント］", @response.body
+
+    # J-PHONE携帯電話での閲覧
+    user_agent "J-PHONE/3.0/V301D"
+    get :docomo_cr
+    assert_equal "\e$Gj\x0f", @response.body
+    get :docomo_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+    get :docomo_docomopoint
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "［ドコモポイント］".tosjis, @response.body
+  end
+  def test_au
+    # PC
+    get :au_cr
+    assert_equal "&#xE488;", @response.body
+    get :au_utf8
+    assert_equal [0xe488].pack("U"), @response.body
+
+    # Au
+    user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+    get :au_cr
+    assert_equal "\xf6\x60", @response.body
+    get :au_utf8
+    assert_equal "\xf6\x60", @response.body
+    get :query, :q=>"\xf6\x60"
+    assert_equal [0xe488].pack("U"), assigns["q"]
+    assert_equal "\xf6\x60", @response.body
+
+    # 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
+
+    # SoftBank携帯電話での閲覧
+    user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+    get :au_cr
+    assert_equal "\e$Gj\x0f", @response.body
+    get :au_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+  end
+  def test_softbank
+    # PCから
+    get :softbank_cr
+    assert_equal "&#xF04A;", @response.body
+    get :softbank_utf8
+    assert_equal [0xf04a].pack("U"), @response.body
+
+    # SoftBank携帯電話から
+    user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+    get :softbank_cr
+    assert_equal "\e$Gj\x0f", @response.body
+    get :softbank_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+    get :query, :q=>[0xe04A].pack("U") # 3G端末はUTF-8で絵文字を送ってくる
+    assert_equal [0xf04a].pack("U"), assigns["q"]
+    assert_equal "\e$Gj\x0f", @response.body
+
+    # 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
+    assert_equal "\e$Gj\x0f", @response.body
+    get :softbank_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+    get :query, :q=>[0xe04A].pack("U") # 3G端末はUTF-8で絵文字を送ってくる
+    assert_equal [0xf04a].pack("U"), assigns["q"]
+    assert_equal "\e$Gj\x0f", @response.body
+
+    # J-PHONE携帯電話から
+    user_agent "J-PHONE/3.0/V301D"
+    get :softbank_cr
+    assert_equal "\e$Gj\x0f", @response.body
+    get :softbank_utf8
+    assert_equal "\e$Gj\x0f", @response.body
+    get :query, :q=>"\e$Gj\x0f" # J-PHONE端末はWebcodeで絵文字を送ってくる
+    assert_equal [0xf04a].pack("U"), assigns["q"]
+    assert_equal "\e$Gj\x0f", @response.body
+
+    # 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
+
+    # Au携帯電話での閲覧
+    user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+    get :softbank_cr
+    assert_equal "\xf6\x60", @response.body
+    get :softbank_utf8
+    assert_equal "\xf6\x60", @response.body
+  end
+end

data/test/emoticon_test.rb

@@ -0,0 +1,58 @@
+require File.dirname(__FILE__)+'/helper'
+
+class DocomoEmoticonTest < Test::Unit::TestCase
+  def test_external_unicodecr_docomo
+    assert_equal "&#xe63e;", Jpmobile::Emoticon::external_to_unicodecr_docomo("\xf8\x9f")
+  end
+  def test_unicodecr_external_docomo
+    assert_equal "\xf8\x9f", Jpmobile::Emoticon::unicodecr_to_external("&#xe63e;")
+  end
+  def test_unicodecr_utf8_docomo
+    assert_equal "\356\230\276", Jpmobile::Emoticon::unicodecr_to_utf8("&#xe63e;")
+  end
+  def test_utf8_unicodecr_docomo
+    assert_equal "&#xe63e;", Jpmobile::Emoticon::utf8_to_unicodecr("\356\230\276")
+  end
+end
+
+class AuEmoticonTest < Test::Unit::TestCase
+  def test_au_external_unicodecr
+    assert_equal "&#xe481;", Jpmobile::Emoticon::external_to_unicodecr_au("\xf6\x59")
+  end
+  def test_au_unicodecr_external
+    assert_equal "\xf6\x59", Jpmobile::Emoticon::unicodecr_to_external("&#xe481;")
+  end
+  def test_au_unicodecr_utf8
+    assert_equal "\356\222\201", Jpmobile::Emoticon::unicodecr_to_utf8("&#xe481;")
+  end
+  def test_au_utf8_unicodecr
+    assert_equal "&#xe481;", Jpmobile::Emoticon::utf8_to_unicodecr("\356\222\201")
+  end
+end
+
+class SoftbankEmoticonTest < Test::Unit::TestCase
+  def test_jphone_webcode_cr
+    assert_equal "&#xf001;&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_jphone("\x1b$G!!\x0f")
+  end
+  def test_softbank_cr
+    assert_equal "&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U'))
+  end
+  def test_vodafone_cr
+    assert_equal "&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U'))
+  end
+  def test_softbank_cr_webcode
+    assert_equal "\x1b$G!\x0f", Jpmobile::Emoticon::unicodecr_to_external("&#xf001;")
+  end
+  def test_softbank_cr_utf8
+    assert_equal "\xef\x80\x81", Jpmobile::Emoticon::unicodecr_to_utf8("&#xf001;")
+  end
+  def test_softbank_utf8_cr
+    assert_equal "&#xf001;", Jpmobile::Emoticon::utf8_to_unicodecr("\xef\x80\x81")
+  end
+end
+
+class KoukaiEmoticonTest < Test::Unit::TestCase
+  def test_koukai_sjis
+    assert_equal "\x8c\xf6\x8a\x4a", Jpmobile::Emoticon::external_to_unicodecr_docomo("\x8c\xf6\x8a\x4a")
+  end
+end

data/test/filter_functional_test.rb

@@ -0,0 +1,146 @@
+require File.dirname(__FILE__)+'/helper'
+
+class FilterTestControllerBase < ActionController::Base
+  def abracadabra
+    render :text=>"アブラカダブラ"
+  end
+  def query
+    @q = params[:q]
+    render :text=>@q
+  end
+  def binary
+    send_data "アブラカダブラ"
+  end
+  def xhtml
+    response.content_type = "application/xhtml+xml"
+    render :text=>"アブラカダブラ"
+  end
+end
+
+class FilterTestController < FilterTestControllerBase
+  mobile_filter
+end
+
+class HankakuFilterTestController < FilterTestControllerBase
+  mobile_filter :hankaku=>true
+end
+
+class FilterFunctionalTestOutput < Test::Unit::TestCase
+  def setup
+    init FilterTestController
+  end
+  def test_docomo
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :abracadabra
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "\203A\203u\203\211\203J\203_\203u\203\211", @response.body # "アブラカダブラ", 全角, Shift_JIS
+  end
+end
+
+class HankakuFilterFunctionalTestOutput < Test::Unit::TestCase
+  def setup
+    init HankakuFilterTestController
+  end
+  def test_pc
+    get :abracadabra
+    assert_equal "utf-8", @response.charset
+    assert_equal "アブラカダブラ", @response.body
+  end
+  def test_docomo_binary
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :binary
+    assert_equal "アブラカダブラ", @response.body
+  end
+  def test_docomo_xhtml
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :xhtml
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "\261\314\336\327\266\300\336\314\336\327", @response.body # "アブラカダブラ", 半角, Shift_JIS
+  end
+  def test_docomo
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :abracadabra
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "\261\314\336\327\266\300\336\314\336\327", @response.body # "アブラカダブラ", 半角, Shift_JIS
+  end
+  def test_jphone
+    user_agent "J-PHONE/3.0/V301D"
+    get :abracadabra
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "\261\314\336\327\266\300\336\314\336\327", @response.body # "アブラカダブラ", 半角, Shift_JIS
+  end
+  def test_au
+    user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+    get :abracadabra
+    assert_equal "Shift_JIS", @response.charset
+    assert_equal "\261\314\336\327\266\300\336\314\336\327", @response.body # "アブラカダブラ", 半角, Shift_JIS
+  end
+  def test_softbank
+    user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+    get :abracadabra
+    assert_equal "utf-8", @response.charset
+    assert_equal "ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ", @response.body
+  end
+  def test_vodafone
+    user_agent "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"
+    get :abracadabra
+    assert_equal "utf-8", @response.charset
+    assert_equal "ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ", @response.body
+  end
+end
+
+class FilterFunctionalTestInput < Test::Unit::TestCase
+  def setup
+    init FilterTestController
+  end
+  def test_docomo
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :query, :q=>"アブラカダブラ".tosjis
+    assert_equal "アブラカダブラ", assigns["q"]
+    get :query, :q=>"\261\314\336\327\266\300\336\314\336\327"
+    assert_equal "ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ", assigns["q"]
+  end
+end
+
+class HankakuFilterFunctionalTestInput < Test::Unit::TestCase
+  def setup
+    init HankakuFilterTestController
+  end
+  def test_pc
+    get :query, :q=>"アブラカダブラ"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+  def test_docomo
+    user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
+    get :query, :q=>"アブラカダブラ".tosjis
+    assert_equal "アブラカダブラ", assigns["q"]
+    get :query, :q=>"\261\314\336\327\266\300\336\314\336\327"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+  def test_jphone
+    user_agent "J-PHONE/3.0/V301D"
+    get :query, :q=>"アブラカダブラ".tosjis
+    assert_equal "アブラカダブラ", assigns["q"]
+    get :query, :q=>"\261\314\336\327\266\300\336\314\336\327"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+  def test_au
+    user_agent "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0"
+    get :query, :q=>"アブラカダブラ".tosjis
+    assert_equal "アブラカダブラ", assigns["q"]
+    get :query, :q=>"\261\314\336\327\266\300\336\314\336\327"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+  def test_softbank
+    user_agent "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1"
+    get :query, :q=>"アブラカダブラ"
+    assert_equal "アブラカダブラ", assigns["q"]
+    get :query, :q=>"ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+  def test_vodafone
+    user_agent "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"
+    get :query, :q=>"アブラカダブラ"
+    assert_equal "アブラカダブラ", assigns["q"]
+  end
+end