move to MooseX::Declare

[dbsrgits/SQL-Translator-2.0-ish.git] / lib / SQL / Translator.pm

diff --git a/lib/SQL/Translator.pm b/lib/SQL/Translator.pm
index 9c848f8..bdca03a 100644 (file)
--- a/lib/SQL/Translator.pm
+++ b/lib/SQL/Translator.pm
@@ -1,79 +1,74 @@
-package SQL::Translator;
-use namespace::autoclean;
-use Moose;
-use MooseX::Types::Moose qw(Str);
-use SQL::Translator::Types qw(DBIHandle Parser Producer);
-
-has 'parser' => (
-    isa => Str,
-    is => 'ro',
-    init_arg => 'from',
-    required => 1,
-);
-
-has 'producer' => (
-    isa => Str,
-    is => 'ro',
-    init_arg => 'to',
-    required => 1,
-);
-
-has '_parser' => (
-    isa => Parser,
-    is => 'rw',
-    lazy_build => 1,
-    handles => [ qw(parse) ],
-);
-
-has '_producer' => (
-    isa => Producer,
-    is => 'rw',
-    lazy_build => 1,
-    handles => [ qw(produce) ],
-);
-
-has 'dbh' => (
-    isa => DBIHandle,
-    is => 'ro',
-    predicate => 'has_dbh',
-);
-
-has 'filename' => (
-    isa => Str,
-    is => 'ro',
-    predicate => 'has_ddl',
-);
-
-sub _build__parser {
-    my $self = shift;
-    my $class = 'SQL::Translator::Parser';
-
-    Class::MOP::load_class($class);
-
-    my $parser = $class->new({ dbh => $self->dbh });
-
-    return $parser;
-}
-
-sub _build__producer {
-    my $self = shift;
-    my $class = 'SQL::Translator::Producer';
-    my $role = $class . '::' . $self->producer;
-
-    Class::MOP::load_class($class);
-    eval { Class::MOP::load_class($role); };
-    if ($@) {
-        $role = $class . '::SQL::' . $self->producer;
+use MooseX::Declare;
+class SQL::Translator {
+    use MooseX::Types::Moose qw(Str);
+    use SQL::Translator::Types qw(DBIHandle Parser Producer);
+    
+    has 'parser' => (
+        isa => Str,
+        is => 'ro',
+        init_arg => 'from',
+        required => 1,
+    );
+    
+    has 'producer' => (
+        isa => Str,
+        is => 'ro',
+        init_arg => 'to',
+        required => 1,
+    );
+    
+    has '_parser' => (
+        isa => Parser,
+        is => 'rw',
+        lazy_build => 1,
+        handles => [ qw(parse) ],
+    );
+    
+    has '_producer' => (
+        isa => Producer,
+        is => 'rw',
+        lazy_build => 1,
+        handles => [ qw(produce) ],
+    );
+    
+    has 'dbh' => (
+        isa => DBIHandle,
+        is => 'ro',
+        predicate => 'has_dbh',
+    );
+    
+    has 'filename' => (
+        isa => Str,
+        is => 'ro',
+        predicate => 'has_ddl',
+    );
+    
+    method _build__parser {
+        my $class = 'SQL::Translator::Parser';
+    
+        Class::MOP::load_class($class);
+    
+        my $parser = $class->new({ dbh => $self->dbh });
+    
+        return $parser;
+    }
+    
+    method _build__producer {
+        my $class = 'SQL::Translator::Producer';
+        my $role = $class . '::' . $self->producer;
+    
+        Class::MOP::load_class($class);
         eval { Class::MOP::load_class($role); };
-        die $@ if $@;
+        if ($@) {
+            $role = $class . '::SQL::' . $self->producer;
+            eval { Class::MOP::load_class($role); };
+            die $@ if $@;
+        }
+    
+        my $producer = $class->new({ schema => $self->parse });
+        $role->meta->apply($producer);
+    
+        return $producer;
     }
-
-    my $producer = $class->new({ schema => $self->parse });
-    $role->meta->apply($producer);
-
-    return $producer;
-}
-
-__PACKAGE__->meta->make_immutable;
-
-1;
+    
+}