yard 0.9.36 → 0.9.43

data/lib/yard/server/templates/default/fulldoc/html/js/autocomplete.js

@@ -1,12 +1,203 @@
-/*
- * jQuery Autocomplete plugin 1.1
- *
- * Copyright (c) 2009 Jörn Zaefferer
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id: jquery.autocomplete.js 15 2009-08-22 10:30:27Z joern.zaefferer $
- */
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}(';(3($){$.2e.1u({19:3(b,d){5 c=W b=="1B";d=$.1u({},$.M.1T,{Y:c?b:P,y:c?P:b,1J:c?$.M.1T.1J:10,X:d&&!d.1D?10:48},d);d.1y=d.1y||3(a){6 a};d.1v=d.1v||d.1R;6 A.I(3(){1M $.M(A,d)})},L:3(a){6 A.11("L",a)},1k:3(a){6 A.14("1k",[a])},2b:3(){6 A.14("2b")},28:3(a){6 A.14("28",[a])},24:3(){6 A.14("24")}});$.M=3(o,r){5 t={2Y:38,2S:40,2N:46,2I:9,2E:13,2B:27,2x:3I,2v:33,2p:34,2n:8};5 u=$(o).3r("19","3o").Q(r.2Q);5 p;5 m="";5 n=$.M.3c(r);5 s=0;5 k;5 h={1F:C};5 l=$.M.32(r,o,1Z,h);5 j;$.1Y.2X&&$(o.2U).11("45.19",3(){4(j){j=C;6 C}});u.11(($.1Y.2X?"43":"42")+".19",3(a){s=1;k=a.2M;3V(a.2M){O t.2Y:a.1d();4(l.N()){l.30()}w{12(0,D)}R;O t.2S:a.1d();4(l.N()){l.2D()}w{12(0,D)}R;O t.2v:a.1d();4(l.N()){l.2C()}w{12(0,D)}R;O t.2p:a.1d();4(l.N()){l.2A()}w{12(0,D)}R;O r.17&&$.1c(r.S)==","&&t.2x:O t.2I:O t.2E:4(1Z()){a.1d();j=D;6 C}R;O t.2B:l.Z();R;3J:1P(p);p=1O(12,r.1J);R}}).2t(3(){s++}).3E(3(){s=0;4(!h.1F){2r()}}).2q(3(){4(s++>1&&!l.N()){12(0,D)}}).11("1k",3(){5 c=(1r.7>1)?1r[1]:P;3 1N(q,a){5 b;4(a&&a.7){16(5 i=0;i<a.7;i++){4(a[i].L.J()==q.J()){b=a[i];R}}}4(W c=="3")c(b);w u.14("L",b&&[b.y,b.F])}$.I(15(u.K()),3(i,a){21(a,1N,1N)})}).11("2b",3(){n.1o()}).11("28",3(){$.1u(r,1r[1]);4("y"2h 1r[1])n.1e()}).11("24",3(){l.1p();u.1p();$(o.2U).1p(".19")});3 1Z(){5 e=l.2g();4(!e)6 C;5 v=e.L;m=v;4(r.17){5 b=15(u.K());4(b.7>1){5 f=r.S.7;5 c=$(o).18().1I;5 d,1H=0;$.I(b,3(i,a){1H+=a.7;4(c<=1H){d=i;6 C}1H+=f});b[d]=v;v=b.3f(r.S)}v+=r.S}u.K(v);1l();u.14("L",[e.y,e.F]);6 D}3 12(b,c){4(k==t.2N){l.Z();6}5 a=u.K();4(!c&&a==m)6;m=a;a=1m(a);4(a.7>=r.29){u.Q(r.26);4(!r.1s)a=a.J();21(a,3a,1l)}w{1q();l.Z()}};3 15(b){4(!b)6[""];4(!r.17)6[$.1c(b)];6 $.4h(b.23(r.S),3(a){6 $.1c(b).7?$.1c(a):P})}3 1m(a){4(!r.17)6 a;5 c=15(a);4(c.7==1)6 c[0];5 b=$(o).18().1I;4(b==a.7){c=15(a)}w{c=15(a.22(a.37(b),""))}6 c[c.7-1]}3 1G(q,a){4(r.1G&&(1m(u.K()).J()==q.J())&&k!=t.2n){u.K(u.K()+a.37(1m(m).7));$(o).18(m.7,m.7+a.7)}};3 2r(){1P(p);p=1O(1l,4g)};3 1l(){5 c=l.N();l.Z();1P(p);1q();4(r.36){u.1k(3(a){4(!a){4(r.17){5 b=15(u.K()).1n(0,-1);u.K(b.3f(r.S)+(b.7?r.S:""))}w{u.K("");u.14("L",P)}}})}};3 3a(q,a){4(a&&a.7&&s){1q();l.35(a,q);1G(q,a[0].F);l.20()}w{1l()}};3 21(f,d,g){4(!r.1s)f=f.J();5 e=n.31(f);4(e&&e.7){d(f,e)}w 4((W r.Y=="1B")&&(r.Y.7>0)){5 c={4f:+1M 4e()};$.I(r.2Z,3(a,b){c[a]=W b=="3"?b():b});$.4d({4c:"4b",4a:"19"+o.49,2V:r.2V,Y:r.Y,y:$.1u({q:1m(f),47:r.X},c),44:3(a){5 b=r.1A&&r.1A(a)||1A(a);n.1i(f,b);d(f,b)}})}w{l.2T();g(f)}};3 1A(c){5 d=[];5 b=c.23("\\n");16(5 i=0;i<b.7;i++){5 a=$.1c(b[i]);4(a){a=a.23("|");d[d.7]={y:a,F:a[0],L:r.1z&&r.1z(a,a[0])||a[0]}}}6 d};3 1q(){u.1h(r.26)}};$.M.1T={2Q:"41",2P:"3Z",26:"3Y",29:1,1J:3W,1s:C,1f:D,1w:C,1g:10,X:3U,36:C,2Z:{},1X:D,1R:3(a){6 a[0]},1v:P,1G:C,E:0,17:C,S:", ",1y:3(b,a){6 b.22(1M 3T("(?![^&;]+;)(?!<[^<>]*)("+a.22(/([\\^\\$\\(\\)\\[\\]\\{\\}\\*\\.\\+\\?\\|\\\\])/2K,"\\\\$1")+")(?![^<>]*>)(?![^&;]+;)","2K"),"<2J>$1</2J>")},1D:D,1E:3S};$.M.3c=3(g){5 h={};5 j=0;3 1f(s,a){4(!g.1s)s=s.J();5 i=s.2H(a);4(g.1w=="3R"){i=s.J().1k("\\\\b"+a.J())}4(i==-1)6 C;6 i==0||g.1w};3 1i(q,a){4(j>g.1g){1o()}4(!h[q]){j++}h[q]=a}3 1e(){4(!g.y)6 C;5 f={},2G=0;4(!g.Y)g.1g=1;f[""]=[];16(5 i=0,2F=g.y.7;i<2F;i++){5 c=g.y[i];c=(W c=="1B")?[c]:c;5 d=g.1v(c,i+1,g.y.7);4(d===C)1V;5 e=d.3Q(0).J();4(!f[e])f[e]=[];5 b={F:d,y:c,L:g.1z&&g.1z(c)||d};f[e].1U(b);4(2G++<g.X){f[""].1U(b)}};$.I(f,3(i,a){g.1g++;1i(i,a)})}1O(1e,25);3 1o(){h={};j=0}6{1o:1o,1i:1i,1e:1e,31:3(q){4(!g.1g||!j)6 P;4(!g.Y&&g.1w){5 a=[];16(5 k 2h h){4(k.7>0){5 c=h[k];$.I(c,3(i,x){4(1f(x.F,q)){a.1U(x)}})}}6 a}w 4(h[q]){6 h[q]}w 4(g.1f){16(5 i=q.7-1;i>=g.29;i--){5 c=h[q.3O(0,i)];4(c){5 a=[];$.I(c,3(i,x){4(1f(x.F,q)){a[a.7]=x}});6 a}}}6 P}}};$.M.32=3(e,g,f,k){5 h={H:"3N"};5 j,z=-1,y,1t="",1S=D,G,B;3 2y(){4(!1S)6;G=$("<3M/>").Z().Q(e.2P).T("3L","3K").1Q(1K.2w);B=$("<3H/>").1Q(G).3G(3(a){4(U(a).2u&&U(a).2u.3F()==\'2s\'){z=$("1L",B).1h(h.H).3D(U(a));$(U(a)).Q(h.H)}}).2q(3(a){$(U(a)).Q(h.H);f();g.2t();6 C}).3C(3(){k.1F=D}).3B(3(){k.1F=C});4(e.E>0)G.T("E",e.E);1S=C}3 U(a){5 b=a.U;3A(b&&b.3z!="2s")b=b.3y;4(!b)6[];6 b}3 V(b){j.1n(z,z+1).1h(h.H);2o(b);5 a=j.1n(z,z+1).Q(h.H);4(e.1D){5 c=0;j.1n(0,z).I(3(){c+=A.1a});4((c+a[0].1a-B.1b())>B[0].3x){B.1b(c+a[0].1a-B.3w())}w 4(c<B.1b()){B.1b(c)}}};3 2o(a){z+=a;4(z<0){z=j.1j()-1}w 4(z>=j.1j()){z=0}}3 2m(a){6 e.X&&e.X<a?e.X:a}3 2l(){B.2z();5 b=2m(y.7);16(5 i=0;i<b;i++){4(!y[i])1V;5 a=e.1R(y[i].y,i+1,b,y[i].F,1t);4(a===C)1V;5 c=$("<1L/>").3v(e.1y(a,1t)).Q(i%2==0?"3u":"3P").1Q(B)[0];$.y(c,"2k",y[i])}j=B.3t("1L");4(e.1X){j.1n(0,1).Q(h.H);z=0}4($.2e.2W)B.2W()}6{35:3(d,q){2y();y=d;1t=q;2l()},2D:3(){V(1)},30:3(){V(-1)},2C:3(){4(z!=0&&z-8<0){V(-z)}w{V(-8)}},2A:3(){4(z!=j.1j()-1&&z+8>j.1j()){V(j.1j()-1-z)}w{V(8)}},Z:3(){G&&G.Z();j&&j.1h(h.H);z=-1},N:3(){6 G&&G.3s(":N")},3q:3(){6 A.N()&&(j.2j("."+h.H)[0]||e.1X&&j[0])},20:3(){5 a=$(g).3p();G.T({E:W e.E=="1B"||e.E>0?e.E:$(g).E(),2i:a.2i+g.1a,1W:a.1W}).20();4(e.1D){B.1b(0);B.T({2L:e.1E,3n:\'3X\'});4($.1Y.3m&&W 1K.2w.3l.2L==="1x"){5 c=0;j.I(3(){c+=A.1a});5 b=c>e.1E;B.T(\'3k\',b?e.1E:c);4(!b){j.E(B.E()-2R(j.T("2O-1W"))-2R(j.T("2O-3j")))}}}},2g:3(){5 a=j&&j.2j("."+h.H).1h(h.H);6 a&&a.7&&$.y(a[0],"2k")},2T:3(){B&&B.2z()},1p:3(){G&&G.3i()}}};$.2e.18=3(b,f){4(b!==1x){6 A.I(3(){4(A.2d){5 a=A.2d();4(f===1x||b==f){a.4n("2c",b);a.3h()}w{a.4m(D);a.4l("2c",b);a.4k("2c",f);a.3h()}}w 4(A.3g){A.3g(b,f)}w 4(A.1C){A.1C=b;A.3e=f}})}5 c=A[0];4(c.2d){5 e=1K.18.4j(),3d=c.F,2a="<->",2f=e.3b.7;e.3b=2a;5 d=c.F.2H(2a);c.F=3d;A.18(d,d+2f);6{1I:d,39:d+2f}}w 4(c.1C!==1x){6{1I:c.1C,39:c.3e}}}})(4i);',62,272,'|||function|if|var|return|length|||||||||||||||||||||||||else||data|active|this|list|false|true|width|value|element|ACTIVE|each|toLowerCase|val|result|Autocompleter|visible|case|null|addClass|break|multipleSeparator|css|target|moveSelect|typeof|max|url|hide||bind|onChange||trigger|trimWords|for|multiple|selection|autocomplete|offsetHeight|scrollTop|trim|preventDefault|populate|matchSubset|cacheLength|removeClass|add|size|search|hideResultsNow|lastWord|slice|flush|unbind|stopLoading|arguments|matchCase|term|extend|formatMatch|matchContains|undefined|highlight|formatResult|parse|string|selectionStart|scroll|scrollHeight|mouseDownOnSelect|autoFill|progress|start|delay|document|li|new|findValueCallback|setTimeout|clearTimeout|appendTo|formatItem|needsInit|defaults|push|continue|left|selectFirst|browser|selectCurrent|show|request|replace|split|unautocomplete||loadingClass||setOptions|minChars|teststring|flushCache|character|createTextRange|fn|textLength|selected|in|top|filter|ac_data|fillList|limitNumberOfItems|BACKSPACE|movePosition|PAGEDOWN|click|hideResults|LI|focus|nodeName|PAGEUP|body|COMMA|init|empty|pageDown|ESC|pageUp|next|RETURN|ol|nullData|indexOf|TAB|strong|gi|maxHeight|keyCode|DEL|padding|resultsClass|inputClass|parseInt|DOWN|emptyList|form|dataType|bgiframe|opera|UP|extraParams|prev|load|Select|||display|mustMatch|substring||end|receiveData|text|Cache|orig|selectionEnd|join|setSelectionRange|select|remove|right|height|style|msie|overflow|off|offset|current|attr|is|find|ac_even|html|innerHeight|clientHeight|parentNode|tagName|while|mouseup|mousedown|index|blur|toUpperCase|mouseover|ul|188|default|absolute|position|div|ac_over|substr|ac_odd|charAt|word|180|RegExp|100|switch|400|auto|ac_loading|ac_results||ac_input|keydown|keypress|success|submit||limit|150|name|port|abort|mode|ajax|Date|timestamp|200|map|jQuery|createRange|moveEnd|moveStart|collapse|move'.split('|'),0,{}))
+(() => {
+	function query(selector, root) {
+		return (root || document).querySelector(selector);
+	}
+
+	function ready(callback) {
+		if (document.readyState === "loading") {
+			document.addEventListener("DOMContentLoaded", callback, { once: true });
+		} else {
+			callback();
+		}
+	}
+
+	function createAutocomplete(input) {
+		const form = input.form;
+		const results = document.createElement("div");
+		const list = document.createElement("ul");
+		let requestTimer = null;
+		let controller = null;
+		let items = [];
+		let activeIndex = -1;
+		let blurTimer = null;
+
+		if (!form) return;
+
+		results.className = "ac_results";
+		results.hidden = true;
+		results.setAttribute("role", "listbox");
+		results.id = `${input.id}_results`;
+		list.setAttribute("role", "presentation");
+		results.appendChild(list);
+		input.setAttribute("autocomplete", "off");
+		input.setAttribute("aria-autocomplete", "list");
+		input.setAttribute("aria-controls", results.id);
+		input.setAttribute("aria-expanded", "false");
+		form.appendChild(results);
+
+		function syncResultsWidth() {
+			results.style.width = `${input.offsetWidth}px`;
+		}
+
+		function hideResults() {
+			results.hidden = true;
+			input.setAttribute("aria-expanded", "false");
+			input.removeAttribute("aria-activedescendant");
+			activeIndex = -1;
+			items = [];
+			list.innerHTML = "";
+		}
+
+		function setActive(index) {
+			if (!items.length) return;
+			activeIndex = (index + items.length) % items.length;
+			items.forEach((item, itemIndex) => {
+				item.element.classList.toggle("ac_over", itemIndex === activeIndex);
+			});
+			input.setAttribute(
+				"aria-activedescendant",
+				items[activeIndex].element.id,
+			);
+		}
+
+		function selectItem(item) {
+			input.value = item.values[1];
+			window.location.href = item.values[3];
+		}
+
+		function renderItems(lines) {
+			syncResultsWidth();
+			list.innerHTML = "";
+			items = lines.map((line, index) => {
+				const values = line.split(",");
+				const element = document.createElement("li");
+				const label = document.createElement("span");
+				const namespace = document.createElement("small");
+
+				element.id = `${results.id}_item_${index}`;
+				element.setAttribute("role", "option");
+				element.className = index % 2 === 0 ? "ac_even" : "ac_odd";
+				label.textContent = values[0];
+				element.appendChild(label);
+
+				if (values[1] !== "") {
+					namespace.textContent = `(${values[1]})`;
+					element.appendChild(document.createTextNode(" "));
+					element.appendChild(namespace);
+				}
+
+				element.addEventListener("mouseenter", () => {
+					setActive(index);
+				});
+				element.addEventListener("mousedown", (event) => {
+					event.preventDefault();
+					selectItem(items[index]);
+				});
+
+				list.appendChild(element);
+
+				return { element: element, values: values };
+			});
+
+			if (items.length) {
+				results.hidden = false;
+				input.setAttribute("aria-expanded", "true");
+				setActive(0);
+			} else {
+				hideResults();
+			}
+		}
+
+		function fetchResults(term) {
+			if (controller) controller.abort();
+			controller = new AbortController();
+			input.classList.add("ac_loading");
+
+			fetch(`${form.action}?q=${encodeURIComponent(term)}&_=${Date.now()}`, {
+				headers: {
+					"X-Requested-With": "XMLHttpRequest",
+				},
+				signal: controller.signal,
+			})
+				.then((response) => response.text())
+				.then((text) => {
+					const lines = text
+						.split("\n")
+						.map((line) => line.trim())
+						.filter(Boolean);
+
+					renderItems(lines);
+				})
+				.catch((error) => {
+					if (error.name !== "AbortError") hideResults();
+				})
+				.finally(() => {
+					input.classList.remove("ac_loading");
+				});
+		}
+
+		input.addEventListener("input", () => {
+			clearTimeout(requestTimer);
+			if (blurTimer) clearTimeout(blurTimer);
+
+			if (!input.value.trim()) {
+				hideResults();
+				return;
+			}
+
+			requestTimer = setTimeout(() => {
+				fetchResults(input.value.trim());
+			}, 200);
+		});
+
+		input.addEventListener("keydown", (event) => {
+			if (
+				results.hidden &&
+				(event.key === "ArrowDown" || event.key === "ArrowUp")
+			) {
+				if (!input.value.trim()) return;
+				fetchResults(input.value.trim());
+				return;
+			}
+
+			if (event.key === "ArrowDown") {
+				event.preventDefault();
+				setActive(activeIndex + 1);
+			} else if (event.key === "ArrowUp") {
+				event.preventDefault();
+				setActive(activeIndex - 1);
+			} else if (event.key === "Enter") {
+				if (activeIndex >= 0 && items[activeIndex]) {
+					event.preventDefault();
+					selectItem(items[activeIndex]);
+				}
+			} else if (event.key === "Escape") {
+				hideResults();
+			}
+		});
+
+		input.addEventListener("blur", () => {
+			blurTimer = setTimeout(hideResults, 150);
+		});
+
+		input.addEventListener("focus", () => {
+			syncResultsWidth();
+			if (items.length) {
+				results.hidden = false;
+				input.setAttribute("aria-expanded", "true");
+			}
+		});
+
+		document.addEventListener("click", (event) => {
+			if (!form.contains(event.target)) hideResults();
+		});
+
+		window.addEventListener("resize", syncResultsWidth);
+		syncResultsWidth();
+	}
+
+	ready(() => {
+		const input = query("#search_box");
+		if (input) createAutocomplete(input);
+	});
+})();

