Changeset 360

Timestamp:

04/30/08 23:43:44 (2 weeks ago)

Author:

ingy

Message:

more porting of selectors

Files:

• trunk/src/ingy/pQuery/lib/pQuery.pm (modified) (4 diffs)
• trunk/src/ingy/pQuery/lib/pQuery/DOM.pm (modified) (2 diffs)
• trunk/src/ingy/pQuery/t/selectors.t (modified) (4 diffs)

trunk/src/ingy/pQuery/lib/pQuery.pm

@@ -171 +171 @@
-    });
-
-
+grep /\S/, 
-}
-
@@ -569 +569 @@
-my $expr = {
-    ":" => {
+        # Position Checks
-        lt => sub { return $_[1] < $_[2][3] },
-        gt => sub { return $_[1] > $_[2][3] },
+        nth => sub { return $_[2][3] == $_[1] },
-        eq => sub { return $_[2][3] == $_[1] },
-        first => sub { return $_[1] == 0 },
@@ -577 +579 @@
-        odd => sub { return $_[1] % 2 },
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        header => sub { return $_[0]->nodeName =~ /^h[1-6]$/i },
+
-    },
-};
@@ -661 +686 @@
-}
-
+sub _nth {
+    my ($this, $cur, $result, $dir, $elem) = @_;
+    $result ||= 1;
+    my $num = 0;
+
+    for (; $cur; $cur = $cur->$dir) {
+        last if (ref($cur) and $cur->nodeType == 1 and ++$num == $result);
+    }
+
+    return $cur;
+}
+
-################################################################################
-# These methods need to go down here because they are Perl builtins.

trunk/src/ingy/pQuery/lib/pQuery/DOM.pm

@@ -238 +238 @@
-}
-
+sub firstChildRef {
+    my $content = $_[0]->{_content} or return;
+    for (my $i = 0; $i < @$content; $i++) {
+        return $content->[$i] if ref $content->[$i];
+    }
+    return;
+}
+
+sub lastChildRef {
+    my $content = $_[0]->{_content} or return;
+    for (my $i = @$content - 1; $i >= 0; $i--) {
+        return $content->[$i] if ref $content->[$i];
+    }
+    return;
+}
+
-sub appendChild {
-    my ($self, $elem) = @_;
@@ -248 +264 @@
-sub previousSibling {
-    die "pQuery::DOM does not support the previousSibling method";
+}
+
+sub nextSiblingRef {
+    my $content = $_[0]->parentNode->{_content} or return;
+    my $found = 0;
+    for (my $i = 0; $i < @$content; $i++) {
+        return $content->[$i] if $found and ref $content->[$i];
+        $found = 1 if ref($content->[$i]) and $content->[$i] == $_[0];
+    }
+    return;
+}
+
+sub previousSiblingRef {
+    my $content = $_[0]->parentNode->{_content} or return;
+    my $found = 0;
+    for (my $i = @$content - 1; $i >= 0; $i--) {
+        return $content->[$i] if $found and ref $content->[$i];
+        $found = 1 if ref($content->[$i]) and $content->[$i] == $_[0];
+    }
+    return;
-}
-

trunk/src/ingy/pQuery/t/selectors.t

@@ -1 @@
-5
+9
-
-use pQuery;
@@ -20 +20 @@
-    'select by class';
-
+is pQuery('td:nth(4)')->text, 'Favorite Number',
+    'select nth';
+
-is pQuery('td:gt(2):lt(2)')->text, 'Age Favorite Number',
-    'select a range with gt/lt';
@@ -35 +38 @@
-    'select last';
-
+is pQuery('td:first-child')->text, 
+    'First Name Alyssa Bennie Chester Delilah Eldridge Fennel',
+    'select :first-child';
+
+is pQuery('td:last-child')->text, 
+    'Favorite Number 13 7 144 54 21 138 377 62.83',
+    'select :last-child';
+
+is pQuery('ul li:only-child')->text, 
+    'Subversion: http://svn.spreadily.com/repo/trunk/',
+    'select :only-child';
+
-is pQuery('td:contains(Blue)')->size, 3,
-    '3 tds contain Blue';
@@ -43 +58 @@
-is pQuery(':header')->size, 2,
-    'Two Headers';
+