jpmobile 0.0.1 → 0.0.2

data/test/filter_test.rb

@@ -18,19 +18,19 @@ class FilterTest < Test::Unit::TestCase
   end
   def test_filter_sjis
     filter = Jpmobile::Filter::Sjis.new
-    assert_equal(@aiu_sjis, filter.to_external(@aiu_utf8))
-    assert_equal(@aiu_utf8, filter.to_internal(@aiu_sjis))
+    assert_equal(@aiu_sjis, filter.to_external(@aiu_utf8, nil))
+    assert_equal(@aiu_utf8, filter.to_internal(@aiu_sjis, nil))
   end
   def test_filter_hankaku
     filter = Jpmobile::Filter::HankakuKana.new
 
-    assert_equal(@aiu_zzz, filter.to_internal(@aiu_zhz))
-    assert_equal(@aiu_zzz, filter.to_internal(@aiu_zzz))
-    assert_equal(@aiu_zhh, filter.to_external(@aiu_zhz))
-    assert_equal(@aiu_zhh, filter.to_external(@aiu_zzz))
+    assert_equal(@aiu_zzz, filter.to_internal(@aiu_zhz, nil))
+    assert_equal(@aiu_zzz, filter.to_internal(@aiu_zzz, nil))
+    assert_equal(@aiu_zhh, filter.to_external(@aiu_zhz, nil))
+    assert_equal(@aiu_zhh, filter.to_external(@aiu_zzz, nil))
 
-    assert_equal(@abracadabra_z_utf8, filter.to_internal(@abracadabra_h_utf8))
-    assert_equal(@abracadabra_h_utf8, filter.to_external(@abracadabra_z_utf8))
+    assert_equal(@abracadabra_z_utf8, filter.to_internal(@abracadabra_h_utf8, nil))
+    assert_equal(@abracadabra_h_utf8, filter.to_external(@abracadabra_z_utf8, nil))
   end
   def test_sjis_filter_for_docomo
     @controller.request = request_with_ua("DoCoMo/2.0 SH902i(c100;TB;W24H12)", "QUERY_STRING"=>"test=test&abra=%83A%83u%83%89%83J%83_%83u%83%89") # アブラカダブラ, Shift_JIS, urlencoded

data/test/softbank_test.rb

@@ -8,7 +8,21 @@ class SoftbankTest < Test::Unit::TestCase
     assert_instance_of(Jpmobile::Mobile::Softbank, req.mobile)
     assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
     assert_equal(nil, req.mobile.position)
+    assert_equal("000000000000000", req.mobile.serial_number)
     assert_equal("000000000000000", req.mobile.ident)
+    assert_equal("000000000000000", req.mobile.ident_device)
+    assert_equal(nil, req.mobile.ident_subscriber)
+    assert(req.mobile.supports_cookie?)
+  end
+
+  # SoftBank, X_JPHONE_UID付き
+  def test_softbank_910t_x_jphone_uid
+    req = request_with_ua("SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "HTTP_X_JPHONE_UID"=>"aaaaaaaaaaaaaaaa")
+    assert_equal("000000000000000", req.mobile.serial_number)
+    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.x_jphone_uid)
+    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident)
+    assert_equal("000000000000000", req.mobile.ident_device)
+    assert_equal("aaaaaaaaaaaaaaaa", req.mobile.ident_subscriber)
     assert(req.mobile.supports_cookie?)
   end
 
@@ -31,6 +45,8 @@ class SoftbankTest < Test::Unit::TestCase
     assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
     assert_equal("000000000000000", req.mobile.serial_number)
     assert_equal("000000000000000", req.mobile.ident)
+    assert_equal("000000000000000", req.mobile.ident_device)
+    assert_equal(nil, req.mobile.ident_subscriber)
     assert_equal(nil, req.mobile.position)
     assert(req.mobile.supports_cookie?)
   end
@@ -43,6 +59,8 @@ class SoftbankTest < Test::Unit::TestCase
     assert_kind_of(Jpmobile::Mobile::Softbank, req.mobile)
     assert_equal("XXXX0000000", req.mobile.serial_number)
     assert_equal("XXXX0000000", req.mobile.ident)
+    assert_equal("XXXX0000000", req.mobile.ident_device)
+    assert_equal(nil, req.mobile.ident_subscriber)
     assert_equal(nil, req.mobile.position)
     assert(!req.mobile.supports_cookie?)
   end