data/lib/yard/server/templates/default/layout/html/breadcrumb.erb

@@ -1,22 +1,6 @@
 <form class="search" method="get" action="<%= abs_url base_path(router.search_prefix) %>">
-  <input name="q" type="search" placeholder="Search" id="search_box" size="30" value="<%= h @query %>" />
+  <input name="q" type="search" placeholder="Search" id="search_box" size="30" value="<%= h @query %>">
 </form>
-<script type="text/javascript" charset="utf-8">
-  $(function() {
-    $('#search_box').autocomplete($('#search_box').parent().attr('action'), {
-      width: 200,
-      formatItem: function(item) {
-        var values = item[0].split(",");
-        return values[0] + (values[1] == '' ? "" : " <small>(" + values[1] + ")</small>");
-      }
-    }).result(function(event, item) {
-      var values = item[0].split(",")
-      $('#search_box').val(values[1]);
-      location.href = values[3];
-      return false;
-    });
-  });
-</script>
 
 <div id="menu">
   <% unless @single_library %>

data/lib/yard/server/templates/default/method_details/html/permalink.erb

@@ -1,4 +1,6 @@
 <script>
-$(document.getElementById("<%= anchor_for(object) %>")).prepend(
-  '<a class="permalink" href="<%= abs_url base_path(router.docs_prefix) %>/<%= urlencode serializer.serialized_path(object) %>">permalink</a>');
+document.getElementById("<%= anchor_for(object) %>").insertAdjacentHTML(
+  "afterbegin",
+  '<a class="permalink" href="<%= abs_url base_path(router.docs_prefix) %>/<%= urlencode serializer.serialized_path(object) %>">permalink</a>'
+);
 </script>

