Checking in changes prior to tagging of version 0.02.

Changelog diff is:

diff --git a/Changes b/Changes
index f67c264..1248d36 100644
--- a/Changes
+++ b/Changes
@@ -2,8 +2,11 @@ Revision history for Perl extension XML::LibXML::jQuery

 {{$NEXT}}

-    - improved data() implementation and tests
-    - not using // operator to support perls 5.10
+0.02 2016-06-26T15:07:06Z
+
+    - implemented all add() signatures
+    - implemented all data() signatures
+    - not using // operator to support perls < 5.10

 0.01 2016-06-22T18:46:06Z

Author: Carlos Fernando Avila Gratz

.gitignore

@@ -29,3 +29,4 @@ cover_db/
 MYMETA.*
 
 /XML::LibXML::jQuery-*
+/sandbox/

Changes

@@ -2,8 +2,11 @@ Revision history for Perl extension XML::LibXML::jQuery
 
 {{$NEXT}}
 
-    - improved data() implementation and tests
-    - not using // operator to support perls 5.10
+0.02 2016-06-26T15:07:06Z
+
+    - implemented all add() signatures
+    - implemented all data() signatures
+    - not using // operator to support perls < 5.10
 
 0.01 2016-06-22T18:46:06Z
 

META.json

@@ -66,6 +66,6 @@
          "web" : "https://github.com/cafe01/xml-libxml-jquery"
       }
    },
-   "version" : "0.01",
+   "version" : "0.02",
    "x_authority" : "cpan:CAFEGRATZ"
 }

README.md

@@ -75,6 +75,16 @@ Unless otherwise noted, all methods behave exactly like the javascript version.
 
 ## add
 
