fix CMY tests

Author: lichtkind

lib/Graphics/Toolkit/Color/Space.pm

@@ -50,24 +50,26 @@ sub add_deformatter   { shift->form->add_deformatter(@_) } # ~format_name, &defo
 
 sub can_convert      { (defined $_[1] and exists $_[0]{'convert'}{ uc $_[1] }) ? 1 : 0 }
 
-sub add_converter {
-    my ($self, $space_name, $to_code, $from_code, $mode) = @_;
-    return 0 if not defined $space_name or ref $space_name or ref $from_code ne 'CODE' or ref $to_code ne 'CODE';
-    return 0 if $self->can_convert( $space_name );
-    $self->{'convert'}{ uc $space_name } = { from => $from_code, to => $to_code, mode => $mode };
-}
-
 sub convert {
     my ($self, $values, $space_name) = @_;
-    return unless $self->{'basis'}->is_array( $values ) and defined $space_name and $self->can_convert( $space_name );
-    return [$self->{'convert'}{ uc $space_name }{'to'}->(@$values)];
+    return unless $self->is_value_tuple( $values ) and defined $space_name and $self->can_convert( $space_name );
+    return [$self->{'convert'}{ uc $space_name }{'to'}->( $values )];
 }
+
 sub deconvert {
     my ($self, $values, $space_name) = @_;
     return unless ref $values eq 'ARRAY' and defined $space_name and $self->can_convert( $space_name );
-    return [ $self->{'convert'}{ uc $space_name }{'from'}->(@$values) ];
+    return [ $self->{'convert'}{ uc $space_name }{'from'}->( $values ) ];
 }
 
+sub add_converter {
+    my ($self, $space_name, $to_code, $from_code, $mode) = @_;
+    return 0 if not defined $space_name or ref $space_name or ref $from_code ne 'CODE' or ref $to_code ne 'CODE';
+    return 0 if $self->can_convert( $space_name );
+    $self->{'convert'}{ uc $space_name } = { from => $from_code, to => $to_code, mode => $mode }; # what is mode ?
+}
+
+
 1;
 
 __END__

lib/Graphics/Toolkit/Color/Space/Format.pm

@@ -60,7 +60,7 @@ sub _value_regex {
         ? (map {'\s*('.$self->{'value_format'}[$_].'\s*(?:'.quotemeta($self->{'suffix'}[$_]).')?)\s*' } $self->basis->iterator)
         : (map {'\s*'.$self->{'value_format'}[$_].'\s*(?:'.quotemeta($self->{'suffix'}[$_]).')?\s*' } $self->basis->iterator);
 }
-#### public formatting API #############################################
+#### public API: formatting value tuples ###############################
 
 sub basis            { $_[0]{'basis'}}
 sub has_format       { (defined $_[1] and exists $_[0]{'format'}{ lc $_[1] }) ? 1 : 0 }

lib/Graphics/Toolkit/Color/Space/Instance/CMY.pm

@@ -7,10 +7,9 @@ package Graphics::Toolkit::Color::Space::Instance::CMY;
 use Graphics::Toolkit::Color::Space;
 
 my $cmy_def = Graphics::Toolkit::Color::Space->new( axis => [qw/cyan magenta yellow/] );
-   $cmy_def->add_converter('RGB', \&to_rgb, \&from_rgb );
+   $cmy_def->add_converter('RGB', \&invert, \&invert );
 
-sub from_rgb { map { 1 - $_} @_ }
-sub to_rgb   { map { 1 - $_} @_ }
+sub invert { map { 1 - $_ } @{$_[0]} }
 
 $cmy_def;
 

lib/Graphics/Toolkit/Color/Space/Instance/RGB.pm

@@ -8,25 +8,23 @@ use Graphics::Toolkit::Color::Space;
 use Graphics::Toolkit::Color::Space::Util ':all';
 
 my $rgb_def = Graphics::Toolkit::Color::Space->new( axis => [qw/red green blue/], range => 255 );
+
+   $rgb_def->add_deformatter( 'array',       sub { $_[1] if $rgb_def->is_value_tuple( $_[1] ) } );
    $rgb_def->add_formatter(   'hex_string',  \&hex_from_rgb );
    $rgb_def->add_deformatter( 'hex_string',  \&rgb_from_hex );
