jpmobile 0.0.7 → 0.0.8

data/test/legacy/docomo_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__)+'/helper'
 
 class DocomoTest < Test::Unit::TestCase
@@ -145,4 +146,42 @@ class DocomoTest < Test::Unit::TestCase
       assert_equal(262144, req.mobile.display.colors)
     end
   end
+
+  # i-modeブラウザバージョン判定
+  def test_docomo_imode_browser_version
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
+    reqs << request_with_ua("DoCoMo/1.0/F505iGPS/c20/TB/W20H10")
+    reqs.flatten.each do |req|
+      assert_equal('1.0', req.mobile.imode_browser_version)
+    end
+
+    reqs = request_with_ua("DoCoMo/2.0 P09A3(c500;TB;W20H12)")
+    reqs << request_with_ua("DoCoMo/2.0 P07A3(c500;TB;W24H15)")
+    reqs.flatten.each do |req|
+      assert_equal('2.0', req.mobile.imode_browser_version)
+    end
+
+    reqs = request_with_ua("DoCoMo/2.0 L01B(c500;TB;W40H10)")
+    reqs.flatten.each do |req|
+      assert_equal('2.0LE', req.mobile.imode_browser_version)
+    end
+  end
+
+  # cookie support
+  def test_docomo_imode_browser_version
+    # i-modeブラウザ1.0 == false
+    reqs = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)")
+    reqs << request_with_ua("DoCoMo/1.0/F505iGPS/c20/TB/W20H10")
+    reqs.flatten.each do |req|
+      assert(!req.mobile.supports_cookie?)
+    end
+
+    # i-modeブラウザ2.0 & 2.0LE == true
+    reqs = request_with_ua("DoCoMo/2.0 P09A3(c500;TB;W20H12)")
+    reqs << request_with_ua("DoCoMo/2.0 P07A3(c500;TB;W24H15)")
+    reqs << request_with_ua("DoCoMo/2.0 L01B(c500;TB;W40H10)")
+    reqs.flatten.each do |req|
+      assert(req.mobile.supports_cookie?)
+    end
+  end
 end

data/test/legacy/emoticon_functional_test.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__)+'/helper'
 
 class EmoticonTestController < ActionController::Base
@@ -46,26 +48,26 @@ class EmoticonFunctionalTest < ActionController::TestCase
     # DoCoMo携帯
     user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
     get :docomo_cr
-    assert_equal "\xf8\x9f", @response.body
+    assert_equal sjis("\xf8\x9f"), @response.body
     get :docomo_utf8
-    assert_equal "\xf8\x9f", @response.body
-    get :query, :q=>"\xf8\x9f"
+    assert_equal sjis("\xf8\x9f"), @response.body
+    get :query, :q=>sjis("\xf8\x9f")
     assert_equal "\xee\x98\xbe", assigns["q"]
-    assert_equal "\xf8\x9f", @response.body
+    assert_equal sjis("\xf8\x9f"), @response.body
 
     get :docomo_docomopoint
