4 files changed, 31 insertions, 52 deletions

diff --git a/lib/Net/HTTP/Console/Dispatcher/HTTP.pm b/lib/Net/HTTP/Console/Dispatcher/HTTP.pm
index c0e24ae..88f8814 100644
--- a/lib/Net/HTTP/Console/Dispatcher/HTTP.pm
+++ b/lib/Net/HTTP/Console/Dispatcher/HTTP.pm
@@ -21,7 +21,7 @@ class Net::HTTP::Console::Dispatcher::HTTP with Net::HTTP::Console::Dispatcher {
             $self->_do_request_with_body($method, $path, $body);
         }
         else {
-            # XXX unsupporter method
+            $self->application->logger('error', 'unsupported HTTP method');
         }
         return 1;
     }
@@ -32,7 +32,7 @@ class Net::HTTP::Console::Dispatcher::HTTP with Net::HTTP::Console::Dispatcher {
             my ($content, $result) = $self->application->api_object->anonymous;
             $self->application->_set_and_show($content, $result);
         }catch{
-            # XXX error
+            $self->application->error('error', $_);
         };
     }
 
@@ -58,9 +58,7 @@ class Net::HTTP::Console::Dispatcher::HTTP with Net::HTTP::Console::Dispatcher {
             my ($content, $result) = $self->application->api_object->anonymous;
             $self->application->_set_and_show($content, $result);
         }catch{
-            warn $_;
-            use YAML::Syck;
-            warn Dump $_->http_error;
+            $self->application->error('error', $_);
         };
     }
 }
diff --git a/lib/Net/HTTP/Console/Dispatcher/Help.pm b/lib/Net/HTTP/Console/Dispatcher/Help.pm
index 6218676..4493799 100644
--- a/lib/Net/HTTP/Console/Dispatcher/Help.pm
+++ b/lib/Net/HTTP/Console/Dispatcher/Help.pm
@@ -4,6 +4,10 @@ use MooseX::Declare;
 
 class Net::HTTP::Console::Dispatcher::Help with Net::HTTP::Console::Dispatcher {
 
+    method pattern($input) {
+        $input =~ /^help/ ? return $input : return 0;
+    }
+
     method dispatch($input) {
         (my $cmd, my $cmd_name) = $input =~ /^help\s(\w+)?\s?(\w+)?/;
 
@@ -29,10 +33,6 @@ class Net::HTTP::Console::Dispatcher::Help with Net::HTTP::Console::Dispatcher {
         1;
     }
 
-    method pattern($input) {
-        $input =~ /^help/ ? return $input : return 0;
-    }
-
     method _display_help {
         print <<EOF
 help command    -  help about a command
@@ -43,31 +43,6 @@ help load       -  help on how to load a lib
 EOF
     }
 
-    method _list_commands {
-        my @methods =
-          $self->application->api_object->meta->get_all_net_api_methods();
-
-        if (!@methods) {
-            print "no method available\n";
-            return;
-        }
-
-        print "available commands:\n";
-        map { print "- " . $_ . "\n" } @methods;
-    }
-
-    method _get_help_for_command($cmd_name) {
-        my $method =
-          $self->application->api_object->meta->find_net_api_method_by_name($cmd_name);
-
-        if (!$method) {
-            print "unknown method " . $cmd_name . "\n";
-            return;
-        }
-
-        print $method->documentation;
-    }
-
     method _help_about_view {
         print <<EOF
 view headers         -  show the headers of the last request
@@ -91,7 +66,21 @@ EOF
     method _help_about_load {
         print <<EOF
 load libname    -  load a MooseX::Net::API library
-EOF
+
+        print "available commands:\n";
+        map { print "- " . $_ . "\n" } @methods;
+    }
+
+    method _get_help_for_command($cmd_name) {
+        my $method =
+          $self->application->api_object->meta->find_net_api_method_by_name($cmd_name);
+
+        if (!$method) {
+            print "unknown method " . $cmd_name . "\n";
+            return;
+        }
+
+        print $method->documentation;
     }
 }
 
diff --git a/lib/Net/HTTP/Console/Dispatcher/Set.pm b/lib/Net/HTTP/Console/Dispatcher/Set.pm
index f97474b..c72b09b 100644
--- a/lib/Net/HTTP/Console/Dispatcher/Set.pm
+++ b/lib/Net/HTTP/Console/Dispatcher/Set.pm
@@ -13,10 +13,6 @@ class Net::HTTP::Console::Dispatcher::Set with Net::HTTP::Console::Dispatcher {
         }elsif($command eq 'unset') {
             $self->_unset_header($key) if $type eq 'header';
         }
-
-        # elsif ($command eq 'show_defined_headers') {
-        #     $self->_show_defined_headers();
-        # }
     }
 
     method pattern($input) {
@@ -25,19 +21,13 @@ class Net::HTTP::Console::Dispatcher::Set with Net::HTTP::Console::Dispatcher {
 
     method _set_header($header, $value) {
         $self->application->set_header($header, $value);
-        print "header $header set to $value\n";
+        $self->application->message("header $header set to $value");
     }
 
     method _unset_header($header) {
         $self->application->delete_header($header);
-        print "header $header unset\n";
+        $self->application->message("header $header unset");
     }
-
-    # method _show_defined_headers {
-    #     foreach ($self->application->all_headers) {
-    #         print $_->[0].": ".$_->[1]."\n";
-    #     }
-    # }
 }
 
 1;
diff --git a/lib/Net/HTTP/Console/Dispatcher/View.pm b/lib/Net/HTTP/Console/Dispatcher/View.pm
index 9d623d7..bfc50f0 100644
--- a/lib/Net/HTTP/Console/Dispatcher/View.pm
+++ b/lib/Net/HTTP/Console/Dispatcher/View.pm
@@ -12,12 +12,14 @@ class Net::HTTP::Console::Dispatcher::View with Net::HTTP::Console::Dispatcher {
         (my $key) = $input =~ /^show ([\w]+)/;
 
         if ($key eq 'headers') {
-            $self->application->_show_last_headers
-        }elsif ($key eq 'content') {
-            $self->application->_show_last_content
-        }elsif ($key eq 'defined_headers') {
+            $self->application->_show_last_headers;
+        }
+        elsif ($key eq 'content') {
+            $self->application->_show_last_content;
+        }
+        elsif ($key eq 'defined_headers') {
             foreach ($self->application->all_headers) {
-                print $_->[0].': '.$_->[1]."\n";
+                $self->application->message( $_->[0] . ': ' . $_->[1]);
             }
         }
     }