data/lib/yard/server/templates/doc_server/library_list/html/headers.erb

@@ -1,7 +1,7 @@
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<meta charset="UTF-8">
 <title>YARD Documentation Server <%= YARD::VERSION %> - Library Listing</title>
-<link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>?<%= mtime('css/style.css') %>" type="text/css" media="screen" charset="utf-8" />
-<link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>?<%= mtime('css/custom.css') %>" type="text/css" media="screen" charset="utf-8" />
+<link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>?<%= mtime('css/style.css') %>" type="text/css" media="screen" charset="utf-8">
+<link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>?<%= mtime('css/custom.css') %>" type="text/css" media="screen" charset="utf-8">
 <style type="text/css" media="screen">
   ul { list-style: circle inside none; padding: 0; }
   li { font-size: 1.2em; line-height: 1.4em; padding: 3px 5px; }

data/lib/yard/server/templates/doc_server/library_list/html/library_list.erb

@@ -1,6 +1,5 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE html>
+<html lang="en">
   <head>
     <%= erb(:headers) %>
   </head>

data/lib/yard/server/templates/doc_server/processing/html/processing.erb

@@ -2,29 +2,35 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>?<%= mtime('css/style.css') %>" type="text/css" media="screen" charset="utf-8" />
-    <link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>?<%= mtime('css/custom.css') %>" type="text/css" media="screen" charset="utf-8" />
-    <script type="text/javascript" charset="utf-8" src="<%= abs_url('js', 'jquery.js') %>?<%= mtime('js/jquery.js') %>"></script>
+    <link rel="stylesheet" href="<%= abs_url('css', 'style.css') %>?<%= mtime('css/style.css') %>" type="text/css" media="screen" charset="utf-8">
+    <link rel="stylesheet" href="<%= abs_url('css', 'custom.css') %>?<%= mtime('css/custom.css') %>" type="text/css" media="screen" charset="utf-8">
     <script type="text/javascript" charset="utf-8">
       function checkPage(process) {
-        $.ajax({cache: false, url: "<%= router.request.path %>" + (process ? "?process=true" : ""),
-          statusCode: { 200: function() { window.location.reload(true); } } });
-        setTimeout('checkPage()', 2000);
+        fetch("<%= router.request.path %>" + (process ? "?process=true" : ""), { cache: "no-store" })
+          .then(function(response) {
+            if (response.status === 200) window.location.reload();
+          });
+        setTimeout(checkPage, 2000);
       }
       function setFade() {
         centerMessage();
-        $(window).resize(function() { centerMessage(); });
-        $('#fade').fadeIn();
-        $('#processing').fadeIn();
+        window.addEventListener("resize", centerMessage);
+        document.getElementById('fade').style.display = 'block';
+        document.getElementById('processing').style.display = 'block';
       }
       function centerMessage() {
-        $('#fade').css('width', $(window).width() + 'px');
-        $('#fade').css('height', $(window).height() - parseInt($('#fade').css('top')) + 'px');
-        $('#processing').css('left', ($(window).width() / 2 - $('#processing').width() / 2) + 'px');
-        $('#processing').css('top', ($(window).height() / 2 - $('#processing').height() / 2) + 'px');
+        var fade = document.getElementById('fade');
+        var processing = document.getElementById('processing');
+        var fadeTop = parseInt(window.getComputedStyle(fade).top, 10) || 0;
+        fade.style.width = window.innerWidth + 'px';
+        fade.style.height = (window.innerHeight - fadeTop) + 'px';
+        processing.style.left = (window.innerWidth / 2 - processing.offsetWidth / 2) + 'px';
+        processing.style.top = (window.innerHeight / 2 - processing.offsetHeight / 2) + 'px';
       }
