Explain disj

.gitignore

@@ -4,3 +4,6 @@ lib
 classes
 *~
 .lein-deps-sum
+target/
+.nrepl-port
+logs/

README.md

@@ -6,10 +6,50 @@ TryClojure is a online Clojure REPL written using Noir and Chris Done's jquery c
 
 ## Usage
 
-http://tryclj.com
-
 To run it locally, use `lein ring server`.
 
+## Online
+
+The original version of the tutorial is available at: http://tryclj.com
+
+We are running an instance of the extended tutorial on EC2:
+
+http://ec2-54-77-13-3.eu-west-1.compute.amazonaws.com:8801/
+
+## Amazon EC2 setup notes
+
+Installed Ubuntu 14.04 LTS 64-bit AMI, login and:
+
+    sudo apt-get install openjdk-7-jdk
+    cd $(mktemp -d)
+    wget https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein
+    chmod 0755 lein
+    sudo cp lein /usr/local/bin
+    lein version
+    sudo apt-get install git
+    sudo adduser --system tryclj --group --disabled-login --home /opt/tryclojure
+    cd /opt/tryclojure
+    sudo -u tryclj git clone https://github.com/ray1729/tryclojure.git
+    sudo -u tryclj mkdir tryclojure/logs
+    sudo sh -c 'cat > /etc/init/tryclj.conf' <<EOT
+    # tryclj - Try Clojure Ring Server
+    #
+
+    description     "TryClojure Ring Server"
+
+    start on filesystem or runlevel [2345]
+    stop on runlevel [!2345]
+
+    respawn
+    respawn limit 10 5
+    umask 022
+
+    #console none
+
+    exec su tryclj -s /bin/bash -c "cd /opt/tryclojure/tryclojure && lein ring server-headless"
+    EOT
+    sudo service tryclj start
+
 ## Credits
 
 apgwoz: Design

project.clj

@@ -1,13 +1,17 @@
 (defproject tryclojure "0.1.0-SNAPSHOT"
   :description "A simple web-based Clojure REPL for trying out Clojure without having to install it."
-  :dependencies [[org.clojure/clojure "1.4.0"]
-                 [lib-noir "0.8.1"]
-                 [compojure "1.1.6"]
+  :dependencies [[org.clojure/clojure "1.6.0"]
+                 [org.clojure/tools.logging "0.3.0"]
+                 [log4j/log4j "1.2.17"]
+                 [enlive "1.1.5"]
+                 [lib-noir "0.8.4"]
+                 [compojure "1.1.8"]
                  [ring-server "0.3.1"]
                  [commons-lang/commons-lang "2.5"]
                  [clojail "1.0.6"]]
   :jvm-opts ["-Djava.security.policy=example.policy" "-Xmx80M"]
   :min-lein-version "2.0.0"
   :uberjar-name "tryclojure-standalone.jar"
-  :plugins [[lein-ring "0.8.10"]]
-  :ring {:handler tryclojure.server/app :port 8801})
+  :plugins [[lein-ring "0.8.11"]]
+  :ring {:handler tryclojure.server/app :port 8801}
+  :profiles {:dev {:ring {:nrepl? true}}})

resources/log4j.properties

@@ -0,0 +1,10 @@
+log4j.rootLogger=INFO, console, file
+log4j.logger.example=DEBUG
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%-5p %c: %m%n
+log4j.appender.file=org.apache.log4j.FileAppender
+log4j.appender.file.File=logs/server.log
+log4j.appender.file.Append=true
+log4j.appender.file.layout=org.apache.log4j.PatternLayout
+log4j.appender.file.layout.ConversionPattern=%d %p %m%n

resources/public/css/tryclojure.css

