Add close method to IReader

src/pogonos/core.cljc

@@ -49,9 +49,12 @@
      ([file data opts]
       (let [opts (cond-> opts
                    (string? file) (assoc :source file)
-                   (instance? File file) (assoc :source (.getName ^File file)))]
-        (with-open [in ^Closeable (reader/make-file-reader file)]
-          (render-input in data opts))))))
+                   (instance? File file) (assoc :source (.getName ^File file)))
+            in (reader/make-file-reader file)]
+        (try
+          (render-input in data opts)
+          (finally
+            (reader/close in)))))))
 
 #?(:clj
    (defn set-default-partials-base-path! [base-path]

src/pogonos/protocols.cljc

@@ -2,7 +2,8 @@
   (:refer-clojure :exclude [read-line resolve]))
 
 (defprotocol IReader
-  (read-line [this]))
+  (read-line [this])
+  (close [this]))
 
 (defprotocol IRenderable
   (render [this ctx out]))

src/pogonos/reader.cljc

@@ -6,6 +6,8 @@
             [pogonos.strings :as pstr])
   #?(:clj (:import [java.io Reader Closeable])))
 
+(defn close [reader] (proto/close reader))
+
 (deftype StringReader [src ^:unsynchronized-mutable offset]
   proto/IReader
   (read-line [this]
@@ -14,7 +16,8 @@
             offset' (or (some-> i inc) (count src))
             ret (subs src offset offset')]
         (set! offset offset')
-        ret))))
+        ret)))
+  (close [this]))
 
 (defn make-string-reader [s]
   (StringReader. s 0))
@@ -85,7 +88,9 @@
   (base-reader [this] in)
   proto/IReader
   (read-line [this]
-    (read-line this)))
+    (read-line this))
+  (close [this]
+    (proto/close in)))
 
 (defn make-line-buffering-reader [in]
   (->LineBufferingReader in nil 0 0))

src/pogonos/render.cljc

@@ -128,6 +128,4 @@
           (parse/parse r #(render* ctx out %)
                        {:source name :indent (:indent this)})
           (finally
-            #?(:clj
-               (when (instance? java.io.Closeable r)
-                 (.close ^java.io.Closeable r)))))))))
+            (reader/close r)))))))