-      $(function() { checkPage(true); });
-      $(setFade);
+      document.addEventListener("DOMContentLoaded", function() {
+        checkPage(true);
+        setFade();
+      });
     </script>
     <style type="text/css" media="screen">
       body { overflow: hidden; margin: 12px; display: block; }
@@ -46,7 +52,7 @@
         <strong><%= @library.name %></strong> <% if @library.version %>(<%= @library.version %>)<% end %> is being processed.
         You'll be redirected when the pages are built, it shouldn't take much longer.
       </p>
-      <img src="<%= abs_url('images', 'processing.gif') %>?<%= mtime('images/processing.gif') %>" align="center" />
+      <img src="<%= abs_url('images', 'processing.gif') %>?<%= mtime('images/processing.gif') %>" align="center">
     </div>
   </body>
 </html>

data/lib/yard/tags/default_factory.rb

@@ -143,6 +143,7 @@ module YARD
         seen_space = false
         i = 0
         last_seen = ''
+        text ||= ''
         while i < text.length
           c = text[i, 1]
 

data/lib/yard/tags/directives.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'ostruct'
 
 module YARD
   module Tags
@@ -544,6 +543,7 @@ module YARD
     # @since 0.8.0
     class ParseDirective < Directive
       def call
+        existing = YARD::Registry.all.lazy.map(&:path).to_set if handler
         lang = tag.types ? tag.types.first.to_sym :
           (handler ? handler.parser.parser_type : :ruby)
         if handler && lang == handler.parser.parser_type
