sensible profiles and accessors for formatting

[dbsrgits/SQL-Abstract.git] / lib / SQL / Abstract / Tree.pm

diff --git a/lib/SQL/Abstract/Tree.pm b/lib/SQL/Abstract/Tree.pm
index 7c207c2..d79f787 100644 (file)
--- a/lib/SQL/Abstract/Tree.pm
+++ b/lib/SQL/Abstract/Tree.pm
@@ -4,6 +4,14 @@ use strict;
 use warnings;
 use Carp;
 
+
+use Term::ANSIColor 'color';
+use base 'Class::Accessor::Grouped';
+
+__PACKAGE__->mk_group_accessors( simple => $_ ) for qw(
+   newline indent_string indent_amount colormap indentmap
+);
+
 # Parser states for _recurse_parse()
 use constant PARSE_TOP_LEVEL => 0;
 use constant PARSE_IN_EXPR => 1;
@@ -70,7 +78,36 @@ my $tokenizer_re = qr/ \s* ( $tokenizer_re_str | \( | \) | \? ) \s* /xi;
 
 sub _binary_op_keywords { @binary_op_keywords }
 
-sub new { bless sub {}, shift }
+my %profiles = (
+   console => {
+      indent_string => ' ',
+      indent_amount => 2,
+      newline       => "\n",
+      colormap      => {
+         select => [color('red'), color('reset')],
+         where  => [color('green'), color('reset')],
+         from   => [color('cyan'), color('reset')],
+      },
+      indentmap => {
+         select     => 0,
+         where  => 1,
+         from   => 1,
+      },
+   },
+   none => {
+      colormap      => {},
+      indentmap     => {},
+   },
+);
+
+sub new {
+   my ($class, $args) = @_;
+
+   my $profile = delete $args->{profile} || 'none';
+   my $data = {%{$profiles{$profile}}, %{$args||{}}};
+
+   bless $data, $class
+}
 
 sub parse {
   my ($self, $s) = @_;
@@ -165,18 +202,10 @@ sub _recurse_parse {
   }
 }
 
-use Term::ANSIColor 'color';
-
-my %ghetto_colormap = (
-  select => [color('red'), color('reset')],
-  where => [color('green'), color('reset')],
-  from => [color('cyan'), color('reset')],
-);
-
 sub format_keyword {
   my ($self, $keyword) = @_;
 
-  if (my $around = $ghetto_colormap{lc $keyword}) {
+  if (my $around = $self->colormap->{lc $keyword}) {
      $keyword = "$around->[0]$keyword$around->[1]";
   }
 
@@ -185,20 +214,29 @@ sub format_keyword {
 
 sub whitespace {
    my ($self, $keyword, $depth) = @_;
-   if (lc $keyword eq 'from') {
-      return ['', "\n"];
+
+   my $before = '';
+   my $after  = ' ';
+   if (defined $self->indentmap->{lc $keyword}) {
+      $before = $self->newline . $self->indent($depth + $self->indentmap->{lc $keyword});
    }
-   return ['', ''];
+   $before = '' if $depth == 0 and lc $keyword eq 'select';
+   return [$before, $after];
 }
 
-sub newline { "\n" }
+sub indent { ($_[0]->indent_string||'') x ( ( $_[0]->indent_amount || 0 ) * $_[1] ) }
 
-sub indent { '   ' x $_[1] }
+sub _is_select {
+   my $tree = shift;
+   $tree = $tree->[0] while ref $tree;
+
+   defined $tree && lc $tree eq 'select';
+}
 
 sub unparse {
   my ($self, $tree, $depth) = @_;
 
-  $depth ||= 1;
+  $depth ||= 0;
 
   if (not $tree ) {
     return '';
@@ -208,23 +246,23 @@ sub unparse {
   my $cdr = $tree->[1];
 
   if (ref $car) {
-    return join (" ", map $self->unparse($_), @$tree);
+    return join ('', map $self->unparse($_, $depth), @$tree);
   }
   elsif ($car eq 'LITERAL') {
     return $cdr->[0];
   }
   elsif ($car eq 'PAREN') {
-    return '(' . $self->newline .
+    return '(' .
       join(' ',
-        map $self->indent($depth) . $self->unparse($_, $depth + 1), @{$cdr})
-    . $self->newline . ')';
+        map $self->unparse($_, $depth + 2), @{$cdr}) .
+    (_is_select($cdr)?( $self->newline||'' ).$self->indent($depth + 1):'') . ')';
   }
   elsif ($car eq 'OR' or $car eq 'AND' or (grep { $car =~ /^ $_ $/xi } @binary_op_keywords ) ) {
-    return join (" $car ", map $self->unparse($_), @{$cdr});
+    return join (" $car ", map $self->unparse($_, $depth), @{$cdr});
   }
   else {
     my ($l, $r) = @{$self->whitespace($car, $depth)};
-    return sprintf "%s %s$r", $self->format_keyword($car), $self->unparse($cdr);
+    return sprintf "$l%s %s$r", $self->format_keyword($car), $self->unparse($cdr, $depth);
   }
 }