From: Tomas Doran Date: Tue, 25 Oct 2011 02:18:50 +0000 (-0700) Subject: Unfuck DateTime type with newer MX::Types X-Git-Tag: 0.003007~21^2~2 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FGitalist.git;a=commitdiff_plain;h=86b3e7ce8d1bb126b7967ec549c010cd707f318c Unfuck DateTime type with newer MX::Types --- diff --git a/Makefile.PL b/Makefile.PL index 47d1db9..84712e8 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -84,6 +84,7 @@ requires 'MooseX::Types'; requires 'MooseX::Types::Common'; requires 'MooseX::Types::Path::Class'; requires 'MooseX::Types::ISO8601'; +requires 'MooseX::Types::DateTime' => '0.05'; requires 'namespace::autoclean'; requires 'Git::PurePerl' => '0.47'; diff --git a/lib/Gitalist/Git/Head.pm b/lib/Gitalist/Git/Head.pm index 53f689f..8176bb3 100644 --- a/lib/Gitalist/Git/Head.pm +++ b/lib/Gitalist/Git/Head.pm @@ -7,7 +7,8 @@ with 'Gitalist::Git::Serializable'; use MooseX::Types::Common::String qw/NonEmptySimpleStr/; use MooseX::Types::Moose qw/Maybe/; -use Gitalist::Git::Types qw/SHA1 DateTime/; +use Gitalist::Git::Types qw/SHA1/; +use MooseX::Types::DateTime qw/DateTime/; use aliased 'DateTime' => 'DT'; diff --git a/lib/Gitalist/Git/Repository.pm b/lib/Gitalist/Git/Repository.pm index fca63dc..abd2330 100644 --- a/lib/Gitalist/Git/Repository.pm +++ b/lib/Gitalist/Git/Repository.pm @@ -5,7 +5,8 @@ class Gitalist::Git::Repository with (Gitalist::Git::HasUtils, Gitalist::Git::Se use MooseX::Types::Common::String qw/NonEmptySimpleStr/; use MooseX::Types::Moose qw/Str Maybe Bool HashRef ArrayRef/; - use Gitalist::Git::Types qw/SHA1 DateTime Dir/; + use Gitalist::Git::Types qw/SHA1 Dir/; + use MooseX::Types::DateTime qw/ DateTime /; use Moose::Autobox; use aliased 'DateTime' => 'DT'; diff --git a/lib/Gitalist/Git/Tag.pm b/lib/Gitalist/Git/Tag.pm index da14daf..8d20b49 100644 --- a/lib/Gitalist/Git/Tag.pm +++ b/lib/Gitalist/Git/Tag.pm @@ -7,7 +7,8 @@ with 'Gitalist::Git::Serializable'; use MooseX::Types::Common::String qw/NonEmptySimpleStr/; use MooseX::Types::Moose qw/Maybe/; -use Gitalist::Git::Types qw/SHA1 DateTime/; +use Gitalist::Git::Types qw/SHA1/; +use MooseX::Types::DateTime qw/ DateTime /; use aliased 'DateTime' => 'DT'; diff --git a/lib/Gitalist/Git/Types.pm b/lib/Gitalist/Git/Types.pm index 3b5d103..88d423f 100644 --- a/lib/Gitalist/Git/Types.pm +++ b/lib/Gitalist/Git/Types.pm @@ -3,13 +3,12 @@ package Gitalist::Git::Types; use MooseX::Types -declare => [qw/ SHA1 - DateTime Dir /]; use MooseX::Types::Path::Class; use MooseX::Types::ISO8601 qw/ISO8601DateTimeStr/; -use MooseX::Types::DateTime (); +use MooseX::Types::DateTime qw/ DateTime /; use MooseX::Storage::Engine (); use MooseX::Types::Common::String qw/NonEmptySimpleStr/; @@ -22,10 +21,6 @@ coerce SHA1, from NonEmptySimpleStr, via { 1 }; -subtype DateTime, - as 'MooseX::Types::DateTime::DateTime', - where { 1 }; - MooseX::Storage::Engine->add_custom_type_handler( DateTime, expand => sub {