Merge branch 'master' of github.com:seancorfield/engine

Merge beta4 (state path accessor) to intuitive apply, and bump to 0.1.0

src/engine/core.clj

@@ -18,8 +18,10 @@
     "Commit updates/deletes and yield nil or the failure (if any).")
   (return [this value]
     "Set/replace the result this engine will return on a commit!")
-  (state [this]
+  (-state [this path]
     "Yield the current state -- the result that would be returned.
+    If path is not nil, assume state is navigable via that path and
+    return just that part.
     If the engine is in failure mode, return nil.")
   (-transform [this f args]
     "Transform the result this engine will return on a commit!
@@ -82,8 +84,9 @@
   ;; happy path workflow
   (return [this value]
     (if failure this (assoc this :result value)))
-  (state [this]
-    (when-not failure result))
+  (-state [this path]
+    (when-not failure
+      (if path (get-in result path) result)))
   (-transform [this f args]
     (if failure this ($/apply update-in this [:result] f args)))
   (-apply [this f args]
@@ -153,6 +156,11 @@
   [this & args]
   (-query this args))
 
+(defn state
+  "Adapter for 2-arity -state."
+  [this & args]
+  (-state this args))
+
 (defn transform
   "Adapter for 3-arity -transform."
   [this f & args]

test/engine/core_test.clj

@@ -84,7 +84,7 @@
                      (return "> 13"))
             (commit!)))
 
-(expect "some : output\n"
+(expect #"some : output\r?\n"
         (with-out-str
           (-> (engine {:out (c/insertable-store
                              [_ label value]
@@ -115,3 +115,9 @@
                      (transform e #(+ % a b c d)))
                    [1 2 3 4])
             (commit!)))
+
+(expect :ok
+        (-> (engine {})
+            (return {:a {:b {:c [:bad :ok]}}})
+            (as-> e (return e (state e :a :b :c 1)))
+            (commit!)))