more sane intro-data structure link construction

[scpubgit/JSON-Tree-Viewer.git] / br.pl

diff --git a/br.pl b/br.pl
index 054a5ec..2c63bd1 100644 (file)
--- a/br.pl
+++ b/br.pl
@@ -5,13 +5,14 @@ use Module::Runtime qw(use_module);
 use Scalar::Util qw(blessed);
 use IO::All;
 use JSON;
+use URI::Escape;
 
 has root => (is => 'lazy');
 
 has json => (is => 'lazy');
 
 sub _build_root {
-  io->dir("/home/matthewt/tmp/introspection-data/host/services-dev/stable/node/host/")
+  io->dir( $ENV{JTV_ROOT} || die "JTV_ROOT env var not set" )
 }
 
 sub _build_json {
@@ -32,7 +33,7 @@ sub dispatch_request {
   },
   sub (/) {
     sub (?@host=) {
-      [ 302, [ 'Location', '/'.join('+', @{$_[1]}) ], [] ];
+      [ 302, [ 'Location', '/'.join('+', @{$_[1]}).'/' ], [] ];
     },
     sub () {
       $self->root_structure;
@@ -128,6 +129,17 @@ sub mangle_structure {
       columns => [ 'key', 'value' ],
       data => [ map +{ key => $_, value => $data->{$_} }, sort keys %$data ],
     }];
+  } elsif (ref($data) eq 'ARRAY') {
+    if (not grep { not ref($_) eq 'HASH' } @$data) {
+      my %key;
+      $key{$_} = 1
+        for map { keys %$_ } @$data;
+      return [{
+        columns => [sort keys %key],
+        show_columns => 1,
+        data => $data,
+      }];
+    }
   } elsif (blessed($data) and $data->isa('IO::All::Dir')) {
     return [{
       columns => [ 'name', 'explore' ],
@@ -143,7 +155,7 @@ sub mangle_structure {
 sub link_to {
   my ($self, @to) = @_;
   use HTML::Tags;
-  s/\//\./g for my @link = @to;
+  my @link = map uri_escape(uri_escape($_)), @to;
   my $link = join('/', @link, '');
   my $to = $to[-1];
   my $html = join '', HTML::Tags::to_html_string(
@@ -159,8 +171,8 @@ sub descend {
     $target = $self->json->decode(scalar $target->all);
   }
   return $target unless @path;
-  (my $undot = my $step = shift @path) =~ s/\./\//g;
-  $self->descend($target->{$step}||$target->{$undot}, @path);
+  my $step = uri_unescape(uri_unescape( shift @path));
+  $self->descend($target->{$step}, @path);
 }
 
 sub render_table {
@@ -176,7 +188,7 @@ sub render_table {
       ($data->{wrapper}||sub{@_})->(
         '', <table>, "\n",
           (map { my $el = $_;
-            '  ', <tr>,
+            '  ', ($el->{key} eq '__error__') ? <tr class="error"> : <tr>,
               (map {
                 <td>, $self->render_el($el, $_, $el->{$_}), </td>
               } @{$data->{columns}}),
@@ -192,6 +204,14 @@ sub render_table {
 sub render_el {
   my ($self, $whole, $key, $part) = @_;
   if (ref($part) eq 'ARRAY') {
+    if (grep { ref($_) eq 'HASH' } @$part) {
+      if ($whole->{key}) {
+        return $self->link_to($whole->{key})
+      } elsif ($whole->{name}) {
+        return $self->link_to($whole->{name}, $key);
+      }
+      $part = '(complex)';
+    }
     return join(', ', @$part);
   }
   if (ref($part) eq 'HASH') {