@@ -556,6 +556,12 @@ module YARD
           src_parser.file = handler.parser.file if handler
           src_parser.parse(StringIO.new(tag.text))
         end
+        return unless handler
+        YARD::Registry.all.each do |obj|
+          next if existing.include? obj.path
+          obj.files.each { |entry| entry[1] = handler.statement.line if entry[0] == handler.parser.file.to_s }
+          obj.source = handler.statement.source
+        end
       end
     end
 

data/lib/yard/tags/library.rb

@@ -507,7 +507,7 @@ module YARD
       #
       # @example
       #   # Synchronizes system time using NTP.
-      #   # @see http://ntp.org/documentation.html NTP Documentation
+      #   # @see https://ntp.org/documentation.html NTP Documentation
       #   # @see NTPHelperMethods
       #   class NTPUpdater; end
       define_tag "See Also",           :see,         :with_name
@@ -541,7 +541,7 @@ module YARD
       # @example
       #   # @todo Add support for Jabberwocky service.
       #   #   There is an open source Jabberwocky library available
-      #   #   at http://jbrwcky.org that can be easily integrated.
+      #   #   at https://jbrwcky.org that can be easily integrated.
       #   class Wonderlander; end
       # @see tag:note
       define_tag "Todo Item",          :todo
@@ -554,7 +554,7 @@ module YARD
       # of a specific object.
       #
       # @example
