Fixed argument destructuring in defc macro (closes #22)

tonsky · Feb 20, 2015 · ee1bdea · ee1bdea
1 parent c44b1a6
commit ee1bdea
Show file tree

Hide file tree

Showing 4 changed files with 344 additions and 327 deletions.
diff --git a/README.md b/README.md
@@ -293,6 +293,10 @@ This is a detailed breakdown of what happens inside of Rum. By using `rum/defc`,
 
 ## Changes
 
+### 0.2.5
+
+- Fixed argument destructuring in defc macro (issue #22)
+
 ### 0.2.4
 
 - `will-update` and `did-update` lifecycle methods added (thx @[Andrey Vasenin](https://github.com/avasenin), pull request #18)

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject rum "0.2.4"
+(defproject rum "0.2.5"
   :description "ClojureScript wrapper for React"
   :url "https://github.com/tonsky/rum"
   :license {:name "Eclipse Public License"

diff --git a/src/rum.clj b/src/rum.clj
@@ -25,8 +25,9 @@
    `(let [render-fn#    (fn ~argvec ~(s/compile-html `(do ~@render)))
           render-mixin# (~render-ctor render-fn#)
           class#        (rum/build-class (concat [render-mixin#] ~mixins) ~(str name))
-          ctor#         (fn ~argvec
-                          (let [state# (args->state ~argvec)]
+          ctor#         (fn [& args#]
+                          (let [~argvec args#
+                                state# (args->state args#)]
                             (rum/element class# state# nil)))]
       (def ~name ~doc (with-meta ctor# {::class class#})))))
 

diff --git a/web/rum.js b/web/rum.js