From 855ca7e94970d4e83a351938645f8e007f7b8b63 Mon Sep 17 00:00:00 2001
From: Terrence Brannon <metaperl@gmail.com>
Date: Fri, 5 Aug 2011 17:32:42 -0400
Subject: [PATCH] fixes

---
 dist.ini                     | 15 +++++++++++++--
 lib/HTML/Element/Library.pm  | 10 +++++-----
 lib/HTML/Element/Library.pod | 23 +++++++++++++----------
 t/defmap.t                   |  7 +++++--
 t/{newnode.t => newchild.t}  |  9 +++++----
 5 files changed, 41 insertions(+), 23 deletions(-)
 rename t/{newnode.t => newchild.t} (83%)

diff --git a/dist.ini b/dist.ini
index d8740f8..65cb38c 100644
--- a/dist.ini
+++ b/dist.ini
@@ -2,13 +2,24 @@ name = HTML-Element-Library
 author = Terrence Brannon <metaperl@gmail.com>
 license = Perl_5
 copyright_holder = Terrence Brannon
-version = 4.4
+
 
 [@Basic]
 
-[@GitHub]
+[PkgVersion]
+
+[AutoVersion]
+major = 5
+
+
 
 [AutoPrereqs]
 
 skip = (Test::XML|Arsenal|SimpleClass|SelectData|TestUtils|data::table2)
 
+
+
+[TestRelease]
+[ConfirmRelease]
+
+
diff --git a/lib/HTML/Element/Library.pm b/lib/HTML/Element/Library.pm
index cb9cec3..beb1245 100644
--- a/lib/HTML/Element/Library.pm
+++ b/lib/HTML/Element/Library.pm
@@ -25,7 +25,7 @@ our @EXPORT      = qw();
 
 
 
-our $VERSION = '4.3';
+
 
 
 
@@ -98,16 +98,16 @@ sub HTML::Element::prune {
   $self;
 }
 
-sub HTML::Element::newnode {
-  my ($lol, $node_label, $new_node)=@_;
+sub HTML::Element::newchild {
+  my ($lol, $parent_label, @newchild)=@_;
 
   use Data::Rmap qw(rmap_array);
 
   my ($mapresult) = rmap_array {
  
 
-  if ($_->[0] eq $node_label) {
-    $_ = $new_node;
+  if ($_->[0] eq $parent_label) {
+    $_ = [ $parent_label => @newchild ];
     Data::Rmap::cut($_);
   } else {
     $_;
diff --git a/lib/HTML/Element/Library.pod b/lib/HTML/Element/Library.pod
index 909aa9e..267537a 100644
--- a/lib/HTML/Element/Library.pod
+++ b/lib/HTML/Element/Library.pod
@@ -1106,7 +1106,7 @@ you manipulate a loltree programmatically.
 
 These could not be methods because if you bless a loltree, then HTML::Tree will barf.
 
-=head3 HTML::Element::replace_node($lol, $node_label, $new_node)
+=head3 HTML::Element::newchild($lol, $parent_label, @newchild)
 
 Given this initial loltree:
 
@@ -1116,7 +1116,7 @@ This code:
 
     sub shopping_items {
       my @shopping_items = map { [ item => _ ] } qw(bread butter beans) ;
-      \@shopping_items;
+      @shopping_items;
     }
 
     my $new_lol = HTML::Element::newnode($initial_lol, item => shopping_items());
@@ -1128,7 +1128,7 @@ This code:
           'note',
           [
             'shopping',
-            [
+      
               [
                 'item',
                 'bread'
@@ -1141,7 +1141,7 @@ This code:
                 'item',
                 'beans'
               ]
-            ]
+
           ]
         ];
 
@@ -1160,13 +1160,13 @@ A perl package for creating and manipulating HTML trees.
 An L<HTML::Tree> - based module which allows for manipulation of HTML
 trees using cartesian coordinations. 
 
-=head2 * L<HTML::Seamstress>
+=head2 L<HTML::Seamstress>
 
 An L<HTML::Tree> - based module inspired by 
 XMLC (L<http://xmlc.enhydra.org>), allowing for dynamic
 HTML generation via tree rewriting.
 
-=head2 Push-style tmeplating systems
+=head2 Push-style templating systems
 
 A comprehensive cross-language 
 L<list of push-style templating systems|http://perlmonks.org/?node_id=674225>.
@@ -1218,16 +1218,19 @@ down instead:
 
 =cut
 
-=head1 SEE ALSO
-
-L<HTML::Seamstress>
 
-=head1 AUTHOR / SOURCE
+=head1 AUTHOR and ACKS
 
 Terrence Brannon, E<lt>tbone@cpan.orgE<gt>
 
 Many thanks to BARBIE for his RT bug report.
 
+Many thanks to perlmonk kcott for his work on array rewriting:
+L<http://www.perlmonks.org/?node_id=912416>.
+It was crucial in the development of newchild.
+
+=head2 Source Repo
+
 The source is at L<http://github.com/metaperl/html-element-library/tree/master>
 
 =head1 COPYRIGHT AND LICENSE
diff --git a/t/defmap.t b/t/defmap.t
index 05c930d..c26ab43 100644
--- a/t/defmap.t
+++ b/t/defmap.t
@@ -4,6 +4,7 @@ use lib qw(t/ t/m/);
 
 use File::Slurp;
 use Test::More qw(no_plan);
+use Test::XML;
 
 use TestUtils;
 use HTML::TreeBuilder;
@@ -21,9 +22,11 @@ sub tage {
 
   $tree->defmap(smap => \%data, 1);
 
-  my $generated_html = ptree($tree, "$root.gen");
+  my $g = ptree($tree, "$root.gen");
+  my $e = File::Slurp::read_file("$root.exp");
+  warn "generated:$g:\nexpected:$e:";
 
-  is ($generated_html, File::Slurp::read_file("$root.exp"), "HTML for same_as");
+  is_xml ($g, $e, "HTML for defmap");
 }
 
 
diff --git a/t/newnode.t b/t/newchild.t
similarity index 83%
rename from t/newnode.t
rename to t/newchild.t
index 5ca7122..43b641d 100644
--- a/t/newnode.t
+++ b/t/newchild.t
@@ -14,19 +14,18 @@ BEGIN {
 
 
 my $initial_lol = [ note => [ shopping => [ item => 'sample' ] ] ];
-my $new_lol = HTML::Element::newnode($initial_lol, item => shopping_items());
+my $new_lol = HTML::Element::newchild($initial_lol, shopping => shopping_items());
 
 
 sub shopping_items {
   my @shopping_items = map { [ item => $_ ] } qw(bread butter beans);
-  \@shopping_items;
+  @shopping_items;
 }
 
 my $expected =  [
           'note',
           [
             'shopping',
-            [
               [
                 'item',
                 'bread'
@@ -39,10 +38,12 @@ my $expected =  [
                 'item',
                 'beans'
               ]
-            ]
           ]
         ];
 
+use Data::Dumper;
+warn Dumper($new_lol);
+
 is_deeply($new_lol, $expected, 'test unrolling');
 
 
-- 
2.39.2