jpmobile 0.0.3 → 0.0.4

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -9,6 +9,8 @@ module Jpmobile::Mobile
 
     # 対応するuser-agentの正規表現
     USER_AGENT_REGEXP = nil
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = nil
 
     # 緯度経度があれば Position のインスタンスを返す。
     def position; return nil; end
@@ -37,7 +39,7 @@ module Jpmobile::Mobile
     def valid_ip?
       @__valid_ip ||= self.class.valid_ip? @request.remote_addr
     end
-    
+
     # 画面情報を +Display+ クラスのインスタンスで返す。
     def display
       @__displlay ||= Jpmobile::Display.new
@@ -48,6 +50,16 @@ module Jpmobile::Mobile
       return false
     end
 
+    #XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
+    Jpmobile::Mobile.carriers.each do |carrier|
+      carrier_class = Jpmobile::Mobile.const_get(carrier)
+      next if carrier_class == self
+
+      define_method "#{carrier.downcase}?" do
+        self.is_a?(carrier_class)
+      end
+    end
+
     private
     # リクエストのパラメータ。
     def params

data/lib/jpmobile/mobile/au.rb

@@ -11,6 +11,8 @@ module Jpmobile::Mobile
     # 対応するUser-Agentの正規表現
     # User-Agent文字列中に "UP.Browser" を含むVodafoneの端末があるので注意が必要
     USER_AGENT_REGEXP = /^(?:KDDI|UP.Browser\/.+?)-(.+?) /
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@ezweb\.ne\.jp$/
     # 簡易位置情報取得に対応していないデバイスID
     # http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
     LOCATION_UNSUPPORTED_DEVICE_ID = ["PT21", "TS25", "KCTE", "TST9", "KCU1", "SYT5", "KCTD", "TST8", "TST7", "KCTC", "SYT4", "KCTB", "KCTA", "TST6", "KCT9", "TST5", "TST4", "KCT8", "SYT3", "KCT7", "MIT1", "MAT3", "KCT6", "TST3", "KCT5", "KCT4", "SYT2", "MAT1", "MAT2", "TST2", "KCT3", "KCT2", "KCT1", "TST1", "SYT1"]

data/lib/jpmobile/mobile/docomo.rb

@@ -8,6 +8,8 @@ module Jpmobile::Mobile
 
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^DoCoMo/
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@docomo\.ne\.jp$/
 
     # オープンiエリアがあればエリアコードを +String+ で返す。無ければ +nil+ を返す。
     def areacode
@@ -24,7 +26,7 @@ module Jpmobile::Mobile
       lat = params["lat"] || params["LAT"]
       lon = params["lon"] || params["LON"]
       geo = params["geo"] || params["GEO"]
-      return @__position = nil if ( lat.nil? || lat == '' || lon.nil? || lon == '' ) 
+      return @__position = nil if ( lat.nil? || lat == '' || lon.nil? || lon == '' )
       raise "Unsuppoted datum" if geo.downcase != "wgs84"
       pos = Jpmobile::Position.new
       raise "Unsuppoted" unless lat =~ /^([+-]\d+)\.(\d+)\.(\d+\.\d+)/

data/lib/jpmobile/mobile/emobile.rb

@@ -6,6 +6,8 @@ module Jpmobile::Mobile
     autoload :IP_ADDRESSES, 'jpmobile/mobile/z_ip_addresses_emobile'
 
     USER_AGENT_REGEXP = %r{^emobile/|^Mozilla/5.0 \(H11T; like Gecko; OpenBrowser\) NetFront/3.4$|^Mozilla/4.0 \(compatible; MSIE 6.0; Windows CE; IEMobile 7.7\) S11HT$}
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@emnet\.ne\.jp$/
     # EMnet対応端末から通知されるユニークなユーザIDを取得する。
     def em_uid
       @request.env['HTTP_X_EM_UID']

data/lib/jpmobile/mobile/softbank.rb

@@ -10,7 +10,9 @@ module Jpmobile::Mobile
     autoload :IP_ADDRESSES, 'jpmobile/mobile/z_ip_addresses_softbank'
 
     # 対応するuser-agentの正規表現
