r9079 - in /trunk/libjson-any-perl: Changes META.yml debian/changelog lib/JSON/Any.pm t/10_unicode.t

[gregoa-guest at users.alioth.debian.org]

Author: gregoa-guest
Date: Fri Nov  9 15:48:10 2007
New Revision: 9079

URL: http://svn.debian.org/wsvn/?sc=1&rev=9079
Log:
New upstream release.

Modified:
    trunk/libjson-any-perl/Changes
    trunk/libjson-any-perl/META.yml
    trunk/libjson-any-perl/debian/changelog
    trunk/libjson-any-perl/lib/JSON/Any.pm
    trunk/libjson-any-perl/t/10_unicode.t

Modified: trunk/libjson-any-perl/Changes
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/Changes?rev=9079&op=diff
==============================================================================
--- trunk/libjson-any-perl/Changes (original)
+++ trunk/libjson-any-perl/Changes Fri Nov  9 15:48:10 2007
@@ -1,4 +1,7 @@
 Revision history for JSON-Any
+1.13	2007-11-06
+		* Fix 10_unicode.t to skip_all if no supported unicode backend is found
+		 (reported by Andreas König)
 
 1.12	2007-10-22
 		* Fix issue with 05-JSON-Syck.t so we can pass our tests again

Modified: trunk/libjson-any-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/META.yml?rev=9079&op=diff
==============================================================================
--- trunk/libjson-any-perl/META.yml (original)
+++ trunk/libjson-any-perl/META.yml Fri Nov  9 15:48:10 2007
@@ -17,4 +17,4 @@
     - t
 requires: 
   Carp: 0
-version: 1.12
+version: 1.13

Modified: trunk/libjson-any-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/debian/changelog?rev=9079&op=diff
==============================================================================
--- trunk/libjson-any-perl/debian/changelog (original)
+++ trunk/libjson-any-perl/debian/changelog Fri Nov  9 15:48:10 2007
@@ -1,3 +1,9 @@
+libjson-any-perl (1.13-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 09 Nov 2007 16:46:46 +0100
+
 libjson-any-perl (1.12-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libjson-any-perl/lib/JSON/Any.pm
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/lib/JSON/Any.pm?rev=9079&op=diff
==============================================================================
--- trunk/libjson-any-perl/lib/JSON/Any.pm (original)
+++ trunk/libjson-any-perl/lib/JSON/Any.pm Fri Nov  9 15:48:10 2007
@@ -1,6 +1,6 @@
 ##############################################################################
 # JSON::Any
-# v1.12
+# v1.13
 # Copyright (c) 2007 Chris Thompson
 ##############################################################################
 
@@ -16,11 +16,11 @@
 
 =head1 VERSION
 
-Version 1.12
-
-=cut
-
-our $VERSION = '1.12';
+Version 1.13
+
+=cut
+
+our $VERSION = '1.13';
 
 our $UTF8;
 

Modified: trunk/libjson-any-perl/t/10_unicode.t
URL: http://svn.debian.org/wsvn/trunk/libjson-any-perl/t/10_unicode.t?rev=9079&op=diff
==============================================================================
--- trunk/libjson-any-perl/t/10_unicode.t (original)
+++ trunk/libjson-any-perl/t/10_unicode.t Fri Nov  9 15:48:10 2007
@@ -2,7 +2,7 @@
 $|++;
 use strict;
 use utf8;
-use Test::More 'no_plan';
+use Test::More;
 
 use JSON::Any;
 
@@ -14,20 +14,24 @@
         JSON::Any->new;
     };
 
-    diag $@ and next if $@;
+    diag "$backend: " . $@ and next if $@;
 
     $j and $j->handler or next;
 
-    diag "handler is " . (ref($j->handler) || $j->handlerType);
+    diag "handler is " . ( ref( $j->handler ) || $j->handlerType );
+
+    plan 'no_plan' unless $ENV{JSON_ANY_RAN_TESTS};
+    $ENV{JSON_ANY_RAN_TESTS} = 1;
 
     foreach my $text qw(foo שלום) {
 
-        my $struct = [ $text ];
+        my $struct = [$text];
 
-        my $frozen = $j->encode( $struct );
-        my $thawed = $j->decode( $frozen );
+        my $frozen = $j->encode($struct);
+        my $thawed = $j->decode($frozen);
 
-        ok( utf8::is_utf8($frozen) || !scalar($frozen !~ /[\w\d[:punct:]]/), "json output is utf8");
+        ok( utf8::is_utf8($frozen) || !scalar( $frozen !~ /[\w\d[:punct:]]/ ),
+            "json output is utf8" );
 
         is_deeply( $thawed, $struct, "deeply" );
 
@@ -36,15 +40,16 @@
             my $d = Devel::StringInfo->new;
             $d->dump_info( $text, name => "expected" );
             $d->dump_info( $thawed->[0], name => "got" );
-            $d->dump_info( $frozen );
+            $d->dump_info($frozen);
         };
 
-        ok( utf8::is_utf8($thawed->[0]) || !scalar($text !~ /[a-z]/), "text is utf8 if it needs to be" );
+        ok( utf8::is_utf8( $thawed->[0] ) || !scalar( $text !~ /[a-z]/ ),
+            "text is utf8 if it needs to be" );
 
-        if ( utf8::valid($frozen) ) { 
+        if ( utf8::valid($frozen) ) {
             utf8::decode($frozen);
 
-            my $thawed = $j->decode( $frozen );
+            my $thawed = $j->decode($frozen);
 
             is_deeply( $thawed, $struct, "deeply" );
 
@@ -53,11 +58,14 @@
                 my $d = Devel::StringInfo->new;
                 $d->dump_info( $text, name => "expected" );
                 $d->dump_info( $thawed->[0], name => "got" );
-                $d->dump_info( $frozen );
+                $d->dump_info($frozen);
             };
 
-            ok( utf8::is_utf8($thawed->[0]) || !scalar($text !~ /[a-z]/), "text is utf8 if it needs to be" );
+            ok( utf8::is_utf8( $thawed->[0] ) || !scalar( $text !~ /[a-z]/ ),
+                "text is utf8 if it needs to be" );
         }
     }
 }
 
+plan skip_all => 'no JSON package with unicode support installed'
+  unless $ENV{JSON_ANY_RAN_TESTS};