-   $rgb_def->add_deformatter( 'array', sub { $_[1] if $rgb_def->is_value_tuple( $_[1] ) } );
 
 
 sub hex_from_rgb { sprintf("#%02x%02x%02x", @{$_[1]} ) }
 
-sub rgb_from_hex { # translate #000000 and #000 --> r, g, b
+sub rgb_from_hex { # translate #000000 or #000 --> [ r, g, b ]
     my ($self, $hex) = @_;
     return "hex color definition '$hex' has to start with # followed by 3 or 6 hex characters (0-9,a-f)"
         unless defined $hex and not ref $hex
            and (length($hex) == 4 or length($hex) == 7)
-           and substr($hex, 0, 1) eq '#' and $hex =~ /^#[\da-f]+$/i;
+           and substr($hex, 0, 1) eq '#' and $hex =~ /^#[\da-f]+$/i; # ($_[0] =~ /^#[[:xdigit:]]{3}$/ or $_[0] =~ /^#[[:xdigit:]]{6}$/)
     $hex = substr $hex, 1;
     [(length $hex == 3) ? (map { hex($_.$_) } unpack( "a1 a1 a1", $hex))
                         : (map { hex($_   ) } unpack( "a2 a2 a2", $hex))];
 }
 
-# defined $_[0] and ($_[0] =~ /^#[[:xdigit:]]{3}$/ or $_[0] =~ /^#[[:xdigit:]]{6}$/)
-
-
 $rgb_def;

t/11_cmy_space.t

@@ -2,7 +2,7 @@
 
 use v5.12;
 use warnings;
-use Test::More tests => 42;
+use Test::More tests => 45;
 
 BEGIN { unshift @INC, 'lib', '../lib'}
 my $module = 'Graphics::Toolkit::Color::Space::Instance::CMY';
@@ -11,7 +11,7 @@ my $def = eval "require $module";
 is( not($@), 1, 'could load the module');
 is( ref $def, 'Graphics::Toolkit::Color::Space', 'got space object by loading module');
 is( $def->name,       'CMY',                     'color space has right name');
-is( $def->dimensions,     3,                     'color space has 3 dimensions');
+is( $def->axis,           3,                     'CMY color space has 3 axis');
 
 is( ref $def->in_range([0,0,0]),    'ARRAY',   'check CMY values works on lower bound values');
 is( ref $def->in_range([1, 1, 1]),  'ARRAY',   'check CMY values works on upper bound values');
@@ -38,19 +38,22 @@ is( $cmy->[1],   1,     'passed (M) value');
 is( $cmy->[2],   0,     'added (Y) value when too few args');
 
 $cmy = $def->clamp([-0.1, 2, 0.5, 0.4, 0.5]);
+is( ref $cmy,   'ARRAY',  'clamped tuple and got tuple back');
 is( int @$cmy,   3,     'removed missing argument in value vector by clamp');
 is( $cmy->[0],   0,     'clamped up  (C) value to minimum');
 is( $cmy->[1],   1,     'clamped down (M) value to maximum');
 is( $cmy->[2],  0.5,    'passed (Y) value');
 
 
 $cmy = $def->deconvert( [0, 0.1, 1], 'RGB');
+is( ref $cmy,   'ARRAY',  'converted RGB values tuple into CMY tuple');
 is( int @$cmy,   3,     'converted RGB values to CMY');
 is( $cmy->[0],   1,      'converted to maximal cyan value');
 is( $cmy->[1],   0.9,    'converted to mid magenta value');
 is( $cmy->[2],   0,      'converted to minimal yellow value');
 
 my $rgb = $def->convert( [1, 0.9, 0 ], 'RGB');
+is( ref $rgb,  'ARRAY',  'converted CMY values tuple into RGB tuple');
 is( int @$rgb,   3,      'converted CMY to RGB triplets');
 is( $rgb->[0],   0,      'converted red value');
 is( $rgb->[1],   0.1,    'converted green value');
@@ -69,5 +72,4 @@ is( $d->[0],  -0.1,     'C delta');
 is( $d->[1],   0.3,     'M delta');
 is( $d->[2],   0.6,     'Y delta');
 
-
 exit 0;