fixed up to new MXD api

diff --git a/Makefile.PL b/Makefile.PL
index 8fc1fd1..830be13 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -25,9 +25,9 @@ requires        'Data::Dump',                       '1.14';
 requires        'Catalyst',                         '5.80007';
 requires        'CLASS',                            '1.00';
 requires        'Devel::Declare',                   '0.005011';
-requires        'Moose',                            '0.88';
+requires        'Moose',                            '0.89';
 requires        'MooseX::AttributeHelpers',         '0.16';
-requires        'MooseX::Declare',                  '0.23';
+requires        'MooseX::Declare',                  '0.24';
 requires        'MooseX::MethodAttributes',         '0.15';
 requires        'MooseX::Types',                    '0.16';
 requires        'MooseX::Method::Signatures',       '0.16';

diff --git a/lib/CatalystX/Declare/Controller/DetermineActionClass.pm b/lib/CatalystX/Declare/Controller/DetermineActionClass.pm
index d0f0926..189a9ee 100644 (file)
--- a/lib/CatalystX/Declare/Controller/DetermineActionClass.pm
+++ b/lib/CatalystX/Declare/Controller/DetermineActionClass.pm
@@ -18,3 +18,4 @@ role CatalystX::Declare::Controller::DetermineActionClass
     }
 }
 
+1;

diff --git a/lib/CatalystX/Declare/Controller/QualifyClassNames.pm b/lib/CatalystX/Declare/Controller/QualifyClassNames.pm
index 6892232..0176f73 100644 (file)
--- a/lib/CatalystX/Declare/Controller/QualifyClassNames.pm
+++ b/lib/CatalystX/Declare/Controller/QualifyClassNames.pm
@@ -34,3 +34,5 @@ role CatalystX::Declare::Controller::QualifyClassNames {
             ;
     }
 }
+
+1;

diff --git a/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm b/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
index 96b0016..e42a332 100644 (file)
--- a/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
+++ b/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
@@ -13,11 +13,12 @@ role CatalystX::Declare::Controller::RegisterActionRoles
         for my $role (@action_roles) {
             my $fq_role = $self->_qualify_class_name(ActionRole => $role);
 
-            Class::MOP::load_class($role);
-            $role->meta->apply($action);
+            Class::MOP::load_class($fq_role);
+            $fq_role->meta->apply($action);
         }
 
         return $action;
     }
 }
 
+1;

diff --git a/lib/CatalystX/Declare/Keyword/Controller.pm b/lib/CatalystX/Declare/Keyword/Controller.pm
index 84fd8f7..da2020a 100644 (file)
--- a/lib/CatalystX/Declare/Keyword/Controller.pm
+++ b/lib/CatalystX/Declare/Keyword/Controller.pm
@@ -1,13 +1,14 @@
 use MooseX::Declare;
+use Catalyst::Controller;
 
 class CatalystX::Declare::Keyword::Controller
     extends CatalystX::Declare::Keyword::Component {
 
     use MooseX::MethodAttributes ();
     use aliased 'CatalystX::Declare::Keyword::Action', 'ActionKeyword';
-    use aliased 'CatalystX::Declare::Controller::RegisterActionRoles';
     use aliased 'CatalystX::Declare::Controller::DetermineActionClass';
     use aliased 'CatalystX::Declare::Controller::Meta::TypeConstraintMapping';
+    use aliased 'CatalystX::Declare::Controller::RegisterActionRoles';
 
     use Data::Dump qw( pp );
 
@@ -21,6 +22,12 @@ class CatalystX::Declare::Keyword::Controller
                 sprintf('Class::MOP::load_class(q(%s))', TypeConstraintMapping),
                 sprintf('%s->meta->apply(%s->meta->meta)', TypeConstraintMapping, $package),
             ],
+        );
+    }
+
+    after add_extends_option_customizations (Object $ctx, Str $package, $superclasses, $options) {
+
+        $ctx->add_scope_code_parts(
             sprintf('with qw( %s )', join ' ',
                 RegisterActionRoles,
                 DetermineActionClass,