move def of Choice tag, Ignorable attr

Author: erdos

src/stencil/model/numbering.clj

@@ -28,18 +28,14 @@
 (defn- gen-abstract-numbering-id []
   (str (swap! (:counter2 *numbering*) inc)))
 
-
-(def ^:private ignorable-tag :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Ignorable)
-
-
 (defn -add-extra-elems [evaluated-model extra-elems]
   (-> evaluated-model
       (update-in [:main :stencil.model/numbering]
                  (fn [nr#]
                    (if (:stencil.model/path nr#)
                      (dissoc nr# :source-file)
                      (assoc nr#
-                            :parsed {:tag ooxml/tag-numbering :attrs {ignorable-tag ""} :content []}
+                            :parsed {:tag ooxml/tag-numbering :attrs {ooxml/ignorable ""} :content []}
                             :stencil.model/path  "word/numbering.xml"))))
       ;; TODO: make it conditional
       (assoc-in [:content-types :parsed :stencil.model.content-types/override "/word/numbering.xml"]

src/stencil/ooxml.clj

@@ -131,4 +131,10 @@
 ;; drawing, binary large image or picture
 (def blip :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fdrawingml%2F2006%2Fmain/blip)
 ;; hyperlinks
-(def hyperlink :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fwordprocessingml%2F2006%2Fmain/hyperlink)
+(def hyperlink :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fwordprocessingml%2F2006%2Fmain/hyperlink)
+
+;; OOXML attribute holds list of ns aliases
+(def ignorable :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Ignorable)
+
+;; OOXML tag, has Requires attribute which holds list of ns aliases
+(def choice :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Choice)

src/stencil/postprocess/ignored_tag.clj

@@ -6,8 +6,6 @@
             [clojure.string :as s]
             [stencil.ooxml :as ooxml]))
 
-(def ^:private ignorable-tag :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Ignorable)
-(def ^:private choice-tag :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Choice)
 
 ;; like clojure.walk/postwalk but keeps metadata and calls fn only on nodes
 (defn- postwalk-xml [f xml-tree]
@@ -27,7 +25,7 @@
   "Updates the Requires attribute of a Choice tag with the fn"
   [elem f]
   (assert (ifn? f))
-  (if (= (:tag elem) choice-tag)
+  (if (= (:tag elem) ooxml/choice)
     (update-in elem [:attrs :Requires] f)
     elem))
 
@@ -40,14 +38,14 @@
 
 ;; first call this
 (defn map-ignored-attr
-  "Replaces values in ignorable-tag and requires-tag attributes to
+  "Replaces values in Ignorable and Requires attributes to
    the namespace names they are aliased by."
   [xml-tree]
   (postwalk-xml
    (fn [form]
      (let [p->url (get-in (meta form) [:clojure.data.xml/nss :p->u])]
        (-> form
-           (update-if-present [:attrs ignorable-tag] (partial map-str p->url))
+           (update-if-present [:attrs ooxml/ignorable] (partial map-str p->url))
            (update-choice-requires (partial map-str p->url)))))
    xml-tree))
 
@@ -67,7 +65,7 @@
            (when (contains? ooxml/default-aliases ns)
              (find! ns)))
          (-> form
-             (update-if-present [:attrs ignorable-tag] (partial map-str find!))
+             (update-if-present [:attrs ooxml/ignorable] (partial map-str find!))
              (update-choice-requires (partial map-str find!))))
        xml-tree)
       @found)))

test/stencil/ignored_tag_test.clj

@@ -1,10 +1,9 @@
 (ns stencil.ignored-tag-test
   (:require [clojure.data.xml :as xml]
-            [clojure.java.io :as io]
-            [clojure.walk :as walk]
-            [clojure.test :refer [deftest is are testing]]
+            [clojure.test :refer [deftest is testing]]
             [stencil.tokenizer :as tokenizer]
             [stencil.merger :as merger]
+            [stencil.ooxml :as ooxml]
             [stencil.postprocess.ignored-tag :refer :all]))
 
 ;; make all private maps public!
@@ -36,9 +35,7 @@
         (java.io.StringReader.) (merger/parse-to-tokens-seq) (tokenizer/tokens-seq->document)
         (clear-all-metas) (unmap-ignored-attr) (xml/emit-str) (xml/parse-str)
         (as-> *
-              (let [ignorable-value
-                    (-> * :content first :attrs
-                        :xmlns.http%3A%2F%2Fschemas.openxmlformats.org%2Fmarkup-compatibility%2F2006/Ignorable)
+              (let [ignorable-value (-> * :content first :attrs ooxml/ignorable)
                     ignorable-ns (-> * meta :clojure.data.xml/nss :p->u (get ignorable-value))]
                 (is (not (empty? ignorable-value)))
                 (is (= "ns2" ignorable-ns)))))))