Always load Mouse::Util first, which will be load Mouse::XS in the future

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

diff --git a/lib/Mouse.pm b/lib/Mouse.pm
index 4f6e8f9..34108fb 100644 (file)
--- a/lib/Mouse.pm
+++ b/lib/Mouse.pm
@@ -4,17 +4,21 @@ use warnings;
 use 5.006;
 use base 'Exporter';
 
-our $VERSION = '0.30';
+our $VERSION = '0.32';
+
+sub moose_version(){ 0.90 } # which Mouse is a subset of
 
 use Carp 'confess';
 use Scalar::Util 'blessed';
+
 use Mouse::Util qw(load_class is_class_loaded);
 
-use Mouse::Meta::Attribute;
-use Mouse::Meta::Module; # class_of()
+use Mouse::Meta::Module;
 use Mouse::Meta::Class;
+use Mouse::Meta::Role;
+use Mouse::Meta::Attribute;
 use Mouse::Object;
-use Mouse::Util::TypeConstraints;
+use Mouse::Util::TypeConstraints ();
 
 our @EXPORT = qw(extends has before after around override super blessed confess with);
 
@@ -22,15 +26,15 @@ our %is_removable = map{ $_ => undef } @EXPORT;
 delete $is_removable{blessed};
 delete $is_removable{confess};
 
-sub extends { Mouse::Meta::Class->initialize(caller)->superclasses(@_) }
+sub extends { Mouse::Meta::Class->initialize(scalar caller)->superclasses(@_) }
 
 sub has {
-    my $meta = Mouse::Meta::Class->initialize(caller);
+    my $meta = Mouse::Meta::Class->initialize(scalar caller);
     $meta->add_attribute(@_);
 }
 
 sub before {
-    my $meta = Mouse::Meta::Class->initialize(caller);
+    my $meta = Mouse::Meta::Class->initialize(scalar caller);
 
     my $code = pop;
 
@@ -40,7 +44,7 @@ sub before {
 }
 
 sub after {
-    my $meta = Mouse::Meta::Class->initialize(caller);
+    my $meta = Mouse::Meta::Class->initialize(scalar caller);
 
     my $code = pop;
 
@@ -50,7 +54,7 @@ sub after {
 }
 
 sub around {
-    my $meta = Mouse::Meta::Class->initialize(caller);
+    my $meta = Mouse::Meta::Class->initialize(scalar caller);
 
     my $code = pop;
 
@@ -60,7 +64,7 @@ sub around {
 }
 
 sub with {
-    Mouse::Util::apply_all_roles((caller)[0], @_);
+    Mouse::Util::apply_all_roles(scalar(caller), @_);
 }
 
 our $SUPER_PACKAGE;
@@ -117,8 +121,8 @@ sub init_meta {
             unless $metaclass->isa('Mouse::Meta::Class');
     
     # make a subtype for each Mouse class
-    class_type($class)
-        unless find_type_constraint($class);
+    Mouse::Util::TypeConstraints::class_type($class)
+        unless Mouse::Util::TypeConstraints::find_type_constraint($class);
 
     my $meta = $metaclass->initialize($class);
     $meta->superclasses($base_class)
@@ -455,6 +459,8 @@ Yappo
 
 wu-lee
 
+Goro Fuji (gfx) C<< <gfuji at cpan.org> >>
+
 with plenty of code borrowed from L<Class::MOP> and L<Moose>
 
 =head1 BUGS