Remove magic LaTeX::TikZ::Interface->import

[perl/modules/LaTeX-TikZ.git] / lib / LaTeX / TikZ / Set / Rectangle.pm

diff --git a/lib/LaTeX/TikZ/Set/Rectangle.pm b/lib/LaTeX/TikZ/Set/Rectangle.pm
index 8e585bc31e00f32407538a5b2c1767f2c508c508..79dda06e264f662f83eb6c26bf916f300c250cac 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Rectangle.pm
+++ b/lib/LaTeX/TikZ/Set/Rectangle.pm
@@ -17,6 +17,9 @@ our $VERSION = '0.01';
 
 use LaTeX::TikZ::Set::Point;
 
+use LaTeX::TikZ::Interface;
+use LaTeX::TikZ::Functor;
+
 use Any::Moose;
 
 with 'LaTeX::TikZ::Set::Op';
@@ -85,17 +88,26 @@ Attributes 'width' and 'height' are required when 'to' was not given
  $class->$orig(@_);
 };
 
-use LaTeX::TikZ::Interface rectangle => sub {
- shift;
- my ($p, $q) = @_;
+LaTeX::TikZ::Interface->register(
+ rectangle => sub {
+  shift;
+  my ($p, $q) = @_;
 
- my $is_relative = !blessed($q) && ref($q) eq 'HASH';
+  my $is_relative = !blessed($q) && ref($q) eq 'HASH';
 
- __PACKAGE__->new(
-  from => $p,
-  ($is_relative ? (map +($_ => $q->{$_}), qw/width height/) : (to => $q)),
- );
-};
+  __PACKAGE__->new(
+   from => $p,
+   ($is_relative ? (map +($_ => $q->{$_}), qw/width height/) : (to => $q)),
+  );
+ },
+);
+
+LaTeX::TikZ::Functor->default_rule(
+ (__PACKAGE__) => sub {
+  my ($functor, $set, @args) = @_;
+  $set->new(map { $_ => $set->$_->$functor(@args) } qw/from to/)
+ }
+);
 
 __PACKAGE__->meta->make_immutable;