X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FStorage%2FFormat%2FJSON.pm;h=1d3a6c6c47aa7a308c8ac163ba67daa644a39be5;hb=81a523ba27fe312e8d52f275283a892542f79f68;hp=f39c2934f9c2c2dc963eb24be05c011e4225103c;hpb=4d1850a68a911b072b7c9abba786099f9acb6a67;p=gitmo%2FMooseX-Storage.git

diff --git a/lib/MooseX/Storage/Format/JSON.pm b/lib/MooseX/Storage/Format/JSON.pm
index f39c293..1d3a6c6 100644
--- a/lib/MooseX/Storage/Format/JSON.pm
+++ b/lib/MooseX/Storage/Format/JSON.pm
@@ -2,26 +2,108 @@
 package MooseX::Storage::Format::JSON;
 use Moose::Role;
 
-use JSON::Syck ();
+no warnings 'once';
+
+use JSON::Any;
+use utf8 ();
+
+our $VERSION   = '0.33';
+our $AUTHORITY = 'cpan:STEVAN';
 
 requires 'pack';
 requires 'unpack';
 
 sub thaw {
-    my ( $class, $json ) = @_;
-    $class->unpack( JSON::Syck::Load($json) );
+    my ( $class, $json, @args ) = @_;
+    utf8::encode($json) if utf8::is_utf8($json);
+    $class->unpack( JSON::Any->new->jsonToObj($json), @args );
 }
 
 sub freeze {
-    my $self = shift;
-    JSON::Syck::Dump( $self->pack() );
+    my ( $self, @args ) = @_;
+    my $json = JSON::Any->new(canonical => 1)->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__
 
 =pod
 
+=head1 NAME
+
+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
+  ## 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 }');
+
+=head1 METHODS
+
+=over 4
+
+=item B<freeze>
+
+=item B<thaw ($json)>
+
+=back
+
+=head2 Introspection
+
+=over 4
+
+=item B<meta>
+
+=back
+
+=head1 BUGS
+
+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.
+
+=head1 AUTHOR
+
+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-2008 by Infinity Interactive, Inc.
+
+L<http://www.iinteractive.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself.
+
 =cut
 
+