data/tools/generate_au_emoticon_table.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/ruby
+
+# http://www.au.kddi.com/ezfactory/tec/spec/pdf/typeD.pdf から生成
+
+table = []
+open("au.txt") do |f|
+  f.each do |l|
+    l.chomp! 
+    l.scan( /(([0-9A-F] )+)/ ) do |s|
+      s = s[0].gsub!(/ /, "")
+      next if s.size < 16
+      out = s[s.size-16,16]
+      table << [0,4,8].map{|i| out[i,4]}
+    end 
+  end
+end
+
+open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/au.rb","w") do |f|
+  f.puts "Jpmobile::Emoticon::AU_SJIS_TO_UNICODE = {"
+  table.each do |a|
+    f.puts "  0x%s=>0x%s," % [a[0],a[1]]
+  end
+  f.puts "}.freeze"
+  f.puts "Jpmobile::Emoticon::AU_UNICODE_TO_SJIS = Jpmobile::Emoticon::AU_SJIS_TO_UNICODE.invert.freeze"
+end

data/tools/{update_emoji_docomo.rb → generate_docomo_emoticon_table.rb}

@@ -24,15 +24,11 @@ table = []
 end
 
 
-open("lib/jpmobile/mobile/z_emoji_docomo.rb","w") do |f|
-  f.puts "Jpmobile::Filter::Emoji::DOCOMO_UNICODE_TO_SJIS = {"
-  table.each do |row|
-    f.puts "  0x%s=>0x%s, "%[row[3], row[1]]
-  end
-  f.puts "}"
-  f.puts "Jpmobile::Filter::Emoji::DOCOMO_SJIS_TO_UNICODE = {"
+open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/docomo.rb","w") do |f|
+  f.puts "Jpmobile::Emoticon::DOCOMO_SJIS_TO_UNICODE = {"
   table.each do |row|
     f.puts "  0x%s=>0x%s, "%[row[1], row[3]]
   end
-  f.puts "}"
+  f.puts "}.freeze"
+  f.puts "Jpmobile::Emoticon::DOCOMO_UNICODE_TO_SJIS = Jpmobile::Emoticon::DOCOMO_SJIS_TO_UNICODE.invert.freeze"
 end

data/tools/generate_emoticon_conversion_table.rb

