X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FStorage%2FBasic.pm;fp=lib%2FMooseX%2FStorage%2FBasic.pm;h=01e66dd9ecbde24ebfc6566f291440045fbeb616;hb=298cda9863d1e75bd897cef144c86046aa16c430;hp=8651c49ce01301b9124d23f1a93ba3d7ce5f11dc;hpb=335eb37774e94d72fe990375dd4fd647e6275395;p=gitmo%2FMooseX-Storage.git

diff --git a/lib/MooseX/Storage/Basic.pm b/lib/MooseX/Storage/Basic.pm
index 8651c49..01e66dd 100644
--- a/lib/MooseX/Storage/Basic.pm
+++ b/lib/MooseX/Storage/Basic.pm
@@ -1,4 +1,3 @@
-
 package MooseX::Storage::Basic;
 use Moose::Role;
 
@@ -9,16 +8,36 @@ our $AUTHORITY = 'cpan:STEVAN';
 
 sub pack {
     my ( $self, @args ) = @_;
-    my $e = MooseX::Storage::Engine->new( object => $self );
+    my $e = $self->_storage_get_engine( object => $self );
     $e->collapse_object(@args);
 }
 
 sub unpack {
-    my ( $class, $data, @args ) = @_;
-    my $e = MooseX::Storage::Engine->new( class => $class );
-    $class->new( $e->expand_object($data, @args) );
+    my ($class, $data, %args) = @_;
+    my $e = $class->_storage_get_engine(class => $class);
+    
+    $class->_storage_construct_instance( 
+        [ $e->expand_object($data, %args) ], 
+        \%args 
+    );
+}
+
+sub _storage_get_engine {
+    my $self = shift;
+    MooseX::Storage::Engine->new( @_ );
+}
+
+sub _storage_construct_instance {
+    my ($class, $args, $opts) = @_;
+    
+    my @i = defined $opts->{'inject'} ? @{ $opts->{'inject'} } : ();
+ 
+    $class->new( @$args, @i );
 }
 
+
+
+
 1;
 
 __END__