-    USER_AGENT_REGEXP = /^(SoftBank|Semulator)/
+    USER_AGENT_REGEXP = /^(?:SoftBank|Semulator)/
+    # 対応するメールアドレスの正規表現　ディズニーモバイル対応
+    MAIL_ADDRESS_REGEXP = /^.+@(?:softbank\.ne\.jp|disney\.ne\.jp)$/
 
     # 製造番号を返す。無ければ +nil+ を返す。
     def serial_number
@@ -71,6 +73,8 @@ module Jpmobile::Mobile
   class Vodafone < Softbank
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^(Vodafone|Vemulator)/
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@[dhtcrknsq]\.vodafone\.ne\.jp$/
 
     # cookieに対応しているか？
     def supports_cookie?
@@ -82,6 +86,8 @@ module Jpmobile::Mobile
   class Jphone < Vodafone
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^(J-PHONE|J-EMULATOR)/
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@jp-[dhtcrknsq]\.ne\.jp$/
 
     # 位置情報があれば Position のインスタンスを返す。無ければ +nil+ を返す。
     def position

data/lib/jpmobile/mobile/willcom.rb

@@ -9,6 +9,8 @@ module Jpmobile::Mobile
 
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^Mozilla\/3.0\(WILLCOM/
+    # 対応するメールアドレスの正規表現
+    MAIL_ADDRESS_REGEXP = /^.+@(.+\.)?pdx\.ne\.jp$/
 
     # 位置情報があれば Position のインスタンスを返す。無ければ +nil+ を返す。
     def position
@@ -31,5 +33,7 @@ module Jpmobile::Mobile
   class Ddipocket < Willcom
     # 対応するUser-Agentの正規表現
     USER_AGENT_REGEXP = /^Mozilla\/3.0\(DDIPOCKET/
+
+    MAIL_ADDRESS_REGEXP = nil # DdipocketはEmail判定だとWillcomと判定させたい
   end
 end

data/lib/jpmobile/mobile/z_display_info_docomo.rb

@@ -10,6 +10,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>266},
  "P703imyu"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>270},
+ "F02A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>352},
  "F503iS"=>
   {:color_p=>true, :colors=>4096, :browser_width=>120, :browser_height=>130},
  "P851i"=>
@@ -56,6 +58,11 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>120, :browser_height=>130},
  "N2001"=>
   {:color_p=>true, :colors=>4096, :browser_width=>118, :browser_height=>128},
+ "SH01A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>320},
  "SH906i"=>
   {:color_p=>true,
    :colors=>16777216,
@@ -68,6 +75,10 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
    :browser_height=>320},
  "N905iBiz"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
+ "F05A"=>
+  {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>352},
+ "SH706ie"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "SH703i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>240},
  "N900iS"=>
@@ -78,6 +89,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>118, :browser_height=>128},
  "F504i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>136},
+ "N706ie"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "F905i"=>
   {:color_p=>true,
    :colors=>16777216,
@@ -123,6 +136,11 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "SH702iD"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>240},
+ "SH04A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>320},
  "SH706i"=>
   {:color_p=>true,
    :colors=>16777216,
@@ -174,8 +192,15 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>132, :browser_height=>144},
  "P252iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>144},
+ "P03A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "F671iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>160, :browser_height=>120},
+ "NM706i"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>231,
+   :browser_height=>235},
  "P2102V"=>
   {:color_p=>true, :colors=>262144, :browser_width=>176, :browser_height=>198},
  "D702i"=>
@@ -193,6 +218,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
    :browser_height=>352},
  "N600i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>176, :browser_height=>180},
+ "N03A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "SO905iCS"=>
   {:color_p=>true,
    :colors=>16777216,
@@ -224,10 +251,20 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>256, :browser_width=>96, :browser_height=>78},
  "F901iS"=>
   {:color_p=>true, :colors=>262144, :browser_width=>230, :browser_height=>240},
