From e4c14463bb06f72badc359a033ddabf43886ad8a Mon Sep 17 00:00:00 2001
From: gered <gered@blarg.ca>
Date: Sat, 15 Nov 2014 12:50:35 -0500
Subject: [PATCH] switch from clj-jtwig to clj-pebble

---
 src/leiningen/new/yawt/project.clj                   | 2 +-
 src/leiningen/new/yawt/resources/views/error.html    | 2 +-
 src/leiningen/new/yawt/resources/views/index.html    | 2 +-
 src/leiningen/new/yawt/resources/views/notfound.html | 2 +-
 src/leiningen/new/yawt/src/root_ns/core.clj          | 9 ++++-----
 src/leiningen/new/yawt/src/root_ns/views_webapp.clj  | 6 +++---
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/leiningen/new/yawt/project.clj b/src/leiningen/new/yawt/project.clj
index 86f0ae0..31ab178 100644
--- a/src/leiningen/new/yawt/project.clj
+++ b/src/leiningen/new/yawt/project.clj
@@ -14,7 +14,7 @@
 {{#webapp}}
                  [org.clojure/clojurescript "0.0-2371"]
                  [weasel "0.4.2"]
-                 [clj-jtwig "0.5.1"]
+                 [clj-pebble "0.2.0"]
                  [secretary "1.2.1"]
                  [reagent "0.4.3"]
                  [cljs-ajax "0.3.3"]
diff --git a/src/leiningen/new/yawt/resources/views/error.html b/src/leiningen/new/yawt/resources/views/error.html
index fcdd028..e1917c2 100644
--- a/src/leiningen/new/yawt/resources/views/error.html
+++ b/src/leiningen/new/yawt/resources/views/error.html
@@ -1,5 +1,5 @@
 {{=<% %>=}}
-{% extends "base.html" %}
+{% extends "views/base.html" %}
 
 {% block title %}Error :: {% endblock %}
 
diff --git a/src/leiningen/new/yawt/resources/views/index.html b/src/leiningen/new/yawt/resources/views/index.html
index fd19dcd..46acaf1 100644
--- a/src/leiningen/new/yawt/resources/views/index.html
+++ b/src/leiningen/new/yawt/resources/views/index.html
@@ -1,5 +1,5 @@
 {{=<% %>=}}
-{% extends "base.html" %}
+{% extends "views/base.html" %}
 
 {% block head_scripts %}
 	{% if isDev %}
diff --git a/src/leiningen/new/yawt/resources/views/notfound.html b/src/leiningen/new/yawt/resources/views/notfound.html
index 3336b4b..107ee92 100644
--- a/src/leiningen/new/yawt/resources/views/notfound.html
+++ b/src/leiningen/new/yawt/resources/views/notfound.html
@@ -1,5 +1,5 @@
 {{=<% %>=}}
-{% extends "base.html" %}
+{% extends "views/base.html" %}
 
 {% block title %}Not Found :: {% endblock %}
 
diff --git a/src/leiningen/new/yawt/src/root_ns/core.clj b/src/leiningen/new/yawt/src/root_ns/core.clj
index 1a5d8ef..6520127 100644
--- a/src/leiningen/new/yawt/src/root_ns/core.clj
+++ b/src/leiningen/new/yawt/src/root_ns/core.clj
@@ -8,8 +8,8 @@
             [ring.server.standalone :refer [serve]]
             [ring.middleware.file :refer [wrap-file]]
 {{#webapp}}
-            [clj-jtwig.core :as jtwig]
-            [clj-jtwig.web.middleware :refer [wrap-servlet-context-path]]
+            [clj-pebble.core :as pebble]
+            [clj-pebble.web.middleware :refer [wrap-servlet-context-path]]
 {{/webapp}}
             [edn-config.core :refer [env]]
             [prone.middleware :as prone]
@@ -47,9 +47,8 @@
 {{#webapp}}
   (when (env :dev)
     (log :info "Running in :dev environment.")
-    (log :info "Disabling Jtwig template caching.")
-    (jtwig/set-options! :cache-compiled-templates false)
-    (jtwig/set-options! :check-for-minified-web-resources false))
+    (pebble/set-options! :cache false
+                         :check-for-minified-web-resources false))
 {{/webapp}}
 {{#webservice}}
   (when (env :dev)
diff --git a/src/leiningen/new/yawt/src/root_ns/views_webapp.clj b/src/leiningen/new/yawt/src/root_ns/views_webapp.clj
index 94dfe95..732e331 100644
--- a/src/leiningen/new/yawt/src/root_ns/views_webapp.clj
+++ b/src/leiningen/new/yawt/src/root_ns/views_webapp.clj
@@ -1,7 +1,7 @@
 (ns {{root-ns}}.views
   (:require [clojure.string :as str]
-            [clj-jtwig.core :as jtwig]
-            [clj-jtwig.web.middleware :refer [*servlet-context-path*]]
+            [clj-pebble.core :as pebble]
+            [clj-pebble.web.middleware :refer [*servlet-context-path*]]
             [ring.util.response :as response]
             [compojure.response :refer [Renderable]]
             [edn-config.core :refer [env]]))
@@ -9,7 +9,7 @@
 (def template-path "views/")
 
 (defn- render-template [request template params]
-  (jtwig/render-resource
+  (pebble/render-resource
     (str template-path template)
     (assoc params
       :isDev   (env :dev)