-    assert_equal "\xf9\x79", @response.body
+    assert_equal sjis("\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
-    assert_equal "\xf6\x60", @response.body
+    assert_equal sjis("\xf6\x60"), @response.body
     get :docomo_utf8
-    assert_equal "\xf6\x60", @response.body
+    assert_equal sjis("\xf6\x60"), @response.body
     get :docomo_docomopoint
-    assert_equal "［ドコモポイント］".tosjis, @response.body
+    assert_equal to_sjis("［ドコモポイント］"), @response.body
   end
 
   def test_docomo_from_softbank
@@ -88,7 +90,7 @@ class EmoticonFunctionalTest < ActionController::TestCase
     assert_equal "\e$Gj\x0f", @response.body
     get :docomo_docomopoint
     assert_equal "Shift_JIS", @response.charset
-    assert_equal "［ドコモポイント］".tosjis, @response.body
+    assert_equal to_sjis("［ドコモポイント］"), @response.body
   end
 
   def test_au_from_pc
@@ -103,21 +105,21 @@ class EmoticonFunctionalTest < ActionController::TestCase
     # 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
+    assert_equal sjis("\xf6\x60"), @response.body
     get :au_utf8
-    assert_equal "\xf6\x60", @response.body
-    get :query, :q=>"\xf6\x60"
+    assert_equal sjis("\xf6\x60"), @response.body
+    get :query, :q=>sjis("\xf6\x60")
     assert_equal [0xe488].pack("U"), assigns["q"]
-    assert_equal "\xf6\x60", @response.body
+    assert_equal sjis("\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
+    assert_equal sjis("\xf8\x9f"), @response.body
     get :au_utf8
-    assert_equal "\xf8\x9f", @response.body
+    assert_equal sjis("\xf8\x9f"), @response.body
   end
 
   def test_au_from_softbank
@@ -177,17 +179,17 @@ class EmoticonFunctionalTest < ActionController::TestCase
     # DoCoMo携帯電話での閲覧
     user_agent "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
     get :softbank_cr
-    assert_equal "\xf8\x9f", @response.body
+    assert_equal sjis("\xf8\x9f"), @response.body
     get :softbank_utf8
-    assert_equal "\xf8\x9f", @response.body
+    assert_equal sjis("\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
-    assert_equal "\xf6\x60", @response.body
+    assert_equal sjis("\xf6\x60"), @response.body
     get :softbank_utf8
-    assert_equal "\xf6\x60", @response.body
+    assert_equal sjis("\xf6\x60"), @response.body
   end
 end

data/test/legacy/emoticon_test.rb

@@ -2,34 +2,34 @@ 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")
+    assert_equal "&#xe63e;", Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\xf8\x9f"))
   end
   def test_unicodecr_external_docomo
-    assert_equal "\xf8\x9f", Jpmobile::Emoticon::unicodecr_to_external("&#xe63e;")
+    assert_equal sjis("\xf8\x9f"), Jpmobile::Emoticon::unicodecr_to_external("&#xe63e;")
   end
   def test_unicodecr_external_docomo_for_string
-    assert_equal "\xf8\x9f\xf8\xa0", Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true)
+    assert_equal sjis("\xf8\x9f\xf8\xa0"), Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true)
   end
   def test_unicodecr_utf8_docomo
-    assert_equal "\356\230\276", Jpmobile::Emoticon::unicodecr_to_utf8("&#xe63e;")
+    assert_equal utf8("\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")
+    assert_equal "&#xe63e;", Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\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")
+    assert_equal "&#xe481;", Jpmobile::Emoticon::external_to_unicodecr_au(sjis("\xf6\x59"))
   end
   def test_au_unicodecr_external
-    assert_equal "\xf6\x59", Jpmobile::Emoticon::unicodecr_to_external("&#xe481;")
+    assert_equal sjis("\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;")
+    assert_equal utf8("\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")
+    assert_equal "&#xe481;", Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\356\222\201"))
   end
 end
 
@@ -47,10 +47,10 @@ class SoftbankEmoticonTest < Test::Unit::TestCase
     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;")
+    assert_equal utf8("\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")
+    assert_equal "&#xf001;", Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\xef\x80\x81"))
   end
   def test_unicodecr_external_softbank_for_string
     assert_equal "\x1b$Gj\x0f\x1b$Gi\x0f", Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true)
@@ -59,6 +59,6 @@ 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")
+    assert_equal sjis("\x8c\xf6\x8a\x4a"), Jpmobile::Emoticon::external_to_unicodecr_docomo(sjis("\x8c\xf6\x8a\x4a"))
   end
 end

data/test/legacy/filter_test.rb

@@ -1,17 +1,19 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__)+'/helper'
 
 class FilterTest < Test::Unit::TestCase
   def setup
-    @aiu_sjis = "\202\240\202\242\202\244" # あいう
-    @aiu_utf8 = "\343\201\202\343\201\204\343\201\206" # あいう
+    @aiu_sjis = sjis("\202\240\202\242\202\244") # あいう
+    @aiu_utf8 = utf8("\343\201\202\343\201\204\343\201\206") # あいう
 
