unify namespace for deftwg; bump 0.5.0

README.md

@@ -7,11 +7,11 @@ Cached rendering and diff/patch library designed for Cumulo project.
 ### API [![Clojars Project](https://img.shields.io/clojars/v/cumulo/recollect.svg)](https://clojars.org/cumulo/recollect)
 
 ```clojure
-[cumulo/recollect "0.4.4"]
+[cumulo/recollect "0.5.0"]
 ```
 
 ```clojure
-(recollect.macros/deftwig twig-name [param] body)
+(recollect.twig/deftwig twig-name [param] body)
 (recollect.twig/render-twig twig-data old-data-twig)
 (recollect.twig/conceal data-twig)
 (recollect.diff/diff-twig a b {:key :id})

meyvn.edn

@@ -1,7 +1,7 @@
 
 {:pom {:group-id "cumulo",
        :artifact-id "recollect",
-       :version "0.4.4",
+       :version "0.5.0",
        :name "Cached rendering and diff/patch library designed for Cumulo project."}
  :packaging {:jar {:enabled true
                    :remote-repository {:id "clojars"

polyfill/recollect/macros.clj → polyfill/recollect/twig.clj

@@ -1,4 +1,4 @@
-(ns recollect.macros)
+(ns recollect.twig)
 
 (defmacro deftwig [twig-name params & body]
   `(defn ~twig-name [~@params]

src/recollect/test.cljs

@@ -6,7 +6,7 @@
             [recollect.schema :as schema]
             [recollect.util :refer [vec-add seq-add]]
             [shadow.test.env :refer [register-test]]
-            [recollect.macros :refer [deftwig]]
+            [recollect.twig :refer [deftwig]]
             [recollect.twig :refer [render-twig]]))
 
 (deftest
@@ -19,7 +19,7 @@
        b (B fx)
        a1 (render-twig b a0)
        options {:key :id}
-       changes [1]]
+       changes []]
    (is (= changes (diff-twig a0 a1 options)))))
 
 (deftest

src/recollect/twig.cljs

@@ -1,6 +1,7 @@
 
 (ns recollect.twig
-  (:require [recollect.types :refer [Twig twig?]] [recollect.util :refer [=seq literal?]]))
+  (:require [recollect.types :refer [Twig twig?]] [recollect.util :refer [=seq literal?]])
+  (:require-macros [recollect.twig]))
 
 (declare render-map)
 

src/recollect/twig/card.cljs

@@ -1,4 +1,4 @@
 
-(ns recollect.twig.card (:require [recollect.macros :refer [deftwig]]))
+(ns recollect.twig.card (:require [recollect.twig :refer [deftwig]]))
 
 (deftwig twig-card (user date) {:user user, :date date})

src/recollect/twig/container.cljs

@@ -1,6 +1,6 @@
 
 (ns recollect.twig.container
-  (:require [recollect.twig.card :refer [twig-card]] [recollect.macros :refer [deftwig]]))
+  (:require [recollect.twig.card :refer [twig-card]] [recollect.twig :refer [deftwig]]))
 
 (deftwig
  twig-container