diff options
Diffstat (limited to 'server.lua')
| -rw-r--r-- | server.lua | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -3,12 +3,12 @@ Copyright (c) 2012-2013 Kaarle Ritvanen See LICENSE file for license details --]] -require 'acf' +local acf = require('acf') local mnode = acf.model.node local isinstance = acf.object.isinstance -require 'json' -require 'stringy' +local json = require('json') +local stringy = require('stringy') math.randomseed(os.time()) @@ -74,7 +74,7 @@ return function(env) return wrap(400, nil, 'Invalid transaction ID') end end - local txn = acf.transaction.start(parent_txn, true) + local txn = acf.start_txn(parent_txn, true) local function fetch_user(name) user = name and txn:fetch('/auth/users')[name] @@ -201,9 +201,7 @@ return function(env) parent[name] = nil elseif method == 'PUT' then - if isinstance(parent, acf.model.set.Set) then - return 405 - end + if isinstance(parent, mnode.Set) then return 405 end local permission = 'modify' if obj == nil then obj = parent @@ -233,7 +231,7 @@ return function(env) session.last_txn_id = session.last_txn_id + 1 local txn_id = session.last_txn_id - session.txns[txn_id] = acf.transaction.start(parent_txn) + session.txns[txn_id] = acf.start_txn(parent_txn) return 204, {['X-ACF-Transaction-ID']=txn_id} end |