target latest manifold, mark 0.5.6

README.markdown

@@ -7,7 +7,7 @@ Lamina is for describing and analyzing streams of data.  It provides a rich set
 Add the following to the `:dependencies` section of your `project.clj` file:
 
 ```clj
-[lamina "0.5.4"]
+[lamina "0.5.6"]
 ```
 
 ## Rationale

project.clj

@@ -1,13 +1,13 @@
-(defproject lamina "0.5.5"
+(defproject lamina "0.5.6"
   :description "event-driven data structures for clojure"
   :min-lein-version "2.0.0"
-  :dependencies [[org.clojure/tools.logging "0.2.6"]
+  :dependencies [[org.clojure/tools.logging "0.3.1"]
                  [org.flatland/useful "0.11.1"]
-                 [potemkin "0.3.8"]
-                 [manifold "0.1.0-alpha3"]]
+                 [potemkin "0.3.11"]
+                 [manifold "0.1.0-beta8"]]
   :exclusions [org.clojure/contrib
                org.clojure/clojure-contrib]
-  :profiles {:dev {:dependencies [[org.clojure/clojure "1.5.1"]
+  :profiles {:dev {:dependencies [[org.clojure/clojure "1.7.0-alpha5"]
                                   [criterium "0.4.2"]
                                   [codox-md "0.2.0" :exclusions [org.clojure/clojure]]]}
              :1.6 {:dependencies [[org.clojure/clojure "1.6.0"]]}}

src/lamina/core.clj

@@ -13,6 +13,7 @@
     [manifold
      [stream :as s]
      [deferred :as d]]
+    [manifold.stream.core :as manifold]
     [lamina.time :as t]
     [lamina.core.watch :as w]
     [lamina.core.named :as n]
@@ -403,7 +404,7 @@
 
 ;;;
 
-(s/def-source LaminaChannelSource
+(manifold/def-source LaminaChannelSource
   [ch]
 
   (isSynchronous [_] false)
@@ -416,7 +417,7 @@
   (close [_]
     (close ch))
 
-  (take [this blocking? default-val]
+  (take [this default-val blocking?]
     (let [d (d/->deferred
               (p/run-pipeline
                 (read-channel* ch
@@ -432,7 +433,7 @@
         @d
         d)))
 
-  (take [this blocking? default-val timeout timeout-val]
+  (take [this default-val blocking? timeout timeout-val]
     (let [d (d/->deferred
               (p/run-pipeline
                 (read-channel* ch
@@ -450,7 +451,7 @@
         @d
         d))))
 
-(s/def-sink LaminaChannelSink
+(manifold/def-sink LaminaChannelSink
   [ch]
 
   (isSynchronous [_] false)
@@ -464,14 +465,13 @@
     (close ch))
 
   (put [this x blocking?]
-
     (let [x (enqueue ch x)
           x (cond
               (r/async-promise? x)
               (-> x
                 d/->deferred
-                (d/chain (fn [_] true))
-                (d/catch Throwable (fn [_] false)))
+                (d/chain (fn [x] true))
+                (d/catch (fn [_] false)))
 
               (or
                 (identical? :lamina/closed! x)
@@ -488,13 +488,13 @@
 
     (.put this x blocking?)))
 
-(extend-protocol s/Sourceable
+(extend-protocol manifold/Sourceable
 
     lamina.core.channel.IChannel
     (to-source [ch]
       (->LaminaChannelSource ch)))
 
-(extend-protocol s/Sinkable
+(extend-protocol manifold/Sinkable
 
     lamina.core.channel.IChannel
     (to-sink [ch]

test/lamina/test/manifold.clj

@@ -18,7 +18,6 @@
 
     (validate-put-take in out)
 
-    (let [c' (channel)
-          out (s/->source c')]
+    (let [c' (channel)]
       (s/connect c c')
-      (validate-put-take in out))))
+      (validate-put-take in (s/->source c')))))