From 1ec139111a46e26c06144ba6b69e7da1063877ac Mon Sep 17 00:00:00 2001 From: gered Date: Mon, 25 Jan 2016 13:08:42 -0500 Subject: [PATCH] update dependencies. remove lib-noir dependency --- src/leiningen/new/yawt/project.clj | 35 +++++++++++-------- src/leiningen/new/yawt/src/root_ns/core.clj | 21 +++++------ .../yawt/src/root_ns/middleware_webapp.clj | 16 ++++----- .../src/root_ns/middleware_webservice.clj | 16 ++++----- 4 files changed, 45 insertions(+), 43 deletions(-) diff --git a/src/leiningen/new/yawt/project.clj b/src/leiningen/new/yawt/project.clj index c682c14..36c96ed 100644 --- a/src/leiningen/new/yawt/project.clj +++ b/src/leiningen/new/yawt/project.clj @@ -5,26 +5,28 @@ :main {{root-ns}}.core - :dependencies [[org.clojure/clojure "1.6.0"] - [compojure "1.3.1"] - [metosin/ring-http-response "0.5.2"] - [lib-noir "0.9.5" :exclusions [javax.servlet/servlet-api]] + :dependencies [[org.clojure/clojure "1.8.0"] + [compojure "1.4.0"] + [metosin/ring-http-response "0.6.5"] [ring-custom-jetty-server "0.1.0"] - [ring-server "0.3.1"] + [ring-server "0.4.0"] + [ring/ring-defaults "0.1.5" :exclusions [javax.servlet/servlet-api]] + [ring-middleware-format "0.7.0"] + [clj-webtoolbox "0.0.1"] {{#webapp}} - [org.clojure/clojurescript "0.0-2511"] - [weasel "0.4.2"] + [org.clojure/clojurescript "1.7.145"] + [weasel "0.7.0" :exclusions [org.clojure/clojurescript]] [clj-pebble "0.2.0"] - [secretary "1.2.1"] - [reagent "0.5.0-alpha"] - [cljs-ajax "0.3.3"] + [secretary "1.2.3"] + [reagent "0.6.0-alpha"] + [cljs-ajax "0.5.3"] {{/webapp}} {{#webservice}} [hiccup "1.0.5"] {{/webservice}} {{#postgresql}} - [org.clojure/java.jdbc "0.3.6"] - [org.postgresql/postgresql "9.2-1003-jdbc4"] + [org.clojure/java.jdbc "0.4.2"] + [org.postgresql/postgresql "9.4-1202-jdbc42"] [clojurewerkz/ragtime "0.4.0"] {{/postgresql}} {{#couchdb}} @@ -35,7 +37,7 @@ [log4j "1.2.16"] [org.slf4j/slf4j-log4j12 "1.7.1"] [edn-config "0.2"] - [prone "0.8.0"]] + [prone "1.0.1"]] :plugins [[lein-environ "1.0.0"] {{#webapp}} @@ -55,6 +57,9 @@ {{/webservice}} {{#webapp}} + :clean-targets ^{:protect false} [:target-path + [:cljsbuild :builds :main :compiler :output-dir] + [:cljsbuild :builds :main :compiler :output-to]] :cljsbuild {:builds {:main {:source-paths ["src/{{path}}/client"] :compiler {:output-to "resources/public/cljs/main.js" @@ -81,8 +86,8 @@ :stacktraces? false :auto-reload? false}} :dev {:resource-paths ["env-resources/dev"] - :dependencies [{{#webapp}}[com.cemerick/piggieback "0.1.3"]{{/webapp}} - [pjstadig/humane-test-output "0.6.0"]] + :dependencies [{{#webapp}}[com.cemerick/piggieback "0.2.1"]{{/webapp}} + [pjstadig/humane-test-output "0.7.1"]] {{#postgresql}} :ragtime {:migrations ragtime.sql.files/migrations :database "jdbc:postgresql://localhost:5432/db_name?user=username&password=password"} diff --git a/src/leiningen/new/yawt/src/root_ns/core.clj b/src/leiningen/new/yawt/src/root_ns/core.clj index 9ba2ad5..238bca4 100644 --- a/src/leiningen/new/yawt/src/root_ns/core.clj +++ b/src/leiningen/new/yawt/src/root_ns/core.clj @@ -1,12 +1,13 @@ (ns {{root-ns}}.core (:gen-class) (:require - [compojure.core :refer [defroutes]] + [compojure.core :refer [defroutes routes]] [compojure.route :as route] - [noir.util.middleware :refer [app-handler]] [clojure.tools.logging :refer [info]] [ring-custom-jetty.server.standalone :refer [serve]] [ring.adapter.jetty :refer [run-jetty]] + [ring.middleware.defaults :refer [wrap-defaults site-defaults]] + [ring.middleware.format :refer [wrap-restful-format]] {{#webapp}} [clj-pebble.core :as pebble] [clj-pebble.web.middleware :refer [wrap-servlet-context-path]] @@ -60,14 +61,14 @@ (not-found-handler)) (defn get-handler [] - (app-handler - [main-public-routes - api-routes - default-handler-routes] - :middleware [wrap-env-middleware{{#webapp}} - wrap-servlet-context-path{{/webapp}}] - :access-rules [] - :formats [:json-kw :edn])) + (-> (routes + main-public-routes + api-routes + default-handler-routes) + (wrap-env-middleware){{#webapp}} + (wrap-servlet-context-path){{/webapp}} + (wrap-restful-format :formats [:json-kw :edn]) + (wrap-defaults (assoc-in site-defaults [:security :anti-forgery] false)))) ;; support functions for starting the web app in a REPL / running an uberjar directly ;; (not used otherwise) diff --git a/src/leiningen/new/yawt/src/root_ns/middleware_webapp.clj b/src/leiningen/new/yawt/src/root_ns/middleware_webapp.clj index 18894ce..161909f 100644 --- a/src/leiningen/new/yawt/src/root_ns/middleware_webapp.clj +++ b/src/leiningen/new/yawt/src/root_ns/middleware_webapp.clj @@ -1,7 +1,7 @@ (ns {{root-ns}}.middleware (:require [clojure.tools.logging :refer [error]] - [noir.response :as response] + [clj-webtoolbox.response-helpers :as response] [{{root-ns}}.views :as views]) (:use {{root-ns}}.utils)) @@ -20,10 +20,9 @@ (catch Throwable ex (error ex "Unhandled exception.") (if (api-request? request) - (->> (response/json - {:status "error" - :message (.getMessage ex)}) - (response/status 500)) + (response/error + {:status "error" + :message (.getMessage ex)}) (views/render-response request "error.html" @@ -33,10 +32,9 @@ (defn not-found-handler [] (fn [request] (if (api-request? request) - (->> (response/json - {:status "notfound" - :message "The request does not match any supported API calls."}) - (response/status 404)) + (response/not-found + {:status "notfound" + :message "The request does not match any supported API calls."}) (views/render-response request "notfound.html" diff --git a/src/leiningen/new/yawt/src/root_ns/middleware_webservice.clj b/src/leiningen/new/yawt/src/root_ns/middleware_webservice.clj index 2659cdc..61a44b7 100644 --- a/src/leiningen/new/yawt/src/root_ns/middleware_webservice.clj +++ b/src/leiningen/new/yawt/src/root_ns/middleware_webservice.clj @@ -1,7 +1,7 @@ (ns {{root-ns}}.middleware (:require [clojure.tools.logging :refer [error]] - [noir.response :as response] + [clj-webtoolbox.response-helpers :as response] [{{root-ns}}.views :as views]) (:use {{root-ns}}.utils)) @@ -20,10 +20,9 @@ (catch Throwable ex (error ex "Unhandled exception.") (if (api-request? request) - (->> (response/json - {:status "error" - :message (.getMessage ex)}) - (response/status 500)) + (response/error + {:status "error" + :message (.getMessage ex)}) (views/render-response request views/error-page @@ -33,10 +32,9 @@ (defn not-found-handler [] (fn [request] (if (api-request? request) - (->> (response/json - {:status "notfound" - :message "The request does not match any supported API calls."}) - (response/status 404)) + (error/not-found + {:status "notfound" + :message "The request does not match any supported API calls."}) (views/render-response request views/not-found-page