jpmobile 0.0.2 → 0.0.3

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -26,4 +26,7 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "219.108.157.0/25",
  "219.125.151.128/25",
  "219.125.145.0/25",
- "121.111.231.0/25"]
+ "121.111.231.0/25",
+ "121.111.231.160/27",
+ "121.111.227.0/25",
+ "121.111.227.160/27"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_docomo.rb

@@ -0,0 +1,10 @@
+# = IPアドレス帯域テーブル(手動更新分)
+# == DoCoMo
+# http://www.nttdocomo.co.jp/service/imode/make/content/ip/index.html
+# 2006/09現在
+Jpmobile::Mobile::Docomo::IP_ADDRESSES = %w(
+210.153.84.0/24
+210.136.161.0/24
+210.153.86.0/24
+).map {|ip| IPAddr.new(ip) }
+

data/lib/jpmobile/mobile/z_ip_addresses_emobile.rb

@@ -0,0 +1,10 @@
+# = IPアドレス帯域テーブル(手動更新分)
+# == EMOBILE
+# http://developer.emnet.ne.jp/ipaddress.html
+# 2008/02/26現在
+
+#:enddoc:
+
+Jpmobile::Mobile::Emobile::IP_ADDRESSES = %w(
+117.55.1.224/27
+).map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/{z_ip_addresses.rb → z_ip_addresses_softbank.rb}

@@ -1,19 +1,8 @@
 # = IPアドレス帯域テーブル(手動更新分)
-# == DoCoMo
-# 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
 # 2007/10/09現在
-
-#:enddoc:
-Jpmobile::Mobile::Docomo::IP_ADDRESSES = <<EOF
-210.153.84.0/24
-210.136.161.0/24
-210.153.86.0/24
-EOF
-
-Jpmobile::Mobile::Softbank::IP_ADDRESSES=<<EOF
+Jpmobile::Mobile::Softbank::IP_ADDRESSES = %w(
 123.108.236.0/24
 123.108.237.0/27
 202.179.204.0/24
@@ -25,4 +14,4 @@ Jpmobile::Mobile::Softbank::IP_ADDRESSES=<<EOF
 210.175.1.128/25
 210.228.189.0/24
 211.8.159.128/25
-EOF
+).map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -76,4 +76,23 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "61.198.139.128/27",
  "61.198.138.103/32",
  "61.198.139.0/29",
- "219.108.15.0/24"]
+ "219.108.15.0/24",
+ "61.198.130.0/24",
+ "61.198.163.0/24",
+ "61.204.6.128/25",
+ "61.204.7.0/25",
+ "61.204.92.0/24",
+ "61.204.93.0/24",
+ "61.204.94.0/24",
+ "61.204.95.0/24",
+ "61.198.128.0/24",
+ "61.198.131.0/24",
+ "61.198.143.0/24",
+ "61.198.172.0/24",
+ "61.198.173.0/24",
+ "61.198.252.0/24",
+ "61.204.3.128/25",
+ "211.126.192.128/25",
+ "219.108.11.0/24",
+ "219.108.12.0/24",
+ "219.108.13.0/24"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/position.rb

@@ -2,8 +2,8 @@
 
 # plugins/以下にgeokitがインストールされている場合は読み込む
 begin
-  require File.dirname(__FILE__) + '/../../../geokit/lib/geo_kit/mappable'
-rescue MissingSourceFile
+  require RAILS_ROOT + '/vendor/plugins/geokit/lib/geo_kit/mappable'
+rescue MissingSourceFile, NameError
 end
 
 module Jpmobile

data/lib/jpmobile/request_with_mobile.rb

@@ -0,0 +1,44 @@
+# jpmobile の各機能を提供するモジュール
+# envメソッドと、parameter あるいは params メソッドが実装されている必要がある。
+# 今のところはRack::RequestとActionController::AbstractRequestに対応しているはず。
+
+module Jpmobile
+  module RequestWithMobile
+    # 環境変数 HTTP_USER_AGENT を返す。
+    def user_agent
+      env['HTTP_USER_AGENT']
+    end
+
+    # for reverse proxy.
+    def remote_addr
+      if respond_to? :remote_ip
+        return __send__(:remote_ip)
+      else
+        return ( env["HTTP_X_FORWARDED_FOR"] ? env["HTTP_X_FORWARDED_FOR"].split(',').pop : env["REMOTE_ADDR"] )
+      end
+    end
+
+    # 環境変数 HTTP_USER_AGENT を設定する。
+    def user_agent=(str)
+      self.env["HTTP_USER_AGENT"] = str
+    end
+
+    # 携帯電話からであれば +true+を、そうでなければ +false+ を返す。
+    def mobile?
+      mobile != nil
+    end
+
+    # 携帯電話の機種に応じて Mobile::xxx を返す。
+    # 携帯電話でない場合はnilを返す。
+    def mobile
+      return @__mobile if @__mobile
+
+      Jpmobile::Mobile.constants.each do |const|
+        c = Jpmobile::Mobile.const_get(const)
+        return @__mobile = c.new(self) if c::USER_AGENT_REGEXP && user_agent =~ c::USER_AGENT_REGEXP
+      end
+      nil
+    end
+  end
+end
+

