Changeset 6186

Timestamp:

02/21/07 12:04:56 (1 year ago)

Author:

christophe

Message:

- Merged unit tests from Andrew and I
- Merged in my inline, togglable benchmarking in the unit tests
- Fixed assertEnumEqual, just in case its arguments are NOT arrays: the zip

call wouldn't work in the prior version.

- Renamed 'sibling' to 'laterSibling': was a misnomer.
- Optimized XPath for ..^=..
- Fixed XPath for :first-child, :last-child, :only-child, :checked,

:disabled, :enabled

- Made a few loops more consistent in style (inline declaration of results).
- Fixed handlers.laterSibling to actually use nextSiblings instead of

siblings

- Fixed handlers.tagName to deal properly with contextual use of '*'
- Fixed handlers.id to return [] instead of [null] on doc-context

nonexistent ID

- Removed incorrect optimization of x ~ #y, defaults to regular handler

processing

- Slight optimisation of handlers.byClassName by using strings instead of

Arrays and joins.

- Fixed handlers.(next|previous)ElementSibling, which assumed there would be

at least one sibling...

- Removed obsolete combinator argument on pseudo handler invocation.
- Slight optimisation using else's in nth-child handler.
- Fixed findChildElements which, using concat instead of handlers.concat,

was (a) suboptimal and (b) incorrectly processing raw NodeLists when
returned by the matcher (since we removed $A overhead from tagName, for
instance).

- Added full TO-DO at the end of the script, so everybody sees what's ahead.

Files:

• spinoffs/prototype/branches/selector/src/selector.js (modified) (23 diffs)
• spinoffs/prototype/branches/selector/test/lib/unittest.js (modified) (1 diff)
• spinoffs/prototype/branches/selector/test/unit/selector.html (modified) (5 diffs)

spinoffs/prototype/branches/selector/src/selector.js

