jpmobile 0.0.3 → 0.0.4

data/lib/jpmobile/position.rb

@@ -9,8 +9,14 @@ end
 module Jpmobile
   # 位置情報
   class Position
-    # GeoKitが読み込まれている場合はMappableにする
-    include ::GeoKit::Mappable if Object.const_defined?("GeoKit")
+    if Object.const_defined?("GeoKit")
+      # GeoKitが読み込まれている場合はMappableにする
+      include ::GeoKit::Mappable
+      def self.acts_as_mappable; end
+      def self.distance_column_name; end
+      def self.lat_column_name; :lat; end
+      def self.lng_column_name; :lng; end
+    end
     def initialize
       @lat = nil
       @lon = nil

data/lib/jpmobile/request_with_mobile.rb

@@ -33,7 +33,7 @@ module Jpmobile
     def mobile
       return @__mobile if @__mobile
 
-      Jpmobile::Mobile.constants.each do |const|
+      Jpmobile::Mobile.carriers.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

data/lib/jpmobile/util.rb

@@ -0,0 +1,21 @@
+require 'tempfile'
+module Jpmobile
+  module Util
+    module_function
+    def deep_apply(obj, &proc)
+      case obj
+      when Hash
+        obj.each_pair do |key, value|
+          obj[key] = deep_apply(value, &proc)
+        end
+      when Array
+        obj.collect!{|value| deep_apply(value, &proc)}
+      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
+        return obj
+      else
+        obj = obj.to_param if obj.respond_to?(:to_param)
+        proc.call(obj)
+      end
+    end
+  end
+end

data/lib/jpmobile/version.rb

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

data/test/au_test.rb

@@ -80,7 +80,7 @@ class AuTest < Test::Unit::TestCase
   # 正しいIPアドレス空間からのアクセスを判断できるか。
   def test_au_valid_ip_address
     reqs = request_with_ua("KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
-                          {"REMOTE_ADDR"=>"210.169.40.1"})
+                          {"REMOTE_ADDR"=>"210.230.128.225"})
     reqs.each do |req|
       assert_equal(req.mobile.valid_ip?, true)
     end

data/tools/update_display_info_docomo.rb

@@ -19,6 +19,7 @@ user_agents = {}
     end
     a[0].sub!(/（.*）/,"")
     a[0].sub!(/\(.+\)/,"")
+    a[0].sub!(/-/,'') # F-01A -> F01A
 
     a[3].sub!(/^.*?(\d+×\d+).*$/,'\1')
     width, height = a[3].split(/×/,2).map{|x| x.to_i}

data/tools/update_ip_addresses_willcom.rb

@@ -5,8 +5,9 @@ require 'kconv'
 require 'open-uri'
 require 'pp'
 
-src = open("http://www.willcom-inc.com/ja/service/contents_service/club_air_edge/for_phone/ip/index.html").read.toutf8
+src = open("http://www.willcom-inc.com/ja/service/contents_service/create/center_info/index.html").read.toutf8
 
+src.sub!(%r{^.*<b>Webアクセス時のIPアドレス帯域</b>(.+?)</table>.*$}m, '\\1')
 ips = src.scan(/(\d+\.\d+\.\d+\.\d+\/\d+)/).flatten
 
 # 書き出し

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jpmobile
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - dara
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-23 00:00:00 +09:00
+date: 2009-03-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,37 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.1.0
+        version: 2.2.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.12
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-fixture
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.2
     version: 
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
@@ -35,84 +65,6 @@ files:
 - README
 - CHANGELOG
 - Rakefile
