Merge pull request #593 from skynet-gh/clj-commons-byte-streams

Update byte-streams and use clj-commons namespace prefixes

Author: KingMob

examples/src/aleph/examples/http.clj

@@ -7,7 +7,7 @@
     [compojure.route :as route]
     [compojure.response :refer [Renderable]]
     [aleph.http :as http]
-    [byte-streams :as bs]
+    [clj-commons.byte-streams :as bs]
     [manifold.stream :as s]
     [manifold.deferred :as d]
     [clojure.core.async :as a]

examples/src/aleph/examples/udp.clj

@@ -1,10 +1,9 @@
 (ns aleph.examples.udp
   (:require
-    [manifold.deferred :as d]
     [manifold.stream :as s]
     [aleph.udp :as udp]
     [clojure.string :as str]
-    [byte-streams :as bs]))
+    [clj-commons.byte-streams :as bs]))
 
 ;; Full documentation for the `aleph.udp` namespace can be found [here](http://aleph.io/codox/aleph/aleph.udp.html).
 

examples/src/aleph/examples/websocket.clj

@@ -4,11 +4,9 @@
     [ring.middleware.params :as params]
     [compojure.route :as route]
     [aleph.http :as http]
-    [byte-streams :as bs]
     [manifold.stream :as s]
     [manifold.deferred :as d]
-    [manifold.bus :as bus]
-    [clojure.core.async :as a]))
+    [manifold.bus :as bus]))
 
 (def non-websocket-request
   {:status 400
@@ -111,8 +109,8 @@
 
 ;; Here we create two clients, and have them speak to each other
 (let [conn1 @(http/websocket-client "ws://localhost:10000/chat")
-      conn2 @(http/websocket-client "ws://localhost:10000/chat")
-      ]
+      conn2 @(http/websocket-client "ws://localhost:10000/chat")]
+      
 
   ;; sign our two users in
   (s/put-all! conn1 ["shoes and ships" "Alice"])
@@ -126,7 +124,7 @@
   (s/put! conn2 "hi!")
 
   @(s/take! conn1)   ;=> "Bob: hi!"
-  @(s/take! conn2)   ;=> "Bob: hi!"
-  )
+  @(s/take! conn2))   ;=> "Bob: hi!"
+  
 
 (.close s)

project.clj

@@ -12,8 +12,9 @@
 
 (def other-dependencies
   '[[org.clojure/tools.logging "1.1.0" :exclusions [org.clojure/clojure]]
-    [manifold "0.1.9"]
-    [org.clj-commons/byte-streams "0.2.10"]
+    [manifold "0.2.3"]
+    [org.clj-commons/byte-streams "0.3.0"]
+    [org.clj-commons/primitive-math "1.0.0"]
     [potemkin "0.4.5"]])
 
 (defproject aleph "0.4.7"

src/aleph/http/client.clj

@@ -1,7 +1,7 @@
 (ns aleph.http.client
   (:require
     [clojure.tools.logging :as log]
-    [byte-streams :as bs]
+    [clj-commons.byte-streams :as bs]
     [manifold.deferred :as d]
     [manifold.stream :as s]
     [aleph.http.core :as http]

src/aleph/http/client_middleware.clj

@@ -8,7 +8,7 @@
     [manifold.deferred :as d]
     [manifold.stream :as s]
     [manifold.executor :as ex]
-    [byte-streams :as bs]
+    [clj-commons.byte-streams :as bs]
     [clojure.edn :as edn]
     ;; leave this dependency to make sure that HeaderMap is already compiled
     [aleph.http.core :as http])

src/aleph/http/core.clj

@@ -6,8 +6,8 @@
     [clojure.tools.logging :as log]
     [clojure.set :as set]
     [clojure.string :as str]
-    [byte-streams :as bs]
-    [byte-streams.graph :as g]
+    [clj-commons.byte-streams :as bs]
+    [clj-commons.byte-streams.graph :as g]
     [potemkin :as p]
     [clojure.java.io :as io])
   (:import

src/aleph/http/encoding.clj

@@ -1,7 +1,7 @@
 (ns aleph.http.encoding
   (:require
-    [byte-streams :as bs]
-    [primitive-math :as p])
+    [clj-commons.byte-streams :as bs]
+    [clj-commons.primitive-math :as p])
   (:import
     [io.netty.buffer
      ByteBuf

src/aleph/http/multipart.clj

@@ -1,7 +1,7 @@
 (ns aleph.http.multipart
   (:require
    [clojure.core :as cc]
-   [byte-streams :as bs]
+   [clj-commons.byte-streams :as bs]
    [aleph.http.encoding :refer [encode]]
    [aleph.http.core :as http-core]
    [aleph.netty :as netty]

src/aleph/http/server.clj

@@ -3,7 +3,7 @@
     [aleph.http.core :as http]
     [aleph.netty :as netty]
     [aleph.flow :as flow]
-    [byte-streams :as bs]
+    [clj-commons.byte-streams :as bs]
     [clojure.tools.logging :as log]
     [clojure.string :as str]
     [manifold.deferred :as d]