+ "F01A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>352},
  "N906imyu"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "F209i"=>
   {:color_p=>true, :colors=>256, :browser_width=>96, :browser_height=>91},
+ "SH706iw"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>320},
  "P706imyu"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "F703i"=>
@@ -264,6 +301,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>270},
  "P210i"=>
   {:color_p=>true, :colors=>256, :browser_width=>96, :browser_height=>91},
+ "F04A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>352},
  "F503i"=>
   {:color_p=>true, :colors=>256, :browser_width=>120, :browser_height=>130},
  "L705iX"=>
@@ -303,6 +342,11 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>270},
  "P213i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>144},
+ "SH03A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>320},
  "SH705i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "D701iWM"=>
@@ -349,10 +393,14 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>144},
  "SO211i"=>
   {:color_p=>true, :colors=>4096, :browser_width=>120, :browser_height=>112},
+ "L01A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "N821i"=>
   {:color_p=>false, :colors=>4, :browser_width=>118, :browser_height=>128},
  "P702i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>270},
+ "P02A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "P506iCII"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>266},
  "N701iECO"=>
@@ -374,12 +422,16 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>256},
  "N2701"=>
   {:color_p=>true, :colors=>65536, :browser_width=>176, :browser_height=>198},
+ "N02A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "SA700iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>252},
  "D253i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>176, :browser_height=>198},
  "SH505i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>252},
+ "P05A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "P705imyu"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "D704i"=>
@@ -441,10 +493,17 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>270},
  "D901iS"=>
   {:color_p=>true, :colors=>262144, :browser_width=>230, :browser_height=>240},
+ "F03A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>352},
  "F884i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>364},
  "F502i"=>
   {:color_p=>true, :colors=>256, :browser_width=>96, :browser_height=>91},
+ "N706iII"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "F705i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>352},
  "SH904i"=>
@@ -467,6 +526,16 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>false, :colors=>4, :browser_width=>118, :browser_height=>128},
  "N701i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>270},
+ "SH02A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>320},
+ "F06A"=>
+  {:color_p=>true,
+   :colors=>16777216,
+   :browser_width=>240,
+   :browser_height=>352},
  "SH704i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "F505i"=>
@@ -508,6 +577,8 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>256, :browser_width=>120, :browser_height=>113},
  "P503i"=>
   {:color_p=>true, :colors=>256, :browser_width=>120, :browser_height=>130},
+ "P01A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "P251iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>144},
  "SO503iS"=>
@@ -525,14 +596,16 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
    :browser_height=>320},
  "P704i"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>270},
+ "F903iBSC"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>230, :browser_height=>240},
  "P504iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>144},
  "F212i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>132, :browser_height=>136},
- "F903iBSC"=>
-  {:color_p=>true, :colors=>262144, :browser_width=>230, :browser_height=>240},
  "D503iS"=>
   {:color_p=>true, :colors=>4096, :browser_width=>132, :browser_height=>126},
+ "N01A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
  "P705iCL"=>
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "N900iG"=>
@@ -543,6 +616,10 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>65536, :browser_width=>800, :browser_height=>600},
  "SO213i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>120, :browser_height=>112},
+ "P04A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
+ "F884iES"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>282},
  "D2101V"=>
   {:color_p=>true, :colors=>262144, :browser_width=>120, :browser_height=>130},
  "D209i"=>
@@ -571,8 +648,14 @@ Jpmobile::Mobile::Docomo::DISPLAY_INFO =
   {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>256},
  "N601i"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>270},
+ "N04A"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>320},
+ "L706ie"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>280},
  "SH251iS"=>
   {:color_p=>true, :colors=>65536, :browser_width=>176, :browser_height=>187},
+ "P706ie"=>
+  {:color_p=>true, :colors=>262144, :browser_width=>240, :browser_height=>350},
  "N900iL"=>
   {:color_p=>true, :colors=>65536, :browser_width=>240, :browser_height=>269},
  "N211i"=>

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -1,32 +1,47 @@
 Jpmobile::Mobile::Au::IP_ADDRESSES = 
