added Luminus benchmark

luminus/README.md

@@ -0,0 +1,33 @@
+# Compojure Benchmarking Test
+
+This is the Compojure portion of a [benchmarking test suite](../) comparing a variety of web development platforms.
+
+### JSON Encoding Test
+
+* [JSON test source](hello/src/hello/handler.clj)
+
+### Data-Store/Database Mapping Test
+
+* [Database test source](hello/src/hello/handler.clj)
+
+## Infrastructure Software Versions
+The dependencies are documented in [project.clj](hello/project.clj),
+but the main ones are:
+
+* [Clojure 1.5.1](http://clojure.org/)
+* [Compojure 1.1.5](https://github.com/weavejester/compojure)
+* [Ring-JSON 0.2.0](https://github.com/ring-clojure/ring-json), which in turn uses [Cheshire](https://github.com/dakrone/cheshire), which in turn uses [Jackson](http://jackson.codehaus.org/)
+* [Korma 0.3.0-RC5](http://sqlkorma.com/)
+
+## Test URLs
+### JSON Encoding Test
+
+http://localhost/hello-compojure-standalone/json
+
+### Data-Store/Database Mapping Test
+
+http://localhost/hello-compojure-standalone/db
+
+### Variable Query Test
+
+http://localhost/hello-compojure-standalone/db/2

luminus/benchmark_config

@@ -0,0 +1,21 @@
+{
+  "framework": "luminus",
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/luminus/json",
+      "db_url": "/luminus/db/1",
+      "query_url": "/luminus/db/",
+      "fortune_url": "/luminus/fortune",
+      "port": 8080,
+      "sort": 2
+    },
+    "raw": {
+      "setup_file": "setup",
+      "db_url": "/luminus/dbraw/1",
+      "query_url": "/luminus/dbraw/",
+      "port": 8080,
+      "sort": 85
+    }
+  }]
+}

luminus/hello/.gitignore

@@ -0,0 +1,11 @@
+/target
+/lib
+/classes
+/checkouts
+pom.xml
+*.jar
+*.class
+.lein-deps-sum
+.lein-failures
+.lein-plugins
+.lein-env

luminus/hello/README.md

@@ -0,0 +1,19 @@
+# hello
+
+FIXME
+
+## Prerequisites
+
+You will need [Leiningen][1] 2.0 or above installed.
+
+[1]: https://github.com/technomancy/leiningen
+
+## Running
+
+To start a web server for the application, run:
+
+    lein ring server
+
+## License
+
+Copyright © 2013 FIXME

luminus/hello/project.clj

@@ -0,0 +1,40 @@
+(defproject
+  hello
+  "luminus"
+  :dependencies
+  [[org.clojure/clojure "1.5.1"]
+   [lib-noir "0.5.4"]
+   [compojure "1.1.5"]
+   [ring-server "0.2.8"]
+   [clabango "0.5"]
+   [com.taoensso/timbre "1.6.0"]
+   [com.postspectacular/rotor "0.1.0"]
+   [com.taoensso/tower "1.5.1"]
+   [markdown-clj "0.9.19"]
+   [org.clojure/java.jdbc "0.2.3"]
+   [mysql/mysql-connector-java "5.1.6"]
+   [korma "0.3.0-RC5"]
+   [log4j
+    "1.2.15"
+    :exclusions
+    [javax.mail/mail
+     javax.jms/jms
+     com.sun.jdmk/jmxtools
+     com.sun.jmx/jmxri]]]
+  :ring
+  {:handler hello.handler/war-handler,
+   :init hello.handler/init,
+   :destroy hello.handler/destroy}
+  :profiles
+  {:production
+   {:ring
+    {:open-browser? false, :stacktraces? false, :auto-reload? false}},
+   :dev
+   {:dependencies [[ring-mock "0.1.3"] [ring/ring-devel "1.1.8"]]}}
+  :url
+  "http://example.com/FIXME"
+  :plugins
+  [[lein-ring "0.8.5"]]
+  :description
+  "FIXME: write description"
+  :min-lein-version "2.0.0")

luminus/hello/resources/public/css/screen.css

@@ -0,0 +1,55 @@
+body {	
+    background-color: #fff;
+    color: #333;
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+}
+
+#register {
+    float: left;
+    display: inline-block;
+}
+
+h1 {
+    -webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+	background-color: #E9E9E9;
+	border: 1px solid #CFCFCF;
+	border-radius: 4px;
+}
+
+.nav li {
+    float: left;
+    list-style: none;
+    padding: 5px;
+}
+
+.navbar {
+    text-align: right;
+    padding: 5px;
+    margin-bottom: 10px;
+}
+
+#container {
+    height: auto;
+    margin-bottom: 10px;
+}
+
+#footer {    
+    width: 95%;
+    margin-left: 1%;
+    margin-right: 1%;
+    position:absolute;
+    bottom:0;
+    font-size: 11px;
+    font-weight: bold;
+    height: auto;    
+    text-align: center;
+    
+	padding-top: 10px;
+	
+	-webkit-border-radius: 4px;
+    -moz-border-radius: 4px;
+	background-color: #E9E9E9;
+	border: 1px solid #CFCFCF;
+	border-radius: 4px;
+}

