Module:URL - Revision history

Ookami: 28 revisions imported

2020-09-03T04:38:29Z

28 revisions imported

← Older revision	Revision as of 04:38, 3 September 2020
(No difference)

meta>Pppery: Making extraction of URLs containing "=" actually work per edit request

2019-07-26T16:45:29Z

Making extraction of URLs containing "=" actually work per edit request

← Older revision		Revision as of 16:45, 26 July 2019
Line 2:		Line 2:
	-- This module implements {{URL}}		-- This module implements {{URL}}
	--		--
	-- See unit tests at [[Module:URL/~~tests~~]]		-- See unit tests at [[Module:URL/testcases]]

	local p = {}		local p = {}
Line 17:		Line 17:
	local function extractUrl(args)		local function extractUrl(args)
	for name, val in pairs(args) do		for name, val in pairs(args) do
	local url = name .. "=" .. val;		if name ~= 2 and name ~= "msg" then
	url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?):(/?)([^/])', 'http%1://%3')		local url = name .. "=" .. val;
	local uri = safeUri(url);		url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?):(/?)([^/])', 'http%1://%3')
	if uri and uri.host then		local uri = safeUri(url);
	return url		if uri and uri.host then
			return url
			end
	end		end
	end		end
Line 89:		Line 91:

	--[[		--[[
	The main entry point for ~~caling~~ from Template:URL.		The main entry point for calling from Template:URL.
	--]]		--]]
	function p.url(frame)		function p.url(frame)
	local templateArgs = frame.args		local templateArgs = frame.args
	local parentArgs = frame:getParent().args		local parentArgs = frame:getParent().args
	local url = templateArgs[1] or parentArgs[1] ~~or ''~~		local url = templateArgs[1] or parentArgs[1]
	local text = templateArgs[2] or parentArgs[2]		local text = templateArgs[2] or parentArgs[2] or ''
	local msg = templateArgs.msg or parentArgs.msg or ''		local msg = templateArgs.msg or parentArgs.msg or ''
	~~if not text then~~		url = url or extractUrl(templateArgs) or extractUrl(parentArgs) or ''
	url = url or extractUrl(templateArgs) or extractUrl(parentArgs)
	~~end~~
	~~text = text~~ or ''
	return p._url(url, text, msg)		return p._url(url, text, msg)
	end		end
Line 112:		Line 111:
	local templateArgs = frame.args		local templateArgs = frame.args
	local parentArgs = frame:getParent().args		local parentArgs = frame:getParent().args
	local url = templateArgs[1] or parentArgs[1] ~~or ''~~		local url = templateArgs[1] or parentArgs[1]
	local text = templateArgs[2] or parentArgs[2] or ''		local text = templateArgs[2] or parentArgs[2] or ''
	-- default to no message		-- default to no message
	local msg = templateArgs.msg or parentArgs.msg or 'no'		local msg = templateArgs.msg or parentArgs.msg or 'no'
	~~if text == '' then~~		url = url or extractUrl(templateArgs) or extractUrl(parentArgs) or ''
	url = url or extractUrl(templateArgs) or extractUrl(parentArgs)
	~~end~~
	-- strip out html tags and [ ] from url		-- strip out html tags and [ ] from url
	url = (url or ''):gsub("<[^>]*>", ""):gsub("[%[%]]", "")		url = (url or ''):gsub("<[^>]*>", ""):gsub("[%[%]]", "")

meta>RexxS: catch nil value for msg

2019-02-24T22:45:43Z

catch nil value for msg

← Older revision		Revision as of 22:45, 24 February 2019
Line 29:		Line 29:
	url = mw.text.trim(url or '')		url = mw.text.trim(url or '')
	text = mw.text.trim(text or '')		text = mw.text.trim(text or '')
	local nomsg = msg:sub(1,1):lower() == "n" or msg == 'false' -- boolean: true if msg is "false" or starts with n or N		local nomsg = (msg or ''):sub(1,1):lower() == "n" or msg == 'false' -- boolean: true if msg is "false" or starts with n or N

	if url == '' then		if url == '' then

meta>RexxS: update main module from sandbox - implement functionality of {{URL2}} - see talk

2019-02-24T22:09:35Z

update main module from sandbox - implement functionality of {{URL2}} - see talk

Show changes

meta>Codename Lisa: Per talk page request. I studied the syntax carefully. Looks like it is alright after all. Since two eyes have seen this, I assume it is okay to commit it to the production version.

2018-02-23T12:44:37Z

Per talk page request. I studied the syntax carefully. Looks like it is alright after all. Since two eyes have seen this, I assume it is okay to commit it to the production version.

