X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FStorage%2FBasic.pm;h=58cd6a30085baf61ea41f1c2178c31cb26c776c4;hb=81a523ba27fe312e8d52f275283a892542f79f68;hp=a803e7432d1370619958978a76a6980f824f6918;hpb=a473d69d41c77bb4ba2d94dfd731bdcf6e7a8d63;p=gitmo%2FMooseX-Storage.git

diff --git a/lib/MooseX/Storage/Basic.pm b/lib/MooseX/Storage/Basic.pm
index a803e74..58cd6a3 100644
--- a/lib/MooseX/Storage/Basic.pm
+++ b/lib/MooseX/Storage/Basic.pm
@@ -2,8 +2,9 @@ package MooseX::Storage::Basic;
 use Moose::Role;
 
 use MooseX::Storage::Engine;
+use String::RewritePrefix;
 
-our $VERSION   = '0.18';
+our $VERSION   = '0.33';
 our $AUTHORITY = 'cpan:STEVAN';
 
 sub pack {
@@ -15,30 +16,33 @@ sub pack {
 sub unpack {
     my ($class, $data, %args) = @_;
     my $e = $class->_storage_get_engine_class(%args)->new(class => $class);
-    
-    $class->_storage_construct_instance( 
-        $e->expand_object($data, %args), 
-        \%args 
+
+    $class->_storage_construct_instance(
+        $e->expand_object($data, %args),
+        \%args
     );
 }
 
 sub _storage_get_engine_class {
     my ($self, %args) = @_;
 
-    my $default = 'MooseX::Storage::Engine';
-
-    return $default
+    return 'MooseX::Storage::Engine'
         unless (
-            exists $args{engine_traits} 
+            exists $args{engine_traits}
          && ref($args{engine_traits}) eq 'ARRAY'
          && scalar(@{$args{engine_traits}})
     );
-    
-    my @roles = map { sprintf("%s::Trait::%s", $default, $_) }
-        @{$args{engine_traits}};
-    
+
+    my @roles = String::RewritePrefix->rewrite(
+        {
+            '' => 'MooseX::Storage::Engine::Trait::',
+            '+' => '',
+        },
+        @{$args{engine_traits}}
+    );
+
     Moose::Meta::Class->create_anon_class(
-        superclasses => [$default],
+        superclasses => ['MooseX::Storage::Engine'],
         roles => [ @roles ],
         cache => 1,
     )->name;
@@ -47,10 +51,12 @@ sub _storage_get_engine_class {
 sub _storage_construct_instance {
     my ($class, $args, $opts) = @_;
     my %i = defined $opts->{'inject'} ? %{ $opts->{'inject'} } : ();
- 
+
     $class->new( %$args, %i );
 }
 
+no Moose::Role;
+
 1;
 
 __END__
@@ -66,33 +72,33 @@ MooseX::Storage::Basic - The simplest level of serialization
   package Point;
   use Moose;
   use MooseX::Storage;
-  
+
   our $VERSION = '0.01';
-  
+
   with Storage;
-  
+
   has 'x' => (is => 'rw', isa => 'Int');
   has 'y' => (is => 'rw', isa => 'Int');
-  
+
   1;
-  
+
   my $p = Point->new(x => 10, y => 10);
-  
-  ## methods to pack/unpack an 
+
+  ## methods to pack/unpack an
   ## object in perl data structures
-  
+
   # pack the class into a hash
   $p->pack(); # { __CLASS__ => 'Point-0.01', x => 10, y => 10 }
-  
+
   # unpack the hash into a class
   my $p2 = Point->unpack({ __CLASS__ => 'Point-0.01', x => 10, y => 10 });
-  
+
   # unpack the hash, with insertion of paramaters
   my $p3 = Point->unpack( $p->pack, inject => { x => 11 } );
 
 =head1 DESCRIPTION
 
-This is the most basic form of serialization. This is used by default 
+This is the most basic form of serialization. This is used by default
 but the exported C<Storage> function.
 
 =head1 METHODS
@@ -125,7 +131,7 @@ the class' C<new> function, or override ones from the serialized data.
 
 =head1 BUGS
 
-All complex software has bugs lurking in it, and this module is no 
+All complex software has bugs lurking in it, and this module is no
 exception. If you find a bug please either email me, or add the bug
 to cpan-RT.