From: Matt S Trout <mst@shadowcat.co.uk>
Date: Wed, 30 Jul 2008 14:25:21 +0000 (+0000)
Subject: fix coerce to accept anon types like subtype can
X-Git-Tag: 0_55~22
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=470b518affbc363b57fab2e333640fd43eb022cc;p=gitmo%2FMoose.git

fix coerce to accept anon types like subtype can
---

diff --git a/Changes b/Changes
index 4502108..0d2f073 100644
--- a/Changes
+++ b/Changes
@@ -11,6 +11,9 @@ Revision history for Perl extension Moose
         the type constraints (RT #37569)
         - added tests for this (Charles Alderman)
 
+    * Moose::Util::TypeConstraints
+      - fix coerce to accept anon types like subtype can
+
     * Moose::Cookbook
       - reorganized the recipes into sections - Basics, Roles, Meta
         (Dave Rolsky)
diff --git a/lib/Moose/Util/TypeConstraints.pm b/lib/Moose/Util/TypeConstraints.pm
index 6434caf..6e5e364 100644
--- a/lib/Moose/Util/TypeConstraints.pm
+++ b/lib/Moose/Util/TypeConstraints.pm
@@ -424,7 +424,7 @@ sub _create_type_constraint ($$$;$$) {
 
 sub _install_type_coercions ($$) {
     my ($type_name, $coercion_map) = @_;
-    my $type = $REGISTRY->get_type_constraint($type_name);
+    my $type = find_type_constraint($type_name);
     (defined $type)
         || confess "Cannot find type '$type_name', perhaps you forgot to load it.";
     if ($type->has_coercion) {
diff --git a/t/040_type_constraints/005_util_type_coercion.t b/t/040_type_constraints/005_util_type_coercion.t
index e631309..0e0b732 100644
--- a/t/040_type_constraints/005_util_type_coercion.t
+++ b/t/040_type_constraints/005_util_type_coercion.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 14;
+use Test::More tests => 24;
 use Test::Exception;
 
 BEGIN {
@@ -38,39 +38,54 @@ ok(Header($header), '... this passed the type test');
 ok(!Header([]), '... this did not pass the type test');
 ok(!Header({}), '... this did not pass the type test');
 
-my $coercion = find_type_constraint('Header')->coercion;
-isa_ok($coercion, 'Moose::Meta::TypeCoercion');
+my $anon_type = subtype Object => where { $_->isa('HTTPHeader') };
 
-{
-    my $coerced = $coercion->coerce([ 1, 2, 3 ]);
-    isa_ok($coerced, 'HTTPHeader');
+lives_ok {
+    coerce $anon_type
+        => from ArrayRef 
+            => via { HTTPHeader->new(array => $_[0]) }
+        => from HashRef 
+            => via { HTTPHeader->new(hash => $_[0]) };
+} 'coercion of anonymous subtype succeeds';
 
-    is_deeply(
-        $coerced->array(),
-        [ 1, 2, 3 ],
-        '... got the right array');
-    is($coerced->hash(), undef, '... nothing assigned to the hash');        
-}
+foreach my $coercion (
+    find_type_constraint('Header')->coercion,
+    $anon_type->coercion
+    ) {
 
-{
-    my $coerced = $coercion->coerce({ one => 1, two => 2, three => 3 });
-    isa_ok($coerced, 'HTTPHeader');
+    my $coercion = find_type_constraint('Header')->coercion;
+    isa_ok($coercion, 'Moose::Meta::TypeCoercion');
     
-    is_deeply(
-        $coerced->hash(),
-        { one => 1, two => 2, three => 3 },
-        '... got the right hash');
-    is($coerced->array(), undef, '... nothing assigned to the array');        
-}
-
-{
-    my $scalar_ref = \(my $var);
-    my $coerced = $coercion->coerce($scalar_ref);
-    is($coerced, $scalar_ref, '... got back what we put in');
-}
-
-{
-    my $coerced = $coercion->coerce("Foo");
-    is($coerced, "Foo", '... got back what we put in');
+    {
+        my $coerced = $coercion->coerce([ 1, 2, 3 ]);
+        isa_ok($coerced, 'HTTPHeader');
+    
+        is_deeply(
+            $coerced->array(),
+            [ 1, 2, 3 ],
+            '... got the right array');
+        is($coerced->hash(), undef, '... nothing assigned to the hash');        
+    }
+    
+    {
+        my $coerced = $coercion->coerce({ one => 1, two => 2, three => 3 });
+        isa_ok($coerced, 'HTTPHeader');
+        
+        is_deeply(
+            $coerced->hash(),
+            { one => 1, two => 2, three => 3 },
+            '... got the right hash');
+        is($coerced->array(), undef, '... nothing assigned to the array');        
+    }
+    
+    {
+        my $scalar_ref = \(my $var);
+        my $coerced = $coercion->coerce($scalar_ref);
+        is($coerced, $scalar_ref, '... got back what we put in');
+    }
+    
+    {
+        my $coerced = $coercion->coerce("Foo");
+        is($coerced, "Foo", '... got back what we put in');
+    }
 }
-