Import of MSCHWERN/mixin-0.04 from CPAN.

gitpan-cpan-distribution: mixin
gitpan-cpan-version:      0.04
gitpan-cpan-path:         MSCHWERN/mixin-0.04.tar.gz
gitpan-cpan-author:       MSCHWERN
gitpan-cpan-maturity:     released

Changes

@@ -1,3 +1,6 @@
+0.04  Mon Apr 29 18:45:58 EDT 2002
+  * And I forgot to test it. :(
+
 0.03  Mon Apr 29 18:33:45 EDT 2002
   * mixin forgot to require the package being mixed in!
 

MANIFEST

@@ -3,6 +3,7 @@ MANIFEST
 Makefile.PL
 lib/mixin.pm
 lib/mixin/with.pm
+t/lib/Dog/Hamish.pm
 t/lib/Test/Builder.pm
 t/lib/Test/More.pm
 t/lib/Test/Simple.pm

lib/mixin.pm

@@ -3,7 +3,7 @@ package mixin;
 use strict;
 no strict 'refs';
 use vars qw($VERSION);
-$VERSION = '0.03';
+$VERSION = '0.04';
 
 
 =head1 NAME
@@ -67,7 +67,9 @@ sub import {
 
     foreach my $mixin (@mixins) {
         # XXX This is lousy, but it will do for now.
-        eval { require $caller; } unless defined ${$caller.'::VERSION'};
+        unless( defined ${$mixin.'::VERSION'} ) {
+            eval qq{ require $mixin; };
+        }
         _mixup($mixin, $caller);
     }
 }

t/lib/Dog/Hamish.pm

@@ -0,0 +1,9 @@
+package Dog::Hamish;
+
+use mixin::with 'Dog';
+
+sub burglers {
+    return 'burglers are everywhere!';
+}
+
+1;

t/mixin.t

@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use lib 't/lib';
-use Test::More tests => 4;
+use Test::More tests => 7;
 
 require_ok('mixin');
 require_ok('mixin::with');
@@ -31,3 +31,15 @@ package main;
 my $small_retriever = Dog::Small::Retriever->new;
 is( $small_retriever->speak,            "Yip!\n" );
 is( $small_retriever->fetch('ball'),    "Get your own stinking ball\n" );
+
+
+package Hamish;
+use base  'Dog';
+use mixin 'Dog::Hamish';
+
+
+package main;
+my $hamish = Hamish->new;
+isa_ok( $hamish, 'Hamish' );
+is( $hamish->speak,                     "Bark!\n" );
+is( $hamish->burglers,                  'burglers are everywhere!' );