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

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

diff --git a/lib/LaTeX/TikZ/Set/Circle.pm b/lib/LaTeX/TikZ/Set/Circle.pm
index c3a0ec0f1bffa3e6ebdd2cce26bfb229de26466c..06a692aec4f8149a2ac3475b104083b406eb6889 100644 (file)
--- a/lib/LaTeX/TikZ/Set/Circle.pm
+++ b/lib/LaTeX/TikZ/Set/Circle.pm
@@ -15,6 +15,11 @@ Version 0.01
 
 our $VERSION = '0.01';
 
+use LaTeX::TikZ::Set::Point;
+
+use LaTeX::TikZ::Interface;
+use LaTeX::TikZ::Functor;
+
 use LaTeX::TikZ::Tools;
 
 use Any::Moose;
@@ -24,8 +29,9 @@ with 'LaTeX::TikZ::Set::Op';
 
 has 'center' => (
  is       => 'ro',
- does     => 'LaTeX::TikZ::Point',
+ isa      => 'LaTeX::TikZ::Set::Point',
  required => 1,
+ coerce   => 1,
 );
 
 subtype 'LaTeX::TikZ::Set::Circle::Radius'
@@ -46,11 +52,23 @@ sub path {
  $set->center->path(@_) . ' circle (' . $tikz->len($set->radius) . ')';
 }
 
-use LaTeX::TikZ::API circle => sub {
- shift;
+LaTeX::TikZ::Interface->register(
+ circle => sub {
+  shift;
 
- __PACKAGE__->new(center => $_[0], radius => $_[1]);
-};
+  __PACKAGE__->new(center => $_[0], radius => $_[1]);
+ },
+);
+
+LaTeX::TikZ::Functor->default_rule(
+ (__PACKAGE__) => sub {
+  my ($functor, $set, @args) = @_;
+  $set->new(
+   center => $set->center->$functor(@args),
+   radius => $set->radius,
+  );
+ }
+);
 
 __PACKAGE__->meta->make_immutable;