+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**)
+
+Documentation and examples at [http://api.jquery.com/add/](http://api.jquery.com/add/).
+
 ## add\_class
 
 ## after
@@ -97,6 +107,14 @@ Unless otherwise noted, all methods behave exactly like the javascript version.
 
 ## data
 
+Implemented signatures:
+
+- **data**(Str **key**, Any **value**)
+- **data**(Str **key**)
+- **data**(HashRef **obj**)
+
+Documentation and examples at [http://api.jquery.com/data/](http://api.jquery.com/data/).
+
 ## detach
 
 ## document

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.01";
+our $VERSION = "0.02";
 our @EXPORT = qw/ j /;
 
 use constant {
@@ -29,17 +29,15 @@ my $data = {};
 
 sub new {
     my ($class, $stuff, $before) = @_;
-    my $self;
+    my ($self, $existing_document, $nodes);
 
+    # instance method, reuse document
     if (ref $class) {
         $self = $class;
         $class = ref $self;
+        $existing_document = $self->{document};
     }
 
-    $class = ref $class if ref $class;
-
-    my $nodes;
-
     if (blessed $stuff) {
 
         if ($stuff->isa(__PACKAGE__)) {
@@ -65,27 +63,41 @@ sub new {
             $nodes = [ _parse_html($stuff) ];
         }
 
+        # # if called as instance method, import nodes to our document
+        # if (ref $self && defined $self->{nodes}[0]) {
+        #
+        #     my $doc = $self->{nodes}[0]->ownerDocument;
+        #     $doc->adoptNode($_)
+        #         for grep { $_->nodeType != XML_DOCUMENT_NODE } @$nodes;
+        # }
     }
 
-    # if called as instance method, import nodes to our document
-    if (ref $self && defined $self->{nodes}[0]) {
+    # catch bugs :)
+    confess "undefined node" if grep { !defined } @$nodes;
 
-        my $doc = $self->{nodes}[0]->ownerDocument;
-        $doc->adoptNode($_)
-            for grep { $_->nodeType != XML_DOCUMENT_NODE } @$nodes;
-    }
+    # adopt nodes to existing document
+    if ($existing_document) {
 
+        my $doc_id = $existing_document->unique_key;
+        $existing_document->adoptNode($_)
+            for grep { $_->ownerDocument->unique_key != $doc_id }
+                grep { $_->nodeType != XML_DOCUMENT_NODE }
+                @$nodes;
+    }
 
-    if (@$nodes) {
+    my $document = defined $nodes->[0] ? $nodes->[0]->ownerDocument
+                                       : XML::LibXML->createDocument;
 
-        # increment document data refcount
-        my $doc_id = $nodes->[0]->ownerDocument->unique_key;
-        $data->{$doc_id}{refcount}++;
-        # printf STDERR "[%s] incremented document %d data ref count: %d\n", __PACKAGE__, $doc_id, $data->{$doc_id}{refcount};
-    }
+    # increment document data refcount
+    my $doc_id = $document->unique_key;
+    $data->{$doc_id}{refcount}++;
+    # printf STDERR "[%s] incremented document %d data ref count: %d\n", __PACKAGE__, $doc_id, $data->{$doc_id}{refcount};
 
-    confess "undefined node" if grep { !defined } @$nodes;
-    bless({ nodes => $nodes, before => $before }, $class);
+    bless {
+        document => $document,
+        nodes => $nodes,
+        before => $before
+    }, $class;
 }
 
 
@@ -159,7 +171,7 @@ sub end {
 
 sub document {
     my $self = shift;
-    $self->new([ $self->{nodes}[0] ? $self->{nodes}[0]->ownerDocument : () ], $self);
+    $self->new([ $self->{document} ], $self);
 }
 
 sub tagname {
@@ -199,16 +211,20 @@ sub as_html {
         # TODO benchmark as_html() using can() vs nodeType to detect document nodes
         # best method, but only document nodes can toStringHTML()
         if ($_->can('toStringHTML')) {
+            # printf STDERR "%s: toStringHTML\n", ref $_;
             $output .= $_->toStringHTML;
             next;
         }
 
+
         # second best is to call toStringC14N(1), which generates valid HTML (eg. no auto closed <div/>),
         # but dies on some cases with "Failed to convert doc to string in doc->toStringC14N" error.
         # so we fallback to toString()
+        # the most common case where toStringC14N fails is unbound nodes (getOwner returns a DocumentFragment)
         {
             local $@; # protect existing $@
             my $html = eval { $_->toStringC14N(1) };
+            # printf STDERR "%s: %s\n", ref $_->getOwner, ($@ ? "toString: $@" : 'toStringC14N');
             $output .= $@ ? $_->toString : $html;
         }
     }
@@ -393,7 +409,7 @@ sub append {
 
 sub append_to {
     my $self = shift;
-    _append_to($self->{nodes}, $self->new(@_)->{nodes});
+    _append_to($self->{nodes}, (ref $self)->new(@_)->{nodes});
     $self;
 }
 
@@ -430,7 +446,7 @@ sub prepend {
 
 sub prepend_to {
     my $self = shift;
-    _prepend_to($self->{nodes}, $self->new(@_)->{nodes});
+    _prepend_to($self->{nodes}, (ref $self)->new(@_)->{nodes});
     $self;
 }
 
@@ -474,7 +490,7 @@ sub before {
 
 sub insert_before {
     my $self = shift;
-    _insert_before($self->{nodes}, $self->new(@_)->{nodes});
+    _insert_before($self->{nodes}, (ref $self)->new(@_)->{nodes});
     $self;
 }
 
@@ -520,7 +536,7 @@ sub after {
 
 sub insert_after {
     my $self = shift;
-    _insert_after($self->{nodes}, $self->new(@_)->{nodes});
+    _insert_after($self->{nodes}, (ref $self)->new(@_)->{nodes});
     $self;
 }
 
@@ -993,6 +1009,24 @@ Unless otherwise noted, all methods behave exactly like the javascript version.
 
 =head2 add
 
+Implemented signatures:
+
+=over
+
+=item B<add>(Str B<selector>)
+
+=item B<add>(Str B<selector>, XML::LibXML::jQuery B<context>)
+
+=item B<add>(Str B<html>)
+
+=item B<add>(ArrayRef[L<XML::LibXML::Node>] B<elements>)
+
+=item B<add>(XML::LibXML::jQuery B<selection>)
+
+=back
+
+Documentation and examples at L<http://api.jquery.com/add/>.
+
 =head2 add_class
 
 =head2 after
@@ -1015,6 +1049,20 @@ Unless otherwise noted, all methods behave exactly like the javascript version.
 
 =head2 data
 
+Implemented signatures:
+
+=over
+
+=item B<data>(Str B<key>, Any B<value>)
+
+=item B<data>(Str B<key>)
+
+=item B<data>(HashRef B<obj>)
+
+=back
+
+Documentation and examples at L<http://api.jquery.com/data/>.
+
 =head2 detach
 
 =head2 document

t/add.t

@@ -10,16 +10,28 @@ sub test (&@);
 
 test { shift->add('div > bar') } "add(selector)";
 
-test { my $orig = shift; $orig->add('bar', $orig->document->find('baz')) } "add(selector, context)";
+test {
+    my $orig = shift;
+    $orig->add('bar', $orig->document->find('baz'));
+} "add(selector, context)";
 
 test {
     my $orig = shift;
-    $orig->add($orig->document->find('div > bar')->{nodes})
+    $orig->add($orig->document->find('div > bar')->{nodes});
 } "add(elements)";
 
-test { shift->add('<bar/>') } "add(html)";
+test {
+    my $orig = shift;
+    my $new = $orig->add('<bar/>')->append_to($orig->parent); # append to render as html
+    $new;
+} "add(html)";
+
+test {
+    my $orig = shift;
+    my $new = $orig->add(j('<bar/>'))->append_to($orig->parent); # append to render as html
+    $new;
+} "add(jQuery)";
 
-test { shift->add(j('<bar/>')) } "add(jQuery)";
 
 done_testing;
 
@@ -46,6 +58,6 @@ sub test (&@) {
         isnt $orig_obj, $new_obj, "returns new object";
         is $orig_obj->size, 1, 'orig object size';
         is $new_obj->size, 2, 'new object size';
-        is $new_obj->as_html, '<foo/><bar/>', 'output';
+        is $new_obj->as_html, '<foo></foo><bar></bar>', 'output';
     };
 }