provide env-slots on child config to control overriding settings from env

config.lisp

@@ -6,7 +6,7 @@
   (:use :common-lisp)
   (:export #:base #:root
            #:env-data #:env-keys #:env-prefix #:env-path 
-           #:add #:children #:parent
+           #:add #:children #:env-slots #:parent
            #:hash-to-slots))
 
 (in-package :scopes/config)
@@ -52,12 +52,14 @@
 ;;;; config base class
 
 (defclass base (common)
-  ((parent :reader parent
+  ((env-slots :reader env-slots :initform nil :allocation :class)
+   (parent :reader parent
            :initarg :parent)))
 
 (defmethod initialize-instance :after ((cfg base) &key parent &allow-other-keys)
   (if parent
-    (push cfg (children parent))))
+    (push cfg (children parent))
+    (hash-to-slots (env-data cfg) cfg (env-slots cfg))))
 
 (defmethod (setf parent) ((cfg base) (parent common))
   (push cfg (children parent)))

core/core.lisp

@@ -15,8 +15,8 @@
 
 (defclass config (config:root) ())
 
-(defun root-config ()
-  (make-instance 'config))
+(defun root-config (&rest params)
+  (apply #'make-instance 'config params))
 
 (defclass service-config (config:base)
   ((name :reader name :initarg :name)

test/etc/config-web.lisp

@@ -2,8 +2,7 @@
 
 (in-package :scopes/test-web)
 
-(setf *config* 
-  (make-instance 'config:root :env-keys '(:address :port)))
+(setf *config* (core:root-config :env-keys '(:address :port)))
 
 (make-instance 'server:config :parent *config*
                :port "8899")

test/test-config.lisp

@@ -19,12 +19,10 @@
    (config:env-path :initform (t:test-path ".test.env"))))
 
 (defclass child-config (config:base) 
-   ((user :accessor user :initarg :user)
+   ((config:env-slots :initform '(user password))
+    (user :accessor user :initarg :user)
     (password :accessor password :initarg :password)))
 
-(defmethod initialize-instance :after ((cfg child-config) &key &allow-other-keys)
-  (config:hash-to-slots (config:env-data cfg) cfg '(user password)))
-
 (defun run ()
   (let ((*config* nil)
         (t:*test-suite* (t:test-suite "config")))

test/test-core.lisp

@@ -64,6 +64,6 @@
         (msg (message:simple-message '(:test :dummy) "dummy payload"))
         (msg-exp (message:simple-message '(:test :dummy) "dummy payload")))
     (expect rcvr msg-exp)
-    (== (core:name (core:config rcvr)) :test-receiver)
+    (== (core:name rcvr) :test-receiver)
     (core:send rcvr msg)
     ))

test/test-web.lisp

@@ -3,6 +3,7 @@
 (defpackage :scopes/test-web
   (:use :common-lisp)
   (:local-nicknames (:config :scopes/config)
+                    (:core :scopes/core)
                     (:client :scopes/web/client)
                     (:server :scopes/web/server)
                     (:t :scopes/testing))

web/server.lisp

@@ -9,12 +9,10 @@
 (in-package :scopes/web/server)
 
 (defclass config (config:base)
-  ((address :reader address :initarg :address :initform "localhost")
+  ((config:env-slots :initform '(address port))
+   (address :reader address :initarg :address :initform "localhost")
    (port :reader port :initarg :port :initform "8888")))
 
-(defmethod initialize-instance :after ((cfg config) &key &allow-other-keys)
-  (config:hash-to-slots (config:env-data cfg) cfg '(address port)))
-
 ;;;; listener = server process
 
 (defvar *listener* nil)