Add Gorilla renderer. Add licence info.

LICENCE.txt

@@ -0,0 +1,14 @@
+Copyright (c) 2014-, Jony Hudson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -4,3 +4,6 @@
 
 ## License
 
+Gorilla is licensed to you under the MIT licence. See LICENCE.txt for details.
+
+Copyright © 2014- Jony Hudson

project.clj

@@ -1,6 +1,11 @@
+;;;; This file is part of gg4clj. Copyright (C) 2014-, Jony Hudson.
+;;;;
+;;;; gg4clj is licenced to you under the MIT licence. See the file LICENCE.txt for full details.
+
 (defproject gg4clj "0.1.0-SNAPSHOT"
   :description "A simple wrapper for R's ggplot2 in Clojure."
   :url "https://github.com/JonyEpsilon/gg4clj"
   :license {:name "MIT"}
-  :dependencies [[org.clojure/clojure "1.6.0"]]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [gorilla-renderable "1.0.0"]]
   :plugins [[lein-gorilla "0.3.4"]])

src/gg4clj/core.clj

@@ -1,7 +1,12 @@
+;;;; This file is part of gg4clj. Copyright (C) 2014-, Jony Hudson.
+;;;;
+;;;; gg4clj is licenced to you under the MIT licence. See the file LICENCE.txt for full details.
+
 (ns gg4clj.core
   (:import (java.io File))
   (:require [clojure.java.shell :as shell]
-            [clojure.string :as string]))
+            [clojure.string :as string]
+            [gorilla-renderable.core :as render]))
 
 
 ;; * Functions for building R code *
@@ -59,6 +64,7 @@
   [:data.frame
    (apply hash-map (mapcat (fn [e] [(key e) (into [:c] (val e))]) data-map))])
 
+
 ;; * Functions for driving R *
 
 (defn- rscript
@@ -81,16 +87,35 @@
      command
      [:ggsave {:filename filepath :width 5 :height 3}]]))
 
-(defn render-ggplot
+(defn render
+  "Takes a ggplot2 command, expressed in the Clojure representation of R code, and returns the plot rendered to SVG
+  as a string."
   [plot-command]
-  (let [r-file (File/createTempFile "gorilla" ".r")
+  (let [r-file (File/createTempFile "gg4clj" ".r")
         r-path (.getAbsolutePath r-file)
         ;;_ (println r-path)
-        out-file (File/createTempFile "gorilla" ".svg")
+        out-file (File/createTempFile "gg4clj" ".svg")
         out-path (.getAbsolutePath out-file)
         _ (spit r-path (wrap-ggplot plot-command out-path))
         _ (rscript r-path)
         rendered-plot (slurp out-path)
         _ (.delete r-file)
         _ (.delete out-file)]
-    rendered-plot))
+    rendered-plot))
+
+
+;; * Gorilla REPL rendering *
+
+(defrecord GGView [plot-command])
+
+;; This renderer displays the rendered SVG output, and attaches the plot-command (in Clojure) as
+;; the rendered item's value.
+(extend-type GGView
+  render/Renderable
+  (render [self]
+    {:type :html :content (render (:plot-command self)) :value (pr-str self)}))
+
+(defn view
+  "View a ggplot2 command, expressed in the Clojure representation of R code, in Gorilla REPL."
+  [plot-command]
+  (GGView. plot-command))