luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-18 00:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-package & re-module

Browse source
This commit is contained in:
Tommi Reiman 2017-10-28 12:17:20 +03:00
parent 7aa36fc18b
commit f93a452209
14 changed files with 51 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/reitit-ring/project.clj
View file

@ -1,6 +1,6 @@
(load-file "../../.deps-versions.clj") (load-file "../../.deps-versions.clj")
(defproject metosin/reitit-ring reitit-version (defproject metosin/reitit-ring reitit-version
:description "Ring routing with reitit" :description "Reitit: Ring routing"
:url "https://github.com/metosin/reitit" :url "https://github.com/metosin/reitit"
:license {:name "Eclipse Public License" :license {:name "Eclipse Public License"
:url "http://www.eclipse.org/legal/epl-v10.html"} :url "http://www.eclipse.org/legal/epl-v10.html"}

10
modules/reitit-ring/src/reitit/ring.cljc
View file

@ -1,7 +1,7 @@
(ns reitit.ring (ns reitit.ring
(:require [meta-merge.core :refer [meta-merge]] (:require [meta-merge.core :refer [meta-merge]]
[reitit.middleware :as middleware] [reitit.ring.middleware :as middleware]
[reitit.core :as reitit] [reitit.core :as r]
[reitit.impl :as impl])) [reitit.impl :as impl]))
(def http-methods #{:get :head :patch :delete :options :post :put}) (def http-methods #{:get :head :patch :delete :options :post :put})
@ -18,7 +18,7 @@
(with-meta (with-meta
(fn (fn
([request] ([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) (let [method (:request-method request :any)
params (:params match) params (:params match)
result (:result match) result (:result match)
@ -29,7 +29,7 @@
(cond-> (impl/fast-assoc request ::match match) (cond-> (impl/fast-assoc request ::match match)
(seq params) (impl/fast-assoc :path-params params))))))) (seq params) (impl/fast-assoc :path-params params)))))))
([request respond raise] ([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) (let [method (:request-method request :any)
params (:params match) params (:params match)
result (:result match) result (:result match)
@ -73,4 +73,4 @@
(router data nil)) (router data nil))
([data opts] ([data opts]
(let [opts (meta-merge {:coerce coerce-handler, :compile compile-result} opts)] (let [opts (meta-merge {:coerce coerce-handler, :compile compile-result} opts)]
(reitit/router data opts)))) (r/router data opts))))

6
modules/reitit-ring/src/reitit/coercion.cljc → modules/reitit-ring/src/reitit/ring/coercion.cljc
View file

@ -1,8 +1,8 @@
(ns reitit.coercion (ns reitit.ring.coercion
(:require [clojure.walk :as walk] (:require [clojure.walk :as walk]
[spec-tools.core :as st] [spec-tools.core :as st]
[reitit.coercion.protocol :as protocol] [reitit.ring.middleware :as middleware]
[reitit.middleware :as middleware] [reitit.ring.coercion.protocol :as protocol]
[reitit.ring :as ring] [reitit.ring :as ring]
[reitit.impl :as impl])) [reitit.impl :as impl]))

2
modules/reitit-ring/src/reitit/coercion/protocol.cljc → modules/reitit-ring/src/reitit/ring/coercion/protocol.cljc
View file

@ -1,4 +1,4 @@
(ns reitit.coercion.protocol (ns reitit.ring.coercion.protocol
(:refer-clojure :exclude [compile])) (:refer-clojure :exclude [compile]))
(defprotocol Coercion (defprotocol Coercion

8
modules/reitit-ring/src/reitit/middleware.cljc → modules/reitit-ring/src/reitit/ring/middleware.cljc
View file

@ -1,6 +1,6 @@
(ns reitit.middleware (ns reitit.ring.middleware
(:require [meta-merge.core :refer [meta-merge]] (:require [meta-merge.core :refer [meta-merge]]
[reitit.core :as reitit])) [reitit.core :as r]))
(defprotocol IntoMiddleware (defprotocol IntoMiddleware
(into-middleware [this meta opts])) (into-middleware [this meta opts]))
@ -91,13 +91,13 @@
(router data nil)) (router data nil))
([data opts] ([data opts]
(let [opts (meta-merge {:compile compile-result} opts)] (let [opts (meta-merge {:compile compile-result} opts)]
(reitit/router data opts)))) (r/router data opts))))
(defn middleware-handler [router] (defn middleware-handler [router]
(with-meta (with-meta
(fn [path] (fn [path]
(some->> path (some->> path
(reitit/match-by-path router) (r/match-by-path router)
:result :result
:handler)) :handler))
{::router router})) {::router router}))

8
modules/reitit-spec/project.clj Normal file
View file

@ -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"]])

4
modules/reitit-ring/src/reitit/coercion/spec.cljc → modules/reitit-spec/src/reitit/ring/coercion/spec.cljc
View file

@ -1,10 +1,10 @@
(ns reitit.coercion.spec (ns reitit.ring.coercion.spec
(:require [clojure.spec.alpha :as s] (:require [clojure.spec.alpha :as s]
[spec-tools.core :as st #?@(:cljs [:refer [Spec]])] [spec-tools.core :as st #?@(:cljs [:refer [Spec]])]
[spec-tools.data-spec :as ds] [spec-tools.data-spec :as ds]
[spec-tools.conform :as conform] [spec-tools.conform :as conform]
[spec-tools.swagger.core :as swagger] [spec-tools.swagger.core :as swagger]
[reitit.coercion.protocol :as protocol]) [reitit.ring.coercion.protocol :as protocol])
#?(:clj #?(:clj
(:import (spec_tools.core Spec)))) (:import (spec_tools.core Spec))))

