before/insert_before fully implemented

Carlos Fernando Avila Gratz · Carlos Fernando Avila Gratz · commit 33a6b570ba47 · 2016-06-26T15:17:14.000-03:00
diff --git a/Changes b/Changes
@@ -2,9 +2,9 @@ Revision history for Perl extension XML::LibXML::jQuery
 
 {{$NEXT}}
 
-    - fixed after(content[, content]) signature
-    - implemented after(function) signature
-    - insert_after(target) signature fully implemented
+    - fixed before/after(content[, content]) signature
+    - implemented before/after(function) signature
+    - insert_before/insert_after(target) signature fully implemented
       - target = selector, element, arrayref of elements, HTML string, or jQuery object
 
 0.02 2016-06-26T15:07:06Z
diff --git a/README.md b/README.md
@@ -77,18 +77,32 @@ Unless otherwise noted, all methods behave exactly like the javascript version.
 
 Implemented signatures:
 
-- **add**(Str **selector**)
-- **add**(Str **selector**, XML::LibXML::jQuery **context**)
-- **add**(Str **html**)
-- **add**(ArrayRef\[[XML::LibXML::Node](https://metacpan.org/pod/XML::LibXML::Node)\] **elements**)
-- **add**(XML::LibXML::jQuery **selection**)
+- add(selector)
+- add(selector, [context](https://metacpan.org/pod/XML::LibXML::jQuery))
+- add(html)
+- add([elements](https://metacpan.org/pod/XML::LibXML::Node))
+- add([selection](https://metacpan.org/pod/XML::LibXML::jQuery))
 
 Documentation and examples at [http://api.jquery.com/add/](http://api.jquery.com/add/).
 
 ## add\_class
 
+Implemented signatures:
+
+- add\_class(className)
+- add\_class(function)
+
+Documentation and examples at [http://api.jquery.com/addClass/](http://api.jquery.com/addClass/).
+
 ## after
 
+Implemented signatures:
+
+- after(content\[, content\])
+- after(function)
+
+Documentation and examples at [http://api.jquery.com/after/](http://api.jquery.com/after/).
+
 ## append
 
 ## append\_to
@@ -109,9 +123,9 @@ Documentation and examples at [http://api.jquery.com/add/](http://api.jquery.com
 
 Implemented signatures:
 
-- **data**(Str **key**, Any **value**)
-- **data**(Str **key**)
-- **data**(HashRef **obj**)
+- data(key, value)
+- data(key)
+- data(obj)
 
 Documentation and examples at [http://api.jquery.com/data/](http://api.jquery.com/data/).
 
@@ -133,6 +147,14 @@ Documentation and examples at [http://api.jquery.com/data/](http://api.jquery.co
 
 ## insert\_after
 
+Implemented signatures:
+
+- insert\_after(target)
+
+    All targets supported: selector, element, array of elements, HTML string, or jQuery object.
+
+Documentation and examples at [http://api.jquery.com/insertAfter/](http://api.jquery.com/insertAfter/).
+
 ## insert\_before
 
 ## filter
diff --git a/lib/XML/LibXML/jQuery.pm b/lib/XML/LibXML/jQuery.pm
@@ -10,7 +10,7 @@ use HTML::Selector::XPath qw/selector_to_xpath/;
 use Carp qw/ confess /;
 use JSON qw/ decode_json /;
 
-our $VERSION = "0.02";
+our $VERSION = "0.03";
 our @EXPORT = qw/ j /;
 
 use constant {
@@ -476,42 +476,56 @@ sub _prepend_to {
 
 sub before {
     my $self = shift;
-    _insert_before($self->new(@_)->{nodes}, $self->{nodes});
+    my $content = ref $_[0] eq 'CODE'
+                  ? $_[0]
+                  : [map { @{ $self->new($_)->{nodes} } } @_];
+
+    $self->_insert_before($content, $self->{nodes});
     $self;
 }
 
 sub insert_before {
-    my $self = shift;
-    _insert_before($self->{nodes}, (ref $self)->new(@_)->{nodes});
+    my ($self, $target) = @_;
+    $target = _is_selector($target) ? $self->document->find($target)
+                                    : (ref $self)->new($target);
+
+    $self->_insert_before($self->{nodes}, $target->{nodes});
     $self;
 }
 
 sub _insert_before {
-    my ($content, $target) = @_;
-    return unless @$content;
+    my ($self, $content, $target) = @_;
+    return if ref $content eq 'ARRAY' && @$content == 0;
 
     for (my $i = 0; $i < @$target; $i++) {
 
         my $is_last = $i == $#$target;
         my $node = $target->[ $i ];
         my $parent = $node->parentNode;
+        my $items;
 
-        # content is cloned except for last target
-        my @items = $i == $#$target ? @$content : map { $_->cloneNode(1) } @$content;
+        if (ref $content eq 'CODE') {
+            local $_ = $node;
+            $items = (ref $self)->new($content->($i, $_))->{nodes};
+        }
+        else {
+            # content is cloned except for last target
+            $items = $i == $#$target ? $content : [map { $_->cloneNode(1) } @$content];
+        }
 
         # thats because insertAfter() is not supported on a Document node (as of XML::LibXML 2.0017)
         unless ($parent->isa('XML::LibXML::Document')) {
 
-            $parent->insertBefore($_, $node) for @items;
+            $parent->insertBefore($_, $node) for @$items;
             next;
         }
 
         # workaround for when parent is document:
         # append nodes then rotate until content is before node
-        $parent->lastChild->addSibling($_) for @items;
+        $parent->lastChild->addSibling($_) for @$items;
 
         my $next = $node;
-        while (not $next->isSameNode($items[0])) {
+        while (not $next->isSameNode($items->[0])) {
             my $node_to_move = $next;
             $next = $node_to_move->nextSibling;
             $parent->lastChild->addSibling($node_to_move);
diff --git a/t/before.pl b/t/before.pl
diff --git a/t/before.t b/t/before.t
@@ -6,26 +6,63 @@ use Test::More;
 use XML::LibXML::jQuery;
 
 
+sub test(&@);
 
 my $html = '<div class="container"><h2>Greetings</h2><div class="inner">Hello</div><div class="inner">Goodbye</div></div>';
 
-is j($html)->find('.inner')->before('<p>Test</p>')->end->as_html,
-    '<div class="container"><h2>Greetings</h2><p>Test</p><div class="inner">Hello</div><p>Test</p><div class="inner">Goodbye</div></div>', 'after';
+# before(html)
+test {  $_->find('h2, .inner')->before('<p/>')  } 'before(html)';
 
-my $j = j($html);
-is $j->find('.inner')->before($j->find('h2'))->end->as_html, '<div class="container"><h2>Greetings</h2><div class="inner">Hello</div><h2>Greetings</h2><div class="inner">Goodbye</div></div>', 'existing element';
+test {  $_->find('h2, .inner')->before(j('<p/>'))  } 'before(jQuery)';
 
-# document
-$j = j('<div/><div/><div/>');
-j($j->get(0))->before('<span/>');
-is $j->document->as_html, "<span></span><div></div><div></div><div></div>\n", 'on root node - node is first child';
+test {
+    my $p = $_->new('<p/>')->append_to($_);
+    $_->find('h2, .inner')->before($p);
+} 'before(jQuery) (existing node)';
 
-# document
-$j = j('<foo/><bar/><baz/>');
-j($j->get(1))->before('<span/>');
-is $j->document->as_html, "<foo></foo><span></span><bar></bar><baz></baz>\n", 'on root node - not first child';
+test { $_->find('.inner')->before( j('<one/>'), '<two/>', $_->{document}->createElement('three')) }
+    'before(jQuery, html, DOMElement)',
+    '<div class="container"><h2>Greetings</h2><one></one><two></two><three></three><div class="inner">Hello</div><one></one><two></two><three></three><div class="inner">Goodbye</div></div>';
 
-# document
-is j('<foo/><bar/><baz/>')->before('<span/>')->document->as_html, "<span></span><foo></foo><span></span><bar></bar><span></span><baz></baz>\n", 'on multiple root node';
+test {
+
+    $_->find('.inner')->before(sub {
+        my $i = shift;
+        sprintf "<%s-%s>", lc $_->textContent, $i;
+    })
+
+} 'before(function)' => '<div class="container"><h2>Greetings</h2><hello-0></hello-0><div class="inner">Hello</div><goodbye-1></goodbye-1><div class="inner">Goodbye</div></div>';
+
+
+subtest 'root nodes' => sub {
+
+    # document
+    my $j = j('<div/><div/><div/>');
+    j($j->get(0))->before('<span/>');
+    is $j->document->as_html, "<span></span><div></div><div></div><div></div>\n", 'on root node - node is first child';
+
+    # document
+    $j = j('<foo/><bar/><baz/>');
+    j($j->get(1))->before('<span/>');
+    is $j->document->as_html, "<foo></foo><span></span><bar></bar><baz></baz>\n", 'on root node - not first child';
+
+    # document
+    is j('<foo/><bar/><baz/>')->before('<span/>')->document->as_html, "<span></span><foo></foo><span></span><bar></bar><span></span><baz></baz>\n", 'on multiple root node';
+
+};
+
+
+
+
+
+sub test (&@) {
+    my ($cb, $name, $expected) = @_;
+
+    $expected ||= '<div class="container"><p></p><h2>Greetings</h2><p></p><div class="inner">Hello</div><p></p><div class="inner">Goodbye</div></div>';
+    my $j = j($html);
+    local $_ = $j;
+    $cb->($j);
+    is $j->as_html, $expected, $name;
+}
 
 done_testing;
diff --git a/t/insert_before.t b/t/insert_before.t
@@ -6,17 +6,36 @@ use Test::More;
 use XML::LibXML::jQuery;
 
 
+
+sub test (&@);
 my $html = '<div class="container"><h2>Greetings</h2><div class="inner">Hello</div><div class="inner">Goodbye</div></div>';
+my $expected = '<div class="container"><p></p><h2>Greetings</h2><p></p><div class="inner">Hello</div><p></p><div class="inner">Goodbye</div></div>';
+
+
+test { $_->new('<p/>')->insert_before($_->find('h2, .inner')->{nodes}) } 'insert_before(arrayref)';
+
+test { $_->new('<p/>')->insert_before($_->find('.inner')->add('h2')) } 'insert_before(jQuery)';
+
+test { $_->new('<p/>')->insert_before('h2, .inner') } 'insert_before(selector)';
 
-my $j = j($html);
 
-j('<p>Test</p>')->insert_before($j->find('.inner'));
+$expected = '<div class="container"><div class="inner">Hello</div><h2>Greetings</h2><div class="inner">Goodbye</div></div>';
 
-is $j->as_html,
-    '<div class="container"><h2>Greetings</h2><p>Test</p><div class="inner">Hello</div><p>Test</p><div class="inner">Goodbye</div></div>', 'new content';
+test { $_->find('h2')->insert_before('.inner:last-child') } 'insert_before(selector) (move)';
 
-$j = j($html);
-is $j->find('h2')->insert_before($j->find('.inner'))->end->as_html, '<div class="container"><h2>Greetings</h2><div class="inner">Hello</div><h2>Greetings</h2><div class="inner">Goodbye</div></div>', 'existing element';
+test { $_->find('h2')->insert_before($_->find('.inner:last-child')->get(0)) } 'insert_before(element)';
 
 
 done_testing;
+
+
+
+
+sub test (&@) {
+    my ($cb, $name) = @_;
+
+    my $j = j($html);
+    local $_ = $j;
+    $cb->($j);
+    is $j->as_html, $expected, $name;
+}
