Merge branch 'feature/22' into develop

.gitignore

@@ -17,7 +17,7 @@ pom.xml.asc
 smeagol.log*
 /node_modules/
 .DS_Store
-
+/.calva
 
 resources/public/content/uploads/
 

project.clj

@@ -3,7 +3,7 @@
   :url "https://github.com/simon-brooke/smeagol"
   :license {:name "GNU General Public License,version 2.0 or (at your option) any later version"
             :url "https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"}
-  :dependencies [[clj-jgit "0.8.10"]
+  :dependencies [[clj-jgit "1.0.0"]
                  [clj-yaml "0.4.0"]
                  [clojure.java-time "0.3.2"]
                  [com.cemerick/url "0.1.1"]

resources/public/html-includes/photoswipe-boilerplate.html

@@ -1,3 +1,6 @@
+<div class="gallery" id="gallery{{index}}">
+    <div class="pswp" id="pswp-{{index}}" tabindex="-1" role="dialog" aria-hidden="true">
+
         <!-- this is the whole of the photoswipe boilerplate as documented
             [here](https://photoswipe.com/documentation/getting-started.html) with the
             outermost div removed; it is supplied by the function
@@ -36,7 +39,7 @@
                     <button class="pswp__button pswp__button--zoom" title="Zoom in/out"></button>
 
                     <!-- Preloader demo https://codepen.io/dimsemenov/pen/yyBWoR -->
-                <!-- element will get class pswp__preloader--active when preloader is running -->
+                    <!-- element will get class pswp__preloader active when preloader is running -->
                     <div class="pswp__preloader">
                         <div class="pswp__preloader__icn">
                             <div class="pswp__preloader__cut">
@@ -63,3 +66,32 @@
             </div>
 
         </div>
+    </div>
+    <script>
+        //<![CDATA[
+        var gallery{{index}} = null;
+        var spec{{index}} = {{spec}};
+        var openGallery{{index}} = function() {
+            if (gallery{{index}}) {
+                try {
+                    gallery{{index}}.destroy();
+                }
+                catch (error) {
+                    console.error(error);
+                }
+            }
+            gallery{{index}} = new PhotoSwipe(document.getElementById("pswp-{{index}}"),
+                PhotoSwipeUI_Default,
+                spec{{index}}.slides,
+                    spec{{index}}.options);
+            gallery{{index}}.init();
+        };
+        if (spec{{index}}.openImmediately) {
+            openGallery{{index}}();
+        }
+        //]]>
+    </script>
+    <p>
+        <button id="open-gallery-{{index}}" onclick="openGallery{{index}}()">Open the gallery</button>
+    </p>
+</div>

src/smeagol/extensions/photoswipe.clj

@@ -9,6 +9,8 @@
             [instaparse.core :as insta]
             [me.raynes.fs :as fs]
             [noir.io :as io]
+            [selmer.parser :refer [render]]
+            [selmer.util :refer [without-escaping]]
             [smeagol.configuration :refer [config]]
             [smeagol.extensions.utils :refer :all]
             [smeagol.util :refer [content-dir upload-dir]]
@@ -41,31 +43,11 @@
   "Process a specification for a photoswipe gallery, using a JSON
   specification based on that documented on the Photoswipe website."
   [^String spec ^Integer index]
-  (str
-    "<div class='gallery'>
-    <div class=\"pswp\" id=\"pswp-"
-    index "\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\">\n"
+  (without-escaping
+   (render
     (slurp
      (str (io/resource-path) "html-includes/photoswipe-boilerplate.html"))
-    "</div>
-    <p><button id=\"open-gallery-" index "\" onclick=\"gallery" index
-    ".init(); document.getElementById(`open-gallery-" index "`).style.display = 'none';\">Open the gallery</button></p>
-    <script>
-    \n//<![CDATA[\n
-    var pswpElement = document.getElementById('pswp-" index "');
-    var spec" index " = "
-    spec
-    ";
-    var gallery" index
-    " = new PhotoSwipe( pswpElement, PhotoSwipeUI_Default, spec"
-    index ".slides, spec" index ".options);
-    if (spec" index ".openImmediately) {
-    document.getElementById(`open-gallery-" index "`).style.display = 'none';
-    gallery" index ".init();
-    }
-    \n//]]\n
-    </script>
-    </div>"))
+    {:spec spec :index index})))
 
 
 (def simple-grammar

src/smeagol/history.clj

@@ -6,11 +6,17 @@
             [clj-jgit.querying :as q]
             [taoensso.timbre :as log])
   (:import  [org.eclipse.jgit.api Git]
-            [org.eclipse.jgit.lib Repository ObjectId]
-            [org.eclipse.jgit.revwalk RevCommit RevTree RevWalk]
-            [org.eclipse.jgit.treewalk TreeWalk AbstractTreeIterator CanonicalTreeParser]
+            [org.eclipse.jgit.lib 
+             ;; Repository
+             ObjectId]
+            ;; [org.eclipse.jgit.revwalk RevCommit RevTree RevWalk]
+            [org.eclipse.jgit.treewalk TreeWalk
+             ;; AbstractTreeIterator 
+             CanonicalTreeParser]
             [org.eclipse.jgit.treewalk.filter PathFilter]
-            [org.eclipse.jgit.diff DiffEntry DiffFormatter]))
+            [org.eclipse.jgit.diff 
+             ;; DiffEntry 
+             DiffFormatter]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
@@ -55,9 +61,9 @@
     (git/load-repo git-directory-path)
     (catch java.io.FileNotFoundException fnf
       (log/info "Initialising Git repository at" git-directory-path)
-      (git/git-init git-directory-path)
+      (git/git-init :dir git-directory-path)
       (let [repo (git/load-repo git-directory-path)]
-        (git/git-add-and-commit repo "Initial commit")
+        (git/git-commit repo "Initial commit")
         repo))))
 
 

