wip

java-src/io/github/erdos/stencil/impl/LifecycleLock.java

@@ -0,0 +1,46 @@
+package io.github.erdos.stencil.impl;
+
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Supplier;
+
+public final class LifecycleLock implements AutoCloseable {
+
+    private final ReentrantReadWriteLock lock;
+    private final AtomicBoolean alive;
+    private final Runnable cleanup;
+
+    public LifecycleLock(Runnable cleanup) {
+        this.lock = new ReentrantReadWriteLock();
+        this.alive = new AtomicBoolean(true);
+        this.cleanup = Objects.requireNonNull(cleanup);
+    }
+
+    public <T> T run(Supplier<T> supplier) {
+        lock.readLock().lock();
+        try {
+            if (alive.get()) {
+                return supplier.get();
+            } else {
+                throw new IllegalStateException("Component has already been closed.");
+            }
+        } finally {
+            lock.readLock().unlock();
+        }
+    }
+
+    @Override
+    public void close() throws Exception {
+        if (alive.get()) {
+            lock.writeLock().lock();
+            try {
+                if (alive.getAndSet(false)) {
+                    cleanup.run();
+                }
+            } finally {
+                lock.writeLock().unlock();
+            }
+        }
+    }
+}

src/stencil/process.clj

@@ -45,7 +45,7 @@
       (render [_ fragments function data]
         ;; TODO: use lifecycle lock here
         (let [data        (into {} (.getData data))
-              function    (fn [name & args] (.call function) (into-array Object args))
+              function    (fn [name args] (.call function name (into-array Object args)))
               writers-map (model/template-model->writers-map @model data function (update-vals fragments datafy))
               writer      (partial render-writers-map writers-map)]
           (reify EvaluatedDocument
@@ -55,7 +55,9 @@
       (close [_]
         (reset! model nil)
         (FileHelper/forceDelete zip-dir))
-      (getVariables [_] variables))))
+      (getVariables [_] variables)
+      clojure.core.protocols/Datafiable
+      (datafy [_] @model))))
 
 ;; Called from Java API
 (defn prepare-fragment [^File fragment-file, ^PrepareOptions options]

test/stencil/model_test.clj

@@ -13,7 +13,7 @@
 
 (deftest test-load-template-model
   (let [model (datafy (api/prepare "test-resources/multipart/main.docx"))]
-
+    (println (type model) (type (datafy model)))
     (is (contains? model :main))
     (is (contains? model :content-types))