From ecb66421b0eaa6c095e3414c66beddd6befae3be Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 8 May 2016 18:00:42 -0400 Subject: [PATCH] rename clj-browserchannel-server as it now also includes cljs stuff --- chat-demo/project.clj | 2 +- clj-browserchannel-immutant-adapter/project.clj | 2 +- clj-browserchannel-jetty-adapter/project.clj | 2 +- {clj-browserchannel-server => clj-browserchannel}/README.md | 0 {clj-browserchannel-server => clj-browserchannel}/project.clj | 4 ++-- .../src/net/thegeez/browserchannel/async_adapter.clj | 0 .../src/net/thegeez/browserchannel/client.cljs | 0 .../src/net/thegeez/browserchannel/server.clj | 4 ++-- 8 files changed, 7 insertions(+), 7 deletions(-) rename {clj-browserchannel-server => clj-browserchannel}/README.md (100%) rename {clj-browserchannel-server => clj-browserchannel}/project.clj (60%) rename {clj-browserchannel-server => clj-browserchannel}/src/net/thegeez/browserchannel/async_adapter.clj (100%) rename {clj-browserchannel-server => clj-browserchannel}/src/net/thegeez/browserchannel/client.cljs (100%) rename {clj-browserchannel-server => clj-browserchannel}/src/net/thegeez/browserchannel/server.clj (99%) diff --git a/chat-demo/project.clj b/chat-demo/project.clj index c33a281..0e0771c 100644 --- a/chat-demo/project.clj +++ b/chat-demo/project.clj @@ -10,7 +10,7 @@ [compojure "1.4.0"] [clj-pebble "0.2.0"] [prismatic/dommy "1.1.0"] - [gered/clj-browserchannel-server "0.2.2"] + [gered/clj-browserchannel "0.3"] [gered/clj-browserchannel-jetty-adapter "0.0.9"] [gered/clj-browserchannel-immutant-adapter "0.0.1"] [org.immutant/web "2.1.4"] diff --git a/clj-browserchannel-immutant-adapter/project.clj b/clj-browserchannel-immutant-adapter/project.clj index fd7a433..ca9b515 100644 --- a/clj-browserchannel-immutant-adapter/project.clj +++ b/clj-browserchannel-immutant-adapter/project.clj @@ -1,6 +1,6 @@ (defproject gered/clj-browserchannel-immutant-adapter "0.0.1" :description "Immutant async adapter for BrowserChannel" - :dependencies [[gered/clj-browserchannel-server "0.2.2"]] + :dependencies [[gered/clj-browserchannel "0.3"]] :profiles {:provided {:dependencies [[org.clojure/clojure "1.8.0"] diff --git a/clj-browserchannel-jetty-adapter/project.clj b/clj-browserchannel-jetty-adapter/project.clj index 6929ae2..424c5aa 100644 --- a/clj-browserchannel-jetty-adapter/project.clj +++ b/clj-browserchannel-jetty-adapter/project.clj @@ -3,7 +3,7 @@ :dependencies [[ring/ring-core "1.4.0"] [ring/ring-servlet "1.4.0"] [org.eclipse.jetty/jetty-server "8.1.16.v20140903"];; includes ssl - [gered/clj-browserchannel-server "0.2.2"]] + [gered/clj-browserchannel "0.3"]] :profiles {:provided {:dependencies [[org.clojure/clojure "1.8.0"]]}}) diff --git a/clj-browserchannel-server/README.md b/clj-browserchannel/README.md similarity index 100% rename from clj-browserchannel-server/README.md rename to clj-browserchannel/README.md diff --git a/clj-browserchannel-server/project.clj b/clj-browserchannel/project.clj similarity index 60% rename from clj-browserchannel-server/project.clj rename to clj-browserchannel/project.clj index 7d6e212..ad99364 100644 --- a/clj-browserchannel-server/project.clj +++ b/clj-browserchannel/project.clj @@ -1,5 +1,5 @@ -(defproject gered/clj-browserchannel-server "0.2.2" - :description "BrowserChannel server implementation in Clojure" +(defproject gered/clj-browserchannel "0.3" + :description "BrowserChannel server implementation in Clojure, with a ClojureScript wrapper for the BrowserChannel API included in Google Closure." :dependencies [[ring/ring-core "1.4.0"] [org.clojure/data.json "0.2.6"] [prismatic/dommy "1.1.0"]] diff --git a/clj-browserchannel-server/src/net/thegeez/browserchannel/async_adapter.clj b/clj-browserchannel/src/net/thegeez/browserchannel/async_adapter.clj similarity index 100% rename from clj-browserchannel-server/src/net/thegeez/browserchannel/async_adapter.clj rename to clj-browserchannel/src/net/thegeez/browserchannel/async_adapter.clj diff --git a/clj-browserchannel-server/src/net/thegeez/browserchannel/client.cljs b/clj-browserchannel/src/net/thegeez/browserchannel/client.cljs similarity index 100% rename from clj-browserchannel-server/src/net/thegeez/browserchannel/client.cljs rename to clj-browserchannel/src/net/thegeez/browserchannel/client.cljs diff --git a/clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj b/clj-browserchannel/src/net/thegeez/browserchannel/server.clj similarity index 99% rename from clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj rename to clj-browserchannel/src/net/thegeez/browserchannel/server.clj index 9450316..2e3a435 100644 --- a/clj-browserchannel-server/src/net/thegeez/browserchannel/server.clj +++ b/clj-browserchannel/src/net/thegeez/browserchannel/server.clj @@ -67,7 +67,7 @@ (str "/" wolast))) ;; @todo to test file -(assert (= (repeat 4 "/foo") +#_(assert (= (repeat 4 "/foo") (map standard-base ["foo" "/foo" "foo/" "/foo"]))) ;; type preserving drop upto for queueus @@ -93,7 +93,7 @@ (sort-by first) ;; order by request number so that messages are recieved on server in same order (map #(into {} (map second (val %)))))})) -(assert (= {:ofs 0 :maps [{"x" "3" "y" "10"} {"abc" "def"}]} +#_(assert (= {:ofs 0 :maps [{"x" "3" "y" "10"} {"abc" "def"}]} (transform-url-data {"count" "2" "ofs" "0" "req0_x" "3"