Setup to deploy on jneen's infra (#44)

* update Dockerfile for jneen server deployment

* add x86_64-linux-musl as a platform

* remove sprockets and use plain css/js

* factor out `make_demo` and log errors

* disable static file serving in production

* don't log on InvalidVersion

* move load-dependent stuff into setup()

* update link colours

---------

Co-authored-by: jneen <jneen@jneen.net>

Author: jneen

Dockerfile

@@ -2,10 +2,6 @@ FROM ruby:4.0-alpine AS base
 
 LABEL org.opencontainers.image.source=https://github.com/rouge-ruby/dingus
 
-RUN apk add --update --no-cache \
-    nodejs=24.11.1-r0 \
-    && rm -rf /var/cache/apk/*
-
 ENV BUNDLER_VERSION=2.6.9
 
 RUN gem update --system \
@@ -15,7 +11,7 @@ RUN gem update --system \
 # This stage is responsible for installing gems
 FROM base AS dep
 
-RUN apk add --no-cache \
+RUN apk add --update --no-cache \
     build-base=0.5-r3
 
 WORKDIR /app
@@ -24,18 +20,23 @@ COPY Gemfile Gemfile.lock ./
 
 # Install core dependencies
 RUN bundle config --local without development && \
-    bundle install --jobs=3 --retry=3
+    bundle install --jobs=3 --retry=3 && \
+    bundle config --local frozen true
 
 # ---------------------------------
 # This stage is what we run the app
 FROM base
 
 RUN adduser -D app
 
-USER app
-
 WORKDIR /app
 
+RUN apk add --update --no-cache \
+  git \
+  bash
+
+USER app
+
 COPY --from=dep /usr/local/bundle /usr/local/bundle
 COPY --chown=app . ./
 

Gemfile

@@ -6,12 +6,6 @@ source 'https://rubygems.org'
 gem 'puma'
 gem 'sinatra'
 
-# Asset pipeline
-gem 'base64'
-gem 'sassc-embedded'
-gem 'sprockets'
-gem 'uglifier'
-
 # Standard library gems
 gem 'logger'
 gem 'ostruct'

Gemfile.lock

@@ -7,12 +7,7 @@ GEM
     base64 (0.3.0)
     bigdecimal (4.0.1)
     coderay (1.1.3)
-    concurrent-ruby (1.3.6)
     drb (2.2.3)
-    execjs (2.10.0)
-    google-protobuf (4.34.0-arm64-darwin)
-      bigdecimal
-      rake (~> 13.3)
     io-console (0.8.2)
     json (2.19.0)
     json-schema (6.2.0)
@@ -85,33 +80,23 @@ GEM
       rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    sass-embedded (1.97.3-arm64-darwin)
-      google-protobuf (~> 4.31)
-    sassc-embedded (1.80.8)
-      sass-embedded (~> 1.80)
     sinatra (4.2.1)
       logger (>= 1.6.0)
       mustermann (~> 3.0)
       rack (>= 3.0.0, < 4)
       rack-protection (= 4.2.1)
       rack-session (>= 2.0.0, < 3)
       tilt (~> 2.0)
-    sprockets (4.2.2)
-      concurrent-ruby (~> 1.0)
-      logger
-      rack (>= 2.2.4, < 4)
     tilt (2.7.0)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
 
 PLATFORMS
   arm64-darwin-25
+  x86_64-linux-musl
 
 DEPENDENCIES
-  base64
   bigdecimal
   json
   logger
@@ -125,10 +110,7 @@ DEPENDENCIES
   rubocop
   rubocop-minitest
   rubocop-performance (~> 1.20)
-  sassc-embedded
   sinatra
-  sprockets
-  uglifier
 
 BUNDLED WITH
    2.6.9

app.rb

@@ -14,24 +14,21 @@ class Dingus < Sinatra::Base
   MAX_PATH_SIZE = 1900
   MAX_BODY_SIZE = 1400
 
-  # initialize new sprockets environment
-  set :environment, Sprockets::Environment.new
-
-  # append assets paths
-  environment.append_path 'assets/images'
-  environment.append_path 'assets/stylesheets'
-  environment.append_path 'assets/javascripts'
-
-  # [jneen] no need to compress assets for now, the site is
-  # extremely simple.
-  #
-  # environment.js_compressor  = Uglifier.new(harmony: true)
-  # environment.css_compressor = :scssc
-
-  # get assets
-  get '/assets/*' do
-    env['PATH_INFO'].sub!('/assets', '')
-    settings.environment.call(env)
+  enable :logging
+
+  if environment == :development
+    set :static, true
+  else
+    set :static, false
+  end
+
+  def make_demo(*args)
+    Demo.new(*args)
+  rescue Demo::InvalidVersion
+    halt 400
+  rescue StandardError => e
+    request.logger.error "#{e.message}:\n#{e.backtrace.join("\n")}"
+    halt 400
   end
 
   before do
@@ -54,13 +51,7 @@ class Dingus < Sinatra::Base
     when 'application/json'
       payload = JSON.parse request.body.read
 
-      demo = begin
-        Demo.new payload['ver'],
-                 payload['lang'],
-                 payload['source']
-      rescue StandardError
-        halt 400
-      end
+      demo = make_demo(payload['ver'], payload['lang'], payload['source'])
 
       content_type :json
 
@@ -84,29 +75,17 @@ class Dingus < Sinatra::Base
   end
 
   get '/:ver' do
-    demo = begin
-      Demo.new params['ver'], nil, nil
-    rescue StandardError
-      halt 400
-    end
+    demo = make_demo(params['ver'], nil, nil)
 
     erb :index, locals: { demo: demo, flash: nil }
   end
 
   get '/:ver/:lang/:source?' do
-    if params['source'].nil? || params['source'] == 'draft'
-      demo = begin
-        Demo.new params['ver'], params['lang']
-      rescue StandardError
-        halt 400
-      end
+    demo = if params['source'].nil? || params['source'] == 'draft'
+      make_demo(params['ver'], params['lang'])
     else
       source = Base64.urlsafe_decode64(params['source']).force_encoding('utf-8')
-      demo = begin
-        Demo.new params['ver'], params['lang'], source
-      rescue StandardError
-        halt 400
-      end
+      make_demo(params['ver'], params['lang'], source)
     end
 
     erb :index, locals: { demo: demo, flash: nil }