shifting around makefile stuff and get rid of attribute helpers

diff --git a/Makefile.PL b/Makefile.PL
index a74cae6..0577393 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1,33 +1,24 @@
-use inc::Module::Install;
+#!/usr/bin/env perl
 
-BEGIN {
-    if ($Module::Install::AUTHOR) {
+use strict;
+use warnings;
 
-        "Module::Install::$_"->can('can') 
-            or die "Module::Install extension Module::Install::$_ is required for authors"
-            for qw(
-                    AuthorTests
-                    AutoManifest
-                    ReadmeFromPod
-                    ProvidesClass
-            );
-
-        Module::Install::ProvidesClass->VERSION('0.000001_99');
-    }
-}
+use inc::Module::Install 1.00;
+use Module::Install::AuthorTests;
+use Module::Install::AutoManifest;
+use Module::Install::ProvidesClass;
+use Module::Install::Repository;
+use Module::Install::Homepage;
 
 name            'CatalystX-Declare';
 author          'Robert Sedlacek <rs@474.at>';
-license         'perl';
 version         '0.015';
 
 all_from        'lib/CatalystX/Declare.pm';
 readme_from     'lib/CatalystX/Declare.pm';
 
-tests           't/*.t';
-author_tests    'xt', 'examples/MyApp-Web/t';
-
 requires        'Carp';
+requires        'FindBin';
 requires        'Class::Inspector',                 '1.24';
 requires        'Perl6::Junction',                  '1.40000';
 requires        'aliased',                          '0.30';
@@ -35,9 +26,8 @@ requires        'parent',                           '0.221';
 requires        'Data::Dump',                       '1.14';
 requires        'Catalyst',                         '5.80025';
 requires        'CLASS',                            '1.00';
-requires        'Devel::Declare',                   '0.005011';
-requires        'Moose',                            '0.89';
-requires        'MooseX::AttributeHelpers',         '0.21';
+requires        'Devel::Declare',                   '0.006000';
+requires        'Moose',                            '1.12';
 requires        'MooseX::Declare',                  '0.33';
 requires        'MooseX::MethodAttributes',         '0.16';
 requires        'MooseX::Role::Parameterized',      '0.13';
@@ -45,17 +35,19 @@ requires        'MooseX::Types',                    '0.20';
 requires        'MooseX::Method::Signatures',       '0.26';
 requires        'Catalyst::Controller::ActionRole', '0.15';
 requires        'Data::Pond',                       '0.002';
-requires        'FindBin';
 
-test_requires   'Test::More',                       '0.92';
+test_requires   'Test::More',                       '0.96';
 test_requires   'Test::Output',                     '0.16';
 test_requires   'Catalyst::Test';
 test_requires   'FindBin';
 
-repository      'http://github.com/phaylon/catalystx-declarative/tree/master';
-bugtracker      'http://github.com/phaylon/catalystx-declarative/issues';
+tests           't/*.t';
+author_tests    'xt', 'examples/MyApp-Web/t';
 
+auto_install;
 auto_manifest;
+auto_set_homepage;
+auto_set_repository;
 auto_provides_class;
 
 WriteAll;

diff --git a/lib/CatalystX/Declare/Controller/Meta/TypeConstraintMapping.pm b/lib/CatalystX/Declare/Controller/Meta/TypeConstraintMapping.pm
index 88b7eec..f1fc653 100644 (file)
--- a/lib/CatalystX/Declare/Controller/Meta/TypeConstraintMapping.pm
+++ b/lib/CatalystX/Declare/Controller/Meta/TypeConstraintMapping.pm
@@ -1,5 +1,4 @@
 use MooseX::Declare;
-use MooseX::AttributeHelpers;
 
 role CatalystX::Declare::Controller::Meta::TypeConstraintMapping {
 
@@ -14,9 +13,9 @@ role CatalystX::Declare::Controller::Meta::TypeConstraintMapping {
         isa         => HashRef[Object],
         required    => 1,
         lazy_build  => 1,
-        provides    => {
-            get         => 'get_method_type_constraint',
-            set         => 'set_method_type_constraint',
+        handles    => {
+            'get_method_type_constraint' => 'get',
+            'set_method_type_constraint' => 'set,
         },
     );
 
@@ -26,9 +25,9 @@ role CatalystX::Declare::Controller::Meta::TypeConstraintMapping {
         isa         => HashRef[ArrayRef[Str]],
         required    => 1,
         lazy_build  => 1,
-        provides    => {
-            get         => 'get_method_named_params',
-            set         => 'set_method_named_params',
+        handles    => {
+            'get_method_named_params' => 'get',
+            'set_method_named_params' => 'set',
         },
     );
 
@@ -38,9 +37,9 @@ role CatalystX::Declare::Controller::Meta::TypeConstraintMapping {
         isa         => HashRef[HashRef[Object]],
         required    => 1,
         lazy_build  => 1,
-        provides    => {
-            get         => 'get_method_named_type_constraint',
-            set         => 'set_method_named_type_constraint',
+        handles    => {
+            'get_method_named_type_constraint' => 'get',
+            'set_method_named_type_constraint' => 'set',
         },
     );