eliminate deprecated module style

2 files changed, 16 insertions, 15 deletions

diff --git a/acf/transaction/backend.lua b/acf/transaction/backend.lua
index 659fca2..4393101 100644
--- a/acf/transaction/backend.lua
+++ b/acf/transaction/backend.lua
@@ -3,7 +3,7 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-module(..., package.seeall)
+local M = {}
 
 local err = require('acf.error')
 
@@ -13,29 +13,29 @@ local err = require('acf.error')
 
 
 local generation = 0
-function gen_number()
+function M.gen_number()
    generation = generation + 1
    return generation
 end
 
 
-TransactionBackend = require('acf.object').class()
+M.TransactionBackend = require('acf.object').class()
 
-function TransactionBackend:init() self.mod_time = {} end
+function M.TransactionBackend:init() self.mod_time = {} end
 
-function TransactionBackend:get_if_older(path, timestamp)
+function M.TransactionBackend:get_if_older(path, timestamp)
    local value, ts = self:get(path)
    if ts > timestamp then err.raise('conflict', path) end
    return value, ts
 end
 
-function TransactionBackend:set(path, value)
+function M.TransactionBackend:set(path, value)
    self:set_multiple{{path, value}}
 end
 
-function TransactionBackend:set_multiple(mods)
+function M.TransactionBackend:set_multiple(mods)
    -- TODO delegate to PM backends?
-   local timestamp = gen_number()
+   local timestamp = M.gen_number()
    local effective = {}
 
    local function tostr(s) return s ~= nil and tostring(s) or nil end
@@ -56,7 +56,7 @@ function TransactionBackend:set_multiple(mods)
 end
 
 -- TODO should be atomic, mutex with set_multiple
-function TransactionBackend:comp_and_setm(accessed, mods)
+function M.TransactionBackend:comp_and_setm(accessed, mods)
    local errors = err.ErrorDict()
    for path, timestamp in pairs(accessed) do
       errors:collect(self.get_if_older, self, path, timestamp)
@@ -65,3 +65,6 @@ function TransactionBackend:comp_and_setm(accessed, mods)
 
    self:set_multiple(mods)
 end
+
+
+return M
diff --git a/acf/transaction/init.lua b/acf/transaction/init.lua
index ca6ca6f..2ca63c5 100644
--- a/acf/transaction/init.lua
+++ b/acf/transaction/init.lua
@@ -3,8 +3,6 @@ Copyright (c) 2012-2013 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
-module(..., package.seeall)
-
 local ErrorDict = require('acf.error').ErrorDict
 local root = require('acf.model.root')
 local object = require('acf.object')
@@ -205,8 +203,8 @@ function Transaction:commit()
 end
 
 
-local store = require('acf.persistence').DataStore()
+local store = require('acf.persistence')
 
-function start(txn, defer_validation)
-   return Transaction(txn or store, not (txn and defer_validation))
-end
+return function(txn, defer_validation)
+	  return Transaction(txn or store, not (txn and defer_validation))
+       end