X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse.pm;h=e03e12a7d7dac90e27cb944a3386f3e192394123;hp=67c1e7744d00993d774dd3133853b468061b18bb;hb=a81cc7b83f688ff21284b599a81e14a44bcdf401;hpb=60f6eba91f12d48fa30a8e16abe2db8c95b4d878 diff --git a/lib/Mouse.pm b/lib/Mouse.pm index 67c1e77..e03e12a 100644 --- a/lib/Mouse.pm +++ b/lib/Mouse.pm @@ -4,15 +4,7 @@ use warnings; use 5.006; use base 'Exporter'; -our $VERSION = '0.18'; - -BEGIN { - if ($ENV{MOUSE_DEBUG}) { - *DEBUG = sub (){ 1 }; - } else { - *DEBUG = sub (){ 0 }; - } -} +our $VERSION = '0.30'; use Carp 'confess'; use Scalar::Util 'blessed'; @@ -25,6 +17,10 @@ use Mouse::Util::TypeConstraints; our @EXPORT = qw(extends has before after around override super blessed confess with); +our %is_removable = map{ $_ => undef } @EXPORT; +delete $is_removable{blessed}; +delete $is_removable{confess}; + sub extends { Mouse::Meta::Class->initialize(caller)->superclasses(@_) } sub has { @@ -96,6 +92,45 @@ sub override { }); } +sub init_meta { + # This used to be called as a function. This hack preserves + # backwards compatibility. + if ( $_[0] ne __PACKAGE__ ) { + return __PACKAGE__->init_meta( + for_class => $_[0], + base_class => $_[1], + metaclass => $_[2], + ); + } + + shift; + my %args = @_; + + my $class = $args{for_class} + or Carp::croak( + "Cannot call init_meta without specifying a for_class"); + my $base_class = $args{base_class} || 'Mouse::Object'; + my $metaclass = $args{metaclass} || 'Mouse::Meta::Class'; + + Carp::croak("The Metaclass $metaclass must be a subclass of Mouse::Meta::Class.") + unless $metaclass->isa('Mouse::Meta::Class'); + + # make a subtype for each Mouse class + class_type($class) + unless find_type_constraint($class); + + my $meta = $metaclass->initialize($class); + $meta->superclasses($base_class) + unless $meta->superclasses; + + $meta->add_method(meta => sub{ + return Mouse::Meta::Class->initialize(ref($_[0]) || $_[0]); + }); + + + return $meta; +} + sub import { my $class = shift; @@ -119,13 +154,9 @@ sub import { return; } - my $meta = Mouse::Meta::Class->initialize($caller); - $meta->superclasses('Mouse::Object') - unless $meta->superclasses; - - no strict 'refs'; - no warnings 'redefine'; - *{$caller.'::meta'} = sub { $meta }; + Mouse->init_meta( + for_class => $caller, + ); if (@_) { __PACKAGE__->export_to_level( $level+1, $class, @_); @@ -141,21 +172,30 @@ sub import { sub unimport { my $caller = caller; - no strict 'refs'; + my $stash = do{ + no strict 'refs'; + \%{$caller . '::'} + }; + for my $keyword (@EXPORT) { - delete ${ $caller . '::' }{$keyword}; + my $code; + if(exists $is_removable{$keyword} + && ($code = $caller->can($keyword)) + && (Mouse::Util::get_code_info($code))[0] eq __PACKAGE__){ + + delete $stash->{$keyword}; + } } } sub load_class { my $class = shift; - if (ref($class) || !defined($class) || !length($class)) { + if (!Mouse::Util::is_valid_class_name($class)) { my $display = defined($class) ? $class : 'undef'; confess "Invalid class name ($display)"; } - return 1 if $class eq 'Mouse::Object'; return 1 if is_class_loaded($class); (my $file = "$class.pm") =~ s{::}{/}g; @@ -166,11 +206,14 @@ sub load_class { return 1; } +my %is_class_loaded_cache; sub is_class_loaded { my $class = shift; return 0 if ref($class) || !defined($class) || !length($class); + return 1 if exists $is_class_loaded_cache{$class}; + # walk the symbol table tree to avoid autovififying # \*{${main::}{"Foo::"}} == \*main::Foo:: @@ -181,21 +224,25 @@ sub is_class_loaded { } # check for $VERSION or @ISA - return 1 if exists ${$$pack}{VERSION} + return ++$is_class_loaded_cache{$class} if exists ${$$pack}{VERSION} && defined *{${$$pack}{VERSION}}{SCALAR}; - return 1 if exists ${$$pack}{ISA} + return ++$is_class_loaded_cache{$class} if exists ${$$pack}{ISA} && defined *{${$$pack}{ISA}}{ARRAY}; # check for any method foreach ( keys %{$$pack} ) { next if substr($_, -2, 2) eq '::'; - return 1 if defined *{${$$pack}{$_}}{CODE}; + return ++$is_class_loaded_cache{$class} if defined *{${$$pack}{$_}}{CODE}; } # fail return 0; } +sub class_of { + return Mouse::Meta::Class::class_of($_[0]); +} + 1; __END__ @@ -232,19 +279,21 @@ Mouse - Moose minus the antlers =head1 DESCRIPTION -L is wonderful. +L is wonderful. B -Unfortunately, it's a little slow. Though significant progress has been made -over the years, the compile time penalty is a non-starter for some -applications. +Unfortunately, Moose has a compile-time penalty. Though significant progress +has been made over the years, the compile time penalty is a non-starter for +some very specific applications. If you are writing a command-line application +or CGI script where startup time is essential, you may not be able to use +Moose. We recommend that you instead use L and FastCGI for the +latter, if possible. -Mouse aims to alleviate this by providing a subset of Moose's -functionality, faster. In particular, L is missing only a few -expert-level features. +Mouse aims to alleviate this by providing a subset of Moose's functionality, +faster. We're also going as light on dependencies as possible. -L or L is required if you want support -for L, L, and L. +L or L is required +if you want support for L, L, and L. =head2 MOOSE COMPAT @@ -255,9 +304,14 @@ runs the test suite 4x faster. The idea is that, if you need the extra power, you should be able to run C on your codebase and have nothing break. To that end, -nothingmuch has written L (part of this distribution) which will act -as Mouse unless Moose is loaded, in which case it will act as Moose. -L is a more high-tech L. +we have written L which will act as Mouse unless Moose is loaded, +in which case it will act as Moose. Since Mouse is a little sloppier than +Moose, if you run into weird errors, it would be worth running: + + ANY_MOOSE=Moose perl your-script.pl + +to see if the bug is caused by Mouse. Moose's diagnostics and validation are +also much better. =head2 MouseX @@ -267,6 +321,12 @@ should upgrade to Moose. We don't need two parallel sets of extensions! If you really must write a Mouse extension, please contact the Moose mailing list or #moose on IRC beforehand. +=head2 Maintenance + +The original author of this module has mostly stepped down from maintaining +Mouse. See L. +If you would like to help maintain this module, please get in touch with us. + =head1 KEYWORDS =head2 meta -> Mouse::Meta::Class @@ -312,10 +372,16 @@ the attribute. =item isa => TypeConstraint -Provides basic type checking in the constructor and accessor. Basic types such -as C, C, C are supported. Any unknown type is taken to -be a class check (e.g. isa => 'DateTime' would accept only L -objects). +Provides type checking in the constructor and accessor. The following types are +supported. Any unknown type is taken to be a class check (e.g. isa => +'DateTime' would accept only L objects). + + Any Item Bool Undef Defined Value Num Int Str ClassName + Ref ScalarRef ArrayRef HashRef CodeRef RegexpRef GlobRef + FileHandle Object + +For more documentation on type constraints, see L. + =item required => 0|1 @@ -425,6 +491,12 @@ Returns whether this class is actually loaded or not. It uses a heuristic which involves checking for the existence of C<$VERSION>, C<@ISA>, and any locally-defined method. +=head1 SOURCE CODE ACCESS + +We have a public git repo: + + git clone git://jules.scsys.co.uk/gitmo/Mouse.git + =head1 AUTHORS Shawn M Moore, C<< >> @@ -435,11 +507,15 @@ tokuhirom Yappo +wu-lee + with plenty of code borrowed from L and L =head1 BUGS -No known bugs. +There is a known issue with Mouse on 5.6.2 regarding the @ISA tests. Until +this is resolve the minimum version of Perl for Mouse is set to 5.8.0. Patches +to resolve these tests are more than welcome. Please report any bugs through RT: email C, or browse @@ -447,7 +523,9 @@ L. =head1 COPYRIGHT AND LICENSE -Copyright 2008 Shawn M Moore. +Copyright 2008-2009 Infinity Interactive, Inc. + +http://www.iinteractive.com/ This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.