[Moose-commits] r7886 - in MooseX-InsideOut/trunk: lib/MooseX
lib/MooseX/InsideOut lib/MooseX/InsideOut/Meta
lib/MooseX/InsideOut/Role lib/MooseX/InsideOut/Role/Meta
t/lib/InsideOut
hdp at code2.0beta.co.uk
hdp at code2.0beta.co.uk
Sat Apr 4 06:43:40 BST 2009
Author: hdp
Date: 2009-04-03 22:43:39 -0700 (Fri, 03 Apr 2009)
New Revision: 7886
Added:
MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/
MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/Meta/
MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/Meta/Instance.pm
Removed:
MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Class.pm
MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Instance.pm
Modified:
MooseX-InsideOut/trunk/lib/MooseX/InsideOut.pm
MooseX-InsideOut/trunk/t/lib/InsideOut/SubArray.pm
MooseX-InsideOut/trunk/t/lib/InsideOut/SubHash.pm
MooseX-InsideOut/trunk/t/lib/InsideOut/SubIO.pm
MooseX-InsideOut/trunk/t/lib/InsideOut/SubMoose.pm
Log:
update for latest Moose
Deleted: MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Class.pm
===================================================================
--- MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Class.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Class.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -1,35 +0,0 @@
-use strict;
-use warnings;
-
-package MooseX::InsideOut::Meta::Class;
-
-# need to load this before loading Moose and using it as a metaclass, because
-# of circularity
-use MooseX::InsideOut::Meta::Instance;
-use Moose;
-extends 'Moose::Meta::Class';
-
-sub initialize {
- my $class = shift;
- my $pkg = shift;
- $class->SUPER::initialize(
- $pkg,
- instance_metaclass => 'MooseX::InsideOut::Meta::Instance',
- @_,
- );
-}
-
-# this seems like it should be part of Moose::Meta::Class
-sub construct_instance {
- my ($class, %params) = @_;
- my $meta_instance = $class->get_meta_instance;
- my $instance = $params{'__INSTANCE__'}
- || $meta_instance->create_instance();
- foreach my $attr ($class->compute_all_applicable_attributes()) {
- my $meta_instance = $attr->associated_class->get_meta_instance;
- $attr->initialize_instance_slot($meta_instance, $instance, \%params);
- }
- return $instance;
-}
-
-1;
Deleted: MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Instance.pm
===================================================================
--- MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Instance.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Meta/Instance.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -1,89 +0,0 @@
-use strict;
-use warnings;
-
-package MooseX::InsideOut::Meta::Instance;
-
-use Moose;
-extends 'Moose::Meta::Instance';
-
-use Hash::Util::FieldHash::Compat qw(fieldhash);
-use Scalar::Util qw(refaddr weaken);
-
-# don't touch this or I beat you
-# this is only a package variable for inlinability
-fieldhash our %__attr;
-
-sub create_instance {
- my ($self) = @_;
-
- #my $instance = \(my $dummy);
- my $instance = $self->SUPER::create_instance;
-
- $__attr{refaddr $instance} = {};
- return bless $instance => $self->associated_metaclass->name;
-}
-
-sub get_slot_value {
- my ($self, $instance, $slot_name) = @_;
-
- return $__attr{refaddr $instance}->{$slot_name};
-}
-
-sub set_slot_value {
- my ($self, $instance, $slot_name, $value) = @_;
-
- return $__attr{refaddr $instance}->{$slot_name} = $value;
-}
-
-sub deinitialize_slot {
- my ($self, $instance, $slot_name) = @_;
-
- return delete $__attr{refaddr $instance}->{$slot_name};
-}
-
-sub is_slot_initialized {
- my ($self, $instance, $slot_name) = @_;
-
- return exists $__attr{refaddr $instance}->{$slot_name};
-}
-
-sub weaken_slot_value {
- my ($self, $instance, $slot_name) = @_;
-
- weaken $__attr{refaddr $instance}->{$slot_name};
-}
-
-sub inline_create_instance {
- my ($self, $class_variable) = @_;
- return join '',
- #'my $instance = \(my $dummy);',
- # hardcoding superclass -- can't think of a good way to avoid that
- 'my $instance = Moose::Meta::Instance->create_instance;',
- sprintf(
- '$%s::__attr{%s} = {};',
- __PACKAGE__,
- 'Scalar::Util::refaddr($instance)',
- ),
- sprintf(
- 'bless $instance => %s;',
- $class_variable,
- ),
- ;
-}
-
-sub inline_slot_access {
- my ($self, $instance, $slot_name) = @_;
- return sprintf '$%s::__attr{%s}->{%s}',
- __PACKAGE__,
- 'Scalar::Util::refaddr ' . $instance,
- $slot_name,
- ;
-}
-
-sub __dump {
- my ($class, $instance) = @_;
- require Data::Dumper;
- return Data::Dumper::Dumper($__attr{refaddr $instance});
-}
-
-1;
Added: MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/Meta/Instance.pm
===================================================================
--- MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/Meta/Instance.pm (rev 0)
+++ MooseX-InsideOut/trunk/lib/MooseX/InsideOut/Role/Meta/Instance.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -0,0 +1,98 @@
+package MooseX::InsideOut::Role::Meta::Instance;
+
+use Moose::Role;
+
+use Hash::Util::FieldHash::Compat qw(fieldhash);
+use Scalar::Util qw(refaddr weaken);
+use namespace::clean -except => 'meta';
+
+fieldhash our %attr;
+
+around create_instance => sub {
+ my $next = shift;
+ my $instance = shift->$next(@_);
+ $attr{refaddr $instance} = {};
+ return $instance;
+};
+
+sub get_slot_value {
+ my ($self, $instance, $slot_name) = @_;
+
+ return $attr{refaddr $instance}->{$slot_name};
+}
+
+sub set_slot_value {
+ my ($self, $instance, $slot_name, $value) = @_;
+
+ return $attr{refaddr $instance}->{$slot_name} = $value;
+}
+
+sub deinitialize_slot {
+ my ($self, $instance, $slot_name) = @_;
+ return delete $attr{refaddr $instance}->{$slot_name};
+}
+
+sub deinitialize_all_slots {
+ my ($self, $instance) = @_;
+ $attr{refaddr $instance} = {};
+}
+
+sub is_slot_initialized {
+ my ($self, $instance, $slot_name) = @_;
+
+ return exists $attr{refaddr $instance}->{$slot_name};
+}
+
+sub weaken_slot_value {
+ my ($self, $instance, $slot_name) = @_;
+ weaken $attr{refaddr $instance}->{$slot_name};
+}
+
+around inline_create_instance => sub {
+ my $next = shift;
+ my ($self, $class_variable) = @_;
+ my $code = $self->$next($class_variable);
+ $code = "do { {my \$instance = ($code);";
+ $code .= sprintf(
+ '$%s::attr{Scalar::Util::refaddr($instance)} = {};',
+ __PACKAGE__,
+ );
+ $code .= '$instance }';
+ return $code;
+};
+
+sub inline_slot_access {
+ my ($self, $instance, $slot_name) = @_;
+ return sprintf '$%s::attr{Scalar::Util::refaddr(%s)}->{%s}',
+ __PACKAGE__, $instance, $slot_name;
+}
+
+1;
+
+__END__
+
+=head1 DESCRIPTION
+
+Meta-instance role implementing inside-out storage.
+
+=method create_instance
+
+=method get_slot_value
+
+=method set_slot_value
+
+=method deinitialize_slot
+
+=method deinitialize_all_slots
+
+=method is_slot_initialized
+
+=method weaken_slot_value
+
+=method inline_create_instance
+
+=method inline_slot_access
+
+See L<Class::MOP::Instance>.
+
+=cut
Modified: MooseX-InsideOut/trunk/lib/MooseX/InsideOut.pm
===================================================================
--- MooseX-InsideOut/trunk/lib/MooseX/InsideOut.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/lib/MooseX/InsideOut.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -4,28 +4,23 @@
package MooseX::InsideOut;
# ABSTRACT: inside-out objects with Moose
-use MooseX::InsideOut::Meta::Class;
-BEGIN { require Moose }
-use Carp;
+use Moose ();
+use Moose::Exporter;
+use Moose::Util::MetaRole;
+use MooseX::InsideOut::Role::Meta::Instance;
-sub import {
- my $class = shift;
-
- if (@_) { Carp::confess "$class has no exports" }
+Moose::Exporter->setup_import_methods(
+ also => [ 'Moose' ],
+);
- my $into = caller;
-
- return if $into eq 'main';
-
- Moose::init_meta(
- $into,
- 'Moose::Object',
- 'MooseX::InsideOut::Meta::Class',
+sub init_meta {
+ shift;
+ my %p = @_;
+ Moose->init_meta(%p);
+ Moose::Util::MetaRole::apply_metaclass_roles(
+ for_class => $p{for_class},
+ instance_metaclass_roles => [ 'MooseX::InsideOut::Role::Meta::Instance' ],
);
-
- Moose->import({ into => $into });
-
- return;
}
1;
@@ -42,22 +37,19 @@
package My::Subclass;
- use metaclass 'MooseX::InsideOut::Meta::Class';
- use Moose;
+ use MooseX::InsideOut;
extends 'Some::Other::Class';
=head1 DESCRIPTION
-MooseX::InsideOut provides a metaclass and an instance metaclass for inside-out
-objects.
+MooseX::InsideOut provides metaroles for inside-out objects. That is, it sets
+up attribute slot storage somewhere other than inside C<$self>. This means
+that you can extend non-Moose classes, whose internals you either don't want to
+care about or aren't hash-based.
-You can use MooseX::InsideOut, as in the first example in the L</SYNOPSIS>.
-This sets up the metaclass and instance metaclass for you, as well as importing
-all of the normal Moose goodies.
+=method init_meta
-You can also use the metaclass C<MooseX::InsideOut::Meta::Class> directly, as
-in the second example. This is most useful when extending a non-Moose class,
-whose internals you either don't want to care about or aren't hash-based.
+Apply the instance metarole necessary for inside-out storage.
=head1 TODO
Modified: MooseX-InsideOut/trunk/t/lib/InsideOut/SubArray.pm
===================================================================
--- MooseX-InsideOut/trunk/t/lib/InsideOut/SubArray.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/t/lib/InsideOut/SubArray.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -3,8 +3,7 @@
package InsideOut::SubArray;
-use metaclass 'MooseX::InsideOut::Meta::Class';
-use Moose;
+use MooseX::InsideOut;
extends 'InsideOut::BaseArray';
has sub_foo => ( is => 'rw' );
Modified: MooseX-InsideOut/trunk/t/lib/InsideOut/SubHash.pm
===================================================================
--- MooseX-InsideOut/trunk/t/lib/InsideOut/SubHash.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/t/lib/InsideOut/SubHash.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -3,8 +3,7 @@
package InsideOut::SubHash;
-use metaclass 'MooseX::InsideOut::Meta::Class';
-use Moose;
+use MooseX::InsideOut;
extends 'InsideOut::BaseHash';
has sub_foo => ( is => 'rw' );
Modified: MooseX-InsideOut/trunk/t/lib/InsideOut/SubIO.pm
===================================================================
--- MooseX-InsideOut/trunk/t/lib/InsideOut/SubIO.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/t/lib/InsideOut/SubIO.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -3,8 +3,7 @@
package InsideOut::SubIO;
-use metaclass 'MooseX::InsideOut::Meta::Class';
-use Moose;
+use MooseX::InsideOut;
extends 'InsideOut::BaseIO';
has sub_foo => ( is => 'rw' );
Modified: MooseX-InsideOut/trunk/t/lib/InsideOut/SubMoose.pm
===================================================================
--- MooseX-InsideOut/trunk/t/lib/InsideOut/SubMoose.pm 2009-04-04 05:43:32 UTC (rev 7885)
+++ MooseX-InsideOut/trunk/t/lib/InsideOut/SubMoose.pm 2009-04-04 05:43:39 UTC (rev 7886)
@@ -3,8 +3,7 @@
package InsideOut::SubMoose;
-use metaclass 'MooseX::InsideOut::Meta::Class';
-use Moose;
+use MooseX::InsideOut;
extends 'InsideOut::BaseMoose';
has sub_foo => ( is => 'rw' );
More information about the Moose-commits
mailing list