assets/jquery.livequery.js
@@ -73,7 +73,7 @@ $(b9j_bootstrap_css): $(bootstrap_css) source/b9jTest/source.css
cat $^ > $@
$(call yuicompress,$@,$@)
-$(bootstrap_js): $(jquery_js) $(yui_js)
+$(bootstrap_js): $(jquery_js) assets/jquery.livequery.js $(yui_js)
cat $^ > $@
$(call yuicompress_js,$@,$@)
Makefile
@@ -340,12 +340,18 @@
;
else if (extension[0] != ".")
extension = "." + extension
+
if (this.isEmpty() || this.isRoot())
this.append(extension);
else {
- ending = ending.replace(matcher, extension);
- this.pop();
- this.push(ending);
+ if (matcher.test(ending)) {
+ ending = ending.replace(matcher, extension);
+ this.pop();
+ this.push(ending);
+ }
+ else {
+ this.append(extension);
+ }
}
return this;
}
source/path/source.js
@@ -158,6 +158,10 @@ b9jTest(function(test) {
test.is("a/b/c.zip", new b9j.path.Path( "a/b/c.html" ).extension( "zip" ));
test.is("a/b/c", new b9j.path.Path( "a/b/c.html" ).extension( "" ));
test.is("a/b/c.", new b9j.path.Path( "a/b/c.html" ).extension( "." ));
+
+ path = new b9j.path.Path("a/b/c");
+ test.is("a/b/c.html", path.extension(".html") + "");
+ test.is("a/b/c.html", path.extension(".html") + "");
}
{
source/path/test.js
@@ -13,6 +13,9 @@ body {
}
#uri {
font-size: 167%;
+ background: #def;
+ padding: 4px;
+ border: 1px solid #bcd;
}
.uri-function {
float: left;
@@ -36,6 +39,13 @@ body {
.uri-function a:hover {
background: #348;
}
+a.uri-from-history {
+ text-decoration: none;
+ color: blue;
+}
+a:hover.uri-from-history {
+ text-decoration: underline;
+}
.clear {
clear: both;
}
@@ -48,6 +58,13 @@ body {
padding: 0.2em;
}
+.bd {
+}
+
+hr {
+ color: #ccc;
+}
+
.source-history {
padding: 0.2em;
background: #eee;
@@ -59,40 +76,158 @@ body {
<div id="doc">
- <div class="uri-function">
- <a href="#"id="uri-button-parent">parent</a>
+ <div id="uri" class="bd">
</div>
- <div class="uri-function">
- <a href="#" id="uri-button-child">child</a>
- <input id="uri-input-child" type="text"/>
- </div>
+ <hr noshade>
- <div class="clear"></div>
+ <div class="bd">
- <div class="uri-function">
- <a href="#" id="uri-button-scheme">scheme</a>
- <input id="uri-input-scheme" type="text"/>
- </div>
+ <!-- scheme -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-scheme">scheme</a>
+ <input id="uri-input-scheme" type="text" style="width: 6em;"/>
- <div class="uri-function">
- <a href="#" id="uri-button-scheme-http">http</a>
- <a href="#" id="uri-button-scheme-https">https</a>
- <a href="#" id="uri-button-scheme-ftp">ftp</a>
- </div>
+ <a href="#" id="uri-button-scheme-http">http</a>
+ <a href="#" id="uri-button-scheme-https">https</a>
+ <a href="#" id="uri-button-scheme-ftp">ftp</a>
+ </div>
- <div class="clear"></div>
+ <div class="clear"></div>
- <div class="uri-function">
- <a href="#" id="uri-button-fragment">fragment</a>
- <input id="uri-input-fragment" type="text"/>
- </div>
+ <!-- host -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-host">host</a>
+ <input id="uri-input-host" type="text" style="width: 10em;"/>
- <div class="clear"></div>
+ <a href="#" id="uri-button-host-example-com">example.com</a>
+ <a href="#" id="uri-button-host-www-example-org">www.example.org</a>
+ </div>
+
+ <!-- port -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-port">port</a>
+ <input id="uri-input-port" type="text" style="width: 4em;"/>
+
+ <a href="#" id="uri-button-port-80">80</a>
+ <a href="#" id="uri-button-port-443">443</a>
+ <a href="#" id="uri-button-port-8080">8080</a>
+ </div>
+
+ <div class="clear"></div>
+
+ <!-- user/password -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-user">user</a>
+ <input id="uri-input-user" type="text" style="width: 6em;"/>
+
+ <a href="#" id="uri-button-user-alice">alice</a>
+ <a href="#" id="uri-button-user-bob">bob</a>
+ </div>
+
+ <div class="uri-function">
+ <a href="#" id="uri-button-password">password</a>
+ <input id="uri-input-password" type="text" style="width: 6em;"/>
+
+ <a href="#" id="uri-button-password-xyzzy">xyzzy</a>
+ <a href="#" id="uri-button-password-frobozz">frobozz</a>
+ </div>
+
+ <div class="clear"></div>
+
+ <!-- path -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-path">path</a>
+ <input id="uri-input-path" type="text"/>
+
+ <a href="#" id="uri-button-path-a-b-c">a/b/c</a>
+ </div>
+
+ <div class="uri-function">
+ <a href="#" id="uri-button-append">append</a>
+ <input id="uri-input-append" type="text"/>
+
+ <a href="#" id="uri-button-append-d-e-f">d/e/f</a>
+ </div>
+
+ <!-- parent/child -->
+ <div class="uri-function">
+ <a href="#"id="uri-button-parent">parent</a>
+ </div>
+
+ <div class="uri-function">
+ <a href="#" id="uri-button-child">child</a>
+ <input id="uri-input-child" type="text"/>
+ </div>
+
+ <!-- extension -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-extension">extension</a>
+ <input id="uri-input-extension" type="text" style="width: 6em;"/>
+
+ <a href="#" id="uri-button-extension-html">html</a>
+ <a href="#" id="uri-button-extension-txt">txt</a>
+ <a href="#" id="uri-button-extension-js">js</a>
+ <a href="#" id="uri-button-extension-css">css</a>
+ <a href="#" id="uri-button-extension-pl">pl</a>
+ <a href="#" id="uri-button-extension-php">php</a>
+ </div>
+
+ <div class="clear"></div>
+
+ <!-- fragment -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-fragment">fragment</a>
+ <input id="uri-input-fragment" type="text" style="width: 10em;"/>
+
+ <a href="#" id="uri-button-fragment-top">#top</a>
+ <a href="#" id="uri-button-fragment-bottom">#bottom</a>
+ </div>
+
+ <div class="clear"></div>
+
+ <hr noshade>
+
+ <!-- query set -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-query-set">set</a>
+ <input id="uri-input-query-set" type="text"/>
+
+ <a href="#" id="uri-button-query-set-a-b-c">a=1&b=2&c=3&c=4&c=5</a>
+ <a href="#" id="uri-button-query-set-hello-world">a="Hello, World!"</a>
+ <a href="#" id="uri-button-query-set-a-6">a=6</a>
+ <a href="#" id="uri-button-query-set-b-7">b=7</a>
+ <a href="#" id="uri-button-query-set-c-8">c=8</a>
+
+ <a href="#" id="uri-button-query-clear">clear</a>
+ </div>
+
+ <!-- query add -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-query-add">add</a>
+ <input id="uri-input-query-add" type="text"/>
+
+ <a href="#" id="uri-button-query-add-a-b-c">a=1&b=2&c=3&c=4&c=5</a>
+ <a href="#" id="uri-button-query-add-hello-world">a="Hello, World!"</a>
+ <a href="#" id="uri-button-query-add-a-6">a=6</a>
+ <a href="#" id="uri-button-query-add-b-7">b=7</a>
+ <a href="#" id="uri-button-query-add-c-8">c=8</a>
+ </div>
+
+ <!-- query append -->
+ <div class="uri-function">
+ <a href="#" id="uri-button-query-append">append</a>
+ <input id="uri-input-query-append" type="text"/>
+
+ <a href="#" id="uri-button-query-append-hello-world">a="Hello, World!"</a>
+ </div>
+
+ <div class="clear"></div>
- <div id="uri" class="bd">
</div>
+ <hr noshade>
+
<div id="uri-source-history" class="bd">
</div>
source/uri/example.html
@@ -2,11 +2,17 @@ var uriSourceHistory = [];
var uri = new b9j.uri.URI();
function example_addHistory(uri, source) {
+ if (null == uri)
+ uri = "";
+ else
+ uri = "<a class=\"uri-from-history\" href=\"#\">" + uri + "</a>";
+
var html = "<div class=\"yui-g\ uri-source-history-line\"><div class=\"yui-u first uri-history\">" +
- uri +
+ uri +
"</div><div class=\"yui-u source-history\"><pre>" +
source +
"</pre></div></div>";
+
$("#uri-source-history").prepend(html);
}
@@ -18,49 +24,309 @@ function uri_function(fn, arguments_, fn_name) {
if (! fn_name)
fn_name = fn;
uri[fn].apply(uri, arguments_);
- var arguments_string = arguments_[0] || arguments_.length > 1 ? " " + Array.prototype.slice.call(arguments_).join(",") + " " : "";
+ if (1 == arguments_.length && "" == arguments_[0])
+ arguments_[0] = '""'
+ var arguments_string = b9j.isValue(arguments_[0]) || arguments_.length > 1 ? " " + Array.prototype.slice.call(arguments_).join(",") + " " : "";
example_addHistory(uri, "uri." + fn_name + "(" + arguments_string + ");");
example_update();
}
+function uri_query_function(fn, arguments_, fn_name) {
+ if (! fn_name)
+ fn_name = fn;
+ var query = uri.query();
+ query[fn].apply(query, arguments_);
+ if (1 == arguments_.length && "" == arguments_[0])
+ arguments_[0] = '""'
+ var arguments_string = b9j.isValue(arguments_[0]) || arguments_.length > 1 ? " " + Array.prototype.slice.call(arguments_).join(",") + " " : "";
+ example_addHistory(uri, "uri.query()." + fn_name + "(" + arguments_string + ");");
+ console.log(query, query.toString());
+ example_update();
+}
+
$(document).ready(function(){
- $("#uri-button-parent").bind("click", function(){
- arguments_ = [ ];
- uri_function("up", arguments_, "parent");
+ $("a.uri-from-history").livequery("click", function() {
+ arguments_ = [ this.innerHTML ];
+ uri_function("set", arguments_);
});
- $("#uri-button-child").bind("click", function(){
- arguments_ = [ $("#uri-input-child").val() ];
- uri_function("down", arguments_, "child");
- });
+ function _default(value, default_) {
+ if (1 == arguments.length)
+ default_ = "";
+ return null == value || "" == value ? value : default_;
+ }
- $("#uri-button-scheme").bind("click", function(){
- arguments_ = [ $("#uri-input-scheme").val() ];
- uri_function("scheme", arguments_);
- });
+ {
+ $("#uri-button-parent").bind("click", function(){
+ arguments_ = [ ];
+ uri_function("up", arguments_, "parent");
+ });
- $("#uri-button-scheme-ftp").bind("click", function(){
- arguments_ = [ "ftp" ];
- uri_function("scheme", arguments_);
- });
+ $("#uri-button-child").bind("click", function(){
+ arguments_ = [ $("#uri-input-child").val() ];
+ uri_function("down", arguments_, "child");
+ });
+ }
- $("#uri-button-scheme-http").bind("click", function(){
- arguments_ = [ "http" ];
- uri_function("scheme", arguments_);
- });
+ {
+ $("#uri-button-path").bind("click", function(){
+ arguments_ = [ $("#uri-input-path").val() ];
+ uri_function("path", arguments_);
+ });
- $("#uri-button-scheme-https").bind("click", function(){
- arguments_ = [ "https" ];
- uri_function("scheme", arguments_);
- });
+ $("#uri-button-path-a-b-c").bind("click", function(){
+ arguments_ = [ "a/b/c" ];
+ uri_function("path", arguments_);
+ });
- $("#uri-button-fragment").bind("click", function(){
- arguments_ = [ $("#uri-input-fragment").val() ];
- uri_function("fragment", arguments_);
- });
+ $("#uri-button-append").bind("click", function(){
+ arguments_ = [ $("#uri-input-append").val() ];
+ uri_function("append", arguments_);
+ });
+
+ $("#uri-button-append-d-e-f").bind("click", function(){
+ arguments_ = [ "d/e/f" ];
+ uri_function("append", arguments_);
+ });
+
+ }
+
+ {
+ $("#uri-button-extension").bind("click", function(){
+ arguments_ = [ _default( $("#uri-input-extension").val() ) ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-html").bind("click", function(){
+ arguments_ = [ "html" ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-txt").bind("click", function(){
+ arguments_ = [ "txt" ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-js").bind("click", function(){
+ arguments_ = [ "js" ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-css").bind("click", function(){
+ arguments_ = [ "css" ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-pl").bind("click", function(){
+ arguments_ = [ "pl" ];
+ uri_function("extension", arguments_);
+ });
+
+ $("#uri-button-extension-php").bind("click", function(){
+ arguments_ = [ "php" ];
+ uri_function("extension", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-scheme").bind("click", function(){
+ arguments_ = [ $("#uri-input-scheme").val() ];
+ uri_function("scheme", arguments_);
+ });
+
+ $("#uri-button-scheme-ftp").bind("click", function(){
+ arguments_ = [ "ftp" ];
+ uri_function("scheme", arguments_);
+ });
+
+ $("#uri-button-scheme-http").bind("click", function(){
+ arguments_ = [ "http" ];
+ uri_function("scheme", arguments_);
+ });
+
+ $("#uri-button-scheme-https").bind("click", function(){
+ arguments_ = [ "https" ];
+ uri_function("scheme", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-host").bind("click", function(){
+ arguments_ = [ $("#uri-input-host").val() ];
+ uri_function("host", arguments_);
+ });
+
+ $("#uri-button-host-example-com").bind("click", function(){
+ arguments_ = [ "example.com" ];
+ uri_function("host", arguments_);
+ });
+
+ $("#uri-button-host-www-example-org").bind("click", function(){
+ arguments_ = [ "www.example.org" ];
+ uri_function("host", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-port").bind("click", function(){
+ arguments_ = [ $("#uri-input-port").val() ];
+ uri_function("port", arguments_);
+ });
+
+ $("#uri-button-port-80").bind("click", function(){
+ arguments_ = [ 80 ];
+ uri_function("port", arguments_);
+ });
+
+ $("#uri-button-port-443").bind("click", function(){
+ arguments_ = [ 443 ];
+ uri_function("port", arguments_);
+ });
+
+ $("#uri-button-port-8080").bind("click", function(){
+ arguments_ = [ 8080 ];
+ uri_function("port", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-user").bind("click", function(){
+ arguments_ = [ $("#uri-input-user").val() ];
+ uri_function("user", arguments_);
+ });
+
+ $("#uri-button-user-alice").bind("click", function(){
+ arguments_ = [ "alice" ];
+ uri_function("user", arguments_);
+ });
+
+ $("#uri-button-user-bob").bind("click", function(){
+ arguments_ = [ "bob" ];
+ uri_function("user", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-password").bind("click", function(){
+ arguments_ = [ $("#uri-input-password").val() ];
+ uri_function("password", arguments_);
+ });
+
+ $("#uri-button-password-xyzzy").bind("click", function(){
+ arguments_ = [ "xyzzy" ];
+ uri_function("password", arguments_);
+ });
+
+ $("#uri-button-password-frobozz").bind("click", function(){
+ arguments_ = [ "frobozz" ];
+ uri_function("password", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-fragment").bind("click", function(){
+ arguments_ = [ $("#uri-input-fragment").val() ];
+ uri_function("fragment", arguments_);
+ });
+
+ $("#uri-button-fragment-top").bind("click", function(){
+ arguments_ = [ "top" ];
+ uri_function("fragment", arguments_);
+ });
+
+ $("#uri-button-fragment-bottom").bind("click", function(){
+ arguments_ = [ "bottom" ];
+ uri_function("fragment", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-query-clear").bind("click", function(){
+ arguments_ = [ ]
+ uri_query_function("clear", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-query-set").bind("click", function(){
+ arguments_ = [ $("#uri-input-query-set").val() ];
+ uri_query_function("set", arguments_);
+ });
+
+ $("#uri-button-query-set-a-b-c").bind("click", function(){
+ arguments_ = [ "a=1&b=2&c=3&c=4&c=5" ];
+ uri_query_function("set", arguments_);
+ });
+
+ $("#uri-button-query-set-hello-world").bind("click", function(){
+ arguments_ = [ "a=\"Hello, World!\"" ];
+ uri_query_function("set", arguments_);
+ });
+
+ $("#uri-button-query-set-a-6").bind("click", function(){
+ arguments_ = [ "a", 6 ];
+ uri_query_function("set", arguments_);
+ });
+
+ $("#uri-button-query-set-b-7").bind("click", function(){
+ arguments_ = [ "b", 7 ];
+ uri_query_function("set", arguments_);
+ });
+
+ $("#uri-button-query-set-c-8").bind("click", function(){
+ arguments_ = [ "c", 8 ];
+ uri_query_function("set", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-query-add").bind("click", function(){
+ arguments_ = [ $("#uri-input-query-add").val() ];
+ uri_query_function("add", arguments_);
+ });
+
+ $("#uri-button-query-add-a-b-c").bind("click", function(){
+ arguments_ = [ "a=1&b=2&c=3&c=4&c=5" ];
+ uri_query_function("add", arguments_);
+ });
+
+ $("#uri-button-query-add-hello-world").bind("click", function(){
+ arguments_ = [ "a=\"Hello, World!\"" ];
+ uri_query_function("add", arguments_);
+ });
+
+ $("#uri-button-query-add-a-6").bind("click", function(){
+ arguments_ = [ "a", 6 ];
+ uri_query_function("add", arguments_);
+ });
+
+ $("#uri-button-query-add-b-7").bind("click", function(){
+ arguments_ = [ "b", 7 ];
+ uri_query_function("add", arguments_);
+ });
+
+ $("#uri-button-query-add-c-8").bind("click", function(){
+ arguments_ = [ "c", 8 ];
+ uri_query_function("add", arguments_);
+ });
+ }
+
+ {
+ $("#uri-button-query-append").bind("click", function(){
+ arguments_ = [ $("#uri-input-query-append").val() ];
+ uri_query_function("append", arguments_);
+ });
+
+ $("#uri-button-query-append-hello-world").bind("click", function(){
+ arguments_ = [ "a=\"Hello, World!\"" ];
+ uri_query_function("append", arguments_);
+ });
+ }
- uri_function("set", [ "http://example.com/a/b/c" ]);
+ example_addHistory(null, "<script src=\"http://appengine.bravo9.com/b9j/b9j.uri.js\"\n type=\"text/javascript\"></script>");
+ example_addHistory(null, "var uri = new b9j.uri.URI()");
+ uri_function("set", [ "http://example.com/a/b/c?a=1#top" ]);
});
source/uri/example.js
@@ -439,6 +439,8 @@
if (this._dirtyUserInformation) {
var userInformation = "";
userInformation = this.user() + ":" + this.password();
+ if (":" == userInformation)
+ userInformation = "";
this._uri.userInformation = userInformation;
this._dirtyUserInformation = false;
}
@@ -1020,7 +1022,7 @@
for (var key in this._store) {
return false;
}
- return true;
+ return b9j.isEmpty(this._queryString);
},
/*
source/uri/source.js
@@ -211,6 +211,17 @@ function _testURI(test) {
test.is("http://example.net/.html.gz#top", uri.clone().extension(".html.gz") + "");
test.is("http://example.net/#top", uri.clone().extension("") + "");
}
+
+ {
+ uri.set("http://alice:xyzzy@example.net/");
+ test.is("http://alice:xyzzy@example.net/", uri + "");
+
+ uri.user("");
+ test.is("http://:xyzzy@example.net/", uri + "");
+
+ uri.password("");
+ test.is("http://example.net/", uri + "");
+ }
}
function _testURIQuery(test) {
@@ -321,6 +332,17 @@ function _testURIQuery(test) {
query.append(null);
test.is("a=1&b=2&c=3&c=4&c=5&c=6", query);
}
+
+ {
+ query = new b9j.uri.query.Query("");
+ test.isTrue(query.isEmpty());
+
+ query.append("d=7&d=1");
+ test.is("d=7&d=1", query + "");
+
+ query.append(null);
+ test.is("", query + "");
+ }
}
b9jTest(function(test) {
source/uri/test.js
15d4adca2a768d0f16f65970cb94ec9732d77dff
robertkrimen
robertkrimen@gmail.com
http://github.com/robertkrimen/b9j/commit/5ad990d4a9b81b23cd048539c497d0cc755834d0
5ad990d4a9b81b23cd048539c497d0cc755834d0
2008-09-10T14:10:42-07:00
2008-09-10T14:10:42-07:00
Finished up uri/example.* and fixed some bugs along the way
fb83402c33cda082b25711c18fefcd923d62cd39
robertkrimen
robertkrimen@gmail.com