diff options
Diffstat (limited to 'aconf/model')
-rw-r--r-- | aconf/model/init.lua | 1 | ||||
-rw-r--r-- | aconf/model/net.lua | 4 | ||||
-rw-r--r-- | aconf/model/node.lua | 19 | ||||
-rw-r--r-- | aconf/model/root.lua | 5 | ||||
-rw-r--r-- | aconf/model/service.lua | 10 |
5 files changed, 17 insertions, 22 deletions
diff --git a/aconf/model/init.lua b/aconf/model/init.lua index 69d26bc..437cb93 100644 --- a/aconf/model/init.lua +++ b/aconf/model/init.lua @@ -58,7 +58,6 @@ local isinstance = M.object.isinstance local super = M.object.super M.path = require('aconf.path') -M.addr = require('aconf.path.address') local store = require('aconf.persistence') local def_store = require('aconf.persistence.defer') diff --git a/aconf/model/net.lua b/aconf/model/net.lua index 268e60e..6de00f0 100644 --- a/aconf/model/net.lua +++ b/aconf/model/net.lua @@ -15,7 +15,7 @@ local object = require('aconf.object') local class = object.class local super = object.super -local address = require('aconf.path.address') +local pth = require('aconf.path') local update = require('aconf.util').update @@ -26,7 +26,7 @@ local BaseIPAddress = class(String) function BaseIPAddress:abs_mask_addr(context) if self.mask_addr then - return address.join(address.parent(context.addr), self.mask_addr) + return pth.join(pth.parent(context.addr), self.mask_addr) end end diff --git a/aconf/model/node.lua b/aconf/model/node.lua index f15b97e..4f09c99 100644 --- a/aconf/model/node.lua +++ b/aconf/model/node.lua @@ -13,7 +13,6 @@ local isinstance = object.isinstance local super = object.super local pth = require('aconf.path') -local address = require('aconf.path.address') local util = require('aconf.util') local copy = util.copy @@ -24,7 +23,7 @@ local update = util.update function M.null_addr(path, name) local comps = pth.split(path) table.insert(comps, pth.escape(name)) - return address.join('/null', table.unpack(comps)) + return pth.join('/null', table.unpack(comps)) end @@ -33,13 +32,13 @@ M.BoundMember = class() function M.BoundMember:init(parent, name, field) local pmt = getmetatable(parent) - if pmt.maddr and name ~= address.wildcard then self.addr = pmt.maddr(name) + if pmt.maddr and name ~= pth.wildcard then self.addr = pmt.maddr(name) else - self.addr = field.addr or address.escape(name) + self.addr = field.addr or pth.escape(name) if type(self.addr) == 'function' then self.addr = self.addr(pmt.path, name) end - self.addr = address.to_absolute(self.addr, pmt.addr) + self.addr = pth.to_absolute(self.addr, pmt.addr) end local context = { @@ -374,12 +373,12 @@ function M.List:init(context, params) local addrs = expand() if not addrs[1] then - addrs[1] = address.join( + addrs[1] = pth.join( '/', table.unpack( util.map( - function(c) return c == address.wildcard and 1 or c end, - address.split(mt.field.addr) + function(c) return c == pth.wildcard and 1 or c end, + pth.split(mt.field.addr) ) ) ) @@ -387,9 +386,9 @@ function M.List:init(context, params) if addrs[i] then return addrs[i] end - local comps = address.split(addrs[#addrs]) + local comps = pth.split(addrs[#addrs]) comps[#comps] = comps[#comps] + i - #addrs - return address.join('/', table.unpack(comps)) + return pth.join('/', table.unpack(comps)) end function mt.members() return util.keys(expand()) end diff --git a/aconf/model/root.lua b/aconf/model/root.lua index 949005e..3f95b0e 100644 --- a/aconf/model/root.lua +++ b/aconf/model/root.lua @@ -9,7 +9,6 @@ local model = require('aconf.model.model') local node = require('aconf.model.node') local object = require('aconf.object') local pth = require('aconf.path') -local address = require('aconf.path.address') local util = require('aconf.util') local setdefault = util.setdefault @@ -42,10 +41,10 @@ M.topology = setmetatable( util.setdefaults(self, {members={}, paths={}, referrers={}}) if type(addr) == 'table' then addr = util.copy(addr) - else addr = address.split(addr) end + else addr = pth.split(addr) end if not addr[1] then return self end - local comp = address.escape(addr[1]) + local comp = pth.escape(addr[1]) local top if create then top = setdefault(self.members, comp, {order=order}) diff --git a/aconf/model/service.lua b/aconf/model/service.lua index a7c02b0..2d129fa 100644 --- a/aconf/model/service.lua +++ b/aconf/model/service.lua @@ -6,18 +6,16 @@ See LICENSE file for license details local fld = require('aconf.model.field') local new = require('aconf.model.model').new local super = require('aconf.object').super -local address = require('aconf.path.address') +local pth = require('aconf.path') local store = require('aconf.persistence') return function(name) local res = new() - local addr = address.join('/service', name) - local eaddr = address.join(addr, 'enabled') + local addr = pth.join('/service', name) + local eaddr = pth.join(addr, 'enabled') res.enabled = fld.Boolean{addr=eaddr, required=true} - res.status = fld.String{ - addr=address.join(addr, 'status'), editable=false - } + res.status = fld.String{addr=pth.join(addr, 'status'), editable=false} local function is_enabled() return store:get(eaddr) end local enabled |