===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm,v
retrieving revision 1.10
retrieving revision 1.14
diff -u -r1.10 -r1.14
--- HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/06/27 04:59:32	1.10
+++ HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/06/30 19:45:42	1.14
@@ -1,13 +1,12 @@
 package Net::OpenAMD;
 
-# $AFresh1: OpenAMD.pm,v 1.9 2010/06/27 03:45:07 andrew Exp $
+# $AFresh1: OpenAMD.pm,v 1.13 2010/06/30 05:30:17 andrew Exp $
 
 use warnings;
 use strict;
 use Carp;
 
-use version; our $VERSION = qv('0.0.1');
-
+use version; our $VERSION = qv('0.0.3');
 my $BASE_URI = 'https://api.hope.net/api/';
 
 use Scalar::Util qw( refaddr );
@@ -16,24 +15,33 @@
 use LWP::UserAgent;
 use URI;
 use Net::OAuth;
-use JSON::Any;
+use JSON qw/ from_json /;
 
 {
 
-    my @attr_refs = \( my %base_uri_of, my %ua_of, my %auth_of, );
+    my @attr_refs
+        = \( my %base_uri_of, my %ua_of, my %auth_of, my %helpers_of );
 
     sub new {
         my ( $class, $options ) = @_;
         my $self = bless do { \my $x }, $class;
         my $ident = _ident($self);
 
-        $options //= {};
+        $options ||= {};
 
         croak 'Options should be a hashref' if ref $options ne 'HASH';
 
         $base_uri_of{$ident} = $options->{base_uri} || $BASE_URI;
         $ua_of{$ident}       = $options->{ua}       || LWP::UserAgent->new();
+        $helpers_of{$ident}  = $options->{helpers}
+            || [qw( location speakers talks interests users )];
 
+        foreach my $helper ( @{ $helpers_of{$ident} } ) {
+            ## no critic
+            no strict 'refs';
+            *{$helper} = sub { shift->get( $helper, @_ ) };
+        }
+
         # XXX Authenticate
 
         return $self;
@@ -47,20 +55,15 @@
         $uri->query($query);
 
         my $response = $ua_of{$ident}->get($uri);
+        croak $response->status_line if !$response->is_success;
 
-        if ( !$response->is_success ) {
-            croak $response->status_line;
-        }
+        my @data = map { from_json($_) } split /\r?\n/xms,
+            $response->decoded_content;
 
-        return JSON::Any->jsonToObj( $response->decoded_content );
+        return @data == 1 ? $data[0] : \@data;
     }
 
-    sub location  { return shift->get( 'location',  @_ ) }
-    sub speakers  { return shift->get( 'speakers',  @_ ) }
-    sub talks     { return shift->get( 'talks',     @_ ) }
-    sub interests { return shift->get( 'interests', @_ ) }
-    sub users     { return shift->get( 'users',     @_ ) }
-    sub stats     { croak 'Unused feature' }
+    sub stats { croak 'Unused feature' }
 
     sub DESTROY {
         my ($self) = @_;
@@ -176,7 +179,7 @@
 
 =head1 DIAGNOSTICS
 
-All methods should croak when an error occours.  
+All methods should croak when an error occurs.  
 If the remote API returns a successful response that contains valid JSON, that
 will be decoded and returned.