===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/06/27 04:11:22	1.7
+++ HOPE/Net-OpenAMD/lib/Net/OpenAMD.pm	2010/06/28 18:49:31	1.11
@@ -1,6 +1,6 @@
 package Net::OpenAMD;
 
-# $AFresh1: OpenAMD.pm,v 1.6 2010/06/27 00:52:33 andrew Exp $
+# $AFresh1: OpenAMD.pm,v 1.10 2010/06/27 03:59:32 andrew Exp $
 
 use warnings;
 use strict;
@@ -8,9 +8,10 @@
 
 use version; our $VERSION = qv('0.0.1');
 
-my $BASE_URL = 'https://api.hope.net/api/';
+my $BASE_URI = 'https://api.hope.net/api/';
 
-use Class::Std::Utils;
+use Scalar::Util qw( refaddr );
+*_ident = \&refaddr;
 
 use LWP::UserAgent;
 use URI;
@@ -19,18 +20,18 @@
 
 {
 
-    my @attr_refs = \( my %base_url_of, my %ua_of, my %auth_of, );
+    my @attr_refs = \( my %base_uri_of, my %ua_of, my %auth_of, );
 
     sub new {
         my ( $class, $options ) = @_;
-        my $self = bless anon_scalar(), $class;
-        my $ident = ident($self);
+        my $self = bless do { \my $x }, $class;
+        my $ident = _ident($self);
 
         $options //= {};
 
         croak 'Options should be a hashref' if ref $options ne 'HASH';
 
-        $base_url_of{$ident} = $options->{base_url} || $BASE_URL;
+        $base_uri_of{$ident} = $options->{base_uri} || $BASE_URI;
         $ua_of{$ident}       = $options->{ua}       || LWP::UserAgent->new();
 
         # XXX Authenticate
@@ -40,9 +41,9 @@
 
     sub get {
         my ( $self, $action, $query ) = @_;
-        my $ident = ident($self);
+        my $ident = _ident($self);
 
-        my $uri = URI->new( $base_url_of{$ident} . '/' . $action );
+        my $uri = URI->new_abs( $action, $base_uri_of{$ident} );
         $uri->query($query);
 
         my $response = $ua_of{$ident}->get($uri);
@@ -54,16 +55,16 @@
         return JSON::Any->jsonToObj( $response->decoded_content );
     }
 
-    sub location  { my $self = shift; return $self->get( 'location',  @_ ) }
-    sub speakers  { my $self = shift; return $self->get( 'speakers',  @_ ) }
-    sub talks     { my $self = shift; return $self->get( 'talks',     @_ ) }
-    sub interests { my $self = shift; return $self->get( 'interests', @_ ) }
-    sub users     { my $self = shift; return $self->get( 'users',     @_ ) }
-    sub stats { croak 'Unused feature' }
+    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 DESTROY {
         my ($self) = @_;
-        my $ident = ident $self;
+        my $ident = _ident $self;
 
         foreach my $attr_ref (@attr_refs) {
             delete $attr_ref->{$ident};
@@ -122,10 +123,13 @@
 
 =over
 
-=item base_url
+=item base_uri
 
-A URL to the API, currently defaults to https://api.hope.net/api
+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.
+
 =item ua
 
 Should be a pre-configured LWP::UserAgent or similar that returns a
@@ -171,7 +175,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.