@@ -84 +84 @@
-  
-  match: function(element) {
+    // XXX TDD->Andrew: this prevents reusing the Selector on a changed DOM
-    this.results = this.results || this.findElements(document);
-    return this.results.include(element);
-    //return this.findElements(document).include(element);
-  }
-};
@@ -97 +97 @@
-    child:        "/",
-    adjacent:     "/following-sibling::[1]",
-sibling:     
+laterSibling:
-    tagName:      "#{1}",
-    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
@@ -108 +108 @@
-    pseudo: function(m) {
-      var h = Selector.xpath.pseudos[m[1]];
+      // XXX TDD->Andrew: shouldn't we return '' instead?
-      if (!h) return;
-      if (typeof h === 'function') return h(m);
@@ -116 +117 @@
-      '=':  "[@#{1}='#{3}']",
-      '!=': "[@#{1}!='#{3}']",
-ubstring(@#{1}, 1, string-length('#{3}'))='#{3}'
+tarts-with(@#{1}, '#{3}')
-      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
-      '*=': "[contains(@#{1}, '#{3}')]",
@@ -123 +124 @@
-    },
-    pseudos: {
-
-
+
+
+
-      'empty':       '[not(node())]',
-
-
-
-
+
+
+
-      'not':         function(m) {
+        // XXX TDD->Andrew: shouldn't we return '' instead?
-        if (!m[4]) return;
-        for (var i in Selector.patterns) {
@@ -150 +152 @@
-          var a = m[1] !== undefined ? Number(m[1]) : 1;
-          var b = m[3] !== undefined ? Number(m[2]) : 0;
+          // TODO: fix this, it won't work due to position's semantics.
-          predicate = "position() mod " + mm[1] + " = " + mm[3];
-        }
@@ -170 +173 @@
-    child:        'd = "child";',
-    adjacent:     'd = "adjacent";',
-sibling:      'd = "s
+laterSibling: 'd = "laterS
-  },
-
@@ -176 +179 @@
-    // combinators must be listed first
-    // (and descendant needs to be last combinator)
-sibling:     
+laterSibling:
-    child:        /^\s*>\s*/,
-    adjacent:     /^\s*\+\s*/,
@@ -199 +202 @@
-    
-    child: function(nodes) {
-
-
+
-        Selector.handlers.concat(results, Element.immediateDescendants(node));
-      return results;
@@ -206 +208 @@
-    
-    adjacent: function(nodes) {
-
-
+
-        var next = this.nextElementSibling(node);
-        if (next) results.push(next);
@@ -214 +215 @@
-    },
-    
-
-
-
-
+
+
+
-      return results;
-    },
@@ -235 +235 @@
-          }
-          nodes = this[combinator](nodes);
+          if ('*' == tagName) return nodes;
-        }
-        for (var i = 0, node; node = nodes[i]; i++) {
@@ -246 +247 @@
-    
-    className: function(nodes, root, className, combinator) {
-results = [], 
+
-      if (nodes) {
-        if (combinator) nodes = this[combinator](nodes);
@@ -252 +253 @@
-      }
-      return h.byClassName(nodes, root, className);
-      //return document.getElementsByClassName(className, root);
-    },
-    
-    id: function(nodes, root, id, combinator) {
-      var targetNode = $(id);
-[targetNode
+targetNode ? [targetNode] : [
-      if (nodes) {
-        if (combinator) {
@@ -268 +268 @@
-          } else if (combinator == 'adjacent') {
-            for (var i = 0, node; node = nodes[i]; i++)
-
-
-
+
-          } else nodes = Selector.handlers[combinator](nodes);
-        } 
@@ -313 +311 @@
-        node._counted = true;
-      return nodes;
-
+ // RESUME
-    
-    unmark: function(nodes) {
@@ -333 +331 @@
-        }
-      }
+      // TODO: check whether multiple calls won't require unmarking nodes
-      return Selector.handlers.unmark(results);
-    },
@@ -338 +337 @@
-    byClassName: function(nodes, root, className) {
-      if (!nodes) nodes = Selector.handlers.descendant([root]);
-[" ", className, " "].join('')
+' ' + className + ' '
-      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
-        nodeClassName = node.className;
-        if (nodeClassName.length == 0) continue;
-
-
+
-          results.push(node);
-      }
@@ -350 +348 @@
-        
-    nextElementSibling: function(node) {
-
-
-
-
+
+
+
-    },
-    
-    previousElementSibling: function(node) {
-
-
-
-
+
+
+
-    },
-    
-    pseudo: function(nodes, name, value, root, combinator) {
-      if (combinator) nodes = this[combinator](nodes);
-, combinator
+
-    },
-    
@@ -406 +402 @@
-        for (var i = 0, node; node = nodes[i]; i++)
-          if ((node.nodeIndex + 1) % 2 == mod) results.push(node);
-
-
-
+
-        formula = Number(formula);
-        for (var i = 0, node; node = nodes[i]; i++)
-          if (node.nodeIndex == formula) results.push(node);
-
-
-
+
-        var a = m[1] !== undefined ? Number(m[1]) : 1;
-        var b = m[3] !== undefined ? Number(m[2]) : 0;
@@ -428 +420 @@
-    'only-child': function(nodes, value, root) {
-      var h = Selector.handlers;
-
-
-
+
+
-          results.push(node);  
-        }
-      }
-      return results;
-    },
@@ -488 +477 @@
-    for (var i = 0, l = expressions.length; i < l; i++) {
-      selector = new Selector(expressions[i].strip());
-results  = results.concat(
+Selector.handlers.concat(results, 
-    }
-    return results;
@@ -498 +487 @@
-}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

spinoffs/prototype/branches/selector/test/lib/unittest.js

@@ -306 +306 @@
-  assertEnumEqual: function(expected, actual) {
-    var message = arguments[2] || "assertEnumEqual";
-
+
+
+
-      expected.zip(actual).all(function(pair) { return pair[0] == pair[1] }) ?
-        this.pass() : this.fail(message + ': expected ' + Test.Unit.inspect(expected) + 

spinoffs/prototype/branches/selector/test/unit/selector.html

@@ -1 +1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
+
+
-<head>
-  <title>Prototype Unit test file</title>
@@ -39 +40 @@
-  <form id="troubleForm"><input type="hidden" name="id" /></form>
-  
+  <html:p id="nsP"></html:p>
-  
+  <div id="level1">
+    <span id="level2_1">
+        <span id="level3_1"></span>
+        <!-- This comment should be ignored by the adjacent selector -->
+        <span id="level3_2"></span>
+    </span>
+    <span id="level2_2"><em id="level_only_child"></em></span>
+    <div id="level2_3"></div>
+  </div>
+
+  <div id="dupContainer">
+    <span id="dupL1">
+      <span id="dupL2">
+        <span id="dupL3">
+          <span id="dupL4">
+            <span id="dupL5"></span>
+          </span>
+        </span>
+      </span>
+    </span>
+  </div>
+</div>
+
-  <div id="grandfather"> grandfather    
-    <div id="father" class="brothers men"> father      
@@ -54 +79 @@
-<script type="text/javascript" language="javascript" charset="utf-8">
-// <![CDATA[
+
+// Added by TDD - 2007.02.20
+$RunBenchmarks = false;
+
-  new Test.Unit.Runner({
-    
@@ -135 +164 @@
-    }},
-    
-    testSelectorWithSubstringAttributeValues: function() {with(this) {
-      assertEnumEqual($('father', 'uncle'), $$('div[class^=bro]'), 'matching beginning of string');
-      assertEnumEqual($('father', 'uncle'), $$('div[class$=men]'), 'matching end of string');
-      assertEnumEqual($('father', 'uncle'), $$('div[class*="ers m"]'), 'matching substring')
-    }},
-    
-    test$$WithNestedAttributeSelectors: function() {with(this) {
-      assertEnumEqual([$('strong')], $$('div[style] p[id] strong'));
@@ -167 +190 @@
-    }},
-    
-
+
+
+
+
+
+
+
+
+
+
+
+
-      assertEnumEqual($('link_1', 'link_2'), $$('p.first > a'));
-      assertEnumEqual($('father', 'uncle'), $$('div#grandfather > div'));
-
-
-
+
+
+
+
+
+
+
+
+
-      assertEnumEqual([$('uncle')], $$('div.brothers + div.brothers'));
-      assertEnumEqual([$('uncle')], $$('div.brothers + div'));      
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      assertEnumEqual([$('list')], $$('h1 ~ ul'));
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      assertEnumEqual($$('div div'), $$('div div').uniq());
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }, 'testlog');
-// ]]>