fix for new MXMS powered MooseX-Declare

diff --git a/Changes b/Changes
index f226617..2fd39b7 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,4 +1,5 @@
 [0.006] ...
+    - fixed keyword listing method to use new MXD around
 
 [0.005] Wed Aug 12 22:51:42 CEST 2009
     - action signature errors now lead to 404's, not 400's

diff --git a/examples/MyApp-Web/lib/MyApp/Web/Controller/Root.pm b/examples/MyApp-Web/lib/MyApp/Web/Controller/Root.pm
index 3f2e3d6..309905b 100644 (file)
--- a/examples/MyApp-Web/lib/MyApp/Web/Controller/Root.pm
+++ b/examples/MyApp-Web/lib/MyApp/Web/Controller/Root.pm
@@ -6,7 +6,7 @@ controller MyApp::Web::Controller::Root
       with MyApp::Web::ControllerRole::RenderView {
 
     # $CLASS is provided by CLASS.pm
-    $CLASS->config(namespace => '');
+    $CLASS->config->{namespace} = '';
 
 
     # this is the common root action for all other actions

diff --git a/lib/CatalystX/Declare.pm b/lib/CatalystX/Declare.pm
index 50e557f..43c58d9 100644 (file)
--- a/lib/CatalystX/Declare.pm
+++ b/lib/CatalystX/Declare.pm
@@ -12,7 +12,7 @@ class CatalystX::Declare extends MooseX::Declare is dirty {
 
     our $VERSION = '0.006';
 
-    around keywords {
+    around keywords (ClassName $self:) {
         $self->$orig,
         ControllerKeyword->new(     identifier => 'controller'      ),
         RoleKeyword->new(           identifier => 'controller_role' ),

diff --git a/t/lib/TestApp/Controller/Root.pm b/t/lib/TestApp/Controller/Root.pm
index 4318c04..4c2d88f 100644 (file)
--- a/t/lib/TestApp/Controller/Root.pm
+++ b/t/lib/TestApp/Controller/Root.pm
@@ -1,7 +1,7 @@
 use CatalystX::Declare;
 
 controller TestApp::Controller::Root {
-    CLASS->config(namespace => '');
+    CLASS->config->{namespace} = '';
 
     action base under '/' as '';
 }