From 96ad26b054e118181a0763303088319f45091480 Mon Sep 17 00:00:00 2001 From: Patrick Carlisle Date: Tue, 11 Mar 2014 17:59:07 -0700 Subject: [PATCH] Reorganize sync and async clients. --- README.md | 4 ++-- src/puppetlabs/http/{client.clj => client/async.clj} | 2 +- src/puppetlabs/http/{ => client}/sync.clj | 4 ++-- .../http/{client_test.clj => client/async_test.clj} | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/puppetlabs/http/{client.clj => client/async.clj} (99%) rename src/puppetlabs/http/{ => client}/sync.clj (95%) rename test/puppetlabs/http/{client_test.clj => client/async_test.clj} (95%) diff --git a/README.md b/README.md index 928f9a2..6ca8846 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,5 @@ providing some extra functionality for configuring SSL in a way compatible with Puppet. Async versions of the http methods are exposed in -puppetlabs.http.client, and synchronous versions are in -puppetlabs.http.sync. +puppetlabs.http.client.async, and synchronous versions are in +puppetlabs.http.client.sync. diff --git a/src/puppetlabs/http/client.clj b/src/puppetlabs/http/client/async.clj similarity index 99% rename from src/puppetlabs/http/client.clj rename to src/puppetlabs/http/client/async.clj index cb5b565..d86dbb9 100644 --- a/src/puppetlabs/http/client.clj +++ b/src/puppetlabs/http/client/async.clj @@ -12,7 +12,7 @@ ;; See the puppetlabs.http.sync namespace for synchronous versions of all ;; these methods. -(ns puppetlabs.http.client +(ns puppetlabs.http.client.async (:require [org.httpkit.client :as http] [puppetlabs.kitchensink.ssl :as ssl]) (:refer-clojure :exclude (get))) diff --git a/src/puppetlabs/http/sync.clj b/src/puppetlabs/http/client/sync.clj similarity index 95% rename from src/puppetlabs/http/sync.clj rename to src/puppetlabs/http/client/sync.clj index e8893e2..cd6a8a6 100644 --- a/src/puppetlabs/http/sync.clj +++ b/src/puppetlabs/http/client/sync.clj @@ -1,8 +1,8 @@ ;; This namespace provides synchronous versions of the request functions ;; defined in puppetlabs.http.client -(ns puppetlabs.http.sync - (:require [puppetlabs.http.client :as async]) +(ns puppetlabs.http.client.sync + (:require [puppetlabs.http.client.async :as async]) (:refer-clojure :exclute (get))) (defn request diff --git a/test/puppetlabs/http/client_test.clj b/test/puppetlabs/http/client/async_test.clj similarity index 95% rename from test/puppetlabs/http/client_test.clj rename to test/puppetlabs/http/client/async_test.clj index 66139b4..2747c03 100644 --- a/test/puppetlabs/http/client_test.clj +++ b/test/puppetlabs/http/client/async_test.clj @@ -1,8 +1,8 @@ -(ns puppetlabs.http.client-test +(ns puppetlabs.http.client.async-test (:require [clojure.test :refer :all] [clojure.java.io :refer [resource]] [puppetlabs.kitchensink.ssl :as ks-ssl] - [puppetlabs.http.client :as http]) + [puppetlabs.http.client.async :as http]) (:import [javax.net.ssl SSLEngine])) (deftest ssl-config-with-files