Module:Namespace detect/sandbox - Revision history

Mr. Stradivarius: don't use the sandbox

2014-04-05T16:58:53Z

don't use the sandbox

← Previous revision		Revision as of 16:58, 5 April 2014
Line 15:		Line 15:
	--]]		--]]

	local data = mw.loadData('Module:Namespace detect/data~~/sandbox~~')		local data = mw.loadData('Module:Namespace detect/data')
	local argKeys = data.argKeys		local argKeys = data.argKeys
	local cfg = data.cfg		local cfg = data.cfg

Mr. Stradivarius: update argKeys name

2014-04-05T16:52:27Z

update argKeys name

← Previous revision		Revision as of 16:52, 5 April 2014
Line 72:		Line 72:
	local function getNamespace(args)		local function getNamespace(args)
	-- This function gets the namespace name from the page object.		-- This function gets the namespace name from the page object.
	local page = fetchValue(args, argKeys.~~page~~)		local page = fetchValue(args, argKeys.demopage)
	if page == '' then		if page == '' then
	page = nil		page = nil

Mr. Stradivarius: use the data sandbox

2014-04-05T16:46:17Z

use the data sandbox

← Previous revision		Revision as of 16:46, 5 April 2014
Line 15:		Line 15:
	--]]		--]]

	local data = mw.loadData('Module:Namespace detect/data')		local data = mw.loadData('Module:Namespace detect/data/sandbox')
	local argKeys = data.argKeys		local argKeys = data.argKeys
	local cfg = data.cfg		local cfg = data.cfg

Mr. Stradivarius: p.table - tidy up header code, and make useTalk work properly

2014-03-22T12:48:42Z

p.table - tidy up header code, and make useTalk work properly

← Previous revision		Revision as of 12:48, 22 March 2014
Line 142:		Line 142:
	-- needs to be excluded in the documentation.		-- needs to be excluded in the documentation.
	--]]		--]]

			-- Load modules and initialise variables.
	mTableTools = require('Module:TableTools')		mTableTools = require('Module:TableTools')
	local namespaces = mw.site.namespaces		local namespaces = mw.site.namespaces
Line 149:		Line 151:
	and yesno(frame.args.talk) -- Whether to use the talk parameter.		and yesno(frame.args.talk) -- Whether to use the talk parameter.

			-- Get the header names.
			local function checkValue(value, default)
			if type(value) == 'string' then
			return value
			else
			return default
			end
			end
			local nsHeader = checkValue(cfg.wikitableNamespaceHeader, 'Namespace')
			local aliasesHeader = checkValue(cfg.wikitableAliasesHeader, 'Aliases')

	-- Put the namespaces in order.		-- Put the namespaces in order.
	local mappingsOrdered = {}		local mappingsOrdered = {}
	for nsname, params in pairs(mappings) do		for nsname, params in pairs(mappings) do
	~~local~~ ~~nsid~~ = ~~namespaces[~~nsname~~].id~~		if useTalk or nsname ~= 'talk' then
	-- Add 1, as the array must start with 1; nsid 0 would be lost otherwise.		local nsid = namespaces[nsname].id
			-- Add 1, as the array must start with 1; nsid 0 would be lost otherwise.
	nsid = nsid + 1		nsid = nsid + 1
	mappingsOrdered[nsid] = params		mappingsOrdered[nsid] = params
			end
	end		end
	mappingsOrdered = mTableTools.compressSparseArray(mappingsOrdered)		mappingsOrdered = mTableTools.compressSparseArray(mappingsOrdered)
Line 162:		Line 177:
	local ret = '{\| class="wikitable"'		local ret = '{\| class="wikitable"'
	.. '\n\|-'		.. '\n\|-'
	.. '\n! ' .. ~~cfg.wikitableNamespaceHeader or 'Namespace'~~		.. '\n! ' .. nsHeader
	.. '\n! ' .. ~~cfg.wikitableAliasesHeader or 'Aliases'~~		.. '\n! ' .. aliasesHeader
	for i, params in ipairs(mappingsOrdered) do		for i, params in ipairs(mappingsOrdered) do
	for j, param in ipairs(params) do		for j, param in ipairs(params) do

Mr. Stradivarius: update p.table function and put the namespaces in order

2014-03-22T12:25:01Z

update p.table function and put the namespaces in order

@@ Line 22: / Line 22: @@
 local yesno = require('Module:Yesno')
 local mArguments -- Lazily initialise Module:Arguments
 local ustringLower = mw.ustring.lower
@@ Line 136: / Line 137: @@
 function p.table(frame)
