Implement assetpack for Sinatra

.gitignore

@@ -1 +1,3 @@
-app/config.rb
+config/database.yml
+config/syntax.yml
+public/assets

Gemfile

@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 gem 'sinatra'
 gem 'shotgun'
 gem 'unicorn'
+gem 'rake'
 
 # Database
 gem 'sequel'
@@ -19,7 +20,11 @@ gem 'pygments.rb'
 gem 'execjs'
 gem 'therubyracer'
 
-# Sugar
+# Assets & Sugar
+gem 'sinatra-assetpack'
 gem 'coffee-script'
 gem 'slim'
 gem 'stylus'
+
+# Deployment
+gem 'mina'

Gemfile.lock

@@ -8,9 +8,14 @@ GEM
     encryptor (1.1.3)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    jsmin (1.0.1)
     kgio (2.8.0)
     libv8 (3.11.8.17)
+    mina (0.3.0)
+      open4
+      rake
     multi_json (1.7.7)
+    open4 (1.3.0)
     pg (0.15.1)
     posix-spawn (0.3.6)
     pygments.rb (0.5.1)
@@ -19,7 +24,10 @@ GEM
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
     raindrops (0.11.0)
+    rake (10.1.0)
     ref (1.0.5)
     sequel (4.0.0)
     shotgun (0.9)
@@ -28,6 +36,11 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
+    sinatra-assetpack (0.2.8)
+      jsmin
+      rack-test
+      sinatra
+      tilt (>= 1.3.0)
     slim (2.0.0)
       temple (~> 0.6.5)
       tilt (~> 1.3, >= 1.3.3)
@@ -53,11 +66,14 @@ DEPENDENCIES
   coffee-script
   encryptor
   execjs
+  mina
   pg
   pygments.rb
+  rake
   sequel
   shotgun
   sinatra
+  sinatra-assetpack
   slim
   stylus
   therubyracer

Rakefile

@@ -0,0 +1,4 @@
+APP_FILE = 'pastemaster.rb'
+APP_CLASS = 'Pastemaster'
+
+require 'sinatra/assetpack/rake'

app/assets/css/pastemaster.styl

@@ -84,10 +84,10 @@ textarea
 
 form input[type="submit"], form a[role="submit"]
   float right
-
-form a[role="submit"]
   width 5em
   font-weight 600
   text-align center
   margin .4em 0
+
+form a[role="submit"]
   display none

app/models/configuration.rb

@@ -8,6 +8,8 @@ class Configuration
     load_syntax_config
   end
 
