fix error propagation when creating broken method modifiers

[gitmo/Role-Tiny.git] / lib / Role / Tiny.pm

diff --git a/lib/Role/Tiny.pm b/lib/Role/Tiny.pm
index a99c90a..8ddc074 100644 (file)
--- a/lib/Role/Tiny.pm
+++ b/lib/Role/Tiny.pm
@@ -40,7 +40,8 @@ sub _load_module {
 sub import {
   my $target = caller;
   my $me = shift;
-  strictures->import;
+  strict->import;
+  warnings->import(FATAL => 'all');
   return if $INFO{$target}; # already exported into this package
   # get symbol table reference
   my $stash = do { no strict 'refs'; \%{"${target}::"} };
@@ -113,7 +114,7 @@ sub create_class_with_roles {
 
   foreach my $role (@roles) {
     _load_module($role);
-    die "${role} is not a Role::Tiny" unless my $info = $INFO{$role};
+    die "${role} is not a Role::Tiny" unless $INFO{$role};
   }
 
   if ($] >= 5.010) {
@@ -126,7 +127,7 @@ sub create_class_with_roles {
 
   *{_getglob("${new_name}::ISA")} = [ @composable, $superclass ];
 
-  my @info = map +($INFO{$_} ? $INFO{$_} : ()), @roles;
+  my @info = map $INFO{$_}, @roles;
 
   $me->_check_requires(
     $new_name, $compose_name,
@@ -157,11 +158,13 @@ sub _composable_package_for {
   ) {
     push @mod_base, "sub ${modified} { shift->next::method(\@_) }";
   }
+  my $e;
   {
     local $@;
     eval(my $code = join "\n", "package ${base_name};", @mod_base);
-    die "Evaling failed: $@\nTrying to eval:\n${code}" if $@;
+    $e = "Evaling failed: $@\nTrying to eval:\n${code}" if $@;
   }
+  die $e if $e;
   $me->_install_modifiers($composed_name, $modifiers);
   $COMPOSED{role}{$composed_name} = 1;
   return $composed_name;
@@ -251,7 +254,7 @@ sub does_role {
 
 =head1 NAME
 
-Role::Tiny - Roles. Like a nouvelle cusine portion size slice of Moose.
+Role::Tiny - Roles. Like a nouvelle cuisine portion size slice of Moose.
 
 =head1 SYNOPSIS
 
@@ -341,7 +344,7 @@ Returns true if class has been composed with role.
 This subroutine is also installed as ->does on any class a Role::Tiny is
 composed into unless that class already has an ->does method, so
 
-  if ($foo->does_role('Some::Role')) {
+  if ($foo->does('Some::Role')) {
     ...
   }