-      #   # The public REST API for http://jbrwcky.org
+      #   # The public REST API for https://jbrwcky.org
       #   # @version 2.0
       #   class JabberwockyAPI; end
       define_tag "Version",            :version

data/lib/yard/tags/overload_tag.rb

@@ -60,7 +60,8 @@ module YARD
           args = YARD::Handlers::Ruby::Legacy::Base.new(nil, nil).send(:tokval_list, toks, :all)
           args = args.map do |a|
             k, v = *a.split(/:|=/, 2)
-            [k.strip.to_s + (a[k.size, 1] == ':' ? ':' : ''), (v ? v.strip : nil)]
+            v.strip! if v
+            [k.strip.to_s + (a[k.size, 1] == ':' ? ':' : ''), (v && v.empty? ? nil : v)]
           end if args
           @name = meth.to_sym
           @parameters = args

data/lib/yard/tags/tag.rb

@@ -23,6 +23,7 @@ module YARD
       attr_accessor :types
 
       # @return [String] a name associated with the tag
+      # @return [nil] if no tag name is supplied
       attr_accessor :name
 
       # @return [CodeObjects::Base] the associated object
@@ -37,7 +38,7 @@ module YARD
       # +raise+, etc.
       #
       # @param [#to_s] tag_name        the tag name to create the tag for
