X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMouse.git;a=blobdiff_plain;f=lib%2FMouse.pm;h=6c09a7705462d99ea364512654c0724e79e97034;hp=9c880ee0b378bd41c0f5782b65487e179b6506d5;hb=87ca293be7ca0041bbb86ad9609a498fb2010f4f;hpb=9e3c345e4b8c719e6750c3b6c6ff43a31c55ba5f diff --git a/lib/Mouse.pm b/lib/Mouse.pm index 9c880ee..6c09a77 100644 --- a/lib/Mouse.pm +++ b/lib/Mouse.pm @@ -4,28 +4,45 @@ use warnings; use 5.006; use base 'Exporter'; -our $VERSION = '0.23'; +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 +52,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 +62,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 +72,7 @@ sub around { } sub with { - Mouse::Util::apply_all_roles((caller)[0], @_); + Mouse::Util::apply_all_roles(scalar(caller), @_); } our $SUPER_PACKAGE; @@ -88,6 +105,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,16 +159,9 @@ sub import { return; } - my $meta = Mouse::Meta::Class->initialize($caller); - $meta->superclasses('Mouse::Object') - unless $meta->superclasses; - - # make a subtype for each Mouse class - class_type($caller) unless find_type_constraint($caller); - - no strict 'refs'; - no warnings 'redefine'; - *{$caller.'::meta'} = sub { $meta }; + $class->init_meta( + for_class => $caller, + ); if (@_) { __PACKAGE__->export_to_level( $level+1, $class, @_); @@ -136,59 +177,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; @@ -229,16 +231,19 @@ Mouse - Moose minus the antlers L is wonderful. B -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 -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. 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 @@ -250,7 +255,13 @@ 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, we have written L which will act as Mouse unless Moose is loaded, -in which case it will act as Moose. +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 @@ -260,6 +271,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 @@ -442,6 +459,8 @@ Yappo wu-lee +Goro Fuji (gfx) C<< >> + with plenty of code borrowed from L and L =head1 BUGS @@ -456,7 +475,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.