From Middleman to DocPad

.gitignore

@@ -1,4 +1,3 @@
-/.sass-cache
 /build
 /node_modules
-/source/data
+/source/files

.travis.yml

@@ -4,10 +4,8 @@ node_js:
     - 0.10
 
 before_script:
-    - bundle
-    - npm install
+    - make run &
+    - sleep 5
 
 script:
-    - middleman &
-    - sleep 5
-    - node_modules/.bin/phantomjs node_modules/qunitjs/addons/phantomjs/runner.js http://0.0.0.0:4567/tests.html
+    - make test

Gemfile

@@ -1,4 +0,0 @@
-source 'http://rubygems.org'
-
-gem "middleman", "~>3.0.13"
-gem 'rb-inotify', '~> 0.9'

Gemfile.lock

@@ -1,104 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    chunky_png (1.2.8)
-    coffee-script (2.2.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.3.3)
-    compass (0.12.2)
-      chunky_png (~> 1.2)
-      fssm (>= 0.2.7)
-      sass (~> 3.1)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    ffi (1.8.1)
-    fssm (0.2.10)
-    haml (4.0.2)
-      tilt
-    hike (1.2.2)
-    http_router (0.10.2)
-      rack (>= 1.0.0)
-      url_mount (~> 0.2.1)
-    i18n (0.6.1)
-    listen (0.7.3)
-    maruku (0.6.1)
-      syntax (>= 1.0.0)
-    middleman (3.0.13)
-      middleman-core (= 3.0.13)
-      middleman-more (= 3.0.13)
-      middleman-sprockets (~> 3.0.8)
-    middleman-core (3.0.13)
-      activesupport (~> 3.2.6)
-      bundler (~> 1.1)
-      listen (~> 0.7.3)
-      rack (~> 1.4.1)
-      rack-test (~> 0.6.1)
-      rb-fsevent (~> 0.9.3)
-      thor (~> 0.15.4)
-      tilt (~> 1.3.6)
-    middleman-more (3.0.13)
-      coffee-script (~> 2.2.0)
-      coffee-script-source (~> 1.3.3)
-      compass (>= 0.12.2)
-      execjs (~> 1.4.0)
-      haml (>= 3.1.6)
-      i18n (~> 0.6.0, < 0.6.2)
-      maruku (~> 0.6.0)
-      middleman-core (= 3.0.13)
-      padrino-helpers (= 0.10.7)
-      sass (>= 3.1.20)
-      uglifier (~> 1.2.6)
-    middleman-sprockets (3.0.11)
-      middleman-more (>= 3.0.11)
-      sprockets (~> 2.1)
-      sprockets-sass (~> 0.9.1)
-    multi_json (1.7.3)
-    padrino-core (0.10.7)
-      activesupport (~> 3.2.0)
-      http_router (~> 0.10.2)
-      sinatra (~> 1.3.1)
-      thor (~> 0.15.2)
-      tilt (~> 1.3.0)
-    padrino-helpers (0.10.7)
-      i18n (~> 0.6)
-      padrino-core (= 0.10.7)
-    rack (1.4.5)
-    rack-protection (1.5.0)
-      rack
-    rack-test (0.6.2)
-      rack (>= 1.0)
-    rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
-      ffi (>= 0.5.0)
-    sass (3.2.9)
-    sinatra (1.3.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.9.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (0.9.1)
-      sprockets (~> 2.0)
-      tilt (~> 1.1)
-    syntax (1.0.0)
-    thor (0.15.4)
-    tilt (1.3.7)
-    uglifier (1.2.7)
-      execjs (>= 0.3.0)
-      multi_json (~> 1.3)
-    url_mount (0.2.1)
-      rack
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  middleman (~> 3.0.13)
-  rb-inotify (~> 0.9)

Makefile

@@ -1,3 +1,13 @@
 default:
-	bundle
-	middleman build
+	npm install
+	node_modules/.bin/docpad generate
+
+run:
+	npm install
+	node_modules/.bin/docpad run
+
+test:
+	node_modules/.bin/phantomjs node_modules/qunitjs/addons/phantomjs/runner.js http://0.0.0.0:9778/tests.html
+
+clean:
+	rm -rf node_modules/ build/

config.rb

@@ -1,8 +0,0 @@
-set :css_dir, 'styles'
-set :js_dir, 'scripts'
-
-Tilt.mappings.delete('md')
-
-configure :build do
-    activate :minify_css
-end

docpad.coffee

@@ -0,0 +1,4 @@
+module.exports = {
+    outPath: "build"
+    srcPath: "source"
+}

package.json

@@ -4,6 +4,10 @@
     "author": "Vit Brunner",
     "description": "Visual comparison of different translations of itemized texts; e.g. poems, bibles, etc.",
     "devDependencies": {
+        "docpad": "6.x",
+        "docpad-plugin-coffeescript": "2.x",
+        "docpad-plugin-jade": "2.x",
+        "docpad-plugin-less": "2.x",
         "qunitjs": "1.11.x",
         "phantomjs": "1.9.x"
     },

source/_scripts.haml

@@ -1,9 +0,0 @@
-/ application scripts
-#{javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.js"}
-/ TODO use cdnjs.com once they serve marked
-#{javascript_include_tag "//raw.github.com/chjj/marked/master/lib/marked.js"}
-#{javascript_include_tag "app"}
-#{javascript_include_tag "services"}
-#{javascript_include_tag "reader/markdown"}
-#{javascript_include_tag "reader/json"}
-#{javascript_include_tag "controllers"}

source/documents/_scripts.html.jade

@@ -0,0 +1,9 @@
+// application scripts
+script(src="//cdnjs.cloudflare.com/ajax/libs/angular.js/1.1.5/angular.js")
+// TODO use cdnjs.com once they serve marked
+script(src="//raw.github.com/chjj/marked/master/lib/marked.js")
+script(src="scripts/app.js")
+script(src="scripts/services.js")
+script(src="scripts/reader/markdown.js")
+script(src="scripts/reader/json.js")
+script(src="scripts/controllers.js")

source/documents/index.html.jade

@@ -0,0 +1,14 @@
+doctype 5
+html(ng-app="sideBySide")
+    head
+        title Side By Side viewer
+        meta(charset="utf-8")
+        link(rel="stylesheet", type="text/css", href="//fonts.googleapis.com/css?family=Titillium+Web:400,700,400italic,700italic")
+        link(rel="stylesheet", type="text/css", href="styles/style.css")
+        include _scripts.html.jade
+
+    body
+        div(class="container", ng-controller="comparisonController")
+            div(class="verse", ng-repeat="verse in verses")
+                div(class="section", ng-bind="verse.section")
+                div(class="version", ng-repeat= "version in verse.versions") {{ version }}

source/documents/styles/style.css.less

@@ -0,0 +1,3 @@
+body {
+    font-family: "Titillium Web", sans-serif;
+}

source/documents/tests.html.jade

@@ -0,0 +1,17 @@
+doctype 5
+html
+    head
+        title Side By Side test suite
+        meta(charset="utf-8")
+
+        include _scripts.html.jade
+
+        // test scripts
+        link(rel="stylesheet", type="text/css", href="//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.css")
+        script(src="//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.js")
+        script(src="scripts/tests/reader/_abstract.js")
+        script(src="scripts/tests/reader/markdown.js")
+        script(src="scripts/tests/reader/json.js")
+
+    body
+        div(id="qunit")

source/index.haml

@@ -1,14 +0,0 @@
-!!! 5
-%html{"ng-app" => "sideBySide"}
-    %head
-        %title Side By Side viewer
-        %meta{:charset => "utf-8"}
-        #{stylesheet_link_tag "//fonts.googleapis.com/css?family=Titillium+Web:400,700,400italic,700italic"}
-        #{stylesheet_link_tag "style"}
-        = render_partial 'scripts'
-
-    %body
-        %div{:class => "container", "ng-controller" => "comparisonController"}
-            %div{:class => "verse", "ng-repeat" => "verse in verses"}
-                %div{:class => "section", "ng-bind" => "verse.section"}
-                %div{:class => "version", "ng-repeat" => "version in verse.versions"} {{ version }}

source/styles/style.sass

@@ -1,2 +0,0 @@
-body
-    font-family: "Titillium Web", sans-serif

source/tests.haml

@@ -1,16 +0,0 @@
-!!! 5
-%html
-    %head
-        %title Side By Side test suite
-        %meta{:charset => "utf-8"}
-        = render_partial 'scripts'
-
-        / test scripts
-        #{stylesheet_link_tag "//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.css"}
-        #{javascript_include_tag "//cdnjs.cloudflare.com/ajax/libs/qunit/1.11.0/qunit.js"}
-        #{javascript_include_tag "tests/reader/_abstract"}
-        #{javascript_include_tag "tests/reader/markdown"}
-        #{javascript_include_tag "tests/reader/json"}
-
-    %body
-        %div{:id => "qunit"}