From 9ff4c5411397ecc6c2b18547a53d4a94df930b88 Mon Sep 17 00:00:00 2001
From: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
Date: Fri, 3 Jan 2014 03:32:08 +0200
Subject: model: consistent naming of DataStore instance variable

---
 acf2/model/init.lua    |  6 +++---
 acf2/model/service.lua | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'acf2/model')

diff --git a/acf2/model/init.lua b/acf2/model/init.lua
index 8f6d133..51d39c8 100644
--- a/acf2/model/init.lua
+++ b/acf2/model/init.lua
@@ -1,5 +1,5 @@
 --[[
-Copyright (c) 2012-2013 Kaarle Ritvanen
+Copyright (c) 2012-2014 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
@@ -56,7 +56,7 @@ local isinstance = object.isinstance
 local super = object.super
 
 M.path = require('acf2.path')
-local DataStore = require('acf2.persistence')
+local store = require('acf2.persistence')
 
 local util = require('acf2.util')
 local update = util.update
@@ -264,7 +264,7 @@ function M.Mixed:save(context, value)
 end
 
 
-function M.trigger(phase, addr, func) DataStore:trigger(phase, addr, func) end
+function M.trigger(phase, addr, func) store:trigger(phase, addr, func) end
 
 
 return M
diff --git a/acf2/model/service.lua b/acf2/model/service.lua
index e2883b2..8d7d6f8 100644
--- a/acf2/model/service.lua
+++ b/acf2/model/service.lua
@@ -1,5 +1,5 @@
 --[[
-Copyright (c) 2012-2013 Kaarle Ritvanen
+Copyright (c) 2012-2014 Kaarle Ritvanen
 See LICENSE file for license details
 --]]
 
@@ -7,7 +7,7 @@ local fld = require('acf2.model.field')
 local new = require('acf2.model.model').new
 local super = require('acf2.object').super
 local pth = require('acf2.path')
-local DataStore = require('acf2.persistence')
+local store = require('acf2.persistence')
 
 return function(name)
 	  local res = new()
@@ -17,7 +17,7 @@ return function(name)
 	  res.enabled = fld.Boolean{addr=eaddr, required=true}
 	  res.status = fld.String{addr=pth.join(addr, 'status'), editable=false}
 
-	  local function is_enabled() return DataStore:get(eaddr) end
+	  local function is_enabled() return store:get(eaddr) end
 	  local enabled
 	  local function pre() enabled = is_enabled() end
 	  local function post()
@@ -27,8 +27,8 @@ return function(name)
 	  end
 
 	  function res:init(context)
-	     DataStore:trigger('pre', context.addr, pre)
-	     DataStore:trigger('post', context.addr, post)
+	     store:trigger('pre', context.addr, pre)
+	     store:trigger('post', context.addr, post)
 	     super(self, res):init(context)
 	  end
 
-- 
cgit v1.2.3