Changeset 33836

Timestamp:

06/08/09 13:24:29 (4 years ago)

Author:

clouder

Message:

lang/perl/HTTP-MobileAgent?/branches/feature-imode-browser2.0: modified some functions

Location:

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0

Files:

• Changes (modified) (1 diff)
• lib/HTTP/MobileAgent.pm (modified) (1 diff)
• lib/HTTP/MobileAgent/DoCoMo.pm (modified) (5 diffs)
• lib/HTTP/MobileAgent/EZweb.pm (modified) (1 diff)
• lib/HTTP/MobileAgent/Vodafone.pm (modified) (1 diff)
• t/12_guid.t (modified) (2 diffs)
• t/13_imode_browser.t (added)

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/Changes

@@ -1 +1 @@
 Revision history for Perl extension HTTP::MobileAgent
+
+0.28 Fri Jun  5 21:44:58 2009
+    * Added gps_compliant() method in DoCoMo.pm/EZweb.pm/Vodafone.pm(SoftBank).
+    * Added browser_version() method in DoCoMo.pm.
+    * $GPSModels and is_gps() method is obsolute but leave for backward compatibility in DoCoMo.pm.
+    * Fixed user_id() problem in Vodafone.pm(SoftBank). (Thanks to masutaro)
 
 0.27 Fri Apr 11 13:34:23 2008

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/lib/HTTP/MobileAgent.pm

@@ -3 +3 @@
 use strict;
 use vars qw($VERSION);
-$VERSION = '0.27';
+$VERSION = '0.28';
 
 use HTTP::MobileAgent::Request;

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/lib/HTTP/MobileAgent/DoCoMo.pm

@@ -3 +3 @@
 use strict;
 use vars qw($VERSION);
-$VERSION = 0.19;
+$VERSION = 0.20;
 
 use base qw(HTTP::MobileAgent);
@@ -15 +15 @@
 
 # various preferences
-use vars qw($DefaultCacheSize $HTMLVerMap $GPSModels);
+use vars qw($DefaultCacheSize $HTMLVerMap $GPSModels $GPSModelsRe);
 $DefaultCacheSize = 5;
 
@@ -28 +28 @@
     qr/505i|506i|252i|253i|P213i|600i|700i|701i|800i|880i|SH851i|P851i|881i|900i|901i/ => '5.0',
     qr/702i|D851iWM|902i/ => '6.0',
+    qr/70[34]i|(F|D|SH)705i|SH706ie|883i|801i|90[34]i|F05A/ => '7.0',
+    qr/(P|N|SO)705i|(N|SO|P|N)706i|884i|905i|N906iL|N03A|N05A|F07A/ => '7.1',
+    qr/(F|SH|P)706|906i|F0[12346]A|P0[123456]A|SH0[1234]A|N0[124]A/ => '7.2',
 ];
 
-$GPSModels = { map { $_ => 1 } qw(F661i F505iGPS) };
+$GPSModels = { map { $_ => 1 } qw(F661i F505iGPS) }; # This value is obsolute,
+                                                     # and will be removed in the near future.
+$GPSModelsRe = qr/(?-xism:(?:F(?:8(?:8(?:4i(?:ES)?|3iES?S)|01i)|0[13569]A|505iGPS|661i)|S(?:A(?:70(?:0iS|2i)|800i)|H0[1234567]A)|(?:N0[12689]|P0[12789])A|90(?:3i(?!TV|X)|[4-6]i)))/;
 
 sub is_docomo { 1 }
@@ -150 +155 @@
 sub is_gps {
     my $self = shift;
-    return exists $GPSModels->{$self->model};
+    return $self->gps_compliant;
+}
+
+sub gps_compliant {
+    my $self = shift;
+    return $self->model =~ qr/$GPSModelsRe/;
 }
 
@@ -156 +166 @@
     my $self = shift;
     return $self->get_header( 'x-dcmguid' );
+}
+
+sub browser_version {
+    my $self = shift;
+    return $self->is_foma && $self->cache_size >= 500 ? '2.0' : '1.0';
 }
 

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/lib/HTTP/MobileAgent/EZweb.pm

@@ -74 +74 @@
         depth  => 2 ** $depth,
     );
+}
+
+sub gps_compliant {
+    my $self = shift;
+    my @specs = split //, $ENV{ HTTP_X_UP_DEVCAP_MULTIMEDIA } || '';
+    return defined $specs[ 1 ] && $specs[ 1 ] =~ /^[23]$/;
 }
 

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/lib/HTTP/MobileAgent/Vodafone.pm

@@ -170 +170 @@
 }
 
+sub gps_compliant {
+    my $self = shift;
+    return $self->is_type_3gc;
+}
+
 sub user_id {
     my $self = shift;
-    return $self->get_header( 'x-jphone-uid' ) unless $self->is_type_c;
+    return if $self->is_type_c;
+    return $self->get_header( 'x-jphone-uid' );
 }
 

lang/perl/HTTP-MobileAgent/branches/feature-imode-browser2.0/t/12_guid.t

@@ -19 +19 @@
     my $ma = HTTP::MobileAgent->new( $header );
     my @keys = qw/carrier user_id/;
-    +{ map { $_ => $ma->$_ } @keys };
+    +{ map { $_ => $ma->$_ || '' } @keys };
 }
 
@@ -42 +42 @@
 user_id: abcdef0123456789
 
+=== Vodafone
+--- input
+headers:
+  User-Agent: J-PHONE/2.0/J-DN02
+  X-JPHONE-UID:
+--- expected
+carrier: V
+user_id:
+
 === KDDI
 --- input