making filter more robust and flexible

Author: rodneyrehm

docs.html

@@ -627,7 +627,7 @@ <h3 id="readable">readable()</h3>
     <h2 id="relative-and-absolute">Relative and Absolute URLs</h2>
 
     <h3 id="relativeto">relativeTo()</h3>
-    <p>.relativeTo() compares to paths an makes one relative to the other</p>
+    <p>.relativeTo() compares two paths an makes one relative to the other</p>
     <pre class="prettyprint lang-js">var uri = new URI("/relative/path");
 // make path relative
 var relUri = uri.relativeTo("/relative/sub/foo/sub/file"); // returns a new URI instance

jquery-uri-plugin.html

@@ -49,6 +49,8 @@ <h1><a href="https://github.com/medialize/URI.js">URI.js</a></h1>
 
         // selectors
         $('a:uri(fragment^=accessor)')
+        $('a:uri(equals:http://example.org/hello/foo/../world.html)
+        // ) may not be used in match-expression!
 
         // access to (transparently updating) URI
         var uri = $('a').uri();

src/jquery.URI.js

@@ -44,7 +44,7 @@ function getUriProperty(elem) {
     return property;
 }
 
-var pseudo = /^([a-zA-Z]+)\s*([\^\$*]?=)\s*(['"]?)(.+)\3|^\s*([a-zA-Z0-9]+)\s*$/,
+var pseudo = /^([a-zA-Z]+)\s*([\^\$*]?=|:)\s*(['"]?)(.+)\3|^\s*([a-zA-Z0-9]+)\s*$/,
     comparable = {},
     // https://developer.mozilla.org/en/CSS/Attribute_selectors
     compare = {
@@ -65,6 +65,12 @@ var pseudo = /^([a-zA-Z]+)\s*([\^\$*]?=)\s*(['"]?)(.+)\3|^\s*([a-zA-Z0-9]+)\s*$/
         // contains
         '*=': function(value, target) {
             return !!(value + "").match(new RegExp(escapeRegEx(target), 'i'));
+        },
+        'equals:': function(uri, target) {
+            return uri.equals(target);
+        },
+        'is:': function(uri, target) {
+            return uri.is(target);
         }
     };
 
@@ -145,16 +151,16 @@ $.expr.filters.uri = function(elem, index, matches) {
     //  - https://github.com/jquery/sizzle/wiki/Sizzle-Home
     //  - https://github.com/jquery/sizzle/blob/master/sizzle.js#L626
 
-    // skip anything without src|href|action
-    if (!getUriProperty(elem)) {
+    // skip anything without src|href|action and bad :uri() syntax
+    if (!getUriProperty(elem) || !matches[3]) {
         return false;
     }
 
     var t = matches[3].match(pseudo),
         property,
         uri;
 
-    if (!t || (!t[5] && !compare[t[2]])) {
+    if (!t || (!t[5] && t[2] !== ':' && !compare[t[2]])) {
         // abort because the given selector cannot be executed
         // filers seem to fail silently
         return false;
@@ -164,6 +170,14 @@ $.expr.filters.uri = function(elem, index, matches) {
 
     if (t[5]) {
         return uri.is(t[5]);
+    } else if (t[2] === ':') {
+        property = t[1].toLowerCase() + ':';
+        if (!compare[property]) {
+            // filers seem to fail silently
+            return false;
+        }
+        
+        return compare[property](uri, t[4]);
     } else {
         property = t[1].toLowerCase();
         if (!comparable[property]) {

test/test_jquery.js

@@ -3,7 +3,7 @@ module("jQuery.URI", {
         var links = [
                 '<a href="http://example.org/">an HTTP link</a>',
                 '<a href="https://example.org/">an HTTPS link</a>',
-                '<a href="http://example.org/some.pdf">some pdf</a>',
+                '<a href="http://example.org/so)me.pdf">some pdf</a>',
                 '<a href="http://example.org/hello/world.html">hello world</a>',
                 '<a href="mailto:mail@example.org?subject=Hello+World">Mail me</a>',
                 '<a href="javascript:alert(\'ugly!\');">some javascript</a>',
@@ -48,7 +48,13 @@ test("filtering with :uri()", function() {
 
     // find using URI.is()
     equal($links.find(':uri(relative)').length, 5, ":uri(relative)");
-    
+    equal($links.find(':uri(is:relative)').length, 5, ":uri(is:relative)");
+
+    // find using URI.equal()
+    equal($links.find(':uri(equals:http://example.org/hello/foo/../world.html)').length, 1, ":uri(equals:$url$)");
+    equal($links.find(':uri(equals:"http://example.org/hello/foo/../world.html")').length, 1, ":uri(equals:$url$)");
+    equal($links.find(':uri(equals: "http://example.org/hello/foo/../world.html")').length, 1, ":uri(equals:$url$)");
+        
     // find URNs
     equal($links.find(':uri(urn)').length, 2, ":uri(urn)");