add strict and alter what params_in_url does

2 files changed, 36 insertions, 41 deletions

diff --git a/lib/MooseX/Net/API/Meta/Method.pm b/lib/MooseX/Net/API/Meta/Method.pm
index 8643152..ddd84f9 100644
--- a/lib/MooseX/Net/API/Meta/Method.pm
+++ b/lib/MooseX/Net/API/Meta/Method.pm
@@ -10,43 +10,22 @@ use MooseX::Types::Moose qw/Str Int ArrayRef/;
 
 extends 'Moose::Meta::Method';
 
-subtype UriPath => as 'Str' => where { $_ =~ m!^/! } =>
-  message {"path must start with /"};
+subtype UriPath
+    => as 'Str'
+    => where { $_ =~ m!^/! }
+    => message {"path must start with /"};
 
 enum Method => qw(HEAD GET POST PUT DELETE);
 
-has method => (
-    is       => 'ro',
-    isa      => 'Method',
-    required => 1
-);
-has path => (
-    is       => 'ro',
-    isa      => 'UriPath',
-    required => 1,
-    coerce   => 1
-);
-has description => (
-    is        => 'ro',
-    isa       => 'Str',
-    predicate => 'has_description'
-);
-has params_in_url => (
-    is        => 'ro',
-    isa       => 'Bool',
-    predicate => 'has_params_in_url',
-    default   => 0
-);
-has strict => (
+has path   => (is => 'ro', isa => 'UriPath', required => 1, coerce => 1);
+has method => (is => 'ro', isa => 'Method', required => 1);
+has description => (is => 'ro', isa => 'Str',  predicate => 'has_description');
+has strict      => (is => 'ro', isa => 'Bool', default   => 1,);
+has authentication => (
     is => 'ro',
     isa => 'Bool',
-    default => 1,
-);
-has authentication => (
-    is        => 'ro',
-    isa       => 'Bool',
     predicate => 'has_authentication',
-    default   => 0
+    default => 0
 );
 has expected => (
     traits     => ['Array'],
@@ -66,6 +45,15 @@ has params => (
     auto_deref => 1,
     handles    => {find_request_parameter => 'first',}
 );
+has params_in_url => (
+    traits     => ['Array'],
+    is         => 'ro',
+    isa        => ArrayRef [Str],
+    required   => 0,
+    default    => sub { [] },
+    auto_deref => 0,
+    handles => {find_request_url_parameters => 'first'}
+);
 has required => (
     traits     => ['Array'],
     is         => 'ro',
@@ -106,7 +94,7 @@ before wrap => sub {
         foreach my $required ( @{ $args{required} } ) {
             die MooseX::Net::API::Error->new( reason =>
                     "$required is required but is not declared in params" )
-                if ( !grep { $_ eq $required } @{ $args{params} } );
+                if ( !grep { $_ eq $required } @{ $args{params} }, @{$args{params_in_url}} );
         }
     }
 };
@@ -176,7 +164,9 @@ sub _check_params_before_run {
 
     # check if there is no undeclared param
     foreach my $arg (keys %$args) {
-        if (!$self->find_request_parameter(sub {/$arg/})) {
+        if (   !$self->find_request_parameter(sub {/$arg/})
+            && !$self->find_request_url_parameters(sub {/$arg/}))
+        {
             die MooseX::Net::API::Error->new(
                 reason => "'$arg' is not declared as a param");
         }
@@ -208,10 +198,10 @@ sub _build_path {
             $path =~ s/(?:\$|:)$match/$value/;
         }
         if ($max_iter > $i) {
-            $path =~ s/(?:\/)?(?:\$|:)(\w+)$//;
+            $path =~ s/(?:\/)?(?:$|:)(?:.*)$//;
         }
     }
-    $path =~ s/(?:\/)?(?:\$|\\:)(\w+)$//;
+    $path =~ s/(?:\/)?(?:$|:)(?:.*)$//;
     return $path;
 }
 
diff --git a/lib/MooseX/Net/API/Role/Request.pm b/lib/MooseX/Net/API/Role/Request.pm
index 5adb43c..13221d3 100644
--- a/lib/MooseX/Net/API/Role/Request.pm
+++ b/lib/MooseX/Net/API/Role/Request.pm
@@ -28,18 +28,23 @@ sub http_request {
 
     my $request;
 
-    if ( $method =~ /^(?:GET|DELETE)$/ || $params_in_url ) {
+    if ($method =~ /^(?:GET|DELETE)$/) {
         $uri->query_form(%$args);
-        $request = HTTP::Request->new( $method => $uri );
+        $request = HTTP::Request->new($method => $uri);
     }
-    elsif ( $method =~ /^(?:POST|PUT)$/ ) {
-        $request = HTTP::Request->new( $method => $uri );
+    elsif ($method =~ /^(?:POST|PUT)$/) {
+        my $params = {};
+        foreach my $key (@$params_in_url) {
+            $params->{$key} = $args->{$key} if exists $args->{$key};
+        }
+        $uri->query_form(%$params) if $params;
+
+        $request = HTTP::Request->new($method => $uri);
         my $content = $self->serialize($args);
         $request->content($content);
     }
     else {
-        die MooseX::Net::API::Error->new(
-            reason => "$method is not defined" );
+        die MooseX::Net::API::Error->new(reason => "$method is not defined");
     }
 
     $request->header(