← Older revision		Revision as of 12:44, 23 February 2018
Line 6:		Line 6:
	local p = {}		local p = {}

	~~function trim(s)~~		local function safeUri(s)
	~~return (mw.ustring.gsub(s, "^%s(.-)%s$", "%1"))~~
	~~end~~

	function safeUri(s)
	local success, uri = pcall(function()		local success, uri = pcall(function()
	return mw.uri.new(s)		return mw.uri.new(s)
Line 20:		Line 16:

	function p._url(url, text)		function p._url(url, text)
	url = trim(url or '')		url = mw.text.trim(url or '')
	text = trim(text or '')		text = mw.text.trim(text or '')

	if url == '' then		if url == '' then

meta>Codename Lisa: Deploying the fixed code from the sandbox. See Template talk:Official website#Problem_with_Template%3A.27_used_in_website_description for details.

2017-07-01T13:30:46Z

Deploying the fixed code from the sandbox. See Template talk:Official website#Problem_with_Template:.27_used_in_website_description for details.

← Older revision		Revision as of 13:30, 1 July 2017
Line 25:		Line 25:
	if url == '' then		if url == '' then
	if text == '' then		if text == '' then
	return '~~<strong class~~="~~error~~"~~>URL: Syntax error.</strong> ([[Template:URL/doc\|Help!]])~~'		return mw.getCurrentFrame():expandTemplate{ title = 'tlx', args = { 'URL', "''example.com''", "''optional display text''" } }
	else		else
	return text		return text
Line 61:		Line 61:

	text = mw.ustring.lower(uri.host or '') .. port .. (uri.relativePath or '')		text = mw.ustring.lower(uri.host or '') .. port .. (uri.relativePath or '')

			-- Add <wbr> before _/.-# sequences
			text = mw.ustring.gsub(text,"(/+)","<wbr/>%1") -- This entry MUST be the first. "<wbr/>" has a "/" in it, you know.
			text = mw.ustring.gsub(text,"(%.+)","<wbr/>%1")
			-- text = mw.ustring.gsub(text,"(%-+)","<wbr/>%1") -- DISABLED for now
			text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")
			text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")
	else -- URL is badly-formed, so just display whatever was passed in		else -- URL is badly-formed, so just display whatever was passed in
	text = url		text = url
Line 66:		Line 73:
	end		end

	~~-- Add <wbr> before _/.-# sequences~~
	~~text = mw.ustring.gsub(text,"(/+)","<wbr/>%1") -- This entry MUST be the first. "<wbr/>" has a "/" in it, you know.~~
	~~text = mw.ustring.gsub(text,"(%.+)","<wbr/>%1")~~
	~~-- text = mw.ustring.gsub(text,"(%-+)","<wbr/>%1") -- DISABLED for now~~
	~~text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")~~
	~~text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")~~

	return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)		return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)
	end		end
Line 78:		Line 78:
	function p.url(frame)		function p.url(frame)
	local templateArgs = frame.args		local templateArgs = frame.args
	local url = templateArgs[1] or ''		local parentArgs = frame:getParent().args;
	local text = templateArgs[2] or ''		local url = templateArgs[1] or parentArgs[1] or ''
			local text = templateArgs[2] or parentArgs[2]
			if not text then
			url = url or extractUrl(templateArgs) or extractUrl(parentArgs);
			end
			text = text or ''
	return p._url(url, text)		return p._url(url, text)
	end		end
			function extractUrl(args)
			for name, val in pairs(args) do
			local url = name .. "=" .. val;
			url = mw.ustring.gsub(url, '^[Hh][Tt][Tt][Pp]([Ss]?):(/?)([^/])', 'http%1://%3')
			local uri = safeUri(url);
			if uri and uri.host then
			return url
			end
			end
			end
	return p		return p

meta>Codename Lisa: Reverted good faith edits by Ahecht (talk): Your test case is unsatisfactory. It is not a bar-all case.

2017-06-30T06:05:05Z

Reverted good faith edits by Ahecht (talk): Your test case is unsatisfactory. It is not a bar-all case.

← Older revision		Revision as of 06:05, 30 June 2017
Line 72:		Line 72:
	text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")		text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")
	text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")		text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")
	~~text = mw.ustring.gsub(text, "(%b<>)", function(i) return mw.ustring.gsub(i,"<wbr/>","") end) --remove <wbr/>s inside HTML/XML tags~~

	return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)		return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)

meta>Ahecht: remove s inside HTML/XML tags

2017-06-29T20:47:54Z

remove <wbr/>s inside HTML/XML tags

← Older revision		Revision as of 20:47, 29 June 2017
Line 72:		Line 72:
	text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")		text = mw.ustring.gsub(text,"(%#+)","<wbr/>%1")
	text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")		text = mw.ustring.gsub(text,"(_+)","<wbr/>%1")
			text = mw.ustring.gsub(text, "(%b<>)", function(i) return mw.ustring.gsub(i,"<wbr/>","") end) --remove <wbr/>s inside HTML/XML tags

	return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)		return mw.ustring.format('<span class="url">[%s %s]</span>', url, text)

meta>Codename Lisa: Looks like unless the error is big and red, nobody is noticing it.

2017-05-12T11:35:28Z

Looks like unless the error is big and red, nobody is noticing it.

← Older revision		Revision as of 11:35, 12 May 2017
Line 25:		Line 25:
	if url == '' then		if url == '' then
	if text == '' then		if text == '' then
	return mw.~~getCurrentFrame~~():~~expandTemplate{ title = 'tlx', args = { '~~URL'~~, "''example.com''" } }~~		return '<strong class="error">URL: Syntax error.</strong> ([[Template:URL/doc\|Help!]])'
	else		else
	return text		return text

meta>Codename Lisa: It is foolish to advertise the use of parameter that we are deprecating

2017-05-08T11:58:01Z

It is foolish to advertise the use of parameter that we are deprecating

← Older revision		Revision as of 11:58, 8 May 2017
Line 25:		Line 25:
	if url == '' then		if url == '' then
	if text == '' then		if text == '' then
	return mw.getCurrentFrame():expandTemplate{ title = 'tlx', args = { 'URL', "''example.com~~''", "''optional display text~~''" } }		return mw.getCurrentFrame():expandTemplate{ title = 'tlx', args = { 'URL', "''example.com''" } }
	else		else
	return text		return text