-["210.169.40.0/24",
- "210.196.3.192/26",
- "210.196.5.192/26",
- "210.230.128.0/24",
- "210.230.141.192/26",
- "210.234.105.32/29",
- "210.234.108.64/26",
- "210.251.1.192/26",
- "210.251.2.0/27",
- "211.5.1.0/24",
- "211.5.2.128/25",
- "211.5.7.0/24",
- "218.222.1.0/24",
- "61.117.0.0/24",
- "61.117.1.0/24",
- "61.117.2.0/26",
- "61.202.3.0/24",
- "219.108.158.0/26",
- "219.125.148.0/24",
- "222.5.63.0/24",
- "222.7.56.0/24",
+["210.230.128.224/28",
+ "61.117.0.128/25",
+ "61.117.1.128/25",
+ "218.222.1.0/25",
+ "121.111.227.160/27",
+ "218.222.1.128/28",
+ "218.222.1.144/28",
+ "218.222.1.160/28",
+ "61.202.3.64/28",
+ "61.117.1.0/28",
+ "219.108.158.0/27",
+ "219.125.146.0/28",
+ "61.117.2.32/29",
+ "61.117.2.40/29",
+ "219.108.158.40/29",
+ "219.125.148.0/25",
+ "222.5.63.0/25",
+ "222.5.63.128/25",
  "222.5.62.128/25",
- "222.7.57.0/24",
  "59.135.38.128/25",
  "219.108.157.0/25",
- "219.125.151.128/25",
  "219.125.145.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) }
+ "118.152.214.192/26",
+ "118.159.131.0/25",
+ "118.159.133.0/25",
+ "219.125.148.160/27",
+ "219.125.148.192/27",
+ "222.7.56.0/27",
+ "222.7.56.32/27",
+ "222.7.56.96/27",
+ "222.7.56.128/27",
+ "222.7.56.192/27",
+ "222.7.56.224/27",
+ "222.7.57.64/27",
+ "222.7.57.96/27",
+ "222.7.57.128/27",
+ "222.7.57.160/27",
+ "222.7.57.192/27",
+ "222.7.57.224/27",
+ "219.125.151.128/27",
+ "219.125.151.160/27",
+ "219.125.151.192/27",
+ "222.7.57.32/27",
+ "121.111.231.160/27"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_docomo.rb

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

data/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -1,98 +1,119 @@
 Jpmobile::Mobile::Willcom::IP_ADDRESSES =
-["61.198.142.0/24",
- "219.108.14.0/24",
+["61.198.128.0/24",
+ "61.198.129.0/24",
+ "61.198.130.0/24",
+ "61.198.131.0/24",
+ "61.198.132.0/24",
+ "61.198.133.0/24",
+ "61.198.134.0/24",
+ "61.198.135.0/24",
+ "61.198.136.0/24",
+ "61.198.137.0/24",
+ "61.198.138.100/32",
+ "61.198.138.101/32",
+ "61.198.138.102/32",
+ "61.198.138.103/32",
+ "61.198.139.0/29",
+ "61.198.139.128/27",
+ "61.198.139.160/28",
+ "61.198.140.0/24",
+ "61.198.141.0/24",
+ "61.198.142.0/24",
+ "61.198.143.0/24",
+ "61.198.160.0/24",
  "61.198.161.0/24",
- "219.108.0.0/24",
+ "61.198.162.0/24",
+ "61.198.163.0/24",
+ "61.198.164.0/24",
+ "61.198.165.0/24",
+ "61.198.166.0/24",
+ "61.198.168.0/24",
+ "61.198.169.0/24",
+ "61.198.170.0/24",
+ "61.198.171.0/24",
+ "61.198.172.0/24",
+ "61.198.173.0/24",
+ "61.198.174.0/24",
+ "61.198.175.0/24",
+ "61.198.248.0/24",
  "61.198.249.0/24",
- "219.108.1.0/24",
  "61.198.250.0/24",
- "219.108.2.0/24",
+ "61.198.251.0/24",
+ "61.198.252.0/24",
  "61.198.253.0/24",
- "219.108.3.0/24",
  "61.198.254.0/24",
- "219.108.4.0/24",
  "61.198.255.0/24",
- "219.108.5.0/24",
+ "61.204.0.0/24",
+ "61.204.2.0/24",
  "61.204.3.0/25",
- "219.108.6.0/24",
+ "61.204.3.128/25",
  "61.204.4.0/24",
- "221.119.0.0/24",
+ "61.204.5.0/24",
  "61.204.6.0/25",
- "221.119.1.0/24",
- "125.28.4.0/24",
- "221.119.2.0/24",
- "125.28.5.0/24",
- "221.119.3.0/24",
- "125.28.6.0/24",
- "221.119.4.0/24",
- "125.28.7.0/24",
- "221.119.5.0/24",
- "125.28.8.0/24",
- "221.119.6.0/24",
- "211.18.235.0/24",
- "221.119.7.0/24",
- "211.18.238.0/24",
- "221.119.8.0/24",
- "211.18.239.0/24",
- "221.119.9.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",
+ "125.28.0.0/24",
+ "125.28.1.0/24",
  "125.28.11.0/24",
- "125.28.13.0/24",
  "125.28.12.0/24",
+ "125.28.13.0/24",
  "125.28.14.0/24",
+ "125.28.15.0/24",
+ "125.28.16.0/24",
+ "125.28.17.0/24",
  "125.28.2.0/24",
  "125.28.3.0/24",
+ "125.28.4.0/24",
+ "125.28.5.0/24",
+ "125.28.6.0/24",
+ "125.28.7.0/24",
+ "125.28.8.0/24",
+ "210.168.246.0/24",
+ "210.168.247.0/24",
+ "210.169.92.0/24",
+ "210.169.93.0/24",
+ "210.169.94.0/24",
+ "210.169.95.0/24",
+ "210.169.96.0/24",
+ "210.169.97.0/24",
+ "210.169.98.0/24",
+ "210.169.99.0/24",
+ "211.126.192.128/25",
  "211.18.232.0/24",
  "211.18.233.0/24",
+ "211.18.234.0/24",
+ "211.18.235.0/24",
  "211.18.236.0/24",
  "211.18.237.0/24",
- "125.28.0.0/24",
- "125.28.1.0/24",
- "61.204.0.0/24",
- "210.168.246.0/24",
- "210.168.247.0/24",
- "219.108.7.0/24",
- "61.204.2.0/24",
- "61.204.5.0/24",
- "61.198.129.0/24",
- "61.198.140.0/24",
- "61.198.141.0/24",
- "125.28.15.0/24",
- "61.198.165.0/24",
- "61.198.166.0/24",
- "61.198.168.0/24",
- "61.198.169.0/24",
- "61.198.170.0/24",
- "61.198.248.0/24",
- "125.28.16.0/24",
- "125.28.17.0/24",
- "211.18.234.0/24",
- "219.108.8.0/24",
- "219.108.9.0/24",
+ "211.18.238.0/24",
+ "211.18.239.0/24",
  "219.108.10.0/24",
- "61.198.138.100/32",
- "61.198.138.101/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",
- "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) }
+ "219.108.13.0/24",
+ "219.108.14.0/24",
+ "219.108.15.0/24",
+ "219.108.2.0/24",
+ "219.108.3.0/24",
+ "219.108.4.0/24",
+ "219.108.5.0/24",
+ "219.108.6.0/24",
+ "219.108.7.0/24",
+ "219.108.8.0/24",
+ "219.108.9.0/24",
+ "221.119.0.0/24",
+ "221.119.1.0/24",
+ "221.119.2.0/24",
+ "221.119.3.0/24",
+ "221.119.4.0/24",
+ "221.119.5.0/24",
+ "221.119.6.0/24",
+ "221.119.7.0/24",
+ "221.119.8.0/24",
+ "221.119.9.0/24",
+ "219.108.0.0/24",
+ "219.108.1.0/24"].map {|ip| IPAddr.new(ip) }