port the reaction type system to MooseX::Types

5 files changed, 23 insertions, 9 deletions

diff --git a/lib/Reaction/Types/Core.pm b/lib/Reaction/Types/Core.pm
index cb904a3..8faa6ed 100644
--- a/lib/Reaction/Types/Core.pm
+++ b/lib/Reaction/Types/Core.pm
@@ -1,6 +1,10 @@
 package Reaction::Types::Core;
 
-use Moose::Util::TypeConstraints;
+use MooseX::Types
+    -declare => [qw/SimpleStr NonEmptySimpleStr Password StrongPassword
+                    NonEmptyStr PositiveNum PositiveInt SingleDigit/];
+
+use MooseX::Types::Moose qw/Str Num Int/;
 
 subtype 'SimpleStr'
   => as 'Str'
@@ -22,7 +26,8 @@ subtype 'Password'
 subtype 'StrongPassword'
   => as 'Password'
   => where { (length($_) > 7) && (m/[^a-zA-Z]/) }
-  => message { "Must be between 8 and 255 chars, and contain a non-alpha char" };
+  => message {
+       "Must be between 8 and 255 chars, and contain a non-alpha char" };
 
 subtype 'NonEmptyStr'
   => as 'Str'
diff --git a/lib/Reaction/Types/DBIC.pm b/lib/Reaction/Types/DBIC.pm
index 66601c7..3efd7db 100644
--- a/lib/Reaction/Types/DBIC.pm
+++ b/lib/Reaction/Types/DBIC.pm
@@ -1,17 +1,19 @@
 package Reaction::Types::DBIC;
 
-use Moose::Util::TypeConstraints;
+use MooseX::Types
+    -declare => [qw/ResultSet Row/];
 
+use MooseX::Types::Moose 'Object';
 use DBIx::Class::ResultSet;
 
-subtype 'DBIx::Class::ResultSet'
+subtype 'ResultSet'
   => as 'Object'
   => where { $_->isa('DBIx::Class::ResultSet') };
 
 use DBIx::Class::Core;
 use DBIx::Class::Row;
 
-subtype 'DBIx::Class::Row'
+subtype 'Row'
   => as 'Object'
   => where { $_->isa('DBIx::Class::Row') };
 
diff --git a/lib/Reaction/Types/DateTime.pm b/lib/Reaction/Types/DateTime.pm
index 60fbabd..b3797cf 100644
--- a/lib/Reaction/Types/DateTime.pm
+++ b/lib/Reaction/Types/DateTime.pm
@@ -1,7 +1,9 @@
 package Reaction::Types::DateTime;
 
-use Moose::Util::TypeConstraints;
+use MooseX::Types
+    -declare => [qw/DateTime SpanSet TimeRangeCollection/];
 
+use MooseX::Types::Moose qw/Object ArrayRef/;
 use DateTime;
 
 subtype 'DateTime'
@@ -11,7 +13,7 @@ subtype 'DateTime'
 
 use DateTime::SpanSet;
 
-subtype 'DateTime::SpanSet'
+subtype 'SpanSet'
   => as 'Object'
   => where { $_->isa('DateTime::SpanSet') };
 
diff --git a/lib/Reaction/Types/Email.pm b/lib/Reaction/Types/Email.pm
index 0bf9adc..faa165f 100644
--- a/lib/Reaction/Types/Email.pm
+++ b/lib/Reaction/Types/Email.pm
@@ -1,6 +1,9 @@
 package Reaction::Types::Email;
 
-use Moose::Util::TypeConstraints;
+use MooseX::Types
+    -declare => [qw/EmailAddress/];
+
+use Reaction::Types::Core 'NonEmptySimpleStr';
 use Email::Valid;
 
 subtype 'EmailAddress'
diff --git a/lib/Reaction/Types/File.pm b/lib/Reaction/Types/File.pm
index dc17e36..6274a7b 100644
--- a/lib/Reaction/Types/File.pm
+++ b/lib/Reaction/Types/File.pm
@@ -1,7 +1,9 @@
 package Reaction::Types::File;
 
-use Moose::Util::TypeConstraints;
+use MooseX::Types
+    -declare => [qw/File/];
 
+use MooseX::Types::Moose 'Object';
 use Catalyst::Request::Upload;
 
 subtype 'File'