-      # @param [String] text           the descriptive text for this tag
+      # @param [String, nil] text      the descriptive text for this tag, or nil if none provided
       # @param [Array<String>] types   optional type list of formally declared types
       #                                for the tag
       # @param [String] name           optional key name which the tag refers to

data/lib/yard/tags/types_explainer.rb

@@ -32,7 +32,7 @@ module YARD
 
         def to_s(singular = true)
           if name[0, 1] == "#"
-            singular ? "an object that responds to #{name}" : "objects that respond to #{name}"
+            (singular ? "an object that responds to " : "objects that respond to ") + list_join(name.split(/ *& */), with: "and")
           elsif name[0, 1] =~ /[A-Z]/
             singular ? "a#{name[0, 1] =~ /[aeiou]/i ? 'n' : ''} " + name : "#{name}#{name[-1, 1] =~ /[A-Z]/ ? "'" : ''}s"
           else
@@ -42,12 +42,12 @@ module YARD
 
         private
 
-        def list_join(list)
+        def list_join(list, with: "or")
           index = 0
           list.inject(String.new) do |acc, el|
             acc << el.to_s
             acc << ", " if index < list.size - 2
-            acc << " or " if index == list.size - 2
+            acc << " #{with} " if index == list.size - 2
             index += 1
             acc
           end
@@ -102,6 +102,7 @@ module YARD
           :fixed_collection_start => /\(/,
           :fixed_collection_end => /\)/,
           :type_name => /#{ISEP}#{METHODNAMEMATCH}|#{NAMESPACEMATCH}|\w+/,