data/lib/jpmobile/trans_sid.rb

@@ -4,12 +4,50 @@
 # by moriq <moriq@moriq.com>
 #
 # cookie support detection inspired by takai http://recompile.net/
+#
+# Rails 2.0.2 support is based on the code contributed
+# by masuidrive <masuidrive (at) masuidrive.jp>
+
+# FastCGI環境では(どういうわけか) cgi.query_string でクエリ文字列を取得できないので
+# ENV['QUERY_STRING'] に代入しておく。
+module ActionController
+  class CgiRequest
+    alias_method :initialize_without_ext, :initialize
+    def initialize(cgi, options = {})
+      initialize_without_ext(cgi, options)
+      ENV['QUERY_STRING'] = query_string
+    end
+  end
+end
 
 class ActionController::Base #:nodoc:
-  class_inheritable_accessor :transit_sid_mode
-  def self.transit_sid(mode=:mobile)
-    include Jpmobile::TransSid
-    self.transit_sid_mode = mode
+  class_inheritable_accessor :trans_sid_mode
+  alias :transit_sid_mode :trans_sid_mode
+  class << self
+    def trans_sid(mode=:mobile)
+      include Jpmobile::TransSid
+      self.trans_sid_mode = mode
+      unless mode == :none
+        # CSRF対策への対策
+        session :cookie_only => false
+        # url/postからsession_keyを取得できるようhookを追加する
+        unless ::CGI::Session.private_method_defined?(:initialize_without_session_key_fixation)
+          ::CGI::Session.class_eval do
+            alias_method :initialize_without_session_key_fixation, :initialize
+            def initialize(cgi, options = {})
+              key = options['session_key']
+              if cgi.cookies[key].empty?
+                session_id = (CGI.parse(cgi.env_table['RAW_POST_DATA'])[key] rescue nil) ||
+                  (CGI.parse(ENV['QUERY_STRING'] || cgi.query_string)[key] rescue nil)
+                cgi.params[key] = session_id unless session_id.blank?
+              end
+              initialize_without_session_key_fixation(cgi, options)
+            end
+          end
+        end
+      end
+    end
+    alias :transit_sid :trans_sid
   end
 end
 
@@ -20,9 +58,9 @@ module Jpmobile::TransSid #:nodoc:
 
   protected
   # URLにsession_idを追加する。
-  def default_url_options(options)
+  def default_url_options(options=nil)
     return unless request # for test process
-    return unless apply_transit_sid?
+    return unless apply_trans_sid?
     { session_key => session.session_id }
   end
 
@@ -35,20 +73,20 @@ module Jpmobile::TransSid #:nodoc:
   end
   # session_idを埋め込むためのhidden fieldを出力する。
   def sid_hidden_field_tag
-    "<input type='hidden' name='#{CGI::escapeHTML session_key}' value='#{CGI::escapeHTML session.session_id}'>"
+    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML session.session_id}\" />"
   end
   # formにsession_idを追加する。
   def append_session_id_parameter
-    return unless request # for test process 
-    return unless apply_transit_sid?
+    return unless request # for test process
+    return unless apply_trans_sid?
     response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
-  # transit_sidを適用すべきかを返す。
-  def apply_transit_sid?
+  # trans_sidを適用すべきかを返す。
+  def apply_trans_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
+    return false if trans_sid_mode == :none
+    return true if trans_sid_mode == :always
+    if trans_sid_mode == :mobile
       if request.mobile?
         return !request.mobile.supports_cookie?
       else

data/lib/jpmobile/version.rb

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

data/test/au_test.rb

