Changeset 16418 for lang/perl/Email-Address-JP-Mobile

Timestamp:

07/25/08 18:04:21 (5 years ago)

Author:

tomi-ru

Message:

• Mail::Address::MobileJpと分離
  
• こちらでは古いモバイルメアドはNonMobile扱いとする
  

Location:

lang/perl/Email-Address-JP-Mobile/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/Email/Address/JP/Mobile.pm (modified) (3 diffs)
• lib/Email/Address/JP/Mobile/AirH.pm (modified) (3 diffs)
• lib/Email/Address/JP/Mobile/Base.pm (modified) (1 diff)
• lib/Email/Address/JP/Mobile/DoCoMo.pm (modified) (2 diffs)
• lib/Email/Address/JP/Mobile/EZweb.pm (modified) (2 diffs)
• lib/Email/Address/JP/Mobile/IsMobile.pm (deleted)
• lib/Email/Address/JP/Mobile/SoftBank.pm (modified) (3 diffs)
• t/01_mobile.t (modified) (5 diffs)
• t/02_emailaddress.t (modified) (2 diffs)

lang/perl/Email-Address-JP-Mobile/trunk/Makefile.PL

@@ -6 +6 @@
 requires 'Encode';
 requires 'Encode::JP::Mobile', 0.26;
-requires 'Mail::Address::MobileJp';
+requires 'Email::Address::Loose';
 requires 'Module::Pluggable';
 

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile.pm

@@ -4 +4 @@
 our $VERSION = '0.01';
 
