Changeset 5442

Timestamp:

01/25/08 00:08:53 (5 years ago)

Author:

tokuhirom

Message:

use H::MA style carrier name at $char->fallback_name.

Location:

lang/perl/Encode-JP-Mobile/branches/character

Files:

• lib/Encode/JP/Mobile/Character.pm (modified) (3 diffs)
• t/character.t (modified) (1 diff)

lang/perl/Encode-JP-Mobile/branches/character/lib/Encode/JP/Mobile/Character.pm

@@ -68 +68 @@
     my ($self, $carrier) = @_;
     croak "missing carrier" unless $carrier;
-    croak "invalid carrier name(docomo, kddi, softbank)" unless $carrier =~ /^(?:kddi|docomo|softbank)$/;
+    croak "invalid carrier name(I or E or V)" unless $carrier =~ /^[IEVH]$/;
 
     $fallback_name_cache ||= do {
@@ -74 +74 @@
         do $src;
     };
+
+    $carrier = +{I => 'docomo', E => 'kddi', V => 'softbank', 'H' => 'docomo'}->{$carrier};
 
     for my $from (keys %$fallback_name_cache) {
@@ -143 +145 @@
 =item fallback_name
 
-    $char->fallback_name('docomo'); # => (>３<)
+    $char->fallback_name('I'); # => (>３<)
 
 メール受信時のキャリヤ間相互絵文字変換において、絵文字に変換されないときに変換される文字列です。
+
+引数は I, E, V, H のうちいずれかで、これは HTTP::MobileAgent 準拠です。
 
 =item number

lang/perl/Encode-JP-Mobile/branches/character/t/character.t

@@ -3 +3 @@
 use utf8;
 use Encode::JP::Mobile::Character;
-use Test::More tests => 12;
+use Test::More tests => 15;
 
 # docomo
-my $char = Encode::JP::Mobile::Character->from_unicode(0xE63E);
-is $char->name, "晴れ";
-ok Encode::is_utf8($char->name), 'flagged';
-is $char->unicode_hex, "E63E";
-is $char->number, 1;
-is $char->fallback_name('docomo'), undef;
+{
+    my $char = Encode::JP::Mobile::Character->from_unicode(0xE63E);
+    is $char->name, "晴れ";
+    ok Encode::is_utf8($char->name), 'flagged';
+    is $char->unicode_hex, "E63E";
+    is $char->number, 1;
+    is $char->fallback_name('I'), undef;
+}
+
+# docomo ext
+{
+    my $char = Encode::JP::Mobile::Character->from_unicode(0xE757);
+    is $char->number, "拡76", 'docomo ext';
+    ok Encode::is_utf8($char->number);
+}
 
 # KDDI
 {
     my $char = Encode::JP::Mobile::Character->from_unicode(0xECA2);
-    is $char->fallback_name('docomo'), "(>３<)";
-    ok Encode::is_utf8($char->fallback_name('docomo'));
+    is $char->fallback_name('I'), "(>３<)";
+    is $char->fallback_name('H'), "(>３<)", "airhphone is same as docomo";
+    ok Encode::is_utf8($char->fallback_name('I'));
     is $char->name, "チュー２", "What's name for 0xECA2";
     ok Encode::is_utf8($char->name);