@@ -3,140 +3,171 @@ require File.dirname(__FILE__)+'/helper'
 class AuTest < Test::Unit::TestCase
   # au, 端末種別の識別
   def test_au_ca32
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           "HTTP_X_UP_SUBNO"=>"00000000000000_mj.ezweb.ne.jp")
-    assert_equal(true, req.mobile?)
-    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?)
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      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
   end
 
   # TuKa, 端末種別の識別
   def test_tuka_tk22
-    req = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
-    assert_equal(true, req.mobile?)
-    assert_instance_of(Jpmobile::Mobile::Au, req.mobile)
+    reqs = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
+    reqs.each do |req|
+      assert_equal(true, req.mobile?)
+      assert_instance_of(Jpmobile::Mobile::Au, req.mobile)
+    end
   end
 
   # au, gps, degree, wgs84
   def test_au_gps_degree
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1"})
-    assert_equal(43.07772, req.mobile.position.lat)
-    assert_equal(141.34114, req.mobile.position.lon)
+    reqs.each do |req|
+      assert_equal(43.07772, req.mobile.position.lat)
+      assert_equal(141.34114, req.mobile.position.lon)
+    end
   end
 
   # au, gps, dms, wgs84
   # これが一番端末を選ばないようだ
   # http://hiyuzawa.jpn.org/blog/2006/09/gps1_augps_1.html
   def test_au_gps_dms
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"ver=1&datum=0&unit=0&lat=%2b43.05.08.95&lon=%2b141.20.25.99&alt=155&time=20060521010328&smaj=76&smin=62&vert=65&majaa=49&fm=1"})
-    assert_in_delta(43.08581944, req.mobile.position.lat, 1e-7)
-    assert_in_delta(141.3405528, req.mobile.position.lon, 1e-7)
+    reqs.each do |req|
+      assert_in_delta(43.08581944, req.mobile.position.lat, 1e-7)
+      assert_in_delta(141.3405528, req.mobile.position.lon, 1e-7)
+    end
   end
 
   # au, gps, degree, tokyo
   def test_au_gps_degree_tokyo
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1"})
-    assert_in_delta(43.07719289, req.mobile.position.lat, 1e-4)
-    assert_in_delta(141.3389013, req.mobile.position.lon, 1e-4)
+    reqs.each do |req|
+      assert_in_delta(43.07719289, req.mobile.position.lat, 1e-4)
+      assert_in_delta(141.3389013, req.mobile.position.lon, 1e-4)
+    end
   end
 
   # au, gps, dms, tokyo
   def test_au_gps_dms_tokyo
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"ver=1&datum=1&unit=0&lat=%2b43.04.28.26&lon=%2b141.20.33.15&alt=-5&time=20061017183807&smaj=52&smin=36&vert=31&majaa=101&fm=1"})
-    assert_in_delta(43.07695833, req.mobile.position.lat, 1e-4)
-    assert_in_delta(141.3388528, req.mobile.position.lon, 1e-4)
+    reqs.each do |req|
+      assert_in_delta(43.07695833, req.mobile.position.lat, 1e-4)
+      assert_in_delta(141.3388528, req.mobile.position.lon, 1e-4)
+    end
   end
 
   # au, antenna, dms (au簡易位置情報)
   def test_au_antenna
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75"})
-    assert_in_delta(43.08194444, req.mobile.position.lat, 1e-7)
-    assert_in_delta(141.3474306, req.mobile.position.lon, 1e-7)
+    reqs.each do |req|
+      assert_in_delta(43.08194444, req.mobile.position.lat, 1e-7)
+      assert_in_delta(141.3474306, req.mobile.position.lon, 1e-7)
+    end
   end
 
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_au_valid_ip_address
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"REMOTE_ADDR"=>"210.169.40.1"})
-    assert_equal(req.mobile.valid_ip?, true)
+    reqs.each do |req|
+      assert_equal(req.mobile.valid_ip?, true)
+    end
   end
 
   # 正しくないIPアドレス空間からのアクセスを判断できるか。
   def test_au_invalid_ip_address
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"REMOTE_ADDR"=>"127.0.0.1"})
-    assert_equal(req.mobile.valid_ip?, false)
+    reqs.each do |req|
+      assert_equal(req.mobile.valid_ip?, false)
+    end
   end
 
   # 端末の画面サイズを正しく取得できるか。
   def test_au_w41ca_display
-    req = request_with_ua("KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0",
                           "HTTP_X_UP_DEVCAP_SCREENDEPTH"=>"16,RGB565",
                           "HTTP_X_UP_DEVCAP_SCREENPIXELS"=>"240,346",
                           "HTTP_X_UP_DEVCAP_ISCOLOR"=>"1"
                           )
