Skip to content

Commit

Permalink
Release candidate v0.5.0-rc5
Browse files Browse the repository at this point in the history
  • Loading branch information
@gmsvalente
gmsvalente committed Nov 10, 2023
1 parent 9e4d5c0 commit 0afa1ba
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 49 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
## Unreleased

## 0.5.0-rc5

- Bump info.sunng/ring-jetty9-adapter ring adapter library
- Refactor swagger

## 0.5.0-rc4

- added swagger-ui
Expand Down
38 changes: 19 additions & 19 deletions deps.edn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,27 @@
:deps {org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/core.async {:mvn/version "1.5.648"}
org.clojure/tools.cli {:mvn/version "1.0.206"}
org.clojure/data.json {:mvn/version "2.4.0"},
org.clojure/data.xml {:mvn/version "0.0.8"},
com.draines/postal {:mvn/version "2.0.5"},
com.flexiana/tiny-rbac {:mvn/version "0.1.1"},
com.taoensso/timbre {:mvn/version "5.2.1"},
crypto-password/crypto-password {:mvn/version "0.3.0"},
funcool/cuerdas {:mvn/version "2.2.1"},
info.sunng/ring-jetty9-adapter {:mvn/version "0.30.1"},
metosin/malli {:mvn/version "0.8.4"},
metosin/reitit {:mvn/version "0.5.18"},
;; migratus/migratus {:mvn/version "1.3.7"},
org.clojure/data.json {:mvn/version "2.4.0"}
org.clojure/data.xml {:mvn/version "0.0.8"}
com.draines/postal {:mvn/version "2.0.5"}
com.flexiana/tiny-rbac {:mvn/version "0.1.1"}
com.taoensso/timbre {:mvn/version "5.2.1"}
crypto-password/crypto-password {:mvn/version "0.3.0"}
funcool/cuerdas {:mvn/version "2.2.1"}
info.sunng/ring-jetty9-adapter {:mvn/version "0.30.1"}
metosin/malli {:mvn/version "0.8.4"}
metosin/reitit {:mvn/version "0.5.18"}
;; migratus/migratus {:mvn/version "1.3.7"}
migratus/migratus {:git/url "https://github.com/Flexiana/migratus"
:sha "fba4aa9d57da6cc6a1d6e8c4a2b4198ad5a44315"}
nilenso/honeysql-postgres {:mvn/version "0.4.112"},
buddy/buddy-core {:mvn/version "1.10.413"},
buddy/buddy-sign {:mvn/version "3.4.333"},
org.clojure/java.jdbc {:mvn/version "0.7.12"},
clj-test-containers/clj-test-containers {:mvn/version "0.7.2"},
org.postgresql/postgresql {:mvn/version "42.3.3"},
piotr-yuxuan/closeable-map {:mvn/version "0.35.0"},
seancorfield/next.jdbc {:mvn/version "1.2.659"},
nilenso/honeysql-postgres {:mvn/version "0.4.112"}
buddy/buddy-core {:mvn/version "1.10.413"}
buddy/buddy-sign {:mvn/version "3.4.333"}
org.clojure/java.jdbc {:mvn/version "0.7.12"}
clj-test-containers/clj-test-containers {:mvn/version "0.7.2"}
org.postgresql/postgresql {:mvn/version "42.3.3"}
piotr-yuxuan/closeable-map {:mvn/version "0.35.0"}
seancorfield/next.jdbc {:mvn/version "1.2.659"}
yogthos/config {:mvn/version "1.2.0"}
hikari-cp/hikari-cp {:mvn/version "3.0.1"}
org.slf4j/slf4j-simple {:mvn/version "2.0.7"}
Expand Down
2 changes: 1 addition & 1 deletion release.edn
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{:group-id "com.flexiana"
:artifact-id "framework"
:version "0.5.0-rc4"
:version "0.5.0-rc5"
:scm-url "https://github.com/Flexiana/framework"}
56 changes: 27 additions & 29 deletions src/xiana/swagger.clj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,35 +13,34 @@
[reitit.trie :as trie]
[ring.util.response]))

;; "xiana-route->reitit-route is taking route entry of our custom shape of routes
;; and transforms it into proper reitit route entry that is valid on the Swagger
;; implemention of reitit.

;; "xiana-route->reitit-route is taking route entry of our custom shape of routes
;; and transforms it into proper reitit route entry that is valid on the Swagger
;; implemention of reitit.

;; (xiana-route->reitit-route [\"/swagger-ui\" {:action :swagger-ui
;; :some-values true}])
;; ;; => [\"/swagger-ui\"
;; {:get
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :patch
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :trace
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :connect
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :delete
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :head
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :post
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :action :swagger-ui,
;; :options
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :put
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :some-values true}]
;; "
;; (xiana-route->reitit-route [\"/swagger-ui\" {:action :swagger-ui
;; :some-values true}])
;; ;; => [\"/swagger-ui\"
;; {:get
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :patch
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :trace
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :connect
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :delete
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :head
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :post
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :action :swagger-ui,
;; :options
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :put
;; {:handler #function[clojure.core/identity], :action :swagger-ui},
;; :some-values true}]
;; "

(def all-methods
[:get :patch :trace :connect :delete :head :post :options :put])
Expand Down Expand Up @@ -70,7 +69,6 @@
(assoc-in [:get :action] (:action opt-map)))
(reduce-opt-map opt-map all-methods)))


(defn xiana-route->reitit-route
[[url opt-map & nested-routes :as route] all-methods]
(when-not (-> route meta :no-doc)
Expand Down

0 comments on commit 0afa1ba

Please sign in to comment.