From: Chris Prather <chris@prather.org>
Date: Fri, 30 Mar 2007 04:04:25 +0000 (+0000)
Subject: Patch to use JSON::Any and Test::JSON
X-Git-Tag: 0_02~32
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=gitmo%2FMooseX-Storage.git;a=commitdiff_plain;h=b5384d082ce9b7c4fc23c74c4dfc4479ddbe7a67

Patch to use JSON::Any and Test::JSON
---

diff --git a/lib/MooseX/Storage/Format/JSON.pm b/lib/MooseX/Storage/Format/JSON.pm
index f39c293..9726bf7 100644
--- a/lib/MooseX/Storage/Format/JSON.pm
+++ b/lib/MooseX/Storage/Format/JSON.pm
@@ -2,19 +2,19 @@
 package MooseX::Storage::Format::JSON;
 use Moose::Role;
 
-use JSON::Syck ();
+use JSON::Any;
 
 requires 'pack';
 requires 'unpack';
 
 sub thaw {
     my ( $class, $json ) = @_;
-    $class->unpack( JSON::Syck::Load($json) );
+    $class->unpack( JSON::Any->jsonToObj($json) );
 }
 
 sub freeze {
     my $self = shift;
-    JSON::Syck::Dump( $self->pack() );
+    JSON::Any->objToJson( $self->pack() );
 }
 
 1;
diff --git a/t/001_basic.t b/t/001_basic.t
index 9c005bf..e842107 100644
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -6,47 +6,61 @@ use warnings;
 use Test::More no_plan => 1;
 
 {
+
     package Foo;
     use Moose;
     use MooseX::Storage;
-    
-    with Storage('format' => 'JSON');
-    
-    has 'number' => (is => 'ro', isa => 'Int');
-    has 'string' => (is => 'ro', isa => 'Str');
-    has 'float'  => (is => 'ro', isa => 'Num');        
-    has 'array'  => (is => 'ro', isa => 'ArrayRef');
-    has 'hash'   => (is => 'ro', isa => 'HashRef');    
-	has 'object' => (is => 'ro', isa => 'Object');    
+
+    with Storage( 'format' => 'JSON' );
+
+    has 'number' => ( is => 'ro', isa => 'Int' );
+    has 'string' => ( is => 'ro', isa => 'Str' );
+    has 'float'  => ( is => 'ro', isa => 'Num' );
+    has 'array'  => ( is => 'ro', isa => 'ArrayRef' );
+    has 'hash'   => ( is => 'ro', isa => 'HashRef' );
+    has 'object' => ( is => 'ro', isa => 'Object' );
 }
 
-{
+SKIP: {
+    eval { require Test::JSON };
+    skip "HTML::Lint not installed", 3 if $@;
+    Test::JSON->import();
     my $foo = Foo->new(
         number => 10,
         string => 'foo',
         float  => 10.5,
         array  => [ 1 .. 10 ],
-        hash   => { map { $_ => undef } (1 .. 10) },
-    	object => Foo->new( number => 2 ),
+        hash   => { map { $_ => undef } ( 1 .. 10 ) },
+        object => Foo->new( number => 2 ),
+    );
+    isa_ok( $foo, 'Foo' );
+    my $json = $foo->freeze;
+    is_valid_json($json);
+    is_json(
+        $json,
+        '{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__class__":"Foo"},"number":10,"__class__":"Foo","string":"foo"}',
+        '... got the right JSON'
     );
-    isa_ok($foo, 'Foo');
-
-    is($foo->freeze, 
-    '{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__class__":"Foo"},"number":10,"__class__":"Foo","string":"foo"}',
-    '... got the right JSON');
 }
 
 {
-    my $foo = Foo->thaw('{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__class__":"Foo"},"number":10,"__class__":"Foo","string":"foo"}');
-    isa_ok($foo, 'Foo');
+    my $foo = Foo->thaw(
+        '{"array":[1,2,3,4,5,6,7,8,9,10],"hash":{"6":null,"3":null,"7":null,"9":null,"2":null,"8":null,"1":null,"4":null,"10":null,"5":null},"float":10.5,"object":{"number":2,"__class__":"Foo"},"number":10,"__class__":"Foo","string":"foo"}'
+    );
+    isa_ok( $foo, 'Foo' );
 
-    is($foo->number, 10, '... got the right number');
-    is($foo->string, 'foo', '... got the right string');
-    is($foo->float, 10.5, '... got the right float');
-    is_deeply($foo->array, [ 1 .. 10], '... got the right array');
-    is_deeply($foo->hash, { map { $_ => undef } (1 .. 10) }, '... got the right hash');
+    is( $foo->number, 10,    '... got the right number' );
+    is( $foo->string, 'foo', '... got the right string' );
+    is( $foo->float,  10.5,  '... got the right float' );
+    is_deeply( $foo->array, [ 1 .. 10 ], '... got the right array' );
+    is_deeply(
+        $foo->hash,
+        { map { $_ => undef } ( 1 .. 10 ) },
+        '... got the right hash'
+    );
 
-    isa_ok($foo->object, 'Foo');
-    is($foo->object->number, 2, '... got the right number (in the embedded object)');
+    isa_ok( $foo->object, 'Foo' );
+    is( $foo->object->number, 2,
+        '... got the right number (in the embedded object)' );
 }