-    assert_equal(240, req.mobile.display.width)
-    assert_equal(346, req.mobile.display.height)
-    assert_equal(true, req.mobile.display.color?)
-    assert_equal(65536, req.mobile.display.colors)
+
+    reqs.each do |req|
+      assert_equal(240, req.mobile.display.width)
+      assert_equal(346, req.mobile.display.height)
+      assert_equal(true, req.mobile.display.color?)
+      assert_equal(65536, req.mobile.display.colors)
+    end
   end
 
   # 端末の画面情報が渡ってない場合に正しく動作するか。
   def test_au_w41ca_display_information_omitted
-    req = request_with_ua("KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0")
-    assert_equal(nil, req.mobile.display.width)
-    assert_equal(nil, req.mobile.display.height)
-    assert_equal(nil, req.mobile.display.browser_width)
-    assert_equal(nil, req.mobile.display.browser_height)
-    assert_equal(nil, req.mobile.display.physical_width)
-    assert_equal(nil, req.mobile.display.physical_height)
-    assert_equal(nil, req.mobile.display.color?)
-    assert_equal(nil, req.mobile.display.colors)
+    reqs = request_with_ua("KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0")
+    reqs.each do |req|
+      assert_equal(nil, req.mobile.display.width)
+      assert_equal(nil, req.mobile.display.height)
+      assert_equal(nil, req.mobile.display.browser_width)
+      assert_equal(nil, req.mobile.display.browser_height)
+      assert_equal(nil, req.mobile.display.physical_width)
+      assert_equal(nil, req.mobile.display.physical_height)
+      assert_equal(nil, req.mobile.display.color?)
+      assert_equal(nil, req.mobile.display.colors)
+    end
   end
 
   # for GeoKit::Mappable
   def test_au_gps_degree_geokit
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
                           {"QUERY_STRING"=>"ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1"})
-    assert_equal(43.07772, req.mobile.position.lat)
-    assert_equal(141.34114, req.mobile.position.lng)
-    assert_equal("43.07772,141.34114", req.mobile.position.ll)
-    assert_equal(req.mobile.position, req.mobile.position)
-    if req.mobile.position.respond_to?(:distance_to) # GeoKitがインストールされている場合
-      assert_equal(0, req.mobile.position.distance_to(req.mobile.position))
+    reqs.each do |req|
+      assert_equal(43.07772, req.mobile.position.lat)
+      assert_equal(141.34114, req.mobile.position.lng)
+      assert_equal("43.07772,141.34114", req.mobile.position.ll)
+      assert_equal(req.mobile.position, req.mobile.position)
+      if req.mobile.position.respond_to?(:distance_to) # GeoKitがインストールされている場合
+        assert_equal(0, req.mobile.position.distance_to(req.mobile.position))
+      end
     end
   end
   
   # 位置情報取得機能の有無, W31CA
   def test_au_location_capability_w31ca
-    req = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
-    assert_equal("CA32", req.mobile.device_id)
-    assert_equal(true, req.mobile.supports_location?)
-    assert_equal(true, req.mobile.supports_gps?)
+    reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
+    reqs.each do |req|
+      assert_equal("CA32", req.mobile.device_id)
+      assert_equal(true, req.mobile.supports_location?)
+      assert_equal(true, req.mobile.supports_gps?)
+    end
   end
 
   # 位置情報取得機能の有無, A1402S
   def test_au_location_capability_a1402s
-    req = request_with_ua("KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
-    assert_equal("SN26", req.mobile.device_id)
-    assert_equal(true, req.mobile.supports_location?)
-    assert_equal(false, req.mobile.supports_gps?)
+    reqs = request_with_ua("KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
+    reqs.each do |req|
+      assert_equal("SN26", req.mobile.device_id)
+      assert_equal(true, req.mobile.supports_location?)
+      assert_equal(false, req.mobile.supports_gps?)
+    end
   end
 
   # 位置情報取得機能の有無, TK22
   def test_au_location_capability_tk22
-    req = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
-    assert_equal("KCTA", req.mobile.device_id)
-    assert_equal(false, req.mobile.supports_location?)
-    assert_equal(false, req.mobile.supports_gps?)
+    reqs = request_with_ua("UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
+    reqs.each do |req|
+      assert_equal("KCTA", req.mobile.device_id)
+      assert_equal(false, req.mobile.supports_location?)
+      assert_equal(false, req.mobile.supports_gps?)
+    end
   end
 end