+use Email::Address::Loose;
 use Module::Pluggable(
     search_path => __PACKAGE__,
@@ -12 +13 @@
 sub new {
     my $self = bless {}, shift;
-    my $address = shift || "";
+    my $address = shift;
     
+    if (! ref($address) || ! $address->isa('Email::Address')) {
+        ($address) = Email::Address::Loose->parse($address);
+    }
+    
+    return unless $address;
+     
     my @module =
         sort { $b->matches($address) <=> $a->matches($address) }
@@ -19 +26 @@
         grep { $_->isa('Email::Address::JP::Mobile::Base') }
         $self->plugins;
-     
+    
     shift @module;
 }

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile/AirH.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base 'Email::Address::JP::Mobile::IsMobile';
+use base 'Email::Address::JP::Mobile::Base';
+
+my $regex = qr/^(?:
+pdx\.ne\.jp|
+d.\.pdx\.ne\.jp|
+wm\.pdx\.ne\.jp
+)$/x;
 
 sub matches {
-    Mail::Address::MobileJp::is_mobile_jp($_[1]) && $_[1] =~ /pdx\.ne\.jp$/ ? 10 : 0;
+    $_[1]->host =~ $regex  ? 10 : 0;
 }
 
@@ -11 +17 @@
 
 sub carrier_letter { 'H' }
+
+sub is_mobile { 1 }
 
 sub mime_encoding {
@@ -62 +70 @@
 L<http://www.willcom-inc.com/>
 
+L<http://www.willcom-inc.com/ja/service/e_mail/spec/index.html>
+
 =head1 AUTHOR
 

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile/Base.pm

@@ -4 +4 @@
 
 use Encode;
+use Encode::JP::Mobile;
 
 sub new {

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile/DoCoMo.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base 'Email::Address::JP::Mobile::IsMobile';
+use base 'Email::Address::JP::Mobile::Base';
+
+my $regex = qr/^(?:
+docomo\.ne\.jp
+)$/x;
 
 sub matches {
-    Mail::Address::MobileJp::is_imode($_[1]) ? 10 : 0;
+    $_[1]->host =~ $regex  ? 10 : 0;
 }
 
@@ -11 +15 @@
 
 sub carrier_letter { 'I' }
+
+sub is_mobile { 1 }
 
 sub mime_encoding {

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile/EZweb.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base 'Email::Address::JP::Mobile::IsMobile';
+use base 'Email::Address::JP::Mobile::Base';
+
+my $regex = qr/^(?:
+ezweb\.ne\.jp|
+.*\.ezweb\.ne\.jp
+)$/x;
 
 sub matches {
-    Mail::Address::MobileJp::is_ezweb($_[1]) ? 10 : 0;
+    $_[1]->host =~ $regex  ? 10 : 0;
 }
 
@@ -11 +16 @@
 
 sub carrier_letter { 'E' }
+
+sub is_mobile { 1 }
 
 sub mime_encoding {

lang/perl/Email-Address-JP-Mobile/trunk/lib/Email/Address/JP/Mobile/SoftBank.pm

@@ -2 +2 @@
 use strict;
 use warnings;
-use base 'Email::Address::JP::Mobile::IsMobile';
+use base 'Email::Address::JP::Mobile::Base';
+
+my $regex = qr/^(?:
+jp\-[dhtckrnsq]\.ne\.jp|
+[dhtckrnsq]\.vodafone\.ne\.jp|
+softbank\.ne\.jp|
+disney.ne.jp
+)$/x;
 
 sub matches {
-    Mail::Address::MobileJp::is_vodafone($_[1]) ? 10 : 0;
+    $_[1]->host =~ $regex  ? 10 : 0;
 }
 
@@ -11 +18 @@
 
 sub carrier_letter { 'V' }
+
+sub is_mobile { 1 }
 
 sub mime_encoding {
@@ -62 +71 @@
 L<http://mb.softbank.jp/>
 
+L<http://mb.softbank.jp/mb/service/3G/mail/s_mail/>, L<http://disneymobile.jp/mail/>
+
 =head1 AUTHOR
 

lang/perl/Email-Address-JP-Mobile/trunk/t/01_mobile.t

@@ -4 +4 @@
 use Email::Address::JP::Mobile;
 
+my @non_email = (
+    'foo@',
+    '@bar',
+);
+
 my @non_mobile = (
     'foo@example.com',
     'foo@dxx.pdx.ne.jp',
+    'foo@mnx.ne.jp',
+    'foo@bar.mnx.ne.jp',
+    'foo@dct.dion.ne.jp',
+    'foo@sky.tu-ka.ne.jp',
+    'foo@bar.sky.tkc.ne.jp',
+    'foo@em.nttpnet.ne.jp',
+    'foo@bar.em.nttpnet.ne.jp',
+    'foo@phone.ne.jp',
+    'foo@bar.mozio.ne.jp',
+    'foo@p1.foomoon.com',
+    'foo@x.i-get.ne.jp',
+    'foo@ez1.ido.ne.jp',
+    'foo@cmail.ido.ne.jp',
 );
 
@@ -35 +53 @@
 );
 
-my @is_mobile_but_old = (
-    'foo@mnx.ne.jp',
-    'foo@bar.mnx.ne.jp',
-    'foo@dct.dion.ne.jp',
-    'foo@sky.tu-ka.ne.jp',
-    'foo@bar.sky.tkc.ne.jp',
-    'foo@em.nttpnet.ne.jp',
-    'foo@bar.em.nttpnet.ne.jp',
-    'foo@phone.ne.jp',
-    'foo@bar.mozio.ne.jp',
-    'foo@p1.foomoon.com',
-    'foo@x.i-get.ne.jp',
-    'foo@ez1.ido.ne.jp',
-    'foo@cmail.ido.ne.jp',
-);
-
 my @is_mobile = (
     @docomo,
@@ -56 +58 @@
     @softbank,
     @willcom,
-    @is_mobile_but_old,
 );
+
+for my $address (@non_email) {
+    my $carrier = Email::Address::JP::Mobile->new($address);
+    is $carrier, undef, $address;
+}
 
 for my $address (@non_mobile) {
@@ -67 +73 @@
     ok $carrier->mime_encoding->can('encode');
     ok $carrier->mail_encoding->can('encode');
-
     is $carrier->mime_encoding->name, 'MIME-Header';
     is $carrier->mail_encoding->name, 'utf-8-strict';
@@ -79 +84 @@
     my $carrier = Email::Address::JP::Mobile->new($address);
     ok $carrier->is_mobile, $address;
-}
-
-for my $address (@is_mobile_but_old) {
-    my $carrier = Email::Address::JP::Mobile->new($address);
-    ok $carrier->is_mobile, $address;
-    
-    is $carrier->name, 'IsMobile', $address;
-    is $carrier->carrier_letter, '', $address;
-    
-    ok $carrier->mime_encoding->can('encode');
-    ok $carrier->mail_encoding->can('encode');
-    is $carrier->mime_encoding->name, 'MIME-Header-ISO_2022_JP';
-    is $carrier->mail_encoding->name, 'iso-2022-jp';
 }
 

lang/perl/Email-Address-JP-Mobile/trunk/t/02_emailaddress.t

@@ -1 +1 @@
 use strict;
-use Test::More tests => 2;
+use Test::More tests => 4;
 
 use Email::Address;
@@ -8 +8 @@
 isa_ok $email->carrier, 'Email::Address::JP::Mobile::DoCoMo';
 is $email->carrier->name, 'DoCoMo';
+
+my $carrier = Email::Address::JP::Mobile->new($email);
+isa_ok $carrier, 'Email::Address::JP::Mobile::DoCoMo';
+is $carrier->name, 'DoCoMo';
+