Skip to content
This repository has been archived by the owner on Apr 20, 2018. It is now read-only.

Commit

Permalink
Merge pull request #11 from bsvingen/camel-snake-kebab_version
Browse files Browse the repository at this point in the history
Using camel-snake-kebab 0.3.0
  • Loading branch information
moea committed Jun 17, 2015
2 parents fd5a87e + 06b7d16 commit 6f5b64c
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[org.clojure/tools.logging "0.3.1"]
[org.clojure/algo.generic "0.1.2"]

[camel-snake-kebab "0.2.5"]
[camel-snake-kebab "0.3.0"]

[http-kit "2.1.18"]
[com.cemerick/url "0.1.1"]
Expand Down
2 changes: 1 addition & 1 deletion src/eulalie/dynamo.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[eulalie :refer :all]
[cheshire.core :as cheshire]
[clojure.core.async :as async]
[camel-snake-kebab.core :refer [->CamelCaseString ->kebab-case-keyword]]))
[camel-snake-kebab.core :refer [->PascalCaseString ->kebab-case-keyword]]))

;; FIXME how do we handle errors in the body like {__type:} in a
;; general way?
Expand Down
6 changes: 3 additions & 3 deletions src/eulalie/dynamo/mapping.clj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[clojure.algo.generic.functor :as functor]
[clojure.string :as str]
[camel-snake-kebab.core
:refer [->SNAKE_CASE_KEYWORD ->kebab-case-keyword ->CamelCaseKeyword]]))
:refer [->SCREAMING_SNAKE_CASE_KEYWORD ->kebab-case-keyword ->PascalCaseKeyword]]))

(defn handle-attr [f v]
(functor/fmap
Expand All @@ -25,12 +25,12 @@

(defn transform-request [m]
(transform
->CamelCaseKeyword
->PascalCaseKeyword
identity
key-types/request-key-types
{:nest transform-request
:attr #(handle-attr transform-request %)
:enum ->SNAKE_CASE_KEYWORD
:enum ->SCREAMING_SNAKE_CASE_KEYWORD
:list (fn-some->> not-empty (map name) (str/join ","))}
m))

Expand Down
12 changes: 6 additions & 6 deletions src/eulalie/service_util.clj
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
[clj-time.coerce :as time-coerce]
[cemerick.url :as url]
[camel-snake-kebab.core :refer
[->CamelCaseKeyword
->CamelCaseString
[->PascalCaseKeyword
->PascalCaseString
->kebab-case-keyword]]
[camel-snake-kebab.extras :refer [transform-keys]])
(:import java.util.zip.CRC32))
Expand Down Expand Up @@ -110,17 +110,17 @@
(def aws-date-format (time-format/formatters :basic-date))
(def aws-date-time-format (time-format/formatters :basic-date-time-no-ms))

(def ->camel-k ->CamelCaseKeyword)
(def ->camel-k ->PascalCaseKeyword)
(def ->kebab-k ->kebab-case-keyword)
(def ->camel-s ->CamelCaseString)
(def ->camel-s ->PascalCaseString)

(defn ->camel [x]
(if (string? x)
(->camel-s x)
(->camel-k x)))

(def ->camel-keys-k (partial transform-keys ->CamelCaseKeyword))
(def ->camel-keys-s (partial transform-keys ->CamelCaseString))
(def ->camel-keys-k (partial transform-keys ->PascalCaseKeyword))
(def ->camel-keys-s (partial transform-keys ->PascalCaseString))

(defn region->tld [region]
(case (name region)
Expand Down
2 changes: 1 addition & 1 deletion src/eulalie/sns.clj
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
(defn prepare-targeted-message [msg]
(into {}
(for [[k v] msg]
(let [k' (csk/->SNAKE_CASE_KEYWORD k)
(let [k' (csk/->SCREAMING_SNAKE_CASE_KEYWORD k)
k (if (upper-case k') k' k)
v (prepare-message-value
(dispatch-map k k)
Expand Down
12 changes: 6 additions & 6 deletions src/eulalie/util/query.clj
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@
(cond (and (keyword? k) (namespace k))
(str (str/lower-case (namespace k))
":"
(csk/->CamelCaseString (name k)))
(csk/->PascalCaseString (name k)))
(string? k) k
:else (csk/->CamelCaseString k)))
:else (csk/->PascalCaseString k)))

(defn policy-key-in [k]
(let [k (cond-> k (keyword? k) name)]
Expand Down Expand Up @@ -74,8 +74,8 @@
(defn translate-enums [req enum-keys]
(let [matcher (enum-keys->matcher enum-keys)]
(into req
(for [[k v] req :when (matcher k)]
[k (cond-> v (keyword? v) csk/->CamelCaseString)]))))
(for [[k v] req :when (matcher k)]
[k (cond-> v (keyword? v) csk/->PascalCaseString)]))))

(defn join-key-paths [& segments]
(vec (flatten (apply conj [] segments))))
Expand All @@ -96,7 +96,7 @@
(let [k (flatten k)]
(str/join "." (map format-query-key k)))
(string? k) k
(keyword? k) (csk/->CamelCaseString k)
(keyword? k) (csk/->PascalCaseString k)
:else (str k)))

(defn format-query-request [m]
Expand Down Expand Up @@ -153,7 +153,7 @@
[{:keys [version] :as service} {:keys [body target] :as req}]
(let [body (assoc body
:version version
:action (csk/->CamelCaseString target))]
:action (csk/->PascalCaseString target))]
(-> (service-util/default-request service req)
(assoc :body body)
(assoc-in [:headers :content-type]
Expand Down

0 comments on commit 6f5b64c

Please sign in to comment.