fix: fragments without dynamic content

erdos · Oct 1, 2019 · ef97abd · ef97abd
1 parent e977bb7
commit ef97abd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/examples/Multipart Template/Main.java b/examples/Multipart Template/Main.java
@@ -8,17 +8,18 @@
 public class Main {
 
  public static void main(String... args) throws IOException {
-
  // prepare template file
  PreparedTemplate template = API.prepare(findFile("template.docx"));
 
  // prepare header fragment
  PreparedFragment header = API.fragment(findFile("header.docx"));
  PreparedFragment footer = API.fragment(findFile("footer.docx"));
+ PreparedFragment staticContent = API.fragment(findFile("static.docx"));
 
  Map<String, PreparedFragment> fragments = new HashMap<>();
  fragments.put("header", header);
  fragments.put("footer", footer);
+ fragments.put("static", staticContent);
 
  // assemble template data
  Map<String, Object> dataMap = new HashMap<>();

diff --git a/examples/Multipart Template/static.docx b/examples/Multipart Template/static.docx
diff --git a/examples/Multipart Template/template.docx b/examples/Multipart Template/template.docx
diff --git a/src/stencil/model.clj b/src/stencil/model.clj
@@ -192,7 +192,10 @@
  (assert (::path part))
  (if (:dynamic? (:executable part))
  (eval-model-part-exec (:executable part) data functions)
- {:writer (resource-copier part)}))
+ {:writer (resource-copier part)
+ :xml-delay (delay
+ (with-open [reader (io/input-stream (:source-file part))]
+ (update (xml/parse reader) :content doall)))}))
 
 
 (defn- style-file-writer [template]
@@ -417,7 +420,8 @@
  evaled (eval-template-model fragment-model local-data-map {} {})
 
  ;; write back
- evaled-parts (-> evaled :main :result :xml (doto assert) extract-body-parts)]
+ get-xml (fn [x] (or (:xml x) @(:xml-delay x)))
+ evaled-parts (-> evaled :main :result get-xml extract-body-parts)]
  (swap! *inserted-fragments* conj frag-name)
  (swap! *extra-files* into relation-ids-rename)
  [{:text (->FragmentInvoke {:frag-evaled-parts evaled-parts})}])

diff --git a/test/stencil/api_test.clj b/test/stencil/api_test.clj
@@ -83,9 +83,10 @@
 (deftest test-render-with-fragments
  (let [footer (fragment "./examples/Multipart Template/footer.docx")
  header (fragment "./examples/Multipart Template/header.docx")
+ static (fragment "./examples/Multipart Template/static.docx")
  template (prepare "./examples/Multipart Template/template.docx")
  data {:companyName "ACME" :companyAddress "Moon"}
- fs-map {:footer footer :header header}]
+ fs-map {:footer footer :header header :static static}]
  (testing "Rendering multipart template"
  (render! template data :fragments fs-map))
  (testing "Can not render when fragments can not be found."