Show
Ignore:
Timestamp:
06/28/08 02:06:14 (5 years ago)
Author:
tomi-ru
Message:

あまり要らないということで is_mobile をのぞく is_* は廃止。 carrier_letter があるので carrierも廃止。carrier_letter があればcarrier_letter_akaもいらないと思われるので廃止

Location:
lang/perl/Email-Address-JP-Mobile/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile.pm

    r14690 r14734  
    88our $carrier_list = [ 
    99    { 
    10         newname  => 'NonMobile', 
    11         oldname  => 'NonMobile', 
    12         letter   => 'N', 
    13         methods  => [qw( is_non_mobile )], 
    14         detector => sub { not is_mobile_jp(shift) }, 
    15         encoding => 'iso-2022-jp', 
    16     }, 
    17     { 
    18         newname  => 'DoCoMo', 
    19         oldname  => 'DoCoMo', 
     10        name     => 'DoCoMo', 
    2011        letter   => 'D', 
    21         methods  => [qw( is_docomo is_imode )], 
    2212        detector => \&is_imode, 
    2313        encoding => 'x-sjis-docomo', 
    2414    }, 
    2515    { 
    26         newname  => 'EZweb', 
    27         oldname  => 'EZweb', 
     16        name     => 'EZweb', 
    2817        letter   => 'E', 
    29         methods  => [qw( is_kddi is_ezweb )], 
    3018        detector => \&is_ezweb, 
    3119        encoding => 'x-sjis-kddi-auto', 
    3220    }, 
    3321    { 
    34         newname  => 'ThirdForce', 
    35         oldname  => 'Vodafone', 
     22        name     => 'ThirdForce', 
    3623        letter   => 'V', 
    37         methods  => [qw( is_softbank is_thirdforce is_vodafone is_j_phone )], 
    3824        detector => \&is_vodafone, 
    3925        encoding => 'x-utf8-softbank', 
    4026    }, 
    4127    { 
    42         newname  => 'AirHPhone', 
    43         oldname  => 'AirH', 
     28        name     => 'AirHPhone', 
    4429        letter   => 'H', 
    45         methods  => [qw( is_willcom is_airhphone is_airh )], 
    4630        detector => sub { 
    4731            my $email = shift; 
     
    5034        encoding => 'x-sjis-docomo', # XXX x-sjis-airh ?? 
    5135    }, 
     36    { 
     37        name     => 'NonMobile', 
     38        letter   => 'N', 
     39        detector => sub { not is_mobile_jp(shift) }, 
     40        encoding => 'iso-2022-jp', 
     41    }, 
    5242]; 
    5343     
    54 # make is_* method 
    55 for my $carrier (@$carrier_list) { 
    56     no strict 'refs'; ## no critic 
    57     for my $method (@{ $carrier->{methods} }) { 
    58         *{'Email::Address::'.$method} = sub { 
    59             my $self = shift; 
    60             $carrier->{detector}->($self->address) ? 1 : 0; 
    61         }; 
    62     } 
    63 } 
    64  
    6544sub Email::Address::is_mobile { 
    6645    my $self = shift; 
     
    7150    my $self = shift; 
    7251    my $carrier = __carrier($self->address); 
    73     $carrier->{newname}; 
     52    $carrier->{name}; 
    7453} 
    75  
    76 sub Email::Address::carrier_name_aka { 
    77     my $self = shift; 
    78     my $carrier = __carrier($self->address); 
    79     $carrier->{oldname}; 
    80 } 
    81  
    82 *Email::Address::carrier = \&Email::Address::carrier_letter; 
    8354 
    8455sub Email::Address::carrier_letter { 
     
    10273     
    10374    return { # dummy 
    104         newname  => '', 
     75        name     => '', 
    10576        oldname  => '', 
    10677        letter   => '', 
     
    12495   
    12596  $email->is_mobile;      # 1 
    126   $email->is_non_mobile;  # 0 
    127   $email->is_docomo;      # 1 
    128   $email->is_ezweb;       # 0 
    129   $email->is_softbank;    # 0 
    13097  $email->carrier_name;   # DoCoMo 
    13198  $email->carrier_letter; # D 
    132   ... 
     99  $email->encoding_name;  # x-sjis-docomo 
    133100 
    134101=head1 DESCRIPTION 
     
    145112=item is_mobile 
    146113 
    147 =item is_non_mobile 
    148  
    149 =item is_docomo, is_imode 
    150  
    151 =item is_kddi, is_ezweb 
    152  
    153 =item is_softbank, is_thirdforce, is_j_phone, is_vodafone 
    154  
    155 =item is_willcom, is_airhphone, is_airh 
    156  
    157114These return 1 or 0. 
    158115 
    159 =item carrier, carrier_letter 
     116=item carrier_letter 
    160117 
    161118Returns L<HTTP::MobileAgent> (and L<HTTP::MobileAttribute>) 's carrier() value 
     
    165122 
    166123Returns L<HTTP::MobileAttribute>'s carrier_longname() value like "ThirdForce". 
    167  
    168 =item carrier_name_aka 
    169  
    170 Returns L<HTTP::MobileAgent>'s carrier_longname() value like "Vodafone". 
    171124 
    172125=item encoding_name 
  • lang/perl/Email-Address-JP-Mobile/trunk/t/01_mobile.t

    r14690 r14734  
    6060for my $address (@non_mobile) { 
    6161    my ($email) = Email::Address::Loose->parse($address); 
    62     ok $email->is_non_mobile($address), $address; 
    6362    ok ! $email->is_mobile($address), $address; 
    64     ok ! $email->is_docomo($address), $address; 
    65     ok ! $email->is_kddi($address), $address; 
    66     ok ! $email->is_softbank($address), $address; 
    67     ok ! $email->is_willcom($address), $address; 
    6863    is $email->carrier_name, 'NonMobile', $address; 
    69     is $email->carrier_name_aka, 'NonMobile', $address; 
    70     is $email->carrier, 'N', $address; 
    7164    is $email->carrier_letter, 'N', $address; 
    7265    is $email->encoding_name, 'iso-2022-jp'; 
     
    7669    my ($email) = Email::Address::Loose->parse($address); 
    7770    ok $email->is_mobile($address), $address; 
    78     ok ! $email->is_non_mobile($address), $address; 
    7971} 
    8072 
    8173for my $address (@docomo) { 
    8274    my ($email) = Email::Address::Loose->parse($address); 
    83     ok $email->is_docomo($address), $address; 
    84     ok $email->is_imode($address), $address; 
    8575    ok $email->is_mobile($address), $address; 
    86     ok ! $email->is_non_mobile($address), $address; 
    87     ok ! $email->is_kddi($address), $address; 
    88     ok ! $email->is_softbank($address), $address; 
    89     ok ! $email->is_willcom($address), $address; 
    9076    is $email->carrier_name, 'DoCoMo', $address; 
    91     is $email->carrier_name_aka, 'DoCoMo', $address; 
    92     is $email->carrier, 'D', $address; 
    9377    is $email->carrier_letter, 'D', $address; 
    9478    is $email->encoding_name, 'x-sjis-docomo'; 
     
    9781for my $address (@kddi) { 
    9882    my ($email) = Email::Address::Loose->parse($address); 
    99     ok $email->is_kddi($address), $address; 
    100     ok $email->is_ezweb($address), $address; 
    10183    ok $email->is_mobile($address), $address; 
    102     ok ! $email->is_non_mobile($address), $address; 
    103     ok ! $email->is_docomo($address), $address; 
    104     ok ! $email->is_softbank($address), $address; 
    105     ok ! $email->is_willcom($address), $address; 
    10684    is $email->carrier_name, 'EZweb', $address; 
    107     is $email->carrier_name_aka, 'EZweb', $address; 
    108     is $email->carrier, 'E', $address; 
    10985    is $email->carrier_letter, 'E', $address; 
    11086    is $email->encoding_name, 'x-sjis-kddi-auto'; 
     
    11389for my $address (@softbank) { 
    11490    my ($email) = Email::Address::Loose->parse($address); 
    115     ok $email->is_softbank($address), $address; 
    116     ok $email->is_thirdforce($address), $address; 
    117     ok $email->is_vodafone($address), $address; 
    118     ok $email->is_j_phone($address), $address; 
    11991    ok $email->is_mobile($address), $address; 
    120     ok ! $email->is_non_mobile($address), $address; 
    121     ok ! $email->is_docomo($address), $address; 
    122     ok ! $email->is_kddi($address), $address; 
    123     ok ! $email->is_willcom($address), $address; 
    12492    is $email->carrier_name, 'ThirdForce', $address; 
    125     is $email->carrier_name_aka, 'Vodafone', $address; 
    126     is $email->carrier, 'V', $address; 
    12793    is $email->carrier_letter, 'V', $address; 
    12894    is $email->encoding_name, 'x-utf8-softbank'; 
     
    13197for my $address (@willcom) { 
    13298    my ($email) = Email::Address::Loose->parse($address); 
    133     ok $email->is_willcom($address), $address; 
    134     ok $email->is_airh($address), $address; 
    135     ok $email->is_airhphone($address), $address; 
    13699    ok $email->is_mobile($address), $address; 
    137     ok ! $email->is_non_mobile($address), $address; 
    138     ok ! $email->is_docomo($address), $address; 
    139     ok ! $email->is_kddi($address), $address; 
    140     ok ! $email->is_softbank($address), $address; 
    141100    is $email->carrier_name, 'AirHPhone', $address; 
    142     is $email->carrier_name_aka, 'AirH', $address; 
    143     is $email->carrier, 'H', $address; 
    144101    is $email->carrier_letter, 'H', $address; 
    145102    is $email->encoding_name, 'x-sjis-docomo';