+          :symbol => /:#{METHODNAMEMATCH}/,
           :type_next => /[,;]/,
           :whitespace => /\s+/,
           :hash_collection_start => /\{/,
@@ -130,7 +131,7 @@ module YARD
               next unless (match.nil? && @scanner.eos?) || (match && token = @scanner.scan(match))
               found = true
               case token_type
-              when :type_name
+              when :type_name, :symbol
                 raise SyntaxError, "expecting END, got name '#{token}'" if name
                 name = token
               when :type_next

data/lib/yard/templates/engine.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'ostruct'
 
 module YARD
   module Templates

data/lib/yard/templates/helpers/base_helper.rb

@@ -45,7 +45,7 @@ module YARD::Templates::Helpers
     # method depending on the arguments passed in.
     #
     # @example Linking a URL
-    #   linkify('http://example.com')
+    #   linkify('https://example.com')
     # @example Including docstring contents of an object
     #   linkify('include:YARD::Docstring')
     # @example Linking to an extra file

data/lib/yard/templates/helpers/html_helper.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
-require 'cgi'
+if RUBY_VERSION < '3.5'
+  require 'cgi/util'
+else
+  require 'cgi/escape'
+end
 
 module YARD
   module Templates::Helpers
@@ -89,10 +93,16 @@ module YARD
                              :tables,
                              :with_toc_data,
                              :no_intraemphasis).to_html
+        when 'Commonmarker'
+          provider.to_html(text, :options => { }, :plugins => { :syntax_highlighter => nil })
         when 'CommonMarker'
-          CommonMarker.render_html(text, %i[DEFAULT GITHUB_PRE_LANG], %i[autolink table])
+          provider.render_html(text, %i[DEFAULT GITHUB_PRE_LANG], %i[autolink table])
         else
-          provider.new(text).to_html
+          if provider.respond_to?(:to_html)
+            provider.to_html(text)
+          else
+            provider.new(text).to_html
+          end
         end
       end
 
@@ -152,7 +162,7 @@ module YARD
       # @return [String] the output HTML
       # @since 0.6.0
       def html_markup_text(text)
-        h(text).gsub(/\r?\n/, '<br/>')
+        h(text).gsub(/\r?\n/, '<br>')
       end
 
       # @return [String] the same text with no markup
@@ -224,7 +234,7 @@ module YARD
       # @return [String] HTML with linkified references
       def resolve_links(text)
         code_tags = 0
-        text.gsub(%r{<(/)?(pre|code|tt)|(\\|!)?\{(?!\})(\S+?)(?:\s([^\}]*?\S))?\}(?=[\W<]|.+</|$)}m) do |str|
+        text.gsub(%r{<(/)?(pre|code|tt)|(\\|!)?\{(?!\})(\S+?)(?:\s([^\}]*?\S))?\}(?=\W|.+</|$)}m) do |str|
           closed = $1
           tag = $2
           escape = $3
@@ -646,7 +656,12 @@ module YARD
           language ||= detect_lang_in_codeblock_attributes($1, $2)
           language ||= object.source_type
 
-          if options.highlight
+          # Skip re-highlighting if the block is already highlighted (e.g. from a recursive
+          # htmlify call via {include:} or {yard:include_tags}). Passing pre-highlighted HTML
+          # through CGI.unescapeHTML would corrupt deliberately-escaped entities inside spans.
+          # Note: this heuristic suppresses highlighting for code blocks in :html markup that
+          # contain a literal <span> tag in the source being documented (an uncommon edge case).
+          if options.highlight && string !~ HtmlSyntaxHighlightHelper::ALREADY_HIGHLIGHTED_RE
             string = html_syntax_highlight(CGI.unescapeHTML(string), language)
           end
           classes = ['code', language].compact.join(' ')

data/lib/yard/templates/helpers/html_syntax_highlight_helper.rb

@@ -6,6 +6,11 @@ module YARD
       module HtmlSyntaxHighlightHelper
         include ModuleHelper
 
+        # Matches source that has already been highlighted (i.e. contains a span tag).
+        # Used to avoid double-processing pre-highlighted HTML in the rescue clause of
+        # {#html_syntax_highlight_ruby_ripper} and in the {HtmlHelper#parse_codeblocks} guard.
+        ALREADY_HIGHLIGHTED_RE = /<span[\s>]/
+
         # Highlights Ruby source
         # @param [String] source the Ruby source code
         # @return [String] the highlighted Ruby source
@@ -39,7 +44,7 @@ module YARD
           end
           output
         rescue Parser::ParserSyntaxError
-          source =~ /^<span\s+class=/ ? source : h(source)
+          source =~ ALREADY_HIGHLIGHTED_RE ? source : h(source)
         end
 
         def html_syntax_highlight_ruby_legacy(source)