Fix tests, add autobox to flatten interface roles so you can use a string or array...

[catagits/CatalystX-DynamicComponent.git] / lib / CatalystX / DynamicComponent / ModelToControllerReflector.pm

diff --git a/lib/CatalystX/DynamicComponent/ModelToControllerReflector.pm b/lib/CatalystX/DynamicComponent/ModelToControllerReflector.pm
index 64da97f..a3a5804 100644 (file)
--- a/lib/CatalystX/DynamicComponent/ModelToControllerReflector.pm
+++ b/lib/CatalystX/DynamicComponent/ModelToControllerReflector.pm
@@ -2,6 +2,7 @@ package CatalystX::DynamicComponent::ModelToControllerReflector;
 use Moose::Role;
 use Moose::Util qw/does_role/;
 use List::MoreUtils qw/uniq/;
+use Moose::Autobox;
 use namespace::autoclean;
 
 my $mangle_attributes_on_generated_methods = sub {
@@ -23,8 +24,8 @@ after 'setup_components' => sub { shift->_setup_dynamic_controllers(@_); };
 
 sub _setup_dynamic_controllers {
     my ($app) = @_;
-    my @model_names = grep { /::Model::/ } keys %{ $app->components };
 
+    my @model_names = grep { /::Model::/ } keys %{ $app->components };
     foreach my $model_name (@model_names) {
         $app->_reflect_model_to_controller( $model_name, $app->components->{$model_name} );
     }
@@ -33,30 +34,35 @@ sub _setup_dynamic_controllers {
 sub _reflect_model_to_controller {
     my ( $app, $model_name, $model ) = @_;
 
-    my $class = blessed($app) || $app;
+    # Model passed in as MyApp::Model::Foo, strip MyApp
+    $model_name =~ s/^[^:]+:://;
 
+    # Get Controller::Foo
     my $controller_name = $model_name;
-    $controller_name =~ s/::Model::/::Controller::/;
+    $controller_name =~ s/^Model::/Controller::/;
 
+    # Get Foo
     my $suffix = $model_name;
-    $suffix =~ s/^.*::Model:://;
+    $suffix =~ s/Model:://;
 
     my %controller_methods;
     # FIXME - Abstract this strategy crap out.
     my $model_methods = $model->meta->get_method_map;
-    foreach my $method_name (keys %$model_methods) {
-            next unless does_role($model_methods->{$method_name}, 'CatalystX::ControllerGeneratingModel::DispatchableMethod');
-            # Note need to pass model name, as the method actually comes from
-            # the underlying model class, not the Catalyst shim class we autogenerated.
-            $controller_methods{$method_name} = $app->generate_reflected_controller_action_method($suffix, $model_methods->{$method_name})
+    my $interface_roles = [ uniq(($app->config->{$model_name}->{interface_roles}||=[])->flatten,
+        ($app->config->{'CatalystX::DynamicComponent::ModelToControllerReflector'}->{interface_roles}||=[])->flatten) ];
+    
+    for my $interface_role (@$interface_roles) {
+            for my $required_method ($interface_role->meta->get_required_method_list) {
+                    # Note need to pass model name, as the method actually comes from
+                    # the underlying model class, not the Catalyst shim class we autogenerated.
+                    $controller_methods{$required_method} = 
+                         $app->generate_reflected_controller_action_method($suffix, $model_methods->{$required_method})
+            }
     }
 
-    my $config_name = $controller_name;
-    $config_name =~ s/^[^:]+:://;
-    
     # Shallow copy so we don't stuff method refs in config
-    my $config = { %{$app->config->{$config_name}||{}} };
-    
+    my $config = { %{$app->config->{$controller_name}||{}} };
+
     $config->{methods} = \%controller_methods;
     $app->_setup_dynamic_controller( $controller_name, $config );
 }
@@ -67,8 +73,10 @@ sub generate_reflected_controller_action_method {
     sub {
         my ($self, $c, @args) = @_;
         $c->res->header('X-From-Model', $model);
-        $c->res->header('X-From-Model-Data', $c->model($model)->$method_name(@args));
+        my $response = $c->model($model)->$method_name($c->req->data);
+        $c->res->header('X-From-Model-Data', $response);
         $c->res->body('OK');
+        $c->stash->{response} = $response;
     };
 }