burak / CPAN-Parse-HTTP-UserAgent / changeset / c87669421f04

Up to file-list lib/Parse/HTTP/UserAgent.pm:

@@ -81,7 +81,7 @@ sub _parse {
 sub _pre_parse {
     my $self = shift;
-    $self->[IS_MAXTHON] = index(uc $self->[UA_STRING], 'MAXTHON') != MINUS_ONE;
+    $self->[IS_MAXTHON] = index(uc $self->[UA_STRING], 'MAXTHON') != NO_IMATCH;
     my $ua = $self->[UA_STRING];
     my($moz, $thing, $extra, @others) = split RE_SPLIT_PARSE, $ua;
     $thing = $thing ? [ split RE_SC_WS, $thing ] : [];
@@ -96,7 +96,7 @@ sub _do_parse {
     if ( $c && shift @{$t} && ! $e && ! $self->[IS_MAXTHON] ) {
         my($n, $v) = split RE_WHITESPACE, $t->[0];
-        if ( $n eq 'MSIE' && index($m, q{ }) == MINUS_ONE ) {
+        if ( $n eq 'MSIE' && index($m, q{ }) == NO_IMATCH ) {
             return $self->_parse_msie($m, $t, $e, $n, $v);
+        }
+    }
@@ -200,7 +200,7 @@ sub _numify {
     };
     # if version::vpp is used it'll identify 420 as a v-string
     # add a floating point to fool it
-    $v .= q{.0} if index($v, q{.}) == MINUS_ONE;
+    $v .= q{.0} if index($v, q{.}) == NO_IMATCH;
     my $rv = version->new("$v")->numify;
     return $rv;
+}

Up to file-list lib/Parse/HTTP/UserAgent/Base/IS.pm:

@@ -9,7 +9,7 @@ use constant OPERA_FAKER_EXTRA_SIZE => 4
 sub _is_opera_pre {
     my($self, $moz) = @_;
-    return index( $moz, 'Opera') != MINUS_ONE;
+    return index( $moz, 'Opera') != NO_IMATCH;
+}
 sub _is_opera_post {
@@ -26,9 +26,9 @@ sub _is_safari {
     my($self, $extra, $others) = @_;
     my $str = $self->[UA_STRING];
     # epiphany?
     return                index( $str         , 'Chrome'       ) != MINUS_ONE ? 0 # faker
           :    $extra  && index( $extra->[0]  , 'AppleWebKit'  ) != MINUS_ONE ? 1
-          : @{$others} && index( $others->[MINUS_ONE], 'Safari') != MINUS_ONE ? 1
+    return                index( $str                   , 'Chrome'       ) != NO_IMATCH ? 0 # faker
           :    $extra  && index( $extra->[0]            , 'AppleWebKit'  ) != NO_IMATCH ? 1
           : @{$others} && index( $others->[LAST_ELEMENT], 'Safari'       ) != NO_IMATCH ? 1
           :                                                                     0
+          ;
+}
@@ -39,9 +39,9 @@ sub _is_chrome {
     my($chrome, $safari) = split RE_WHITESPACE, $chx;
     return if ! ( $chrome && $safari);
     return              index( $chrome    , 'Chrome'     ) != MINUS_ONE &&
                         index( $safari    , 'Safari'     ) != MINUS_ONE &&
-           ( $extra  && index( $extra->[0], 'AppleWebKit') != MINUS_ONE);
+    return              index( $chrome    , 'Chrome'     ) != NO_IMATCH &&
                         index( $safari    , 'Safari'     ) != NO_IMATCH &&
            ( $extra  && index( $extra->[0], 'AppleWebKit') != NO_IMATCH);
+}
 sub _is_ff {
@@ -55,7 +55,7 @@ sub _is_ff {
+}
 sub _is_gecko {
-    return index(shift->[UA_STRING], 'Gecko/') != MINUS_ONE;
+    return index(shift->[UA_STRING], 'Gecko/') != NO_IMATCH;
+}
 sub _is_generic { #TODO: this is actually a parser
@@ -69,20 +69,20 @@ sub _is_generic { #TODO: this is actuall
 sub _is_netscape {
     my($self, $moz, $thing, $extra, $compatible, @others) = @_;
     my $rv = index($moz, 'Mozilla/') != MINUS_ONE &&
              $moz ne 'Mozilla/4.0'         &&
              ! $compatible                 &&
              ! $extra                      &&
              ! @others                     &&
              $thing->[MINUS_ONE] ne 'Sun'  && # hotjava
-             index($thing->[0], 'http://') == MINUS_ONE # robot
+    my $rv = index($moz, 'Mozilla/') != NO_IMATCH &&
              $moz ne 'Mozilla/4.0'            &&
              ! $compatible                    &&
              ! $extra                         &&
              ! @others                        &&
              $thing->[LAST_ELEMENT] ne 'Sun'  && # hotjava
              index($thing->[0], 'http://') == NO_IMATCH # robot
+             ;
     return $rv;
+}
 sub _is_docomo {
     my($self, $moz) = @_;
-    return index(lc $moz, 'docomo') != MINUS_ONE;
+    return index(lc $moz, 'docomo') != NO_IMATCH;
+}
 sub _is_strength {
@@ -97,7 +97,7 @@ sub _is_generic_bogus_ie {
     my($self, $extra) = @_;
     return $extra
         && $extra->[0]
-        && index( $extra->[0], 'compatible' ) != MINUS_ONE
+        && index( $extra->[0], 'compatible' ) != NO_IMATCH
         && $extra->[1]
         && $extra->[1] eq 'MSIE';
+}

Up to file-list lib/Parse/HTTP/UserAgent/Base/Parsers.pm:

@@ -69,8 +69,8 @@ sub _parse_maxthon {
     my @omap = grep { $_ } map { split RE_SC_WS_MULTI, $_ } @others;
     my($maxthon, $msie, @buf);
     foreach my $e ( @omap, @{$thing} ) { # $extra -> junk
         if ( index(uc $e, 'MAXTHON') != MINUS_ONE ) { $maxthon = $e; next; }
         if ( index(uc $e, 'MSIE'   ) != MINUS_ONE ) { $msie    = $e; next; }
         if ( index(uc $e, 'MAXTHON') != NO_IMATCH ) { $maxthon = $e; next; }
         if ( index(uc $e, 'MSIE'   ) != NO_IMATCH ) { $msie    = $e; next; }
         push @buf, $e;
+    }
@@ -104,7 +104,7 @@ sub _parse_msie {
     my $junk = shift @{ $thing }; # already used
     my($extras,$dotnet) = $self->_extract_dotnet( $thing, $extra );
-    if ( @{$extras} == 2 && index( $extras->[1], 'Lunascape' ) != MINUS_ONE ) {
+    if ( @{$extras} == 2 && index( $extras->[1], 'Lunascape' ) != NO_IMATCH ) {
         ($name, $version) = split RE_CHAR_SLASH_WS, pop @{ $extras };
+    }
@@ -139,14 +139,15 @@ sub _parse_firefox {
 sub _parse_safari {
     my($self, $moz, $thing, $extra, @others) = @_;
     my($version, @junk)     = split RE_WHITESPACE, pop @others;
-    my $ep = $version && index( lc($version), 'epiphany' ) != MINUS_ONE;
+    my $ep = $version && index( lc($version), 'epiphany' ) != NO_IMATCH;
     (undef, $version)       = split RE_SLASH, $version;
     $self->[UA_NAME]        = $ep ? 'Epiphany' : 'Safari';
     $self->[UA_VERSION_RAW] = $version;
     $self->[UA_TOOLKIT]     = [ split RE_SLASH, $extra->[0] ];
     $self->[UA_LANG]        = pop @{ $thing };
     $self->[UA_OS]          = length $thing->[MINUS_ONE] > 1 ? pop   @{ $thing }
                                                       : shift @{ $thing }
     $self->[UA_OS]          = length $thing->[LAST_ELEMENT] > 1
                             ? pop   @{ $thing }
                             : shift @{ $thing }
+                            ;
     $self->[UA_DEVICE]      = shift @{$thing} if $thing->[0] eq 'iPhone';
     $self->[UA_EXTRAS]      = [ @{$thing}, @others ];
@@ -177,7 +178,7 @@ sub _parse_opera_pre {
     # opera 5,9
     my($self, $moz, $thing, $extra) = @_;
     my($name, $version)     = split RE_SLASH, $moz;
-    my $faking_ff           = index($thing->[MINUS_ONE], 'rv:') != MINUS_ONE ? pop @{$thing} : 0;
+    my $faking_ff           = index($thing->[LAST_ELEMENT], 'rv:') != NO_IMATCH ? pop @{$thing} : 0;
     $self->[UA_NAME]        = $name;
     $self->[UA_VERSION_RAW] = $version;
     my $ver = $self->_numify( $version );
@@ -185,7 +186,7 @@ sub _parse_opera_pre {
     if ( $extra ) {
         # http://dev.opera.com/articles/view/opera-ua-string-changes/
-        my $swap = index($extra->[MINUS_ONE], 'Version/') != MINUS_ONE; # damned 10.0 beta
+        my $swap = index($extra->[LAST_ELEMENT], 'Version/') != NO_IMATCH; # damned 10.0 beta
         ($lang = $swap ? shift @{$extra} : pop @{$extra}) =~ tr/[]//d;
         if ( $swap ) {
             my $vjunk = pop @{$extra};
@@ -201,8 +202,9 @@ sub _parse_opera_pre {
+    }
     $self->[UA_LANG] = $lang;
     $self->[UA_OS]   = $self->_is_strength($thing->[MINUS_ONE]) ? shift @{$thing}
                      :                                     pop   @{$thing}
     $self->[UA_OS]   = $self->_is_strength( $thing->[LAST_ELEMENT] )
                      ? shift @{$thing}
                      : pop   @{$thing}
+                     ;
     $self->[UA_EXTRAS] = [ @{ $thing }, ( $extra ? @{$extra} : () ) ];
@@ -216,8 +218,9 @@ sub _parse_opera_post {
     $self->[UA_NAME]        = shift @{$extra};
     $self->[UA_VERSION_RAW] = shift @{$extra};
    ($self->[UA_LANG]        = shift @{$extra} || q{}) =~ tr/[]//d;
     $self->[UA_OS]          = $self->_is_strength($thing->[MINUS_ONE]) ? shift @{$thing}
                             :                                     pop   @{$thing}
     $self->[UA_OS]          = $self->_is_strength($thing->[LAST_ELEMENT])
                             ? shift @{$thing}
                             : pop   @{$thing}
+                            ;
     $self->[UA_EXTRAS]      = [ @{ $thing }, ( $extra ? @{$extra} : () ) ];
     return $self->_fix_opera;
@@ -233,7 +236,7 @@ sub _parse_mozilla_family {
     $self->[UA_TOOLKIT]      = [ split RE_SLASH, $extra->[0] ];
     $self->[UA_VERSION_RAW]  = $version;
-    if ( index($thing->[MINUS_ONE], 'rv:') != MINUS_ONE ) {
+    if ( index($thing->[LAST_ELEMENT], 'rv:') != NO_IMATCH ) {
         $self->[UA_MOZILLA]  = pop @{ $thing };
         $self->[UA_LANG]     = pop @{ $thing };
         $self->[UA_OS]       = pop @{ $thing };
@@ -424,7 +427,7 @@ sub _generic_compatible {
             @extras = (@{ $extras }, @others);
+        }
         else {
-            return if index($moz, q{ }) != MINUS_ONE; # WebTV
+            return if index($moz, q{ }) != NO_IMATCH; # WebTV
+        }
+    }
@@ -445,7 +448,7 @@ sub _generic_compatible {
 sub _parse_docomo {
     my($self, $moz, $thing, $extra, $compatible, @others) = @_;
-    if ( $thing->[0] && index(lc $thing->[0], 'googlebot-mobile') != MINUS_ONE ) {
+    if ( $thing->[0] && index(lc $thing->[0], 'googlebot-mobile') != NO_IMATCH ) {
         my($name, $version) = split RE_SLASH, shift @{ $thing };
         $self->[UA_NAME]        = $name;
         $self->[UA_VERSION_RAW] = $version;

Up to file-list lib/Parse/HTTP/UserAgent/Constants.pm:

@@ -2,10 +2,15 @@ package Parse::HTTP::UserAgent::Constant
 use strict;
 use warnings;
 use vars qw( $VERSION $OID @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS );
 use constant MINUS_ONE => -1;
 $VERSION = '0.10';
 use constant MINUS_ONE           => -1;
 use constant NO_IMATCH           => -1; # for index()
 use constant LAST_ELEMENT        => -1;
 BEGIN { $OID = MINUS_ONE }
 use constant UA_STRING           => ++$OID; # just for information
 use constant UA_UNKNOWN          => ++$OID; # failed to detect?
 use constant UA_GENERIC          => ++$OID; # parsed with a generic parser.
@@ -130,7 +135,8 @@ BEGIN {
             TK_VERSION
         )],
         etc => [qw(
-            MINUS_ONE
+            NO_IMATCH
             LAST_ELEMENT
         )],
     );

commit 94:	c87669421f04
parent 93:	f6bdf7d0bb6b
branch:	default