-	--[[ Create a wikitable of all subject namespace parameters, for documentation purposes. The talk
+	-- Create a wikitable of all subject namespace parameters, for
-		ret = ret .. '\n|-'
+		nsid = nsid + 1
 	end
-						.. '\n| <code>' .. param .. '</code>'
+		.. '\n! ' .. cfg.wikitableAliasesHeader or 'Aliases'
-					ret = ret .. ', <code>' .. param .. '</code>'
+					.. '\n| <code>' .. param .. '</code>'
-				end
+					.. '\n| '
 			end
 		end
 	end
 	ret = ret .. '\n|-'
 		.. '\n|}'

Mr. Stradivarius: allow multiple parameters in the cfg table, avoid using for loops in the p._main function, and move the checks for blank page and demospace args to the main function so that we don't have to check them every time

2014-03-22T10:00:31Z

allow multiple parameters in the cfg table, avoid using for loops in the p._main function, and move the checks for blank page and demospace args to the main function so that we don't have to check them every time

Show changes

Mr. Stradivarius: add a fetchValue function, which will be used for fetching args from the args table according to keys specified in the cfg table

2014-03-22T06:09:25Z

add a fetchValue function, which will be used for fetching args from the args table according to keys specified in the cfg table

← Previous revision		Revision as of 06:09, 22 March 2014
Line 24:		Line 24:

	local p = {}		local p = {}

			local function fetchValue(args, t)
			-- Fetches a value from the table args for the first key in array t where
			-- a non-nil value of args exists.
			for i, key in ipairs(t) do
			local value = args[key]
			if value ~= nil then
		⚫	return value
			end
			end
			return nil
			end

	function p.getPageObject(page)		function p.getPageObject(page)
	-- Get the page object, passing the function through pcall in case we ~~are~~ over the expensive function count limit.		-- Get the page object, passing the function through pcall in case of
			-- errors, e.g. being over the expensive function count limit.
	if page then		if page then
	local ~~noError~~, pageObject = pcall(mw.title.new, page)		local success, pageObject = pcall(mw.title.new, page)
	if ~~not noError~~ then		if success then
⚫	return ~~nil~~
⚫	else
	return pageObject		return pageObject
		⚫	else
			return nil
	end		end
	else		else

Mr. Stradivarius: adjust the top comment so that it fits within 80 characters

2014-03-21T15:52:18Z

adjust the top comment so that it fits within 80 characters

← Previous revision		Revision as of 15:52, 21 March 2014
Line 1:		Line 1:
	--[[		--[[
	~~--------------------~~--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	-- --		-- --
	-- NAMESPACE DETECT --		-- NAMESPACE DETECT --
	-- --		-- --
	-- This module implements the {{namespace detect}} template in Lua, with a ~~few~~ --		-- This module implements the {{namespace detect}} template in Lua, with a --
	-- improvements: all namespaces and all namespace aliases are supported, ~~and namespace~~ --		-- few improvements: all namespaces and all namespace aliases are supported, --
	-- names are detected automatically for the local wiki. The ~~module can also use the~~ --		-- and namespace names are detected automatically for the local wiki. The --
	-- corresponding subject namespace value if it is used on a talk page. Parameter names --		-- module can also use the corresponding subject namespace value if it is --
			-- used on a talk page. Parameter names can be configured for different wikis --
	-- ~~can~~ be ~~configured~~ ~~for~~ ~~different~~ ~~wikis~~ by ~~altering~~ ~~the~~ ~~values~~ in ~~the~~ ~~"cfg"~~ ~~table~~ --		-- by altering the values in the "cfg" table in --
	-- in Module:Namespace detect/config. --		-- Module:Namespace detect/config. --
	-- --		-- --
	~~--------------------~~--------------------------------------------------------------------------------		--------------------------------------------------------------------------------
	--]]		--]]

Mr. Stradivarius: use Module:Arguments

2014-03-21T06:29:41Z

use Module:Arguments

@@ Line 19: / Line 19: @@
 local yesno = require('Module:Yesno')
 local ustringLower = mw.ustring.lower
@@ Line 102: / Line 103: @@
 function p.main(frame)
-	if frame == mw.getCurrentFrame() then
+			if type(value) == 'string' then
-	else
+				else
-	end
+				end
 			end
 		end
-	end
+	})
 	return p._main(args)
 end

Mr. Stradivarius: try and save a couple of table lookups - more changes to come in a bit

2014-03-21T03:28:27Z

try and save a couple of table lookups - more changes to come in a bit

← Previous revision		Revision as of 03:28, 21 March 2014
Line 1:		Line 1:
			--[[
	----------------------------------------------------------------------------------------------------		----------------------------------------------------------------------------------------------------
	-- --		-- --
Line 8:		Line 9:
	-- corresponding subject namespace value if it is used on a talk page. Parameter names --		-- corresponding subject namespace value if it is used on a talk page. Parameter names --
	-- can be configured for different wikis by altering the values in the "cfg" table --		-- can be configured for different wikis by altering the values in the "cfg" table --
	-- in Module:Namespace detect/~~data~~. --		-- in Module:Namespace detect/config. --
	-- --		-- --
	----------------------------------------------------------------------------------------------------		----------------------------------------------------------------------------------------------------
			--]]


	local data = mw.loadData('Module:Namespace detect/data')		local data = mw.loadData('Module:Namespace detect/data')
Line 18:		Line 19:

	local yesno = require('Module:Yesno')		local yesno = require('Module:Yesno')
			local ustringLower = mw.ustring.lower

	local p = {}		local p = {}
Line 48:		Line 50:
	if demospace then		if demospace then
	-- Handle "demospace = main" properly.		-- Handle "demospace = main" properly.
	if ~~mw.ustring.lower~~(demospace) == cfg.main then		if ustringLower(demospace) == cfg.main then
	ret = mw.site.namespaces[0].name		ret = mw.site.namespaces[0].name
	else		else
Line 70:		Line 72:
	end		end
	end		end
	ret = ~~mw.ustring.~~gsub(~~ret,~~ '_', ' ')		ret = ret:gsub('_', ' ')
	return ~~mw.ustring.lower~~(ret)		return ustringLower(ret)
	end		end