-    @aiu_zhz = "\343\201\202\357\275\262\343\202\246" # あイウ (イ半角), UTF-8
-    @aiu_zzz = "\343\201\202\343\202\244\343\202\246" # あイウ, UTF-8
-    @aiu_zhh = "\343\201\202\357\275\262\357\275\263" # あイウ (イウ半角), UTF-8
+    @aiu_zhz = utf8("\343\201\202\357\275\262\343\202\246") # あイウ (イ半角), UTF-8
+    @aiu_zzz = utf8("\343\201\202\343\202\244\343\202\246") # あイウ, UTF-8
+    @aiu_zhh = utf8("\343\201\202\357\275\262\357\275\263") # あイウ (イウ半角), UTF-8
 
-    @abracadabra_z_utf8 = "\343\202\242\343\203\226\343\203\251\343\202\253\343\203\200\343\203\226\343\203\251" # アブラカダブラ, UTF-8
-    @abracadabra_h_utf8 = "\357\275\261\357\276\214\357\276\236\357\276\227\357\275\266\357\276\200\357\276\236\357\276\214\357\276\236\357\276\227" # アブラカダブラ(半角), UTF-8
-    @abracadabra_z_sjis = "\203A\203u\203\211\203J\203_\203u\203\211" # アブラカダブラ, Shift_JIS
+    @abracadabra_z_utf8 = utf8("\343\202\242\343\203\226\343\203\251\343\202\253\343\203\200\343\203\226\343\203\251") # アブラカダブラ, UTF-8
+    @abracadabra_h_utf8 = utf8("\357\275\261\357\276\214\357\276\236\357\276\227\357\275\266\357\276\200\357\276\236\357\276\214\357\276\236\357\276\227") # アブラカダブラ(半角), UTF-8
+    @abracadabra_z_sjis = sjis("\203A\203u\203\211\203J\203_\203u\203\211") # アブラカダブラ, Shift_JIS
   end
   def test_filter_sjis
     filter = Jpmobile::Filter::Sjis.new

data/test/legacy/helper.rb

@@ -1,5 +1,13 @@
-require 'test/unit'
+# -*- coding: utf-8 -*-
+
 require 'rubygems'
+begin
+  gem 'test-unit', '= 1.2.3'
+rescue Gem::LoadError
+end
+require 'test/unit'
+action_pack_version = ENV['RAILS_VERSION'] || '2.3.0'
+gem 'actionpack', "~> #{action_pack_version}"
 require 'action_controller'
 require 'rack'
 
@@ -7,8 +15,10 @@ RAILS_ENV = "test"
 require File.dirname(__FILE__)+'/../../lib/jpmobile'
 
 # ActionPackのTestのためのrequire
-action_pack_full_path = Gem.cache.search('actionpack').sort_by { |g| g.version.version }.last
-require File.join(action_pack_full_path.full_gem_path,'test/abstract_unit')
+action_pack_gem = Gem.cache.find_name('actionpack').find do |gem|
+  gem.version.version >= action_pack_version
+end
+require File.join(action_pack_gem.full_gem_path,'test/abstract_unit')
 
 class FakeCgi < CGI
   attr_accessor :stdinput, :stdoutput, :env_table
@@ -46,5 +56,24 @@ module Jpmobile::TestHelper
     @request.host = "www.example.jp"
     @request.session.session_id = "mysessionid"
   end
+  def sjis(ascii_8bit)
+    if ascii_8bit.respond_to?(:force_encoding)
+      ascii_8bit.force_encoding("Shift_JIS")
+    end
+    ascii_8bit
+  end
+  def utf8(ascii_8bit)
+    if ascii_8bit.respond_to?(:force_encoding)
+      ascii_8bit.force_encoding("utf-8")
+    end
+    ascii_8bit
+  end
+  def to_sjis(utf8)
+    if utf8.respond_to?(:encode)
+      utf8.encode("Shift_JIS")
+    else
+      utf8.tosjis
+    end
+  end
 end
 Test::Unit::TestCase.class_eval{ include Jpmobile::TestHelper }

data/test/legacy/softbank_test.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__)+'/helper'
 
 class SoftbankTest < Test::Unit::TestCase

data/test/rails/.gitignore

@@ -0,0 +1 @@
+rails_root

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

@@ -24,4 +24,14 @@ end
 
 class HankakuFilterController < FilterControllerBase
   mobile_filter :hankaku => true
