gered/yawt
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update dependencies. remove lib-noir dependency

Browse source
This commit is contained in:
Gered 2016-01-25 13:08:42 -05:00
parent b8a12c11fe
commit 1ec139111a
4 changed files with 45 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/leiningen/new/yawt/project.clj
View file

@ -5,26 +5,28 @@
:main {{root-ns}}.core :main {{root-ns}}.core
:dependencies [[org.clojure/clojure "1.6.0"] :dependencies [[org.clojure/clojure "1.8.0"]
[compojure "1.3.1"] [compojure "1.4.0"]
[metosin/ring-http-response "0.5.2"] [metosin/ring-http-response "0.6.5"]
[lib-noir "0.9.5" :exclusions [javax.servlet/servlet-api]]
[ring-custom-jetty-server "0.1.0"] [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}} {{#webapp}}
[org.clojure/clojurescript "0.0-2511"] [org.clojure/clojurescript "1.7.145"]
[weasel "0.4.2"] [weasel "0.7.0" :exclusions [org.clojure/clojurescript]]
[clj-pebble "0.2.0"] [clj-pebble "0.2.0"]
[secretary "1.2.1"] [secretary "1.2.3"]
[reagent "0.5.0-alpha"] [reagent "0.6.0-alpha"]
[cljs-ajax "0.3.3"] [cljs-ajax "0.5.3"]
{{/webapp}} {{/webapp}}
{{#webservice}} {{#webservice}}
[hiccup "1.0.5"] [hiccup "1.0.5"]
{{/webservice}} {{/webservice}}
{{#postgresql}} {{#postgresql}}
[org.clojure/java.jdbc "0.3.6"] [org.clojure/java.jdbc "0.4.2"]
[org.postgresql/postgresql "9.2-1003-jdbc4"] [org.postgresql/postgresql "9.4-1202-jdbc42"]
[clojurewerkz/ragtime "0.4.0"] [clojurewerkz/ragtime "0.4.0"]
{{/postgresql}} {{/postgresql}}
{{#couchdb}} {{#couchdb}}
@ -35,7 +37,7 @@
[log4j "1.2.16"] [log4j "1.2.16"]
[org.slf4j/slf4j-log4j12 "1.7.1"] [org.slf4j/slf4j-log4j12 "1.7.1"]
[edn-config "0.2"] [edn-config "0.2"]
[prone "0.8.0"]] [prone "1.0.1"]]
:plugins [[lein-environ "1.0.0"] :plugins [[lein-environ "1.0.0"]
{{#webapp}} {{#webapp}}
@ -55,6 +57,9 @@
{{/webservice}} {{/webservice}}
{{#webapp}} {{#webapp}}
:clean-targets ^{:protect false} [:target-path
[:cljsbuild :builds :main :compiler :output-dir]
[:cljsbuild :builds :main :compiler :output-to]]
:cljsbuild {:builds {:main :cljsbuild {:builds {:main
{:source-paths ["src/{{path}}/client"] {:source-paths ["src/{{path}}/client"]
:compiler {:output-to "resources/public/cljs/main.js" :compiler {:output-to "resources/public/cljs/main.js"
@ -81,8 +86,8 @@
:stacktraces? false :stacktraces? false
:auto-reload? false}} :auto-reload? false}}
:dev {:resource-paths ["env-resources/dev"] :dev {:resource-paths ["env-resources/dev"]
:dependencies [{{#webapp}}[com.cemerick/piggieback "0.1.3"]{{/webapp}} :dependencies [{{#webapp}}[com.cemerick/piggieback "0.2.1"]{{/webapp}}
[pjstadig/humane-test-output "0.6.0"]] [pjstadig/humane-test-output "0.7.1"]]
{{#postgresql}} {{#postgresql}}
:ragtime {:migrations ragtime.sql.files/migrations :ragtime {:migrations ragtime.sql.files/migrations
:database "jdbc:postgresql://localhost:5432/db_name?user=username&password=password"} :database "jdbc:postgresql://localhost:5432/db_name?user=username&password=password"}

21
src/leiningen/new/yawt/src/root_ns/core.clj
View file

@ -1,12 +1,13 @@
(ns {{root-ns}}.core (ns {{root-ns}}.core
(:gen-class) (:gen-class)
(:require (:require
[compojure.core :refer [defroutes]] [compojure.core :refer [defroutes routes]]
[compojure.route :as route] [compojure.route :as route]
[noir.util.middleware :refer [app-handler]]
[clojure.tools.logging :refer [info]] [clojure.tools.logging :refer [info]]
[ring-custom-jetty.server.standalone :refer [serve]] [ring-custom-jetty.server.standalone :refer [serve]]
[ring.adapter.jetty :refer [run-jetty]] [ring.adapter.jetty :refer [run-jetty]]
[ring.middleware.defaults :refer [wrap-defaults site-defaults]]
[ring.middleware.format :refer [wrap-restful-format]]
{{#webapp}} {{#webapp}}
[clj-pebble.core :as pebble] [clj-pebble.core :as pebble]
[clj-pebble.web.middleware :refer [wrap-servlet-context-path]] [clj-pebble.web.middleware :refer [wrap-servlet-context-path]]
@ -60,14 +61,14 @@
(not-found-handler)) (not-found-handler))
(defn get-handler [] (defn get-handler []
(app-handler (-> (routes
[main-public-routes main-public-routes
api-routes api-routes
default-handler-routes] default-handler-routes)
:middleware [wrap-env-middleware{{#webapp}} (wrap-env-middleware){{#webapp}}
wrap-servlet-context-path{{/webapp}}] (wrap-servlet-context-path){{/webapp}}
:access-rules [] (wrap-restful-format :formats [:json-kw :edn])
: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 ;; support functions for starting the web app in a REPL / running an uberjar directly
;; (not used otherwise) ;; (not used otherwise)

16
src/leiningen/new/yawt/src/root_ns/middleware_webapp.clj
View file

@ -1,7 +1,7 @@
(ns {{root-ns}}.middleware (ns {{root-ns}}.middleware
(:require (:require
[clojure.tools.logging :refer [error]] [clojure.tools.logging :refer [error]]
[noir.response :as response] [clj-webtoolbox.response-helpers :as response]
[{{root-ns}}.views :as views]) [{{root-ns}}.views :as views])
(:use (:use
{{root-ns}}.utils)) {{root-ns}}.utils))
@ -20,10 +20,9 @@
(catch Throwable ex (catch Throwable ex
(error ex "Unhandled exception.") (error ex "Unhandled exception.")
(if (api-request? request) (if (api-request? request)
(->> (response/json (response/error
{:status "error" {:status "error"
:message (.getMessage ex)}) :message (.getMessage ex)})
(response/status 500))
(views/render-response (views/render-response
request request
"error.html" "error.html"
@ -33,10 +32,9 @@
(defn not-found-handler [] (defn not-found-handler []
(fn [request] (fn [request]
(if (api-request? request) (if (api-request? request)
(->> (response/json (response/not-found
{:status "notfound" {:status "notfound"
:message "The request does not match any supported API calls."}) :message "The request does not match any supported API calls."})
(response/status 404))
(views/render-response (views/render-response
request request
"notfound.html" "notfound.html"

16
src/leiningen/new/yawt/src/root_ns/middleware_webservice.clj
View file

@ -1,7 +1,7 @@
(ns {{root-ns}}.middleware (ns {{root-ns}}.middleware
(:require (:require
[clojure.tools.logging :refer [error]] [clojure.tools.logging :refer [error]]
[noir.response :as response] [clj-webtoolbox.response-helpers :as response]
[{{root-ns}}.views :as views]) [{{root-ns}}.views :as views])
(:use (:use
{{root-ns}}.utils)) {{root-ns}}.utils))
@ -20,10 +20,9 @@
(catch Throwable ex (catch Throwable ex
(error ex "Unhandled exception.") (error ex "Unhandled exception.")
(if (api-request? request) (if (api-request? request)
(->> (response/json (response/error
{:status "error" {:status "error"
:message (.getMessage ex)}) :message (.getMessage ex)})
(response/status 500))
(views/render-response (views/render-response
request request
views/error-page views/error-page
@ -33,10 +32,9 @@
(defn not-found-handler [] (defn not-found-handler []
(fn [request] (fn [request]
(if (api-request? request) (if (api-request? request)
(->> (response/json (error/not-found
{:status "notfound" {:status "notfound"
:message "The request does not match any supported API calls."}) :message "The request does not match any supported API calls."})
(response/status 404))
(views/render-response (views/render-response
request request
views/not-found-page views/not-found-page