X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FPurePerl.pm;h=a5a7502c3f1445c945eb639a0739d55b2baf1039;hb=6c7491f2df2cc362ae9d58ff3660f2286a22f878;hp=b1e652f0ad5d4ba3c4cf8e04470fa2dbcda87112;hpb=98a8fd12ede46b22edc10d229680d9d2e8deeade;p=gitmo%2FMouse.git diff --git a/lib/Mouse/PurePerl.pm b/lib/Mouse/PurePerl.pm index b1e652f..a5a7502 100644 --- a/lib/Mouse/PurePerl.pm +++ b/lib/Mouse/PurePerl.pm @@ -145,8 +145,11 @@ sub Bool { $_[0] ? $_[0] eq '1' : 1 } sub Undef { !defined($_[0]) } sub Defined { defined($_[0]) } sub Value { defined($_[0]) && !ref($_[0]) } -sub Num { !ref($_[0]) && looks_like_number($_[0]) } -sub Int { defined($_[0]) && !ref($_[0]) && $_[0] =~ /^-?[0-9]+$/ } +sub Num { looks_like_number($_[0]) } +sub Int { + my($value) = @_; + looks_like_number($value) && $value =~ /\A [+-]? [0-9]+ \z/xms; +} sub Str { my($value) = @_; return defined($value) && ref(\$value) eq 'SCALAR'; @@ -243,6 +246,9 @@ sub add_method { package Mouse::Meta::Class; +use Mouse::Meta::Method::Constructor; +use Mouse::Meta::Method::Destructor; + sub method_metaclass { $_[0]->{method_metaclass} || 'Mouse::Meta::Method' } sub attribute_metaclass { $_[0]->{attribute_metaclass} || 'Mouse::Meta::Attribute' } @@ -274,7 +280,7 @@ sub new_object { } sub _initialize_object{ - my($self, $object, $args, $ignore_triggers) = @_; + my($self, $object, $args, $is_cloning) = @_; my @triggers_queue; @@ -294,7 +300,7 @@ sub _initialize_object{ } else { # no init arg if ($attribute->has_default || $attribute->has_builder) { - if (!$attribute->is_lazy) { + if (!$attribute->is_lazy && !exists $object->{$slot}) { my $default = $attribute->default; my $builder = $attribute->builder; my $value = $builder ? $object->$builder() @@ -307,13 +313,13 @@ sub _initialize_object{ if ref($object->{$slot}) && $attribute->is_weak_ref; } } - elsif($attribute->is_required) { + elsif(!$is_cloning && $attribute->is_required) { $self->throw_error("Attribute (".$attribute->name.") is required"); } } } - if(!$ignore_triggers){ + if(@triggers_queue){ foreach my $trigger_and_value(@triggers_queue){ my($trigger, $value) = @{$trigger_and_value}; $trigger->($object, $value); @@ -611,6 +617,12 @@ sub compile_type_constraint{ return; } +sub check { + my $self = shift; + return $self->_compiled_type_constraint->(@_); +} + + package Mouse::Object; sub BUILDARGS { @@ -708,7 +720,7 @@ Mouse::PurePerl - A Mouse guts in pure Perl =head1 VERSION -This document describes Mouse version 0.50_05 +This document describes Mouse version 0.55 =head1 SEE ALSO