From ed6f1902b9007558722b50ee5b6c45cb249d6bdc Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Sat, 13 Feb 2016 18:56:35 -0500 Subject: [PATCH 1/4] rename VOID to STOP --- src/clj/com/rpl/specter.cljx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clj/com/rpl/specter.cljx b/src/clj/com/rpl/specter.cljx index 85c7129..d1b403e 100644 --- a/src/clj/com/rpl/specter.cljx +++ b/src/clj/com/rpl/specter.cljx @@ -150,7 +150,7 @@ (defpath ^{:doc "Stops navigation at this point. For selection returns nothing and for transformation returns the structure unchanged"} - VOID + STOP [] (select* [this structure next-fn] nil ) From 6db23aa6c8423389020db3cb77835b3ca91f39a4 Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Sun, 14 Feb 2016 13:35:23 -0500 Subject: [PATCH 2/4] fix tests --- test/com/rpl/specter/core_test.cljx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/com/rpl/specter/core_test.cljx b/test/com/rpl/specter/core_test.cljx index 596bc93..442d7a4 100644 --- a/test/com/rpl/specter/core_test.cljx +++ b/test/com/rpl/specter/core_test.cljx @@ -574,11 +574,11 @@ (for-all+ [s1 (gen/vector (limit-size 5 gen/int))] (and - (empty? (s/select s/VOID s1)) - (empty? (s/select [s/VOID s/ALL s/ALL s/ALL s/ALL] s1)) - (= s1 (s/transform s/VOID inc s1)) - (= s1 (s/transform [s/ALL s/VOID s/ALL] inc s1)) - (= (s/transform [s/ALL (s/cond-path even? nil odd? s/VOID)] inc s1) + (empty? (s/select s/STOP s1)) + (empty? (s/select [s/STOP s/ALL s/ALL s/ALL s/ALL] s1)) + (= s1 (s/transform s/STOP inc s1)) + (= s1 (s/transform [s/ALL s/STOP s/ALL] inc s1)) + (= (s/transform [s/ALL (s/cond-path even? nil odd? s/STOP)] inc s1) (s/transform [s/ALL even?] inc s1)) ))) From 33e52d606a092bf342559ac1dc7f7da0dc50ed84 Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Sun, 14 Feb 2016 13:35:39 -0500 Subject: [PATCH 3/4] update changelog --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index c0e4061..caf583b 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,6 +3,7 @@ * declarepath can now be parameterized * Added params-reset which calls its path with the params index walked back by the number of params needed by its path. This enables recursive parameterized paths * Added convenience syntax for defprotocolpath with no params, e.g. (defprotocolpath foo) +* Rename VOID to STOP ## 0.9.2 * Added VOID selector which navigates nowhere From dd906aad95157f728c0aecf2342da0dc601d2530 Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Fri, 26 Feb 2016 09:17:40 -0500 Subject: [PATCH 4/4] change clojure/cljs dependencies to provided --- project.clj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 1316047..f6b51b0 100644 --- a/project.clj +++ b/project.clj @@ -1,16 +1,16 @@ (def VERSION (.trim (slurp "VERSION"))) (defproject com.rpl/specter VERSION - :dependencies [[org.clojure/clojure "1.6.0"] - [org.clojure/clojurescript "0.0-3211"] - ] :jvm-opts ["-XX:-OmitStackTraceInFastThrow"] ; this prevents JVM from doing optimizations which can remove stack traces from NPE and other exceptions :source-paths ["src/clj"] :java-source-paths ["src/java"] :test-paths ["test", "target/test-classes"] :jar-exclusions [#"\.cljx"] :auto-clean false - :profiles {:dev {:dependencies + :profiles {:provided {:dependencies + [[org.clojure/clojure "1.6.0"] + [org.clojure/clojurescript "0.0-3211"]]} + :dev {:dependencies [[org.clojure/test.check "0.7.0"]] :plugins [[com.keminglabs/cljx "0.6.0"]]