+
+  around_filter :freeze_response_body
+
+  private
+  def freeze_response_body
+    yield
+    if response.body.respond_to?(:freeze)
+      response.body.freeze
+    end
+  end
 end

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "docomo_guid が起動しないとき", :shared => true do

data/test/rails/overrides/spec/controllers/docomo_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "DoCoMo SH902i からのアクセス" do

data/test/rails/overrides/spec/controllers/emobile_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "H11T モバイルブラウザからのアクセス", :behaviour_type=>:controller do

data/test/rails/overrides/spec/controllers/filter_spec.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "文字コードフィルタが動作しているとき", :shared => true do
@@ -16,20 +17,20 @@ end
 describe "Shift_JISで通信する端末との通信", :shared => true do
   it "はShift_JISで携帯に送出されること" do
     get :abracadabra_utf8
-    response.body.should == "アブラカダブラ".tosjis
+    response.body.should == to_sjis("アブラカダブラ")
     response.charset.should == "Shift_JIS"
   end
   it "はxhtmlでもShift_JISで携帯に送出されること" do
     get :abracadabra_xhtml_utf8
-    response.body.should == "アブラカダブラ".tosjis
+    response.body.should == to_sjis("アブラカダブラ")
     response.charset.should == "Shift_JIS"
   end
   it "はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること" do
-    get :index, :q => "アブラカダブラ".tosjis
+    get :index, :q => to_sjis("アブラカダブラ")
     assigns[:q].should == "アブラカダブラ"
   end
   it "は半角カナのparamsを変換しないこと" do
-    get :index, :q => "\261\314\336\327\266\300\336\314\336\327" # アブラカダブラ半角,SJIS
+    get :index, :q => sjis("\261\314\336\327\266\300\336\314\336\327") # アブラカダブラ半角,SJIS
     assigns[:q].should == "ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ"
   end
   it_should_behave_like "文字コードフィルタが動作しているとき"
@@ -60,15 +61,15 @@ end
 describe "Shift_JISで通信する端末との通信(半角変換付き)", :shared => true do
   it "は半角に変換されShift_JISで携帯に送出されること" do
     get :abracadabra_utf8
-    response.body.should == "\261\314\336\327\266\300\336\314\336\327" # アブラカダブラ半角,SJIS
+    response.body.should == sjis("\261\314\336\327\266\300\336\314\336\327") # アブラカダブラ半角,SJIS
     response.charset.should == "Shift_JIS"
   end
   it "はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること" do
-    get :index, :q => "アブラカダブラ".tosjis
+    get :index, :q => to_sjis("アブラカダブラ")
     assigns[:q].should == "アブラカダブラ"
   end
   it "は半角Shift_JISで渡されたパラメタがparamsに全角UTF-8に変換されて格納されること" do
-    get :index, :q => "\261\314\336\327\266\300\336\314\336\327" # アブラカダブラ半角,SJIS
+    get :index, :q => sjis("\261\314\336\327\266\300\336\314\336\327") # アブラカダブラ半角,SJIS
     assigns[:q].should == "アブラカダブラ"
   end
   it_should_behave_like "文字コードフィルタが動作しているとき"

data/test/rails/overrides/spec/controllers/pc_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "PCからのアクセスの場合", :behaviour_type=>:controller do

data/test/rails/overrides/spec/controllers/softbank_emulator_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "携帯電話からのアクセス", :shared => true do

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

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 #

data/test/rails/overrides/spec/controllers/trans_sid_spec.rb

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "trans_sid が起動しないとき", :shared => true do

data/test/rails/overrides/spec/helpers/helpers_spec.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Jpmobile::Helpers do

data/test/rails/overrides/spec/spec_helper.rb

@@ -45,3 +45,18 @@ Spec::Runner.configure do |config|
   # 
   # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end
+
+def sjis(ascii_8bit)
+  if ascii_8bit.respond_to?(:force_encoding)
+    ascii_8bit.force_encoding("Shift_JIS")
+  end
+  ascii_8bit
+end
+
+def to_sjis(utf8)
+  if utf8.respond_to?(:encode)
+    utf8.encode("Shift_JIS")
+  else
+    utf8.tosjis
+  end
+end