Changeset 19888

Timestamp:

09/25/08 11:16:41 (5 years ago)

Author:

mizuno_takaaki

Message:

lang/perl/App-Hachero: modified to use HTTP::DetectUserAgent?

Location:

lang/perl/App-Hachero/trunk

Files:

• Makefile.PL (modified) (1 diff)
• lib/App/Hachero/Plugin/Analyze/UserAgent.pm (modified) (2 diffs)
• lib/App/Hachero/Plugin/Classify/UserAgent.pm (modified) (2 diffs)
• lib/App/Hachero/Plugin/Parse/Normalize.pm (modified) (2 diffs)
• t/plugin/analyze/03_useragent.t (modified) (1 diff)
• t/plugin/classify/03_useragent.t (modified) (2 diffs)

lang/perl/App-Hachero/trunk/Makefile.PL

@@ -23 +23 @@
 requires 'IO::All';
 requires 'Module::Collect';
-requires 'HTTP::BrowserDetect';
+requires 'HTTP::DetectUserAgent';
 requires 'File::Find::Rule::Age';
 requires 'Template';

lang/perl/App-Hachero/trunk/lib/App/Hachero/Plugin/Analyze/UserAgent.pm

@@ -11 +11 @@
     my $req = $context->currentinfo->{request} or return;
     my $browser = $context->currentinfo->{useragent} or return;
-    my $browser_string = $browser->browser_string || '';
+    my $browser_string = $browser->name || 'Unknown';
     my $truncate = $self->config->{config}->{truncate_to} || 'hour';
     my $time = $req->{datetime}->clone->truncate(to => $truncate);
@@ -17 +17 @@
 
     $context->result->{UserAgent} ||= App::Hachero::Result::UserAgent->new;
-    
     $context->result->{UserAgent}->push(
         {

lang/perl/App-Hachero/trunk/lib/App/Hachero/Plugin/Classify/UserAgent.pm

@@ -3 +3 @@
 use warnings;
 use base qw(App::Hachero::Plugin::Base);
-use HTTP::BrowserDetect;
+use HTTP::DetectUserAgent;
 
 sub init {
@@ -12 +12 @@
     my ($self, $context, $args) = @_;
     my $ua = $context->currentlog->{ua} or return;
-    my $browser = HTTP::BrowserDetect->new($ua);
+    my $browser = HTTP::DetectUserAgent->new($ua);
     $context->currentinfo->{useragent} = $browser;
 }

lang/perl/App-Hachero/trunk/lib/App/Hachero/Plugin/Parse/Normalize.pm

@@ -5 +5 @@
 use DateTime::Format::HTTP;
 use URI;
+use URI::QueryParam;
 
 sub parse : Hook {
@@ -19 +20 @@
     $info->{request} = {
         method   => $req[0],
-        uri      => URI->new($req[1]),
+        uri      => URI->new($req[1], 'http'),
         protocol => $req[2] || 'HTTP/0.9',
         datetime => $datetime,

lang/perl/App-Hachero/trunk/t/plugin/analyze/03_useragent.t

@@ -61 +61 @@
 --- expected
 datetime: '2008-08-07 00:00:00'
-useragent: 'MSIE'
+useragent: 'Internet Explorer'
 count: 1
 

lang/perl/App-Hachero/trunk/t/plugin/classify/03_useragent.t

@@ -23 +23 @@
     $app->currentinfo( {} );
     $app->run_hook('classify');
-    is $app->currentinfo->{useragent}->browser_string, $block->expected;
+    is $app->currentinfo->{useragent}->name, $block->expected;
 }
 
@@ -31 +31 @@
 ua: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322)
 --- expected
-MSIE
+Internet Explorer
 
 === Firefox