moved to CatalystX::Declare

diff --git a/lib/CatalystX/Declarative.pm b/lib/CatalystX/Declarative.pm
deleted file mode 100644 (file)
index 855109f..0000000
--- a/lib/CatalystX/Declarative.pm
+++ /dev/null
@@ -1,12 +0,0 @@
-use MooseX::Declare;
-
-class CatalystX::Declarative extends MooseX::Declare {
-
-    use aliased 'CatalystX::Declarative::Keyword::Controller', 'ControllerKeyword';
-
-    around keywords {
-        $self->$orig,
-        ControllerKeyword->new(identifier => 'controller'),
-    }
-}
-

diff --git a/lib/CatalystX/Declare.pm b/lib/CatalystX/Declare.pm
new file mode 100644 (file)
index 0000000..0aa8cf2
--- /dev/null
+++ b/lib/CatalystX/Declare.pm
@@ -0,0 +1,12 @@
+use MooseX::Declare;
+
+class CatalystX::Declare extends MooseX::Declare {
+
+    use aliased 'CatalystX::Declare::Keyword::Controller', 'ControllerKeyword';
+
+    around keywords {
+        $self->$orig,
+        ControllerKeyword->new(identifier => 'controller'),
+    }
+}
+

diff --git a/lib/CatalystX/Declarative/Controller/DetermineActionClass.pm b/lib/CatalystX/Declare/Controller/DetermineActionClass.pm
similarity index 77%
rename from lib/CatalystX/Declarative/Controller/DetermineActionClass.pm
rename to lib/CatalystX/Declare/Controller/DetermineActionClass.pm
index a62ae69..d0f0926 100644 (file)
--- a/lib/CatalystX/Declarative/Controller/DetermineActionClass.pm
+++ b/lib/CatalystX/Declare/Controller/DetermineActionClass.pm
@@ -1,8 +1,8 @@
 use MooseX::Declare;
 use Class::MOP;
 
