diff --git a/modules/reitit-ring/project.clj b/modules/reitit-ring/project.clj index 59e95ff6..a2862352 100644 --- a/modules/reitit-ring/project.clj +++ b/modules/reitit-ring/project.clj @@ -1,6 +1,6 @@ (load-file "../../.deps-versions.clj") (defproject metosin/reitit-ring reitit-version - :description "Ring routing with reitit" + :description "Reitit: Ring routing" :url "https://github.com/metosin/reitit" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} diff --git a/modules/reitit-ring/src/reitit/ring.cljc b/modules/reitit-ring/src/reitit/ring.cljc index f866b705..dfb13eb4 100644 --- a/modules/reitit-ring/src/reitit/ring.cljc +++ b/modules/reitit-ring/src/reitit/ring.cljc @@ -1,7 +1,7 @@ (ns reitit.ring (:require [meta-merge.core :refer [meta-merge]] - [reitit.middleware :as middleware] - [reitit.core :as reitit] + [reitit.ring.middleware :as middleware] + [reitit.core :as r] [reitit.impl :as impl])) (def http-methods #{:get :head :patch :delete :options :post :put}) @@ -18,7 +18,7 @@ (with-meta (fn ([request] - (if-let [match (reitit/match-by-path router (:uri request))] + (if-let [match (r/match-by-path router (:uri request))] (let [method (:request-method request :any) params (:params match) result (:result match) @@ -29,7 +29,7 @@ (cond-> (impl/fast-assoc request ::match match) (seq params) (impl/fast-assoc :path-params params))))))) ([request respond raise] - (if-let [match (reitit/match-by-path router (:uri request))] + (if-let [match (r/match-by-path router (:uri request))] (let [method (:request-method request :any) params (:params match) result (:result match) @@ -73,4 +73,4 @@ (router data nil)) ([data opts] (let [opts (meta-merge {:coerce coerce-handler, :compile compile-result} opts)] - (reitit/router data opts)))) + (r/router data opts)))) diff --git a/modules/reitit-ring/src/reitit/coercion.cljc b/modules/reitit-ring/src/reitit/ring/coercion.cljc similarity index 98% rename from modules/reitit-ring/src/reitit/coercion.cljc rename to modules/reitit-ring/src/reitit/ring/coercion.cljc index ae2fffdc..39245b12 100644 --- a/modules/reitit-ring/src/reitit/coercion.cljc +++ b/modules/reitit-ring/src/reitit/ring/coercion.cljc @@ -1,8 +1,8 @@ -(ns reitit.coercion +(ns reitit.ring.coercion (:require [clojure.walk :as walk] [spec-tools.core :as st] - [reitit.coercion.protocol :as protocol] - [reitit.middleware :as middleware] + [reitit.ring.middleware :as middleware] + [reitit.ring.coercion.protocol :as protocol] [reitit.ring :as ring] [reitit.impl :as impl])) diff --git a/modules/reitit-ring/src/reitit/coercion/protocol.cljc b/modules/reitit-ring/src/reitit/ring/coercion/protocol.cljc similarity index 95% rename from modules/reitit-ring/src/reitit/coercion/protocol.cljc rename to modules/reitit-ring/src/reitit/ring/coercion/protocol.cljc index aaacb41a..eb8a961f 100644 --- a/modules/reitit-ring/src/reitit/coercion/protocol.cljc +++ b/modules/reitit-ring/src/reitit/ring/coercion/protocol.cljc @@ -1,4 +1,4 @@ -(ns reitit.coercion.protocol +(ns reitit.ring.coercion.protocol (:refer-clojure :exclude [compile])) (defprotocol Coercion diff --git a/modules/reitit-ring/src/reitit/middleware.cljc b/modules/reitit-ring/src/reitit/ring/middleware.cljc similarity index 95% rename from modules/reitit-ring/src/reitit/middleware.cljc rename to modules/reitit-ring/src/reitit/ring/middleware.cljc index 18bceeb1..420dde6e 100644 --- a/modules/reitit-ring/src/reitit/middleware.cljc +++ b/modules/reitit-ring/src/reitit/ring/middleware.cljc @@ -1,6 +1,6 @@ -(ns reitit.middleware +(ns reitit.ring.middleware (:require [meta-merge.core :refer [meta-merge]] - [reitit.core :as reitit])) + [reitit.core :as r])) (defprotocol IntoMiddleware (into-middleware [this meta opts])) @@ -91,13 +91,13 @@ (router data nil)) ([data opts] (let [opts (meta-merge {:compile compile-result} opts)] - (reitit/router data opts)))) + (r/router data opts)))) (defn middleware-handler [router] (with-meta (fn [path] (some->> path - (reitit/match-by-path router) + (r/match-by-path router) :result :handler)) {::router router})) diff --git a/modules/reitit-spec/project.clj b/modules/reitit-spec/project.clj new file mode 100644 index 00000000..b811c5e9 --- /dev/null +++ b/modules/reitit-spec/project.clj @@ -0,0 +1,8 @@ +(load-file "../../.deps-versions.clj") +(defproject metosin/reitit-spec reitit-version + :description "Reitit: clojure.spec coercion" + :url "https://github.com/metosin/reitit" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[metosin/reitit-ring ~reitit-version] + [metosin/spec-tools "0.5.0"]]) diff --git a/modules/reitit-ring/src/reitit/coercion/spec.cljc b/modules/reitit-spec/src/reitit/ring/coercion/spec.cljc similarity index 97% rename from modules/reitit-ring/src/reitit/coercion/spec.cljc rename to modules/reitit-spec/src/reitit/ring/coercion/spec.cljc index f1f2fb00..a2afa3c8 100644 --- a/modules/reitit-ring/src/reitit/coercion/spec.cljc +++ b/modules/reitit-spec/src/reitit/ring/coercion/spec.cljc @@ -1,10 +1,10 @@ -(ns reitit.coercion.spec +(ns reitit.ring.coercion.spec (:require [clojure.spec.alpha :as s] [spec-tools.core :as st #?@(:cljs [:refer [Spec]])] [spec-tools.data-spec :as ds] [spec-tools.conform :as conform] [spec-tools.swagger.core :as swagger] - [reitit.coercion.protocol :as protocol]) + [reitit.ring.coercion.protocol :as protocol]) #?(:clj (:import (spec_tools.core Spec)))) diff --git a/modules/reitit/project.clj b/modules/reitit/project.clj new file mode 100644 index 00000000..8ebf9a18 --- /dev/null +++ b/modules/reitit/project.clj @@ -0,0 +1,9 @@ +(load-file "../../.deps-versions.clj") +(defproject metosin/reitit reitit-version + :description "Snappy data-driven router for Clojure(Script)" + :url "https://github.com/metosin/reitit" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[metosin/reitit-core ~reitit-version] + [metosin/reitit-ring ~reitit-version] + [metosin/reitit-spec ~reitit-version]]) diff --git a/perf-test/clj/reitit/coercion_perf_test.clj b/perf-test/clj/reitit/coercion_perf_test.clj index 11f161f0..d0351450 100644 --- a/perf-test/clj/reitit/coercion_perf_test.clj +++ b/perf-test/clj/reitit/coercion_perf_test.clj @@ -6,7 +6,7 @@ [spec-tools.core :as st] [reitit.core :as reitit] - [reitit.ring :as ring] + [reitit.core :as ring] [reitit.coercion :as coercion] [reitit.coercion.spec :as spec] [reitit.coercion.protocol :as protocol] @@ -145,7 +145,7 @@ (comment (do - (require '[reitit.ring :as ring]) + (require '[reitit.core :as ring]) (require '[reitit.coercion :as coercion]) (require '[reitit.coercion.spec :as spec]) diff --git a/perf-test/clj/reitit/opensensors_routing_test.clj b/perf-test/clj/reitit/opensensors_routing_test.clj index a5ee7a89..a9f194fb 100644 --- a/perf-test/clj/reitit/opensensors_routing_test.clj +++ b/perf-test/clj/reitit/opensensors_routing_test.clj @@ -5,7 +5,7 @@ [cheshire.core :as json] [clojure.string :as str] [reitit.core :as reitit] - [reitit.ring :as ring] + [reitit.core :as ring] [bidi.bidi :as bidi] diff --git a/project.clj b/project.clj index 6353b147..5f97c273 100644 --- a/project.clj +++ b/project.clj @@ -10,9 +10,6 @@ :source-uri "https://github.com/metosin/reitit/{version}/{filepath}#L{line}" :metadata {:doc/format :markdown}} - :dependencies [[metosin/reitit-core ~reitit-version] - [metosin/reitit-ring ~reitit-version]] - :plugins [[jonase/eastwood "0.2.5"] [lein-doo "0.1.8"] [lein-cljsbuild "1.1.7"] @@ -21,13 +18,18 @@ [metosin/boot-alt-test "0.4.0-20171019.180106-3"]] :profiles {:dev {:jvm-opts ^:replace ["-server"] - :source-paths ["modules/reitit-core/src" - "modules/reitit-ring/src"] + + ;; all module sources for development + :source-paths ["modules/reitit/src" + "modules/reitit-core/src" + "modules/reitit-ring/src" + "modules/reitit-spec/src"] + :dependencies [[org.clojure/clojure "1.9.0-beta2"] [org.clojure/clojurescript "1.9.946"] - [metosin/spec-tools "0.5.0"] - [org.clojure/spec.alpha "0.1.134"] + ;; all modules dependencies + [metosin/reitit ~reitit-version] [expound "0.3.1"] [orchestra "2017.08.13"] @@ -40,7 +42,7 @@ "-Xmx4096m" "-Dclojure.compiler.direct-linking=true"] :test-paths ["perf-test/clj"] - :dependencies [[metosin/compojure-api "2.0.0-alpha10"] + :dependencies [[metosin/compojure-api "2.0.0-alpha12"] [io.pedestal/pedestal.route "0.5.3"] [org.clojure/core.async "0.3.443"] [ataraxy "0.4.0"] diff --git a/test/cljc/reitit/coercion_test.cljc b/test/cljc/reitit/coercion_test.cljc index 20057b8c..1873ca57 100644 --- a/test/cljc/reitit/coercion_test.cljc +++ b/test/cljc/reitit/coercion_test.cljc @@ -1,8 +1,8 @@ (ns reitit.coercion-test (:require [clojure.test :refer [deftest testing is]] [reitit.ring :as ring] - [reitit.coercion :as coercion] - [reitit.coercion.spec :as spec]) + [reitit.ring.coercion :as coercion] + [reitit.ring.coercion.spec :as spec]) #?(:clj (:import (clojure.lang ExceptionInfo)))) diff --git a/test/cljc/reitit/middleware_test.cljc b/test/cljc/reitit/middleware_test.cljc index b77329c8..8120b101 100644 --- a/test/cljc/reitit/middleware_test.cljc +++ b/test/cljc/reitit/middleware_test.cljc @@ -1,6 +1,6 @@ (ns reitit.middleware-test (:require [clojure.test :refer [deftest testing is are]] - [reitit.middleware :as middleware] + [reitit.ring.middleware :as middleware] [clojure.set :as set] [reitit.core :as r]) #?(:clj diff --git a/test/cljc/reitit/ring_test.cljc b/test/cljc/reitit/ring_test.cljc index c9c5844a..e85707ad 100644 --- a/test/cljc/reitit/ring_test.cljc +++ b/test/cljc/reitit/ring_test.cljc @@ -1,8 +1,8 @@ (ns reitit.ring-test (:require [clojure.test :refer [deftest testing is]] - [reitit.middleware :as middleware] - [reitit.ring :as ring] [clojure.set :as set] + [reitit.ring.middleware :as middleware] + [reitit.ring :as ring] [reitit.core :as r]) #?(:clj (:import (clojure.lang ExceptionInfo))))