Fixes for $Test::Builder::Tester, we want to invoke new to get our own instance

[gitmo/Mouse.git] / lib / Mouse / Util.pm

diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index aeaaf3f..0796cf0 100644 (file)
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -6,21 +6,20 @@ use base 'Exporter';
 
 our %dependencies = (
     'Scalar::Util' => {
+
+#       VVVVV   CODE TAKEN FROM SCALAR::UTIL   VVVVV
         'blessed' => do {
-            do {
-                no strict 'refs';
-                *UNIVERSAL::a_sub_not_likely_to_be_here = sub {
-                    my $ref = ref($_[0]);
-
-                    # deviation from Scalar::Util
-                    # XS returns undef, PP returns GLOB.
-                    # let's make that more consistent by having PP return
-                    # undef if it's a GLOB. :/
-
-                    # \*STDOUT would be allowed as an object in PP blessed
-                    # but not XS
-                    return $ref eq 'GLOB' ? undef : $ref;
-                };
+            *UNIVERSAL::a_sub_not_likely_to_be_here = sub {
+                my $ref = ref($_[0]);
+
+                # deviation from Scalar::Util
+                # XS returns undef, PP returns GLOB.
+                # let's make that more consistent by having PP return
+                # undef if it's a GLOB. :/
+
+                # \*STDOUT would be allowed as an object in PP blessed
+                # but not XS
+                return $ref eq 'GLOB' ? undef : $ref;
             };
 
             sub {
@@ -86,8 +85,14 @@ our %dependencies = (
             (tied(*$fh) or defined(fileno($fh)))
                 ? $fh : undef;
         },
+        weaken => {
+            loaded => \&Scalar::Util::weaken,
+            not_loaded => sub { die "Scalar::Util required for weak reference support" },
+        },
+#       ^^^^^   CODE TAKEN FROM SCALAR::UTIL   ^^^^^
     },
     'MRO::Compat' => {
+#       VVVVV   CODE TAKEN FROM MRO::COMPAT   VVVVV
         'get_linear_isa' => {
             loaded     => \&mro::get_linear_isa,
             not_loaded => do {
@@ -112,17 +117,78 @@ our %dependencies = (
                 }
             },
         },
+#       ^^^^^   CODE TAKEN FROM MRO::COMPAT   ^^^^^
+    },
+#       VVVVV   CODE TAKEN FROM TEST::EXCEPTION   VVVVV
+    'Test::Exception' => do {
+
+        my $Tester = Test::Builder->new;
+
+        my $is_exception = sub {
+            my $exception = shift;
+            return ref $exception || $exception ne '';
+        };
+
+        my $exception_as_string = sub {
+            my ( $prefix, $exception ) = @_;
+            return "$prefix normal exit" unless $is_exception->( $exception );
+            my $class = ref $exception;
+            $exception = "$class ($exception)"
+                    if $class && "$exception" !~ m/^\Q$class/;
+            chomp $exception;
+            return "$prefix $exception";
+        };
+        my $try_as_caller = sub {
+            my $coderef = shift;
+            eval { $coderef->() };
+            $@;
+        };
+
+        {
+            'throws_ok' => sub (&$;$) {
+                my ( $coderef, $expecting, $description ) = @_;
+                Carp::croak "throws_ok: must pass exception class/object or regex"
+                    unless defined $expecting;
+                $description = $exception_as_string->( "threw", $expecting )
+                    unless defined $description;
+                my $exception = $try_as_caller->($coderef);
+
+                my $regex = $Tester->maybe_regex( $expecting );
+                my $ok = $regex
+                    ? ( $exception =~ m/$regex/ )
+                    : eval {
+                        $exception->isa( ref $expecting ? ref $expecting : $expecting )
+                    };
+                $Tester->ok( $ok, $description );
+                unless ( $ok ) {
+                    $Tester->diag( $exception_as_string->( "expecting:", $expecting ) );
+                    $Tester->diag( $exception_as_string->( "found:", $exception ) );
+                };
+                $@ = $exception;
+                return $ok;
+            },
+            'lives_ok' => sub (&;$) {
+                my ( $coderef, $description ) = @_;
+                my $exception = $try_as_caller->( $coderef );
+                my $ok = $Tester->ok( ! $is_exception->( $exception ), $description );
+                $Tester->diag( $exception_as_string->( "died:", $exception ) ) unless $ok;
+                $@ = $exception;
+                return $ok;
+            },
+        },
     },
 );
 
 our @EXPORT_OK = map { keys %$_ } values %dependencies;
+our %EXPORT_TAGS = (
+    all  => \@EXPORT_OK,
+    test => [qw/throws_ok lives_ok/],
+);
 
 for my $module_name (keys %dependencies) {
-    (my $file = "$module_name.pm") =~ s{::}{/}g;
-
     my $loaded = do {
         local $SIG{__DIE__} = 'DEFAULT';
-        eval "require '$file'; 1";
+        eval "require $module_name; 1";
     };
 
     for my $method_name (keys %{ $dependencies{ $module_name } }) {
@@ -145,11 +211,34 @@ for my $module_name (keys %dependencies) {
     }
 }
 
-push @EXPORT_OK, qw(weaken);
-sub weaken {
-    require Scalar::Util;
-    goto \&Scalar::Util::weaken;
-}
-
 1;
 
+__END__
+
+=head1 NAME
+
+Mouse::Util - features, with or without their dependencies
+
+=head1 IMPLEMENTATIONS FOR
+
+=head2 L<MRO::Compat>
+
+=head3 get_linear_isa
+
+=head2 L<Scalar::Util>
+
+=head3 blessed
+
+=head3 looks_like_number
+
+=head3 reftype
+
+=head3 openhandle
+
+=head3 weaken
+
+C<weaken> I<must> be implemented in XS. If the user tries to use C<weaken>
+without L<Scalar::Util>, an error is thrown.
+
+=cut
+