luminus/hello/resources/public/md/docs.md

@@ -0,0 +1,11 @@
+### Here are some links to get started
+
+1. [HTML templating](http://www.luminusweb.net/docs/html_templating.md)
+2. [Accessing the database](http://www.luminusweb.net/docs/database.md)
+3. [Serving static resources](http://www.luminusweb.net/docs/static_resources.md)
+4. [Setting response types](http://www.luminusweb.net/docs/responses.md)
+5. [Defining routes](http://www.luminusweb.net/docs/routes.md)
+6. [Adding middleware](http://www.luminusweb.net/docs/middleware.md)
+7. [Sessions and cookies](http://www.luminusweb.net/docs/sessions_cookies.md)
+8. [Security](http://www.luminusweb.net/docs/security.md)
+9. [Deploying the application](http://www.luminusweb.net/docs/deployment.md)

luminus/hello/src/hello/handler.clj

@@ -0,0 +1,50 @@
+(ns hello.handler
+  (:use hello.routes.home
+        compojure.core)
+  (:require [noir.util.middleware :as middleware]
+            [compojure.route :as route]
+            [taoensso.timbre :as timbre]
+            [com.postspectacular.rotor :as rotor]))
+
+(defroutes app-routes
+  (route/resources "/")
+  (route/not-found "Not Found"))
+
+(defn destroy []
+  (timbre/info "picture-gallery is shutting down"))
+
+(defn init
+  "init will be called once when
+   app is deployed as a servlet on
+   an app server such as Tomcat
+   put any initialization code here"
+  []
+  (timbre/set-config!
+    [:appenders :rotor]
+    {:min-level :info
+     :enabled? true
+     :async? false ; should be always false for rotor
+     :max-message-per-msecs nil
+     :fn rotor/append})
+  
+  (timbre/set-config!
+    [:shared-appender-config :rotor]
+    {:path "hello.log" :max-size 10000 :backlog 10})
+  
+  (timbre/info "hello started successfully"))
+
+(defn destroy
+  "destroy will be called when your application
+   shuts down, put any clean up code here"
+  []
+  (timbre/info "hello is shutting down..."))
+
+;;append your application routes to the all-routes vector
+(def all-routes [home-routes app-routes])
+
+(def app (-> all-routes
+             middleware/app-handler
+             ;;add your middlewares here
+             ))
+
+(def war-handler (middleware/war-handler app))

luminus/hello/src/hello/models/db.clj

@@ -0,0 +1,72 @@
+(ns hello.models.db
+  (:use korma.core
+         hello.models.schema)
+  (:require [clojure.java.jdbc :as jdbc]))
+
+
+
+; Set up entity World and the database representation
+(defentity world
+  (pk :id)
+  (table :world)
+  (entity-fields :id :randomNumber)
+  (database db))
+
+; Query a random World record from the database
+(defn get-world []
+  (let [id (inc (rand-int 9999))] ; Num between 1 and 10,000
+    (select world
+            (fields :id :randomNumber)
+            (where {:id id }))))
+
+; Query a random World record from the database
+(defn get-world-raw []
+  (let [id (inc (rand-int 9999))] ; Num between 1 and 10,000
+    (jdbc/with-connection (db-raw)
+      (jdbc/with-query-results rs [(str "select * from world where id = ?") id]
+        (doall rs)))))
+
+; Run the specified number of queries, return the results
+(defn run-queries [queries]
+  (vec ; Return as a vector
+   (flatten ; Make it a list of maps
+    (take
+     queries ; Number of queries to run
+     (repeatedly get-world)))))
+
+; Run the specified number of queries, return the results
+(defn run-queries-raw [queries]
+  (vec ; Return as a vector
+   (flatten ; Make it a list of maps
+    (take
+     queries ; Number of queries to run
+     (repeatedly get-world-raw)))))
+
+(defn get-query-count [queries]
+  "Parse provided string value of query count, clamping values to between 1 and 500."
+  (let [q (try (Integer/parseInt queries)
+               (catch Exception e 1))] ; default to 1 on parse failure
+    (if (> q 500)
+      500 ; clamp to 500 max
+      (if (< q 1)
+        1 ; clamp to 1 min
+        q)))) ; otherwise use provided value
+
+
+; Set up entity World and the database representation
+(defentity fortune
+  (pk :id)
+  (table :fortune)
+  (entity-fields :id :message)
+  (database db))
+
+(defn get-all-fortunes []
+  "Query all Fortune records from the database."
+    (select fortune
+            (fields :id :message)))
+
+(defn get-fortunes []
+  "Fetch the full list of Fortunes from the database, sort them by the fortune
+   message text, and then return the results."
+  (let [fortunes (conj (get-all-fortunes) {:id 0 :message "Additional fortune added at request time."} )]
+    (sort-by #(:message %) fortunes)))

luminus/hello/src/hello/models/schema.clj

@@ -0,0 +1,39 @@
+(ns hello.models.schema
+  (:require [korma.db :refer [defdb mysql]]
+            [clojure.java.jdbc :as sql])
+  (:import com.mchange.v2.c3p0.ComboPooledDataSource))
+
+; Database connection for java.jdbc "raw"
+; https://github.com/clojure/java.jdbc/blob/master/doc/clojure/java/jdbc/ConnectionPooling.md
+(def db-spec-mysql-raw
+  {:classname "com.mysql.jdbc.Driver"
+   :subprotocol "mysql"
+   :subname "//localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
+   :user "benchmarkdbuser"
+   :password "benchmarkdbpass"})
+
+; Database connection
+(defdb db (mysql {:subname "//localhost:3306/hello_world?jdbcCompliantTruncation=false&elideSetAutoCommits=true&useLocalSessionState=true&cachePrepStmts=true&cacheCallableStmts=true&alwaysSendSetIsolation=false&prepStmtCacheSize=4096&cacheServerConfiguration=true&prepStmtCacheSqlLimit=2048&zeroDateTimeBehavior=convertToNull&traceProtocol=false&useUnbufferedInput=false&useReadAheadInput=false&maintainTimeStats=false&useServerPrepStmts&cacheRSMetadata=true"
+                  :user "benchmarkdbuser"
+                  :password "benchmarkdbpass"
+                  ;;OPTIONAL KEYS
+                  :delimiters "" ;; remove delimiters
+                  :maximum-pool-size 256
+                  }))
+                  
+(defn pool
+  [spec]
+  (let [cpds (doto (ComboPooledDataSource.)
+               (.setDriverClass (:classname spec))
+               (.setJdbcUrl (str "jdbc:" (:subprotocol spec) ":" (:subname spec)))
+               (.setUser (:user spec))
+               (.setPassword (:password spec))
+               ;; expire excess connections after 30 minutes of inactivity:
+               (.setMaxIdleTimeExcessConnections (* 30 60))
+               ;; expire connections after 3 hours of inactivity:
+               (.setMaxIdleTime (* 3 60 60)))]
+    {:datasource cpds}))
+
+(def pooled-db (delay (pool db-spec-mysql-raw)))
+
+(defn db-raw [] @pooled-db)

luminus/hello/src/hello/repl.clj

@@ -0,0 +1,34 @@
+(ns hello.repl
+  (:use hello.handler
+        ring.server.standalone
+        [ring.middleware file-info file]))
+
+(defonce server (atom nil))
+
+(defn get-handler []
+  ;; #'app expands to (var app) so that when we reload our code,
+  ;; the server is forced to re-resolve the symbol in the var
+  ;; rather than having its own copy. When the root binding
+  ;; changes, the server picks it up without having to restart.
+  (-> #'app
+    ; Makes static assets in $PROJECT_DIR/resources/public/ available.
+    (wrap-file "resources")
+    ; Content-Type, Content-Length, and Last Modified headers for files in body
+    (wrap-file-info)))
+
+(defn start-server
+  "used for starting the server in development mode from REPL"
+  [& [port]]
+  (let [port (if port (Integer/parseInt port) 8080)]
+    (reset! server
+            (serve (get-handler)
+                   {:port port
+                    :init init
+                    :auto-reload? true
+                    :destroy destroy
+                    :join true}))
+    (println (str "You can view the site at http://localhost:" port))))
+
+(defn stop-server []
+  (.stop @server)
+  (reset! server nil))

luminus/hello/src/hello/routes/home.clj

@@ -0,0 +1,13 @@
+(ns hello.routes.home
+  (:use compojure.core
+        hello.models.db)
+  (:require [hello.views.layout :as layout]
+            [noir.response :as response]))
+
+(defroutes home-routes
+  (GET "/" [] "Hello, World!")
+  (GET "/json" [] (response/json {:message "Hello, World!"}))
+  (GET "/db/:queries" [queries] (response/json (run-queries (get-query-count queries))))
+  (GET "/dbraw/:queries" [queries] (response/json (run-queries-raw (get-query-count queries))))  
+  (GET "/fortune" [] (layout/render "home.html" {:messages (get-fortunes)})))
+

luminus/hello/src/hello/views/layout.clj

@@ -0,0 +1,10 @@
+(ns hello.views.layout
+  (:use noir.request)
+  (:require [clabango.parser :as parser]))
+
+(def template-path "hello/views/templates/")
+
+(defn render [template & [params]]
+  (parser/render-file (str template-path template)
+                      (assoc params :context (:context *request*))))
+

luminus/hello/src/hello/views/templates/about.html

@@ -0,0 +1,10 @@
+
+{% extends "hello/views/templates/base.html" %}
+
+
+
+{% block content %}
+
+ <p>this is the story of hello... work in progress</p>
+
+{% endblock %}

luminus/hello/src/hello/views/templates/base.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Welcome to hello</title>
+	<link href="{{context}}/css/screen.css" rel="stylesheet" type="text/css"></link>
+	<script type="text/javascript">
+	var context = "{{context}}";
+	</script>
+</head>
+<body>
+    <div id="wrap">
+		<div class="navbar navbar-fixed-top navbar-inverse">
+			<div class="navbar-inner">
+				<ul class="nav">
+					<li><a href="{{context}}/">Home</a></li>
+					<li><a href="{{context}}/about">About</a></li>
+				</ul>
+			</div>
+		</div>
+		<div class="container">		
+			
+{% block content %}
+
+{% endblock %}
+
+		</div>		
+	    <div id="push"></div>
+	</div>
+	<div id="footer">
+         <div class="container">                
+             <p class="muted footer-text">Footer content.</p>
+         </div>
+    </div>        
+</body>
+</html>

luminus/hello/src/hello/views/templates/home.html

@@ -0,0 +1,18 @@
+{% extends "luminus_benchmark/views/templates/base.html" %}
+
+{% block content %}
+
+<table>
+  <tr>
+    <th>id</th>
+    <th>message</th>
+  </tr>
+  {% for message in messages %}
+  <tr>
+    <td>{{message.id}}</td>
+    <td>{{message.message}}</td>
+  </tr>
+</table>  
+  {% endfor %}
+
+{% endblock %}

luminus/hello/src/log4j.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+  <logger name="com.mchange">
+    <level value="WARN"/>
+  </logger>
+</log4j:configuration>

luminus/hello/test/hello/test/handler.clj

@@ -0,0 +1,15 @@
+(ns hello.test.handler
+  (:use clojure.test
+        ring.mock.request
+        hello.handler))
+
+(deftest test-app
+  (testing "main route"
+    (let [response (app (request :get "/"))]
+      (is (= (:status response) 200))
+      (is (= (:body response)
+             "<html>\n    <head>\n        <title>Welcome to hello</title>\n        <link href=\"/css/screen.css\" rel=\"stylesheet\" type=\"text/css\"></link>\n    </head>\n    <body>\n        <div class=\"navbar navbar-fixed-top navbar-inverse\">\n            <ul class=\"nav\">\n                <li>\n                    <a href=\"/\">Home</a>\n                </li>\n                <li>\n                    <a href=\"/about\">About</a>\n                </li>\n            </ul>\n        </div>\n        <div id=\"content\">\n        <h1>Welcome to hello</h1>\n        \n<h2>Some links to get started</h2><ol><li><a href='http://www.luminusweb.net/docs/html&#95;templating.md'>HTML templating</a></li><li><a href='http://www.luminusweb.net/docs/database.md'>Accessing the database</a></li><li><a href='http://www.luminusweb.net/docs/static&#95;resources.md'>Serving static resources</a></li><li><a href='http://www.luminusweb.net/docs/responses.md'>Setting response types</a></li><li><a href='http://www.luminusweb.net/docs/routes.md'>Defining routes</a></li><li><a href='http://www.luminusweb.net/docs/middleware.md'>Adding middleware</a></li><li><a href='http://www.luminusweb.net/docs/sessions&#95;cookies.md'>Sessions and cookies</a></li><li><a href='http://www.luminusweb.net/docs/security.md'>Security</a></li><li><a href='http://www.luminusweb.net/docs/deployment.md'>Deploying the application</a></li></ol>\n\n        </div>        \n        <footer>Copyright ...</footer>\n    </body>\n</html>\n\n\n"))))
+
+  (testing "not-found route"
+    (let [response (app (request :get "/invalid"))]
+      (is (= (:status response) 404)))))

luminus/setup.py

@@ -0,0 +1,22 @@
+
+import subprocess
+import sys
+import setup_util
+
+def start(args):
+  setup_util.replace_text("luminus/hello/src/hello/models/schema.clj", ":subname \"//.*:3306", ":subname \"//" + args.database_host + ":3306")
+
+  try:
+    subprocess.check_call("lein ring uberwar", shell=True, cwd="luminus/hello")
+    subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
+    subprocess.check_call("cp luminus/hello/target/hello-luminus-standalone.war $RESIN_HOME/webapps/luminus.war", shell=True)
+    subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)
+    return 0
+  except subprocess.CalledProcessError:
+    return 1
+def stop():
+  try:
+    subprocess.check_call("$RESIN_HOME/bin/resinctl shutdown", shell=True)
+    return 0
+  except subprocess.CalledProcessError:
+    return 1