Better error handling

diff --git a/lib/CatalystX/HelpText/ViewRole.pm b/lib/CatalystX/HelpText/ViewRole.pm
index f06b81b..6220c6a 100644 (file)
--- a/lib/CatalystX/HelpText/ViewRole.pm
+++ b/lib/CatalystX/HelpText/ViewRole.pm
@@ -12,13 +12,28 @@ around expose_methods => sub {
     [ $m->flatten, 'help_text' ];
 };
 
+has helptext_model => (
+    is => 'ro',
+    default => 'Help',
+);
+
 sub help_text {
     my ($self, $c, $key) = @_;
+    my $model = try { $c->model($self->helptext_model) };
+    if (!$model) {
+        $c->log->warn(sprintf("Cannot find the '%s' model for %s", $self->helptext_model, ref($self))) if $c->debug;
+        return;
+    }
+    if (!$model->can('get_help_text_for')) {
+        $c->log->warn(sprintf("Your '%s' model used by '%s' does not have a get_help_text_for method", $self->helptext_model, ref($self))) if $c->debug;
+        return;
+    }
     try {
-        return $c->model('Help')->get_help_text_for($c, $key);
+        $model->get_help_text_for($key);
     }
     catch {
-        $c->log->warn("Error retrieving help_text: ".$_);
+        $c->log->warn("Error retrieving help_text key '$key' from model: $_")
+            if $c->debug;
         return '';
     };
 }

diff --git a/t/lib/TestApp/root/main b/t/lib/TestApp/root/main
index c578551..783474d 100644 (file)
--- a/t/lib/TestApp/root/main
+++ b/t/lib/TestApp/root/main
@@ -1 +1 @@
-fnar[% helptext('fnoo') %]fnee
+fnar[% help_text('fnoo') %]fnee