Skip to content

Switch to Types::Serialiser booleans #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aferreira wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Switch to Types::Serialiser booleans #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6c3fb8
Switch to Types::Serialiser booleans
aferreira Aug 3, 2017
6338cdf
Add test for checking compatibility of JSON and MessagePack
aferreira Aug 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions lib/Data/MessagePack.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,7 @@ use 5.008001;

our $VERSION = '1.00';

sub true () {
require Data::MessagePack::Boolean;
no warnings 'once';
return $Data::MessagePack::Boolean::true;
}

sub false () {
require Data::MessagePack::Boolean;
no warnings 'once';
return $Data::MessagePack::Boolean::false;
}
use Data::MessagePack::Boolean;

if ( !__PACKAGE__->can('pack') ) { # this idea comes from Text::Xslate
my $backend = $ENV{PERL_DATA_MESSAGEPACK} || ($ENV{PERL_ONLY} ? 'pp' : '');
Expand Down
28 changes: 15 additions & 13 deletions lib/Data/MessagePack/Boolean.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
package Data::MessagePack::Boolean;
use strict;
use warnings;
use overload
'bool' => sub { ${ $_[0] } },
'0+' => sub { ${ $_[0] } },
'""' => sub { ${ $_[0] } ? 'true' : 'false' },

fallback => 1,
;

our $true = do { bless \(my $dummy = 1) };
our $false = do { bless \(my $dummy = 0) };

use Types::Serialiser ();

BEGIN {
*Data::MessagePack::Boolean:: = *Types::Serialiser::Boolean::;
}

package
Data::MessagePack;

BEGIN {
*true = \&Types::Serialiser::true;
*false = \&Types::Serialiser::false;
*is_bool = \&Types::Serialiser::is_bool;
}

1;
7 changes: 4 additions & 3 deletions lib/Data/MessagePack/PP.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,9 @@ BEGIN {
@Data::MessagePack::ISA = qw(Data::MessagePack::PP);
@Data::MessagePack::Unpacker::ISA = qw(Data::MessagePack::PP::Unpacker);

*true = \&Data::MessagePack::true;
*false = \&Data::MessagePack::false;
*true = \&Data::MessagePack::true;
*false = \&Data::MessagePack::false;
*is_bool = \&Data::MessagePack::is_bool;
}

sub _unexpected {
Expand Down Expand Up @@ -223,7 +224,7 @@ sub _pack {
}
}

elsif ( ref( $value ) eq 'Data::MessagePack::Boolean' ) {
elsif ( is_bool( $value ) ) {
return CORE::pack( 'C', ${$value} ? 0xc3 : 0xc2 );
}

Expand Down
42 changes: 42 additions & 0 deletions t/60_compat_json.t
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!perl -w
use strict;
use Test::Requires { 'JSON::PP' => 0 };
use Test::More;
use Data::MessagePack;

# Test compatibility of JSON and MessagePack booleans

my $JSON = 'JSON::PP';

is( $JSON->true, Data::MessagePack::true, 'true' );
is( $JSON->false, Data::MessagePack::false, 'false' );

my @TESTS = (
{ json => '[true]' },
{ json => '{"f":false}' },
{ json => '{"x":{"a":null,"b":"xyz"},"y":[]}' },
{ mp => "\x81\xc4\x01\x32\xc0" },
{ mp => "\x92\x90\xc0" },
{ mp => "\x93\xc0\xc2\xc3" },
);

my $mp = Data::MessagePack->new->utf8;
my $j = $JSON->new->utf8;

for my $t (@TESTS) {
my ( $fmt, $input ) = each %$t;
my ( $out1, $out2, $test );
if ( $fmt eq 'json' ) {
$out1 = $j->decode($input);
$out2 = $mp->unpack( $mp->pack($out1) );
$test = "From JSON through MP: $input";
}
elsif ( $fmt eq 'mp' ) {
$out1 = $mp->unpack($input);
$out2 = $j->decode( $j->encode($out1) );
$test = "From MP through JSON: " . $JSON->can('encode_json')->($out1);
}
is_deeply( $out1, $out2, $test );
}

done_testing;