From d0958fca7e5b21131857f40c1aac60a59893ed63 Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Tue, 8 Jun 2010 18:01:03 +0200
Subject: fix loading lib; rename print to message

---
 lib/Net/HTTP/Console/Role/API.pm           | 30 +++++++++++++++++++-----------
 lib/Net/HTTP/Console/Role/HTTP/Response.pm |  4 ++--
 lib/Net/HTTP/Console/Role/Message.pm       |  2 +-
 lib/Net/HTTP/Console/Role/Plugins.pm       |  2 +-
 4 files changed, 23 insertions(+), 15 deletions(-)

(limited to 'lib/Net/HTTP/Console/Role')

diff --git a/lib/Net/HTTP/Console/Role/API.pm b/lib/Net/HTTP/Console/Role/API.pm
index c6ea1f2..cd3ba75 100644
--- a/lib/Net/HTTP/Console/Role/API.pm
+++ b/lib/Net/HTTP/Console/Role/API.pm
@@ -18,22 +18,30 @@ role Net::HTTP::Console::Role::API {
         lazy    => 1,
         default => sub {
             my $self = shift;
-            $self->load_api_lib($self->api_lib);
+            $self->_load_api_lib($self->api_lib);
         },
     );
 
-    method load_api_lib($lib) {
+    method _load_api_lib($lib) {
+        my $api;
         try {
             Class::MOP::load_class($lib);
             $self->api_lib($lib);
-            my $o = $lib->new();
-            $o->api_base_url($self->url)            if $self->has_url;
-            $o->api_format($self->format)           if $self->has_format;
-            $o->api_format_mode($self->format_mode) if $self->has_format_mode;
-            $o;
-        }catch{
-            # XXX ERROR
-        }
+            $api = $lib->new();
+            $api->api_base_url($self->url)  if $self->has_url;
+            $api->api_format($self->format) if $self->has_format;
+            $api->api_format_mode($self->format_mode)
+              if $self->has_format_mode;
+        }catch {
+            $self->logger('error', "failed to load $lib: $_");
+        };
+        return $api if $api;
+    }
+
+    method load_api_lib($lib) {
+        my $object = $self->_load_api_lib($lib);
+        $self->api_object($object);
+        $self->message("successfully loaded $lib");
     }
 
     method new_anonymous_method ($http_method, $path) {
@@ -44,7 +52,7 @@ role Net::HTTP::Console::Role::API {
                 path   => $path,
             );
         }catch {
-            # XXX ERROR
+            $self->logger('error', "failed to add anonymous method: ".$_);
         }
     }
 }
diff --git a/lib/Net/HTTP/Console/Role/HTTP/Response.pm b/lib/Net/HTTP/Console/Role/HTTP/Response.pm
index 27f6925..38e35b2 100644
--- a/lib/Net/HTTP/Console/Role/HTTP/Response.pm
+++ b/lib/Net/HTTP/Console/Role/HTTP/Response.pm
@@ -24,12 +24,12 @@ role Net::HTTP::Console::Role::HTTP::Response {
     );
 
     method _show_last_content {
-        $self->print($self->_last_http_content);
+        $self->message($self->_last_http_content);
     }
 
     method _show_last_headers {
         foreach my $k (keys %{$self->_last_http_response->headers}) {
-            $self->print("$k: ".$self->_last_http_response->header($k));
+            $self->message("$k: ".$self->_last_http_response->header($k));
         }
     }
 
diff --git a/lib/Net/HTTP/Console/Role/Message.pm b/lib/Net/HTTP/Console/Role/Message.pm
index 4b3fce6..1fcac63 100644
--- a/lib/Net/HTTP/Console/Role/Message.pm
+++ b/lib/Net/HTTP/Console/Role/Message.pm
@@ -9,7 +9,7 @@ role Net::HTTP::Console::Role::Message {
         print "[".uc($level)."] ".$message."\n";
     }
 
-    method print($message) {
+    method message($message) {
         print $message."\n";
     }
 
diff --git a/lib/Net/HTTP/Console/Role/Plugins.pm b/lib/Net/HTTP/Console/Role/Plugins.pm
index 8486cdb..07e1eeb 100644
--- a/lib/Net/HTTP/Console/Role/Plugins.pm
+++ b/lib/Net/HTTP/Console/Role/Plugins.pm
@@ -43,7 +43,7 @@ role Net::HTTP::Console::Role::Plugins {
                 last if ($result = $_->dispatch($input));
             }
         }catch{
-            $self->application->logger('error', $_);
+            $self->logger('error', $_);
         };
     }
 }
-- 
cgit 1.4.1