@@ -0,0 +1,107 @@
+#!/usr/bin/ruby -Ku
+require 'pp'
+require 'iconv'
+require 'scanf'
+
+# http://labs.unoh.net/2007/02/post_65.html
+# のテーブルから変換用テーブルを作成する。
+
+# Jpmobileのテーブルを拝借
+module Jpmobile
+  module Emoticon
+  end
+end
+for c in %w(au docomo softbank)
+  require File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/#{c}.rb"
+end
+
+class Table
+  def initialize(path)
+    @list = []
+    @table = {}
+    @code = {}
+    if path =~ /emoji_(.)2(..)/
+      @type = $1
+      @dest_types = $2.split(//)
+    else
+      raise Exception, "something is wrong"
+    end
+    open(path) do |f|
+      f.gets # ヘッダを捨てる
+      f.each do |l|
+        a = Iconv.conv("utf-8", "cp932", l).chomp.split(/\t/)
+        @list << a
+        @code[a[0]] = a[1]
+        @table[a[0]] = a[2...a.size]
+      end
+    end
+  end
+  def chars
+    table.keys.sort_by {|x| x.gsub(/\D/,"").to_i }
+  end
+  def conv(src, dest_type)
+    if dest_type == @type
+      src
+    else
+      @table[src][@dest_types.index(dest_type)]
+    end
+  end
+  attr_reader :list, :table, :code, :type
+end
+
+class Tables
+  def initialize
+    @chars = []
+    @tables = {}
+    @types = []
+    for name in %w(i2es e2is s2ie)
+      table = Table.new("emoji_#{name}.txt")
+      @tables[table.type] = table
+      @chars |= table.chars
+      @types << table.type
+    end
+  end
+  def conv(src, dest_type)
+    src_type = src[1,1]
+    dest = @tables[src_type].conv(src, dest_type)
+    dest = nil if dest == "〓"
+    dest
+  end
+  def id_to_unicode(src)
+    return src if src.nil? || src !~ /^%[ies]\d+%$/
+    case src[1,1]
+    when "i"
+      sjis = tables["i"].code[src]
+      return Jpmobile::Emoticon::DOCOMO_SJIS_TO_UNICODE[sjis.to_i(16)]
+    when "e"
+      sjis = tables["e"].code[src]
+      return Jpmobile::Emoticon::AU_SJIS_TO_UNICODE[sjis.to_i(16)]
+    when "s"
+      webcode = tables["s"].code[src]
+      unicode = Jpmobile::Emoticon::SOFTBANK_WEBCODE_TO_UNICODE[webcode]
+      return nil unless unicode
+      return unicode + 0x1000
+    end
+  end
+  attr_reader :chars, :tables, :types
+end
+
+t = Tables.new
+ident = {'i'=>'DOCOMO', 'e'=>'AU', 's'=>'SOFTBANK'}
+
+open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/conversion_table.rb","w") do |f|
+  for dest_type in %w(i e s)
+    f.puts "Jpmobile::Emoticon::CONVERSION_TABLE_TO_#{ident[dest_type]} = {"
+    for src in t.chars
+      dest = t.conv(src, dest_type)
+      src_unicode = t.id_to_unicode(src)
+      dest_unicode = t.id_to_unicode(dest)
+      next if src_unicode.nil? || dest_unicode.nil?
+      f.printf("  %s=>%s,\n",
+             src_unicode.is_a?(Integer) ? "0x%04X"%src_unicode : "'#{src_unicode}'",
+             dest_unicode.is_a?(Integer) ? "0x%04X"%dest_unicode : "'#{dest_unicode}'"
+            )
+    end
+  f.puts "}"
+  end
+end

data/tools/generate_softbank_emoticon_table.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'hpricot'
+require 'kconv'
+require 'cgi'
+require 'open-uri'
+
+# 'http://developers.softbankmobile.co.jp/dp/tool_dl/web/picword_01.php'
+
+table = []
+for i in 1..6
+  uri = "http://developers.softbankmobile.co.jp/dp/tool_dl/web/picword_%02d.php" % i
+  h = Hpricot(URI(uri).read.toutf8)
+  (h/"//table[@width='100%']//tr").each do |tr|
+    if tr
+      a = (tr/"td/font[@class='j10']").map { |td| td.inner_html }
+      unless a.empty?
+        s = CGI.unescapeHTML(a.last)
+        raise Exception, "something is wrong" if s[0,2] != "\x1b\x24" || s[4] != 0x0f
+        table << [a.first, s[2,2]]
+      end
+    end
+  end
+end
+
+open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/softbank.rb","w") do |f|
+  f.puts "Jpmobile::Emoticon::SOFTBANK_UNICODE_TO_WEBCODE = {"
+  table.each do |a|
+    f.puts %{  0x%s => %p,} % a
+  end
+  f.puts "}"
+  f.puts "Jpmobile::Emoticon::SOFTBANK_WEBCODE_TO_UNICODE = Jpmobile::Emoticon::SOFTBANK_UNICODE_TO_WEBCODE.invert"
+end

data/tools/update_display_info_docomo.rb

@@ -6,19 +6,17 @@ require 'hpricot'
 require 'pp'
 
 src = URI("http://www.nttdocomo.co.jp/service/imode/make/content/spec/screen_area/index.html").read.toutf8
-
+src.gsub!(/μ/,"myu")
 user_agents = {}
 
-(Hpricot(src)/"//div[@id='maincol']//table//table").each do |table|
-#  puts table.to_html
-  (table/"tr[@bgcolor='#FFFFFF']").each do |tr|
+(Hpricot(src)/"//div[@id='maincol']//table").each do |table|
+  (table/"tr[@class='acenter']").each do |tr|
     a = (tr/:td).map {|x| x.inner_text }
     if a.size == 7
       a.shift # remove rowspan
     elsif a.size != 6
       raise "something is wrong"
     end
-    a[0].sub!(/μ/,"myu")
     a[0].sub!(/（.*）/,"")
     a[0].sub!(/\(.+\)/,"")
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.4
 specification_version: 1
 name: jpmobile
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-06-16 00:00:00 +09:00
+  version: 0.0.2
+date: 2007-10-23 00:00:00 +09:00
 summary: A Rails plugin for Japanese mobile-phones
 require_paths: 
 - lib
@@ -32,84 +32,29 @@ files:
 - README
 - CHANGELOG
 - Rakefile
-- doc/classes
-- doc/classes/ActionController
-- doc/classes/ActionController/AbstractRequest.html
-- doc/classes/ActionController.html
-- doc/classes/ActionView.html
-- doc/classes/DatumConv.html
-- doc/classes/Jpmobile
-- doc/classes/Jpmobile/Display.html
-- doc/classes/Jpmobile/Filter
-- doc/classes/Jpmobile/Filter/Base.html
-- doc/classes/Jpmobile/Filter/Emoji
-- doc/classes/Jpmobile/Filter/Emoji/Inner.html
-- doc/classes/Jpmobile/Filter/Emoji/Outer.html
-- doc/classes/Jpmobile/Filter/Emoji.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/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/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/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_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/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_emoji_docomo_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_au_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_rb.html
-- doc/files/lib/jpmobile/mobile/z_ip_addresses_willcom_rb.html
-- doc/files/lib/jpmobile/position_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/NOTES.html
-- doc/files/README.html
-- doc/files/TODO.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/docomo_test.rb
+- test/emoticon_functional_test.rb
+- test/emoticon_test.rb
+- test/filter_functional_test.rb
 - test/filter_test.rb
-- test/firefox_test.rb
 - test/helper.rb
 - test/helpers_test.rb
 - test/softbank_test.rb
-- test/transitsid_test.rb
 - test/willcom_test.rb
 - lib/jpmobile
 - lib/jpmobile/datum_conv.rb
+- lib/jpmobile/emoticon
+- lib/jpmobile/emoticon/au.rb
+- lib/jpmobile/emoticon/conversion_table.rb
+- lib/jpmobile/emoticon/docomo.rb
+- lib/jpmobile/emoticon/softbank.rb
+- lib/jpmobile/emoticon/z_combine.rb
+- lib/jpmobile/emoticon.rb
 - lib/jpmobile/filter.rb
 - lib/jpmobile/helpers.rb
 - lib/jpmobile/hook_abstract_request.rb
+- lib/jpmobile/hook_action_controller.rb
 - lib/jpmobile/hook_action_view.rb
 - lib/jpmobile/mobile
 - lib/jpmobile/mobile/abstract_mobile.rb
@@ -119,7 +64,6 @@ files:
 - lib/jpmobile/mobile/softbank.rb
 - lib/jpmobile/mobile/willcom.rb
 - lib/jpmobile/mobile/z_display_info_docomo.rb
-- lib/jpmobile/mobile/z_emoji_docomo.rb
 - lib/jpmobile/mobile/z_ip_addresses.rb
 - lib/jpmobile/mobile/z_ip_addresses_au.rb
 - lib/jpmobile/mobile/z_ip_addresses_willcom.rb
@@ -127,13 +71,14 @@ files:
 - lib/jpmobile/trans_sid.rb
 - lib/jpmobile/version.rb
 - lib/jpmobile.rb
+- tools/generate_au_emoticon_table.rb
+- tools/generate_docomo_emoticon_table.rb
+- tools/generate_emoticon_conversion_table.rb
+- tools/generate_softbank_emoticon_table.rb
 - tools/list_gps_unsupported_au.rb
 - tools/update_display_info_docomo.rb
-- tools/update_emoji_docomo.rb
 - tools/update_ip_addresses_au.rb
 - tools/update_ip_addresses_willcom.rb
-- TODO
-- NOTES
 test_files: []
 
 rdoc_options: 
@@ -151,8 +96,6 @@ rdoc_options:
 extra_rdoc_files: 
 - README
 - CHANGELOG
-- TODO
-- NOTES
 executables: []
 
 extensions: []

data/NOTES

@@ -1,21 +0,0 @@
-=参考になる情報など
-
-==DoCoMo
-* FOMA位置情報: http://www.nttdocomo.co.jp/service/imode/make/content/html/outline/gps.html
-* オープンiエリア: http://www.nttdocomo.co.jp/service/imode/make/content/iarea/index.html
-* IPアドレス帯域: http://www.nttdocomo.co.jp/service/imode/make/content/ip/about/
-
-==au
-* 簡易位置情報: http://www.au.kddi.com/ezfactory/tec/spec/eznavi.html
-* IPアドレス帯域: http://www.au.kddi.com/ezfactory/tec/spec/ezsava_ip.html
-
-==SoftBank
-http://developers.softbankmobile.co.jp/dp/tool_dl/download.php?docid=120
-* J-PHONEの位置情報->70ページ
-* Vodafone 3G/Softbank携帯の位置情報->71ページ
-* ユーザエージェントについて: http://developers.softbankmobile.co.jp/dp/tool_dl/web/useragent.php
-* IPアドレス帯域: http://developers.softbankmobile.co.jp/dp/tech_svc/web/ip.php
-
-==Willcom
-* 位置情報: http://www.willcom-inc.com/ja/biz/service/location/index.html
-* IPアドレス帯域: http://www.willcom-inc.com/ja/service/contents_service/club_air_edge/for_phone/ip/index.html