X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse.pm;h=97142d4c63e6323601f84a4249d4595b314bcc5d;hb=efeb6d0c0f94adf6e09f4c6db5806cfe463fcc60;hp=8e0566d7599c5e5f90d2b3a31ea8ce03831d2fd4;hpb=e693975ff1701c9d268c7cbde0fec816ce71305c;p=gitmo%2FMouse.git diff --git a/lib/Mouse.pm b/lib/Mouse.pm index 8e0566d..97142d4 100644 --- a/lib/Mouse.pm +++ b/lib/Mouse.pm @@ -4,7 +4,7 @@ use warnings; use 5.006; use base 'Exporter'; -our $VERSION = '0.21'; +our $VERSION = '0.25'; use Carp 'confess'; use Scalar::Util 'blessed'; @@ -88,6 +88,46 @@ 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; + + { + no strict 'refs'; + no warnings 'redefine'; + *{$class.'::meta'} = sub { $meta }; + } + + return $meta; +} + sub import { my $class = shift; @@ -111,16 +151,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 }; + Mouse->init_meta( + for_class => $caller, + ); if (@_) { __PACKAGE__->export_to_level( $level+1, $class, @_); @@ -191,6 +224,12 @@ sub is_class_loaded { return 0; } +sub class_of { + return unless defined $_[0]; + my $class = blessed($_[0]) || $_[0]; + return Mouse::Meta::Class::get_metaclass_by_name($class); +} + 1; __END__ @@ -305,10 +344,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 @@ -424,9 +469,6 @@ We have a public git repo: git clone git://jules.scsys.co.uk/gitmo/Mouse.git -If you would like commit access, send a note with your public SSH key to Yuval -Kogman, at the address below. - =head1 AUTHORS Shawn M Moore, C<< >> @@ -443,7 +485,9 @@ 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