-- doc/classes
-- doc/classes/ActionController
-- doc/classes/ActionController/AbstractRequest.html
-- doc/classes/ActionController/CgiRequest.html
-- doc/classes/ActionController.html
-- doc/classes/ActionView.html
-- doc/classes/DatumConv.html
-- doc/classes/Jpmobile
-- doc/classes/Jpmobile/Display.html
-- doc/classes/Jpmobile/Emoticon.html
-- doc/classes/Jpmobile/Filter
-- doc/classes/Jpmobile/Filter/ApplyOnlyForMobile.html
-- doc/classes/Jpmobile/Filter/Base.html
-- doc/classes/Jpmobile/Filter/Emoticon
-- doc/classes/Jpmobile/Filter/Emoticon/Inner.html
-- doc/classes/Jpmobile/Filter/Emoticon/Outer.html
-- doc/classes/Jpmobile/Filter/Emoticon.html
-- doc/classes/Jpmobile/Filter/FilterTable.html
-- doc/classes/Jpmobile/Filter/HankakuKana.html
-- doc/classes/Jpmobile/Filter/Sjis.html
-- doc/classes/Jpmobile/Filter.html
-- doc/classes/Jpmobile/Helpers.html
-- doc/classes/Jpmobile/Mobile
-- doc/classes/Jpmobile/Mobile/AbstractMobile.html
-- doc/classes/Jpmobile/Mobile/Au.html
-- doc/classes/Jpmobile/Mobile/Ddipocket.html
-- doc/classes/Jpmobile/Mobile/Docomo.html
-- doc/classes/Jpmobile/Mobile/Emobile.html
-- doc/classes/Jpmobile/Mobile/Jphone.html
-- doc/classes/Jpmobile/Mobile/Softbank.html
-- doc/classes/Jpmobile/Mobile/Vodafone.html
-- doc/classes/Jpmobile/Mobile/Willcom.html
-- doc/classes/Jpmobile/Mobile.html
-- doc/classes/Jpmobile/Position.html
-- doc/classes/Jpmobile/RequestWithMobile.html
-- doc/created.rid
-- doc/files
-- doc/files/CHANGELOG.html
-- doc/files/lib
-- doc/files/lib/jpmobile
-- doc/files/lib/jpmobile/datum_conv_rb.html
-- doc/files/lib/jpmobile/emoticon
-- doc/files/lib/jpmobile/emoticon/au_rb.html
-- doc/files/lib/jpmobile/emoticon/conversion_table_rb.html
-- doc/files/lib/jpmobile/emoticon/docomo_rb.html
-- doc/files/lib/jpmobile/emoticon/softbank_rb.html
-- doc/files/lib/jpmobile/emoticon/z_combine_rb.html
-- doc/files/lib/jpmobile/emoticon_rb.html
-- doc/files/lib/jpmobile/filter_rb.html
-- doc/files/lib/jpmobile/helpers_rb.html
-- doc/files/lib/jpmobile/hook_abstract_request_rb.html
-- doc/files/lib/jpmobile/hook_action_controller_rb.html
-- doc/files/lib/jpmobile/hook_action_view_rb.html
-- doc/files/lib/jpmobile/mobile
-- doc/files/lib/jpmobile/mobile/abstract_mobile_rb.html
-- doc/files/lib/jpmobile/mobile/au_rb.html
-- doc/files/lib/jpmobile/mobile/display_rb.html
-- doc/files/lib/jpmobile/mobile/docomo_rb.html
-- doc/files/lib/jpmobile/mobile/emobile_rb.html
-- doc/files/lib/jpmobile/mobile/softbank_rb.html
-- doc/files/lib/jpmobile/mobile/willcom_rb.html
-- doc/files/lib/jpmobile/mobile/z_display_info_docomo_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_au_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_docomo_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_emobile_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_softbank_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_willcom_rb.html
-- doc/files/lib/jpmobile/position_rb.html
-- doc/files/lib/jpmobile/request_with_mobile_rb.html
-- doc/files/lib/jpmobile/trans_sid_rb.html
-- doc/files/lib/jpmobile/version_rb.html
-- doc/files/lib/jpmobile_rb.html
-- doc/files/README.html
-- doc/fr_class_index.html
-- doc/fr_file_index.html
-- doc/fr_method_index.html
-- doc/index.html
-- doc/rdoc-style.css
 - test/au_test.rb
 - test/autoload_test.rb
 - test/docomo_test.rb
@@ -125,6 +77,7 @@ files:
 - test/willcom_test.rb
 - lib/jpmobile
 - lib/jpmobile/datum_conv.rb
+- lib/jpmobile/email.rb
 - lib/jpmobile/emoticon
 - lib/jpmobile/emoticon/au.rb
 - lib/jpmobile/emoticon/conversion_table.rb
@@ -154,6 +107,7 @@ files:
 - lib/jpmobile/position.rb
 - lib/jpmobile/request_with_mobile.rb
 - lib/jpmobile/trans_sid.rb
+- lib/jpmobile/util.rb
 - lib/jpmobile/version.rb
 - lib/jpmobile.rb
 - tools/generate_au_emoticon_table.rb
@@ -196,7 +150,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jpmobile
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A Rails plugin for Japanese mobile-phones

data/doc/classes/ActionController.html

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding=" UTF-8"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Module: ActionController</title>
-  <meta http-equiv="Content-Type" content="text/html; charset= UTF-8" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href=".././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Module</strong></td>
-          <td class="class-name-in-header">ActionController</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../files/lib/jpmobile/trans_sid_rb.html">
-                lib/jpmobile/trans_sid.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-    <div id="description">
-      <p>
-FastCGI環境では(どういうわけか) cgi.query_string
-でクエリ文字列を取得できないので
-ENV[&#8216;QUERY_STRING&#8217;] に代入しておく。
-</p>
-
-    </div>
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-
-    <div id="section">
-
-    <div id="class-list">
-      <h3 class="section-bar">Classes and Modules</h3>
-
-      Class <a href="ActionController/AbstractRequest.html" class="link">ActionController::AbstractRequest</a><br />
-Class <a href="ActionController/CgiRequest.html" class="link">ActionController::CgiRequest</a><br />
-
-    </div>
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>

data/doc/classes/ActionController/AbstractRequest.html

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding=" UTF-8"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: ActionController::AbstractRequest</title>
-  <meta http-equiv="Content-Type" content="text/html; charset= UTF-8" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">ActionController::AbstractRequest</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/jpmobile/hook_abstract_request_rb.html">
-                lib/jpmobile/hook_abstract_request.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Object
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-        <span class="include-name"><a href="../Jpmobile/RequestWithMobile.html">Jpmobile::RequestWithMobile</a></span>
-      </div>
-    </div>
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>