small fix

[catagits/CatalystX-Declare.git] / lib / CatalystX / Declare / Action / CatchValidationError.pm

diff --git a/lib/CatalystX/Declare/Action/CatchValidationError.pm b/lib/CatalystX/Declare/Action/CatchValidationError.pm
index 2902a83..34e168e 100644 (file)
--- a/lib/CatalystX/Declare/Action/CatchValidationError.pm
+++ b/lib/CatalystX/Declare/Action/CatchValidationError.pm
@@ -2,8 +2,7 @@ use MooseX::Declare;
 
 role CatalystX::Declare::Action::CatchValidationError {
 
-    use TryCatch;
-
+    use MooseX::Types::Moose qw( ArrayRef Str HashRef );
     use aliased 'Moose::Meta::TypeConstraint';
 
     has method_type_constraint => (
@@ -14,12 +13,57 @@ role CatalystX::Declare::Action::CatchValidationError {
         },
     );
 
+    has method_named_params => (
+        is          => 'rw',
+        isa         => ArrayRef[Str],
+    );
+
+    has method_named_type_constraint => (
+        is          => 'rw',
+        isa         => HashRef[TypeConstraint],
+    );
+
     has controller_instance => (
         is          => 'rw',
         isa         => 'Catalyst::Controller',
         weak_ref    => 1,
     );
 
+    method extract_named_params (Object $ctx) {
+
+        my %extracted;
+        my $tcs = $self->method_named_type_constraint;
+        
+        if (my $named = $self->method_named_params) {
+
+            for my $key (@$named) {
+
+                next unless exists $ctx->request->params->{ $key };
+
+                my $value = $ctx->request->params->{ $key };
+                my $tc    = $tcs->{ $key };
+                
+                if ($tc and $tc->is_subtype_of(ArrayRef)) {
+
+                    $value = []
+                        unless exists $ctx->request->params->{ $key };
+
+                    $value = [$value]
+                        unless is_ArrayRef $value;
+                }
+
+                $extracted{ $key } = $value;
+            }
+        }
+
+        return \%extracted;
+    }
+
+    around execute (Object $ctrl, Object $ctx, @rest) {
+
+        return $self->$orig($ctrl, $ctx, @rest, %{ $self->extract_named_params($ctx) });
+    }
+
     around match (Object $ctx) {
 
         return 
@@ -29,7 +73,8 @@ role CatalystX::Declare::Action::CatchValidationError {
 
         my @args    = ($self->controller_instance, $ctx, @{ $ctx->req->args });
         my $tc      = $self->method_type_constraint;
-        my $ret     = $self->_check_action_arguments(\@args);
+        my $np      = $self->extract_named_params($ctx);
+        my $ret     = $tc->_type_constraint->check([\@args, $np]);
 
         return $ret;
     }