From ae5a20fd326952e019b3fea5336213190dcb3973 Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Tue, 10 Nov 2009 17:16:43 +0100
Subject: fixed google suggest javascript updates

---
 lib/WebService/Google/Suggest.pm | 20 +++++++++++---------
 t/01_suggest.t                   |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/lib/WebService/Google/Suggest.pm b/lib/WebService/Google/Suggest.pm
index 3c8522d..8f04cd4 100644
--- a/lib/WebService/Google/Suggest.pm
+++ b/lib/WebService/Google/Suggest.pm
@@ -13,7 +13,7 @@ $CompleteURL = "http://www.google.com/complete/search?hl=en&js=true&qu=";
 
 sub new {
     my $class = shift;
-    my $ua = LWP::UserAgent->new();
+    my $ua    = LWP::UserAgent->new();
     $ua->agent("Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)");
     bless { ua => $ua }, $class;
 }
@@ -21,20 +21,22 @@ sub new {
 sub ua { $_[0]->{ua} }
 
 sub complete {
-    my($self, $query) = @_;
+    my ( $self, $query ) = @_;
     my $url = $CompleteURL . uri_escape($query);
 
     my $response = $self->ua->get($url);
-    $response->is_success or croak "Google doesn't respond well: ", $response->code;
+    $response->is_success
+        or croak "Google doesn't respond well: ", $response->code;
 
     my $content = $response->content();
-    $content =~ /^window\.google\.ac\.\w+\(frameElement, ".*?", new Array\((.*?)\), new Array\(""\)\)\;$/
-	or croak "Google returns unrecognized format: $content";
-    my @queries = map { s/^"(.*?)"$/$1/; $_ } split /, /, $1;
-    shift @queries; # new Array(2, ...)
+    $content =~ /^window\.google\.ac\.\w+\(\["([^"]+)",\[(.*)\]\)$/
+        or croak "Google returns unrecognized format: $content";
+
+    my ( $user_query, $array ) = ( $1, $2 );
     my @results;
-    while (my($query, $count) = splice @queries, 0, 2) {
-        $count =~ s/^([\d,]+) results?$/$1/;
+    while ( $array =~ /\[([^\]]+)\]/g ) {
+        my $row = $1;
+        my ( $query, $count ) = $row =~ /\"([^"]+)\",\"([\d,]+) results?/;
         $count =~ tr/,//d;
         $count += 0; # numify
         push @results, { query => $query, results => $count };
diff --git a/t/01_suggest.t b/t/01_suggest.t
index 07dfc6a..5660d24 100644
--- a/t/01_suggest.t
+++ b/t/01_suggest.t
@@ -8,7 +8,7 @@ my $suggest = WebService::Google::Suggest->new();
 isa_ok($suggest->ua, "LWP::UserAgent", "ua() retuens LWP");
 
 my @data = $suggest->complete("google");
-is($data[0]->{query}, "google", "google completes to google");
+is($data[0]->{query}, "google maps", "google completes to google maps");
 ok($data[0]->{results}, "google has more than 0 results");
 is_deeply( [ $suggest->complete("udfg67a") ], [ ], "empty list" );
 
-- 
cgit 1.4.1