-role CatalystX::Declarative::Controller::DetermineActionClass
-    with CatalystX::Declarative::Controller::QualifyClassNames {
+role CatalystX::Declare::Controller::DetermineActionClass
+    with CatalystX::Declare::Controller::QualifyClassNames {
 
     around create_action (%args) {
 

diff --git a/lib/CatalystX/Declarative/Controller/QualifyClassNames.pm b/lib/CatalystX/Declare/Controller/QualifyClassNames.pm
similarity index 92%
rename from lib/CatalystX/Declarative/Controller/QualifyClassNames.pm
rename to lib/CatalystX/Declare/Controller/QualifyClassNames.pm
index ceafb42..6892232 100644 (file)
--- a/lib/CatalystX/Declarative/Controller/QualifyClassNames.pm
+++ b/lib/CatalystX/Declare/Controller/QualifyClassNames.pm
@@ -3,7 +3,7 @@ use MooseX::Declare;
 use Class::MOP;
 use Class::Inspector;
 
-role CatalystX::Declarative::Controller::QualifyClassNames {
+role CatalystX::Declare::Controller::QualifyClassNames {
 
     use Carp qw( croak );
 

diff --git a/lib/CatalystX/Declarative/Controller/RegisterActionRoles.pm b/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
similarity index 78%
rename from lib/CatalystX/Declarative/Controller/RegisterActionRoles.pm
rename to lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
index ee6a6e9..96b0016 100644 (file)
--- a/lib/CatalystX/Declarative/Controller/RegisterActionRoles.pm
+++ b/lib/CatalystX/Declare/Controller/RegisterActionRoles.pm
@@ -1,8 +1,8 @@
 use MooseX::Declare;
 use Class::MOP;
 
-role CatalystX::Declarative::Controller::RegisterActionRoles 
-    with CatalystX::Declarative::Controller::QualifyClassNames {
+role CatalystX::Declare::Controller::RegisterActionRoles 
+    with CatalystX::Declare::Controller::QualifyClassNames {
 
     around create_action (%args) {
 

diff --git a/lib/CatalystX/Declarative/DefaultSuperclassing.pm b/lib/CatalystX/Declare/DefaultSuperclassing.pm
similarity index 84%
rename from lib/CatalystX/Declarative/DefaultSuperclassing.pm
rename to lib/CatalystX/Declare/DefaultSuperclassing.pm
index 5417f1e..436838d 100644 (file)
--- a/lib/CatalystX/Declarative/DefaultSuperclassing.pm
+++ b/lib/CatalystX/Declare/DefaultSuperclassing.pm
@@ -1,6 +1,6 @@
 use MooseX::Declare;
 
-role CatalystX::Declarative::DefaultSuperclassing {
+role CatalystX::Declare::DefaultSuperclassing {
 
     requires qw(
         default_superclasses

diff --git a/lib/CatalystX/Declarative/Keyword/Action.pm b/lib/CatalystX/Declare/Keyword/Action.pm
similarity index 97%
rename from lib/CatalystX/Declarative/Keyword/Action.pm
rename to lib/CatalystX/Declare/Keyword/Action.pm
index b87f72b..d4c5543 100644 (file)
--- a/lib/CatalystX/Declarative/Keyword/Action.pm
+++ b/lib/CatalystX/Declare/Keyword/Action.pm
@@ -1,6 +1,6 @@
 use MooseX::Declare;
 
-class CatalystX::Declarative::Keyword::Action
+class CatalystX::Declare::Keyword::Action
     with MooseX::Declare::Syntax::KeywordHandling {
 
 
@@ -13,7 +13,7 @@ class CatalystX::Declarative::Keyword::Action
 
 
     use constant STOP_PARSING   => '__MXDECLARE_STOP_PARSING__';
-    use constant UNDER_VAR      => '$CatalystX::Declarative::SCOPE::UNDER';
+    use constant UNDER_VAR      => '$CatalystX::Declare::SCOPE::UNDER';
 
     use aliased 'MooseX::Method::Signatures::Meta::Method';
     use aliased 'MooseX::MethodAttributes::Role::Meta::Method', 'AttributeRole';
@@ -197,8 +197,8 @@ class CatalystX::Declarative::Keyword::Action
         $attrs->{Signature} = $proto;
         $attrs->{Action}    = [];
 
-        if (defined $CatalystX::Declarative::SCOPE::UNDER) {
-            $attrs->{Chained} ||= $CatalystX::Declarative::SCOPE::UNDER;
+        if (defined $CatalystX::Declare::SCOPE::UNDER) {
+            $attrs->{Chained} ||= $CatalystX::Declare::SCOPE::UNDER;
         }
 
         return unless $populator;

diff --git a/lib/CatalystX/Declarative/Keyword/Controller.pm b/lib/CatalystX/Declare/Keyword/Controller.pm
similarity index 70%
rename from lib/CatalystX/Declarative/Keyword/Controller.pm
rename to lib/CatalystX/Declare/Keyword/Controller.pm
index ce2a8e9..046b246 100644 (file)
--- a/lib/CatalystX/Declarative/Keyword/Controller.pm
+++ b/lib/CatalystX/Declare/Keyword/Controller.pm
@@ -1,14 +1,14 @@
 use MooseX::Declare;
 
-class CatalystX::Declarative::Keyword::Controller 
+class CatalystX::Declare::Keyword::Controller 
     extends MooseX::Declare::Syntax::Keyword::Class
-    with    CatalystX::Declarative::DefaultSuperclassing {
+    with    CatalystX::Declare::DefaultSuperclassing {
 
 
     use MooseX::MethodAttributes ();
-    use aliased 'CatalystX::Declarative::Keyword::Action', 'ActionKeyword';
-    use aliased 'CatalystX::Declarative::Controller::RegisterActionRoles';
-    use aliased 'CatalystX::Declarative::Controller::DetermineActionClass';
+    use aliased 'CatalystX::Declare::Keyword::Action', 'ActionKeyword';
+    use aliased 'CatalystX::Declare::Controller::RegisterActionRoles';
+    use aliased 'CatalystX::Declare::Controller::DetermineActionClass';
 
 
     before add_namespace_customizations (Object $ctx, Str $package) {

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index 3f5ef1c..fe552c2 100644 (file)
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -5,7 +5,7 @@ use warnings;
 use parent 'Catalyst';
 use Catalyst qw( Static::Simple );
 
-__PACKAGE__->config(name => 'CatalystX::Declarative TestApp');
+__PACKAGE__->config(name => 'CatalystX::Declare TestApp');
 __PACKAGE__->setup;
 
 1;

diff --git a/t/lib/TestApp/Controller/Foo.pm b/t/lib/TestApp/Controller/Foo.pm
index bab5f2f..b8715ae 100644 (file)
--- a/t/lib/TestApp/Controller/Foo.pm
+++ b/t/lib/TestApp/Controller/Foo.pm
@@ -1,4 +1,4 @@
-use CatalystX::Declarative;
+use CatalystX::Declare;
 
 role MyActionYes {
     around match (@args) { $ENV{TESTAPP_ACTIONROLE} ? $self->$orig(@args) : undef }

diff --git a/t/lib/TestApp/Controller/Root.pm b/t/lib/TestApp/Controller/Root.pm
index 95afd0a..4318c04 100644 (file)
--- a/t/lib/TestApp/Controller/Root.pm
+++ b/t/lib/TestApp/Controller/Root.pm
@@ -1,4 +1,4 @@
-use CatalystX::Declarative;
+use CatalystX::Declare;
 
 controller TestApp::Controller::Root {
     CLASS->config(namespace => '');