9
modules/reitit/project.clj Normal file
View file

@ -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]])

4
perf-test/clj/reitit/coercion_perf_test.clj
View file

@ -6,7 +6,7 @@
[spec-tools.core :as st] [spec-tools.core :as st]
[reitit.core :as reitit] [reitit.core :as reitit]
[reitit.ring :as ring] [reitit.core :as ring]
[reitit.coercion :as coercion] [reitit.coercion :as coercion]
[reitit.coercion.spec :as spec] [reitit.coercion.spec :as spec]
[reitit.coercion.protocol :as protocol] [reitit.coercion.protocol :as protocol]
@ -145,7 +145,7 @@
(comment (comment
(do (do
(require '[reitit.ring :as ring]) (require '[reitit.core :as ring])
(require '[reitit.coercion :as coercion]) (require '[reitit.coercion :as coercion])
(require '[reitit.coercion.spec :as spec]) (require '[reitit.coercion.spec :as spec])

2
perf-test/clj/reitit/opensensors_routing_test.clj
View file

@ -5,7 +5,7 @@
[cheshire.core :as json] [cheshire.core :as json]
[clojure.string :as str] [clojure.string :as str]
[reitit.core :as reitit] [reitit.core :as reitit]
[reitit.ring :as ring] [reitit.core :as ring]
[bidi.bidi :as bidi] [bidi.bidi :as bidi]

18
project.clj
View file

@ -10,9 +10,6 @@
:source-uri "https://github.com/metosin/reitit/{version}/{filepath}#L{line}" :source-uri "https://github.com/metosin/reitit/{version}/{filepath}#L{line}"
:metadata {:doc/format :markdown}} :metadata {:doc/format :markdown}}
:dependencies [[metosin/reitit-core ~reitit-version]
[metosin/reitit-ring ~reitit-version]]
:plugins [[jonase/eastwood "0.2.5"] :plugins [[jonase/eastwood "0.2.5"]
[lein-doo "0.1.8"] [lein-doo "0.1.8"]
[lein-cljsbuild "1.1.7"] [lein-cljsbuild "1.1.7"]
@ -21,13 +18,18 @@
[metosin/boot-alt-test "0.4.0-20171019.180106-3"]] [metosin/boot-alt-test "0.4.0-20171019.180106-3"]]
:profiles {:dev {:jvm-opts ^:replace ["-server"] :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"] :dependencies [[org.clojure/clojure "1.9.0-beta2"]
[org.clojure/clojurescript "1.9.946"] [org.clojure/clojurescript "1.9.946"]
[metosin/spec-tools "0.5.0"] ;; all modules dependencies
[org.clojure/spec.alpha "0.1.134"] [metosin/reitit ~reitit-version]
[expound "0.3.1"] [expound "0.3.1"]
[orchestra "2017.08.13"] [orchestra "2017.08.13"]
@ -40,7 +42,7 @@
"-Xmx4096m" "-Xmx4096m"
"-Dclojure.compiler.direct-linking=true"] "-Dclojure.compiler.direct-linking=true"]
:test-paths ["perf-test/clj"] :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"] [io.pedestal/pedestal.route "0.5.3"]
[org.clojure/core.async "0.3.443"] [org.clojure/core.async "0.3.443"]
[ataraxy "0.4.0"] [ataraxy "0.4.0"]

4
test/cljc/reitit/coercion_test.cljc
View file

@ -1,8 +1,8 @@
(ns reitit.coercion-test (ns reitit.coercion-test
(:require [clojure.test :refer [deftest testing is]] (:require [clojure.test :refer [deftest testing is]]
[reitit.ring :as ring] [reitit.ring :as ring]
[reitit.coercion :as coercion] [reitit.ring.coercion :as coercion]
[reitit.coercion.spec :as spec]) [reitit.ring.coercion.spec :as spec])
#?(:clj #?(:clj
(:import (clojure.lang ExceptionInfo)))) (:import (clojure.lang ExceptionInfo))))

2
test/cljc/reitit/middleware_test.cljc
View file

@ -1,6 +1,6 @@
(ns reitit.middleware-test (ns reitit.middleware-test
(:require [clojure.test :refer [deftest testing is are]] (:require [clojure.test :refer [deftest testing is are]]
[reitit.middleware :as middleware] [reitit.ring.middleware :as middleware]
[clojure.set :as set] [clojure.set :as set]
[reitit.core :as r]) [reitit.core :as r])
#?(:clj #?(:clj

4
test/cljc/reitit/ring_test.cljc
View file

@ -1,8 +1,8 @@
(ns reitit.ring-test (ns reitit.ring-test
(:require [clojure.test :refer [deftest testing is]] (:require [clojure.test :refer [deftest testing is]]
[reitit.middleware :as middleware]
[reitit.ring :as ring]
[clojure.set :as set] [clojure.set :as set]
[reitit.ring.middleware :as middleware]
[reitit.ring :as ring]
[reitit.core :as r]) [reitit.core :as r])
#?(:clj #?(:clj
(:import (clojure.lang ExceptionInfo)))) (:import (clojure.lang ExceptionInfo))))