X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FSQL%2FTranslator%2FObject.pm;h=82ee0b65d4f21e1eb1c4d9ac738195d1f76a84b8;hb=88765147fdd499da4c0c870d1da59e1f8f182f7b;hp=6236cea716121738e6fbb2cc3fdc030362145422;hpb=891cdee785473eba08a0b167d4f47410fd37c386;p=dbsrgits%2FSQL-Translator-2.0-ish.git

diff --git a/lib/SQL/Translator/Object.pm b/lib/SQL/Translator/Object.pm
index 6236cea..82ee0b6 100644
--- a/lib/SQL/Translator/Object.pm
+++ b/lib/SQL/Translator/Object.pm
@@ -1,31 +1,31 @@
 use MooseX::Declare;
-class SQL::Translator::Object {
+class SQL::Translator::Object with SQL::Translator::Object::Compat {
     use Tie::IxHash;
     use MooseX::MultiMethods;
-    use MooseX::Types::Moose qw(Any ArrayRef HashRef Str);
+    use MooseX::Types::Moose qw(ArrayRef HashRef Str);
 
     has '_comments' => (
         traits => ['Array'],
-        is => 'rw',
         isa => ArrayRef,
+        coerce => 1,
         handles => {
+            _comments           => 'elements',
             add_comment         => 'push',
             remove_last_comment => 'pop',
         },
         default => sub { [] },
-        auto_deref => 1,
     );
 
     has '_options' => (
         traits => ['Array'],
-        is => 'rw',
         isa => ArrayRef,
+        coerce => 1,
         handles => {
+            _options           => 'elements',
             add_option         => 'push',
             remove_last_option => 'pop',
         },
         default => sub { [] },
-        auto_deref => 1,
     );
 
     has '_extra' => (
@@ -40,18 +40,32 @@ class SQL::Translator::Object {
             add_extra    => 'set',
         },
         default => sub { {} },
-        auto_deref => 1,
+    );
+
+    has '_error' => (
+        is => 'rw',
+        isa => Str
     );
 
     multi method comments(Str $comment) { $self->add_comment($comment); $self->comments }
     multi method comments(ArrayRef $comments) { $self->add_comment($_) for @$comments; $self->comments }
-    multi method comments(Any $) { wantarray ? @{$self->_comments} : join "\n", $self->_comments }
+    multi method comments { wantarray ? $self->_comments : join "\n", $self->_comments }
 
     multi method options(Str $option) { $self->add_option($option); $self->options }
     multi method options(ArrayRef $options) { $self->add_option($_) for @$options; $self->options }
-    multi method options(Any $) { wantarray ? @{$self->_options} : $self->_options }
+    multi method options { wantarray ? $self->_options : $self->_options }
+
+    multi method extra(Str $extra) { $self->get_extra($extra) }
+    multi method extra(HashRef $extra) { $self->add_extra($_, $extra->{$_}) for keys %$extra; $self->extra }
+    multi method extra { wantarray ? %{$self->_extra} : $self->_extra }
+
+    around BUILDARGS(ClassName $self: @args) {
+        my $args = $self->$orig(@args);
+
+        $args->{_comments} = delete $args->{comments} || [];
+        $args->{_options} = delete $args->{options} || [];
+        $args->{_extra} = delete $args->{extra} || {};
 
-    multi method extra(Str $extra) { $self->get_extra($extra); $self->extra }
-    multi method extra(HashRef $extra) { $self->_extra($extra); $self->extra }
-    multi method extra(Any $) { wantarray ? %{$self->_extra} : $self->_extra }
+        return $args;
+     }
 }