X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FStorage%2FFormat%2FJSON.pm;h=bc8316c24b537291b734714d6732bc5a3a9a2d95;hb=e44b5f5498b782752d2c91b6796698c86143a2f0;hp=7377c0ebd180eb5d5781ba25903ea9cbfaa4c1e9;hpb=98ae09f003486b7c70661507771598c6101f23be;p=gitmo%2FMooseX-Storage.git

diff --git a/lib/MooseX/Storage/Format/JSON.pm b/lib/MooseX/Storage/Format/JSON.pm
index 7377c0e..bc8316c 100644
--- a/lib/MooseX/Storage/Format/JSON.pm
+++ b/lib/MooseX/Storage/Format/JSON.pm
@@ -2,23 +2,32 @@
 package MooseX::Storage::Format::JSON;
 use Moose::Role;
 
+no warnings 'once';
+
 use JSON::Any;
+use utf8 ();
 
-our $VERSION = '0.02';
+our $VERSION   = '0.32';
+our $AUTHORITY = 'cpan:STEVAN';
 
 requires 'pack';
 requires 'unpack';
 
 sub thaw {
     my ( $class, $json, @args ) = @_;
-    $class->unpack( JSON::Any->jsonToObj($json), @args );
+    utf8::encode($json) if utf8::is_utf8($json);
+    $class->unpack( JSON::Any->new->jsonToObj($json), @args );
 }
 
 sub freeze {
     my ( $self, @args ) = @_;
-    JSON::Any->objToJson( $self->pack(@args) );
+    my $json = JSON::Any->new->objToJson( $self->pack(@args) );
+    utf8::decode($json) if !utf8::is_utf8($json) and utf8::valid($json); # if it's valid utf8 mark it as such
+    return $json;
 }
 
+no Moose::Role;
+
 1;
 
 __END__
@@ -27,32 +36,32 @@ __END__
 
 =head1 NAME
 
-MooseX::Storage::Format::JSON
+MooseX::Storage::Format::JSON - A JSON serialization role
 
 =head1 SYNOPSIS
 
   package Point;
   use Moose;
   use MooseX::Storage;
-  
+
   with Storage('format' => 'JSON');
-  
+
   has 'x' => (is => 'rw', isa => 'Int');
   has 'y' => (is => 'rw', isa => 'Int');
-  
+
   1;
-  
+
   my $p = Point->new(x => 10, y => 10);
-  
-  ## methods to freeze/thaw into 
+
+  ## methods to freeze/thaw into
   ## a specified serialization format
   ## (in this case JSON)
-  
+
   # pack the class into a JSON string
   $p->freeze(); # { "__CLASS__" : "Point", "x" : 10, "y" : 10 }
-  
+
   # unpack the JSON string into a class
-  my $p2 = Point->thaw('{ "__CLASS__" : "Point", "x" : 10, "y" : 10 }');  
+  my $p2 = Point->thaw('{ "__CLASS__" : "Point", "x" : 10, "y" : 10 }');
 
 =head1 METHODS
 
@@ -74,7 +83,7 @@ MooseX::Storage::Format::JSON
 
 =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.
 
@@ -84,9 +93,11 @@ Chris Prather E<lt>chris.prather@iinteractive.comE<gt>
 
 Stevan Little E<lt>stevan.little@iinteractive.comE<gt>
 
+Yuval Kogman E<lt>yuval.kogman@iinteractive.comE<gt>
+
 =head1 COPYRIGHT AND LICENSE
 
-Copyright 2007 by Infinity Interactive, Inc.
+Copyright 2007-2008 by Infinity Interactive, Inc.
 
 L<http://www.iinteractive.com>