+  private
+
   def load_database_config
     config = YAML.load_file(APP_ROOT.join('config', 'database.yml'))
     @database_url = '%s://%s:%s@%s:%s/%s' % [

app/views/default.slim

@@ -2,16 +2,13 @@ doctype html
 html
   head
     title Pastemaster
-    link rel="stylesheet" href="/normalize.css?v2.1.2"
+    link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/2.1.0/normalize.css"
-    link rel="stylesheet" href="/assets/pastemaster.css?r1"
+    == css :application
-    link rel="stylesheet" href="/assets/dropdown.css?r1"
-    link rel="stylesheet" href="/pygments_solarized_modified.css?r1"
   body
     a href="/"
       h1
         strong Paste
         | master
     .container== yield
-    script type="text/javascript" src="http://code.jquery.com/jquery-2.0.3.min.js"
+    script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.0.3/jquery.min.js"
-    script type="text/javascript" src="/assets/pastemaster.js?r1"
+    == js :application
-    script type="text/javascript" src="/assets/dropdown.js?r1"

config/database.yml

@@ -1 +0,0 @@
-examples/database.yml

config/initializers/sinatra_assetpack_stylus.rb

@@ -0,0 +1,11 @@
+module Sinatra::AssetPack
+  class StylusEngine < Engine
+    def css(str, options={})
+      Tilt.new("stylus", {:style => :compressed}) { str }.render
+    rescue LoadError
+      nil
+    end
+  end
+
+  Compressor.register :css, :stylus, StylusEngine
+end

config/syntax.yml

@@ -1 +0,0 @@
-examples/syntax.yml

lib/assets.rb

@@ -1,21 +0,0 @@
-class CoffeeAssets < Sinatra::Base
-  set :views, File.expand_path('../../app/assets/javascripts', __FILE__)
-
-  get '/assets/:name.js' do
-    path = "#{settings.views}/#{params[:name]}.coffee"
-    return not_found unless File.exists?(path)
-
-    coffee params[:name].to_sym
-  end
-end
-
-class StylusAssets < Sinatra::Base
-  set :views, File.expand_path('../../app/assets/stylesheets', __FILE__)
-
-  get '/assets/:name.css' do
-    path = "#{settings.views}/#{params[:name]}.styl"
-    return not_found unless File.exists?(path)
-
-    stylus params[:name].to_sym
-  end
-end

pastemaster.rb

@@ -6,6 +6,7 @@ require 'yaml'
 
 require 'bundler/setup'
 require 'sinatra'
+require 'sinatra/assetpack'
 require 'sequel'
 require 'encryptor'
 require 'slim'
@@ -18,20 +19,39 @@ require 'app/models/configuration'
 require 'app/models/paste'
 require 'config/initializers/configuration'
 require 'config/initializers/database'
+require 'config/initializers/sinatra_assetpack_stylus'
 require 'lib/error_pages'
-require 'lib/assets'
 
 class Pastemaster < Sinatra::Application
+  set :root, File.dirname(__FILE__)
   set :server, 'unicorn'
   set :public_folder, 'public'
   set :views, File.expand_path('../app/views', __FILE__)
 
+  register Sinatra::AssetPack
+
+  assets do
+    serve '/assets/js', from: 'app/assets/js'
+    serve '/assets/css', from: 'app/assets/css'
+
+    css :application, '/assets/css/application.css', [
+      '/assets/css/pastemaster.css',
+      '/assets/css/dropdown.css',
+      '/assets/css/pygments_solarized_modified.css'
+    ]
+    js :application, '/assets/js/application.js', [
+      '/assets/js/pastemaster.js',
+      '/assets/js/dropdown.js'
+    ]
+
+    js_compression :jsmin
+    css_compression :simple
+  end
+
   set :slim, pretty: true
 
   use ErrorPages
   helpers ErrorPages::Forbidden
-  use CoffeeAssets
-  use StylusAssets
 
   get '/' do
     @syntaxes = CONFIG.syntaxes_map
@@ -40,6 +60,8 @@ class Pastemaster < Sinatra::Application
   end
 
   post '/' do
+    redirect '/' if params[:contents].nil? || params[:contents].strip.empty?
+
     paste = Paste.new(params[:contents], params[:syntax])
     id = paste.save
 

public/normalize.css

@@ -1,396 +0,0 @@
-/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
-
-/* ==========================================================================
-   HTML5 display definitions
-   ========================================================================== */
-
-/**
- * Correct `block` display not defined in IE 8/9.
- */
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-nav,
-section,
-summary {
-    display: block;
-}
-
-/**
- * Correct `inline-block` display not defined in IE 8/9.
- */
-
-audio,
-canvas,
-video {
-    display: inline-block;
-}
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-
-audio:not([controls]) {
-    display: none;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-[hidden] {
-    display: none;
-}
-
-/* ==========================================================================
-   Base
-   ========================================================================== */
-
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-
-html {
-    font-family: sans-serif; /* 1 */
-    -ms-text-size-adjust: 100%; /* 2 */
-    -webkit-text-size-adjust: 100%; /* 2 */
-}
-
-/**
- * Remove default margin.
- */
-
-body {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Links
-   ========================================================================== */
-
-/**
- * Address `outline` inconsistency between Chrome and other browsers.
- */
-
-a:focus {
-    outline: thin dotted;
-}
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-
-a:active,
-a:hover {
-    outline: 0;
-}
-
-/* ==========================================================================
-   Typography
-   ========================================================================== */
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari 5, and Chrome.
- */
-
-h1 {
-    font-size: 2em;
-    margin: 0.67em 0;
-}
-
-/**
- * Address styling not present in IE 8/9, Safari 5, and Chrome.
- */
-
-abbr[title] {
-    border-bottom: 1px dotted;
-}
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome.
- */
-
-b,
-strong {
-    font-weight: bold;
-}
-
-/**
- * Address styling not present in Safari 5 and Chrome.
- */
-
-dfn {
-    font-style: italic;
-}
-
-/**
- * Address differences between Firefox and other browsers.
- */
-
-hr {
-    -moz-box-sizing: content-box;
-    box-sizing: content-box;
-    height: 0;
-}
-
-/**
- * Address styling not present in IE 8/9.
- */
-
-mark {
-    background: #ff0;
-    color: #000;
-}
-
-/**
- * Correct font family set oddly in Safari 5 and Chrome.
- */
-
-code,
-kbd,
-pre,
-samp {
-    font-family: monospace, serif;
-    font-size: 1em;
-}
-
-/**
- * Improve readability of pre-formatted text in all browsers.
- */
-
-pre {
-    white-space: pre-wrap;
-}
-
-/**
- * Set consistent quote types.
- */
-
-q {
-    quotes: "\201C" "\201D" "\2018" "\2019";
-}
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-
-small {
-    font-size: 80%;
-}
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-
-sub,
-sup {
-    font-size: 75%;
-    line-height: 0;
-    position: relative;
-    vertical-align: baseline;
-}
-
-sup {
-    top: -0.5em;
-}
-
-sub {
-    bottom: -0.25em;
-}
-
-/* ==========================================================================
-   Embedded content
-   ========================================================================== */
-
-/**
- * Remove border when inside `a` element in IE 8/9.
- */
-
-img {
-    border: 0;
-}
-
-/**
- * Correct overflow displayed oddly in IE 9.
- */
-
-svg:not(:root) {
-    overflow: hidden;
-}
-
-/* ==========================================================================
-   Figures
-   ========================================================================== */
-
-/**
- * Address margin not present in IE 8/9 and Safari 5.
- */
-
-figure {
-    margin: 0;
-}
-
-/* ==========================================================================
-   Forms
-   ========================================================================== */
-
-/**
- * Define consistent border, margin, and padding.
- */
-
-fieldset {
-    border: 1px solid #c0c0c0;
-    margin: 0 2px;
-    padding: 0.35em 0.625em 0.75em;
-}
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-
-legend {
-    border: 0; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Correct font family not being inherited in all browsers.
- * 2. Correct font size not being inherited in all browsers.
- * 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome.
- */
-
-button,
-input,
-select,
-textarea {
-    font-family: inherit; /* 1 */
-    font-size: 100%; /* 2 */
-    margin: 0; /* 3 */
-}
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-
-button,
-input {
-    line-height: normal;
-}
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+.
- * Correct `select` style inheritance in Firefox 4+ and Opera.
- */
-
-button,
-select {
-    text-transform: none;
-}
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-
-button,
-html input[type="button"], /* 1 */
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; /* 2 */
-    cursor: pointer; /* 3 */
-}
-
-/**
- * Re-set default cursor for disabled elements.
- */
-
-button[disabled],
-html input[disabled] {
-    cursor: default;
-}
-
-/**
- * 1. Address box sizing set to `content-box` in IE 8/9.
- * 2. Remove excess padding in IE 8/9.
- */
-
-input[type="checkbox"],
-input[type="radio"] {
-    box-sizing: border-box; /* 1 */
-    padding: 0; /* 2 */
-}
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome
- *    (include `-moz` to future-proof).
- */
-
-input[type="search"] {
-    -webkit-appearance: textfield; /* 1 */
-    -moz-box-sizing: content-box;
-    -webkit-box-sizing: content-box; /* 2 */
-    box-sizing: content-box;
-}
-
-/**
- * Remove inner padding and search cancel button in Safari 5 and Chrome
- * on OS X.
- */
-
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-    -webkit-appearance: none;
-}
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-    border: 0;
-    padding: 0;
-}
-
-/**
- * 1. Remove default vertical scrollbar in IE 8/9.
- * 2. Improve readability and alignment in all browsers.
- */
-
-textarea {
-    overflow: auto; /* 1 */
-    vertical-align: top; /* 2 */
-}
-
-/* ==========================================================================
-   Tables
-   ========================================================================== */
-
-/**
- * Remove most spacing between table cells.
- */
-
-table {
-    border-collapse: collapse;
-    border-spacing: 0;
-}