@@ -5,7 +5,7 @@ body {
 
 #wrapper {
  text-align: left;
- width: 620px;
+ width: 820px;
  margin: 0 auto;
  border-radius: 5px;
  border: 5px solid #eee;
@@ -48,43 +48,43 @@ body {
  border: 1px solid #aaa;
 }
 
-#console div.jquery-console-inner { 
- width:580px;
- height:200px; 
+#console div.jquery-console-inner {
+ width:780px;
+ height:200px;
  margin: 10px 10px;
- overflow:auto; 
+ overflow:auto;
  text-align:left;
 }
 #console div.jquery-console-message-value {
-  color:#0066FF; 
+  color:#0066FF;
   font-family:monospace;
-  padding:0.1em; 
+  padding:0.1em;
 }
 #console div.jquery-console-prompt-box {
- color:#444; font-family:monospace; 
+ color:#444; font-family:monospace;
 }
 #console div.jquery-console-focus span.jquery-console-cursor {
  background:#333; color:#eee; font-weight:bold;
 }
 #console div.jquery-console-message-error {
  color:#ef0505; font-family:sans-serif; font-weight:bold;
- padding:0.1em; 
+ padding:0.1em;
 }
 #console div.jquery-console-message-success {
  color:#187718; font-family:monospace;
- padding:0.1em; 
+ padding:0.1em;
 }
-#console span.jquery-console-prompt-label { 
+#console span.jquery-console-prompt-label {
  font-weight:bold;
 }
 
-.bottom { 
- background-color: white; color: #333; 
+.bottom {
+ background-color: white; color: #333;
 }
-.bottom a,a:visited { 
- color: #111; 
+.bottom a,a:visited {
+ color: #111;
 }
-table.bottom { 
+table.bottom {
  width: 100%; border: 1px solid black;
 }
 
@@ -93,13 +93,13 @@ table.bottom {
  text-align: center;
  margin-top: 10px;
 }
-#buttons a { 
+#buttons a {
 /* color: #4881d8;*/
  color: #3D5B99;
  padding: .3em 1em;
  margin-right: .7em;
  font-family: Helvetica, sans-serif;
- font-size: 16px; 
+ font-size: 14px;
  font-weight: bold;
  background: #90b4fe;
  border-radius: 5px;
@@ -110,10 +110,10 @@ table.bottom {
 }
 #buttons a:hover {
  color: #5881d8;
- cursor: pointer; 
+ cursor: pointer;
 }
 
-#changer { 
+#changer {
  margin: 10px;
  padding: 0.25em 0.5em 0.25em 0.5em;
  background: #EAF2F5;
@@ -128,12 +128,20 @@ table.bottom {
 
 #changer p {
  background: transparent;
- line-height: 1.3em;
+ line-height: 1.5em;
  font-family: Arial, serif;
- font-size: 16px;
+ font-size: 14px;
  color: #555;
 }
 
+#changer li {
+ background: transparent;
+ line-height: 1.5em;
+ font-family: Arial, serif;
+ font-size: 14px;
+ color: #555;
+}    
+
 #changer code {
   background-color: #eee;
   border: 1px solid #aaa;
@@ -142,17 +150,37 @@ table.bottom {
   padding: 0.1em 0.25em 0.1em 0.25em;
 }
 
+#changer code.expr{
+  background-color: #D8ACDB;
+}
+
 div#tuttext {
 }
 
 div.continue {
  width: 100%;
  text-align: center;
- padding-top: 0.5em; 
+ padding-top: 0.5em;
 }
 
-div.footer { 
- text-align: center; 
+div.footer {
+ text-align: center;
+}
+
+pre.codeblock {
+  background: #eee;
+  border: 1px solid #aaa;
+  font-size: 14px;
+  padding: 10px 0;
+}
+
+pre.codeblock.expr {
+    background: #D8ACDB;
+}
+
+#changer pre.codeblock code{
+  background-color: transparent;
+  border: none;
 }
 
 /* Coderay alpha style */
@@ -204,7 +232,7 @@ table.code td { padding: 2px 4px; vertical-align: top; }
 
 /* operator */
 #changer .code span.cl {
- 
+
 }
 
 /* number */