update regex; modify http methods; ..

4 files changed, 46 insertions, 22 deletions

diff --git a/lib/Net/HTTP/Console/Role/APILib.pm b/lib/Net/HTTP/Console/Role/APILib.pm
new file mode 100644
index 0000000..5f5aff1
--- /dev/null
+++ b/lib/Net/HTTP/Console/Role/APILib.pm
@@ -0,0 +1,26 @@
+package Net::HTTP::Console::Role::APILib;
+
+use Moose::Role;
+
+has lib => (isa => 'Str', is => 'rw', default => 'Net::HTTP::Console::Dummy');
+has api_object => (
+    isa     => 'Object',
+    is      => 'rw',
+    lazy    => 1,
+    default => sub {
+        my $self = shift;
+        $self->load_api_lib($self->lib);
+    },
+);
+
+sub load_api_lib {
+    my ($self, $lib) = @_;
+    Class::MOP::load_class($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;
+}
+
+1;
diff --git a/lib/Net/HTTP/Console/Role/DefaultMethod.pm b/lib/Net/HTTP/Console/Role/DefaultMethod.pm
deleted file mode 100644
index c8f858e..0000000
--- a/lib/Net/HTTP/Console/Role/DefaultMethod.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-package Net::HTTP::Console::Role::DefaultMethod;
-
-use Moose::Role;
-use JSON;
-use Method::Signatures::Simple;
-use namespace::autoclean;
-
-with qw/Net::HTTP::Console::Role::HTTP/;
-
-method from_lib {
-    my $input = shift;
-    $input =~ /^(\w+)\s(.*)$/;
-    my $method = $1;
-    my $args   = $2;
-    my $o      = $self->lib->new();
-    my ($content, $response) = $o->$method(%{JSON::decode_json($args)});
-    $self->_set_and_show($content, $response);
-}
-
-1;
diff --git a/lib/Net/HTTP/Console/Role/HTTP.pm b/lib/Net/HTTP/Console/Role/HTTP.pm
index d0bd2c8..292de40 100644
--- a/lib/Net/HTTP/Console/Role/HTTP.pm
+++ b/lib/Net/HTTP/Console/Role/HTTP.pm
@@ -33,8 +33,7 @@ sub _show_last_headers {
 
 sub _set_and_show {
     my ($self, $content, $response) = @_;
-    my $json = $self->_json->pretty->encode($content);
-    $self->_last_http_content($json);
+    $self->_last_http_content($self->_json->pretty->encode($content));
     $self->_last_http_response($response);
     $self->_show_last_content;
 }
diff --git a/lib/Net/HTTP/Console/Role/Headers.pm b/lib/Net/HTTP/Console/Role/Headers.pm
new file mode 100644
index 0000000..d694d85
--- /dev/null
+++ b/lib/Net/HTTP/Console/Role/Headers.pm
@@ -0,0 +1,19 @@
+package Net::HTTP::Console::Role::Headers;
+
+use Moose::Role;
+
+has custom_headers => (
+    traits  => ['Hash'],
+    is      => 'ro',
+    isa     => 'HashRef[Str]',
+    default => sub { {} },
+    handles => {
+        set_header     => 'set',
+        get_header     => 'get',
+        has_no_headers => 'is_empty',
+        delete_header  => 'delete',
+        all_headers    => 'kv',
+    },
+);
+
+1;