src/smeagol/repl.clj

@@ -45,7 +45,7 @@
 (defn start-server
   "used for starting the server in development mode from REPL"
   [& [port]]
-  (let [port (if port (Integer/parseInt port) 3000)]
+  (let [port (if port (Integer/parseInt (str port)) 3000)]
     (reset! server
             (serve (get-handler)
                    {:port port
@@ -58,3 +58,6 @@
 (defn stop-server []
   (.stop @server)
   (reset! server nil))
+
+;;(start-server 4444)
+

src/smeagol/routes/wiki.clj

@@ -75,7 +75,7 @@
     (log/info (format "Saving %s's changes ('%s') to %s in file '%s'" user summary page file-path))
     (spit file-path source-text)
     (git/git-add git-repo file-name)
-    (git/git-commit git-repo summary {:name user :email email})
+    (git/git-commit git-repo summary :name user :email email)
     (response/redirect
       (str
         "/wiki?page="

src/smeagol/util.clj

@@ -79,15 +79,15 @@
                (cjio/file local-url-base file-path))]
     (cond
       (cs/includes? file-path "..")
-      (cs/join " " file-path
-               "Attempts to ascend the file hierarchy are disallowed.")
+      (cs/join " " [file-path
+                    "Attempts to ascend the file hierarchy are disallowed."])
       (not (cs/starts-with? path local-url-base))
       (cs/join " " [path "is not servable"])
       (not (fs/exists? path))
       (cs/join " " [path "does not exist"])
       (not (fs/readable? path))
       (cs/join " " [path "is not readable"])))
-    (catch Exception any (cs/join " " file-path "is not servable because" (.getMessage any)))))
+    (catch Exception any (cs/join " " [file-path "is not servable because" (.getMessage any)]))))
 
 
 ;; (not-servable-reason "/home/simon/workspace/smeagol/resources/public/content/vendor/node_modules/photoswipe/dist/photoswipe.min.js")
@@ -157,8 +157,10 @@
 
 
 (defn get-servlet-context-path
+  "Return the servlet context path, if we're running as a servlet; if
+   not, return `nil`."
   [request]
-  (if-let [context (:servlet-context request)]
+  (when-let [context (:servlet-context request)]
     ;; If we're not inside a serlvet environment (for
     ;; example when using mock requests), then
     ;; .getContextPath might not exist