X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse.pm;h=98d19e568f6e12893c5b614953df10a798bd26b4;hp=2be14aeb2b180d5b57b75cf0db37040d6042775e;hb=3a63a2e7ef8fbac5f61eab04baecbf5d19374b83;hpb=4216fc14597a0cb62cbb732fd12b77765b109145 diff --git a/lib/Mouse.pm b/lib/Mouse.pm index 2be14ae..98d19e5 100644 --- a/lib/Mouse.pm +++ b/lib/Mouse.pm @@ -4,16 +4,7 @@ use warnings; use 5.006; use base 'Exporter'; -our $VERSION = '0.14'; -use 5.006; - -BEGIN { - if ($ENV{MOUSE_DEBUG}) { - *DEBUG = sub (){ 1 }; - } else { - *DEBUG = sub (){ 0 }; - } -} +our $VERSION = '0.30'; use Carp 'confess'; use Scalar::Util 'blessed'; @@ -22,26 +13,19 @@ use Mouse::Util; use Mouse::Meta::Attribute; use Mouse::Meta::Class; use Mouse::Object; -use Mouse::TypeRegistry; +use Mouse::Util::TypeConstraints; + +our @EXPORT = qw(extends has before after around override super blessed confess with); -our @EXPORT = qw(extends has before after around 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 { my $meta = Mouse::Meta::Class->initialize(caller); - - my $names = shift; - $names = [$names] if !ref($names); - - for my $name (@$names) { - if ($name =~ s/^\+//) { - Mouse::Meta::Attribute->clone_parent($meta, $name, @_); - } - else { - Mouse::Meta::Attribute->create($meta, $name, @_); - } - } + $meta->add_attribute(@_); } sub before { @@ -78,24 +62,104 @@ sub with { Mouse::Util::apply_all_roles((caller)[0], @_); } +our $SUPER_PACKAGE; +our $SUPER_BODY; +our @SUPER_ARGS; + +sub super { + # This check avoids a recursion loop - see + # t/100_bugs/020_super_recursion.t + return if defined $SUPER_PACKAGE && $SUPER_PACKAGE ne caller(); + return unless $SUPER_BODY; $SUPER_BODY->(@SUPER_ARGS); +} + +sub override { + my $meta = Mouse::Meta::Class->initialize(caller); + my $pkg = $meta->name; + + my $name = shift; + my $code = shift; + + my $body = $pkg->can($name) + or confess "You cannot override '$name' because it has no super method"; + + $meta->add_method($name => sub { + local $SUPER_PACKAGE = $pkg; + local @SUPER_ARGS = @_; + local $SUPER_BODY = $body; + + $code->(@_); + }); +} + +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; strict->import; warnings->import; - my $caller = caller; - - my $meta = Mouse::Meta::Class->initialize($caller); - $meta->superclasses('Mouse::Object') - unless $meta->superclasses; + my $opts = do { + if (ref($_[0]) && ref($_[0]) eq 'HASH') { + shift @_; + } else { + +{ }; + } + }; + my $level = delete $opts->{into_level}; + $level = 0 unless defined $level; + my $caller = caller($level); + + # we should never export to main + if ($caller eq 'main') { + warn qq{$class does not export its sugar to the 'main' package.\n}; + return; + } - no strict 'refs'; - no warnings 'redefine'; - *{$caller.'::meta'} = sub { $meta }; + Mouse->init_meta( + for_class => $caller, + ); if (@_) { - __PACKAGE__->export_to_level( 1, $class, @_); + __PACKAGE__->export_to_level( $level+1, $class, @_); } else { # shortcut for the common case of no type character no strict 'refs'; @@ -108,9 +172,19 @@ 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}; + } } } @@ -163,6 +237,10 @@ sub is_class_loaded { return 0; } +sub class_of { + return Mouse::Meta::Class::class_of($_[0]); +} + 1; __END__ @@ -199,21 +277,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. Most functions we use -from L are copied into this dist. L is required if -you'd like weak references; there's simply no way to do it from pure Perl. -L is required if you want support for L, -L, and L. +We're also going as light on dependencies as possible. +L or L is required +if you want support for L, L, and L. =head2 MOOSE COMPAT @@ -224,37 +302,28 @@ 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. - -Mouse also has the blessings of Moose's author, stevan. - -=head2 MISSING FEATURES - -=head3 Roles +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: -We're working on fixing this one! stevan has suggested an implementation -strategy. Mouse currently ignores methods, so that needs to be fixed next. -Roles that consist entirely of attributes may be usable in this very version. + ANY_MOOSE=Moose perl your-script.pl -=head3 Complex types +to see if the bug is caused by Mouse. Moose's diagnostics and validation are +also much better. -User-defined type constraints and parameterized types may be implemented. Type -coercions probably not (patches welcome). +=head2 MouseX -=head3 Bootstrapped meta world +Please don't copy MooseX code to MouseX. If you need extensions, you really +should upgrade to Moose. We don't need two parallel sets of extensions! -Very handy for extensions to the MOP. Not pressing, but would be nice to have. +If you really must write a Mouse extension, please contact the Moose mailing +list or #moose on IRC beforehand. -=head3 Modification of attribute metaclass +=head2 Maintenance -When you declare an attribute with L, you get the inlined accessors -installed immediately. Modifying the attribute metaclass, even if possible, -does nothing. - -=head3 Lots more.. - -MouseX? +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 @@ -301,10 +370,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 @@ -414,6 +489,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<< >> @@ -424,11 +505,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 @@ -436,7 +521,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.