===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm,v
retrieving revision 1.14
retrieving revision 1.19
diff -u -r1.14 -r1.19
--- HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/06/30 19:45:42	1.14
+++ HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/07/14 06:21:23	1.19
@@ -1,12 +1,12 @@
 package Net::OpenAMD;
 
-# $AFresh1: OpenAMD.pm,v 1.13 2010/06/30 05:30:17 andrew Exp $
+# $AFresh1: OpenAMD.pm,v 1.18 2010/07/13 00:14:21 andrew Exp $
 
 use warnings;
 use strict;
 use Carp;
 
-use version; our $VERSION = qv('0.0.3');
+use version; our $VERSION = qv('0.1.0');
 my $BASE_URI = 'https://api.hope.net/api/';
 
 use Scalar::Util qw( refaddr );
@@ -15,12 +15,15 @@
 use LWP::UserAgent;
 use URI;
 use Net::OAuth;
-use JSON qw/ from_json /;
+use JSON;
 
 {
 
-    my @attr_refs
-        = \( my %base_uri_of, my %ua_of, my %auth_of, my %helpers_of );
+    my @attr_refs = \(
+        my %base_uri_of,
+        my %ua_of, my %auth_of, my %actions_of,
+        my %json_of,
+    );
 
     sub new {
         my ( $class, $options ) = @_;
@@ -33,13 +36,14 @@
 
         $base_uri_of{$ident} = $options->{base_uri} || $BASE_URI;
         $ua_of{$ident}       = $options->{ua}       || LWP::UserAgent->new();
-        $helpers_of{$ident}  = $options->{helpers}
+        $json_of{$ident}     = $options->{json}     || JSON->new();
+        $actions_of{$ident}  = $options->{actions}
             || [qw( location speakers talks interests users )];
 
-        foreach my $helper ( @{ $helpers_of{$ident} } ) {
+        foreach my $action ( @{ $actions_of{$ident} } ) {
             ## no critic
             no strict 'refs';
-            *{$helper} = sub { shift->get( $helper, @_ ) };
+            *{$action} = sub { shift->get( $action, @_ ) };
         }
 
         # XXX Authenticate
@@ -51,16 +55,19 @@
         my ( $self, $action, $query ) = @_;
         my $ident = _ident($self);
 
-        my $uri = URI->new_abs( $action, $base_uri_of{$ident} );
-        $uri->query($query);
+        my $uri = URI->new_abs( $action . '/', $base_uri_of{$ident} );
+        $uri->query_form($query);
 
         my $response = $ua_of{$ident}->get($uri);
         croak $response->status_line if !$response->is_success;
 
-        my @data = map { from_json($_) } split /\r?\n/xms,
-            $response->decoded_content;
+        my $data;
+        eval {
+            $data = $json_of{$ident}->decode( $response->decoded_content );
+        };
+        croak "Invalid JSON from [$uri]" if $@;
 
-        return @data == 1 ? $data[0] : \@data;
+        return $data;
     }
 
     sub stats { croak 'Unused feature' }
@@ -88,7 +95,7 @@
 
 =head1 VERSION
 
-This document describes Net::OpenAMD version 0.0.1
+This document describes Net::OpenAMD version 0.0.3
 
 
 =head1 SYNOPSIS
@@ -132,7 +139,7 @@
 A URL to the API, currently defaults to https://api.hope.net/api/
 
 Most likely it should end with a / to make URI happy, so notice that if you
-having 404 errors you don't expect.
+are having 404 errors you don't expect.
 
 =item ua
 
@@ -173,7 +180,7 @@
 
 =back
 
-Unless specified, there is nothing different about any of the helper methods
+Unless specified, there is nothing different about any of the action methods
 than just calling get($action) instead.  Depending on API changes, this may
 not always be the case.