Merge branch 'fix/plugin-edgecase'

Changes

@@ -1,7 +1,7 @@
 {{$NEXT}}
 
     [ BUG FIXES ]
-    * None
+    * PR #1247: Fix edge case in plugin compat (Sawyer X)
 
     [ ENHANCEMENTS ]
     * None

lib/Dancer2/Plugin.pm

@@ -539,8 +539,12 @@ sub register_plugin {
                     no strict 'refs';
                     $plugin_module->can($keyword)
                       or *{"${plugin_module}::$keyword"} = sub {
-                          my $coderef = shift()->app->name->can($keyword);
-                          $coderef->(@_);
+                        $_[0]
+                          ? do {
+                            my $cb = shift()->app->name->can($keyword);
+                            $cb->(@_);
+                          }
+                          : $app_dsl_cb->(@_);
                       };
                 }
             });

t/plugin2/app_dsl_cb/app_dsl_cb.t

@@ -0,0 +1,20 @@
+use strict;
+use warnings;
+use lib 't/plugin2/app_dsl_cb/lib';
+use Test::More 'tests' => 4;
+use Plack::Test;
+use HTTP::Request::Common 'GET';
+use App with => { show_errors => 1 };
+use Test::Fatal 'exception';
+
+my $app = App->to_app;
+my $test = Plack::Test->create($app);
+
+my $res;
+is(
+    exception { $res = $test->request( GET '/' ) },
+    undef,
+    'Did not crash',
+);
+
+is( $res->content, 'GET DONE', 'Ran successfully' );

t/plugin2/app_dsl_cb/lib/App.pm

@@ -0,0 +1,13 @@
+package App;
+use strict;
+use warnings;
+use Dancer2 appname => 'Other';
+use App::TestPlugin;
+
+get '/' => sub {
+    my $res = foo_from_plugin('Foo');
+    ::is( $res, 'OK', 'Plugin returned OK' );
+    return 'GET DONE';
+};
+
+1;

t/plugin2/app_dsl_cb/lib/App/TestPlugin.pm

@@ -0,0 +1,17 @@
+package App::TestPlugin;
+use strict;
+use warnings;
+use Dancer2::Plugin;
+
+plugin_keywords('foo_from_plugin');
+
+sub foo_from_plugin {
+    my ( $self, $arg ) = @_;
+    ::is( $arg, 'Foo', 'Correct argument to plugin' );
+    params();
+    return 'OK';
+}
+
+register_plugin();
+
+1;