X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse.pm;h=9b01f93e1e0e2c84caa044eadded4e2c16c82fad;hp=6278e3dc125dbba3d28f3001aadf21c654a29977;hb=284ca75b14da9b2685a78b7a0d4228512c8575c6;hpb=2bc93d688b465f6b707f9679392e10089b611944 diff --git a/lib/Mouse.pm b/lib/Mouse.pm index 6278e3d..9b01f93 100644 --- a/lib/Mouse.pm +++ b/lib/Mouse.pm @@ -1,31 +1,50 @@ package Mouse; +use 5.006_002; + use strict; use warnings; -use 5.006; + use base 'Exporter'; -our $VERSION = '0.18'; +our $VERSION = '0.33_01'; use Carp 'confess'; use Scalar::Util 'blessed'; -use Mouse::Util; -use Mouse::Meta::Attribute; +use Mouse::Util qw(load_class is_class_loaded not_supported); + +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 with + has + before after around + override super + augment inner -our @EXPORT = qw(extends has before after around override super blessed confess with); + blessed confess +); -sub extends { Mouse::Meta::Class->initialize(caller)->superclasses(@_) } +our %is_removable = map{ $_ => undef } @EXPORT; +delete $is_removable{blessed}; +delete $is_removable{confess}; + +sub extends { Mouse::Meta::Class->initialize(scalar caller)->superclasses(@_) } sub has { - my $meta = Mouse::Meta::Class->initialize(caller); - $meta->add_attribute(@_); + my $meta = Mouse::Meta::Class->initialize(scalar caller); + my $name = shift; + + $meta->add_attribute($_ => @_) for ref($name) ? @{$name} : $name; } sub before { - my $meta = Mouse::Meta::Class->initialize(caller); + my $meta = Mouse::Meta::Class->initialize(scalar caller); my $code = pop; @@ -35,7 +54,7 @@ sub before { } sub after { - my $meta = Mouse::Meta::Class->initialize(caller); + my $meta = Mouse::Meta::Class->initialize(scalar caller); my $code = pop; @@ -45,7 +64,7 @@ sub after { } sub around { - my $meta = Mouse::Meta::Class->initialize(caller); + my $meta = Mouse::Meta::Class->initialize(scalar caller); my $code = pop; @@ -55,7 +74,7 @@ sub around { } sub with { - Mouse::Util::apply_all_roles((caller)[0], @_); + Mouse::Util::apply_all_roles(scalar(caller), @_); } our $SUPER_PACKAGE; @@ -88,6 +107,37 @@ sub override { }); } +sub inner { not_supported } +sub augment{ not_supported } + +sub init_meta { + shift; + my %args = @_; + + my $class = $args{for_class} + or confess("Cannot call init_meta without specifying a for_class"); + my $base_class = $args{base_class} || 'Mouse::Object'; + my $metaclass = $args{metaclass} || 'Mouse::Meta::Class'; + + confess("The Metaclass $metaclass must be a subclass of Mouse::Meta::Class.") + unless $metaclass->isa('Mouse::Meta::Class'); + + # make a subtype for each Mouse class + Mouse::Util::TypeConstraints::class_type($class) + unless Mouse::Util::TypeConstraints::find_type_constraint($class); + + my $meta = $metaclass->initialize($class); + + $meta->add_method(meta => sub{ + return $metaclass->initialize(ref($_[0]) || $_[0]); + }); + + $meta->superclasses($base_class) + unless $meta->superclasses; + + return $meta; +} + sub import { my $class = shift; @@ -111,13 +161,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 }; + $class->init_meta( + for_class => $caller, + ); if (@_) { __PACKAGE__->export_to_level( $level+1, $class, @_); @@ -133,59 +179,20 @@ sub import { sub unimport { my $caller = caller; - no strict 'refs'; - for my $keyword (@EXPORT) { - delete ${ $caller . '::' }{$keyword}; - } -} - -sub load_class { - my $class = shift; - - if (ref($class) || !defined($class) || !length($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; - - eval { CORE::require($file) }; - confess "Could not load class ($class) because : $@" if $@; - - return 1; -} - -sub is_class_loaded { - my $class = shift; - - return 0 if ref($class) || !defined($class) || !length($class); - - # walk the symbol table tree to avoid autovififying - # \*{${main::}{"Foo::"}} == \*main::Foo:: - - my $pack = \*::; - foreach my $part (split('::', $class)) { - return 0 unless exists ${$$pack}{"${part}::"}; - $pack = \*{${$$pack}{"${part}::"}}; - } + my $stash = do{ + no strict 'refs'; + \%{$caller . '::'} + }; - # check for $VERSION or @ISA - return 1 if exists ${$$pack}{VERSION} - && defined *{${$$pack}{VERSION}}{SCALAR}; - return 1 if exists ${$$pack}{ISA} - && defined *{${$$pack}{ISA}}{ARRAY}; + for my $keyword (@EXPORT) { + my $code; + if(exists $is_removable{$keyword} + && ($code = $caller->can($keyword)) + && (Mouse::Util::get_code_info($code))[0] eq __PACKAGE__){ - # check for any method - foreach ( keys %{$$pack} ) { - next if substr($_, -2, 2) eq '::'; - return 1 if defined *{${$$pack}{$_}}{CODE}; + delete $stash->{$keyword}; + } } - - # fail - return 0; } 1; @@ -224,19 +231,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 @@ -247,9 +256,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 @@ -259,6 +273,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 @@ -304,10 +324,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 @@ -417,6 +443,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<< >> @@ -427,11 +459,17 @@ tokuhirom Yappo +wu-lee + +Goro Fuji (gfx) C<< >> + 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 @@ -439,7 +477,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.