acrylic 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580055a09b23911e2449a8a676b3fa9889914a67c1d28582db1f569ec31c9713
-  data.tar.gz: 55db4c45b279807036c3bfde7174849bf196e485f46d6c4d4eddaf5264d025c0
+  metadata.gz: 5d56b01160b2f719dc5f906818499d48b758e079cee6f80cd78cb5683c4a3711
+  data.tar.gz: 2f91c0b5dc26a21c9089a847319b298c05486a5f953e28872f1f47d357c3de9a
 SHA512:
-  metadata.gz: 4c8309dbd48e90a28078e1fbff90993b1914bc667d3a6ffb64ce6e4c0c200cb753154577073b97011bc60bf2e0e8dc55525d3495109b100f25a66dfea24a4c3e
-  data.tar.gz: b406bc59fb25686c0f6836bef6dbcb874f3842453ea4298b23b75ee7c479967d623621fb1cf38c6c5883e8b3febc18d68a20efda119e23d3dd8844d36f0d3944
+  metadata.gz: 0fcd2132b2803b655fa78b64259f6a1e4b06f7f8c7f95ceb6c8c20709b2826e31c1293a277df557263e61a9ba80c23a1d5ca358cffae40fd0b1b405da7ab10cb
+  data.tar.gz: c98658b06742c262d9c59044b935c44d0b0c15dded309ec4eedc079acc25ee2e2c8bda6e84442bbebcd765258feb6e0e3b60bcd58cc98d50b8fb5ec889d3cb50

data/lib/acrylic.rb

@@ -10,6 +10,7 @@ require 'yaml'
 module Acrylic
     TEMPLATE_CACHE = {}
     INITIALIZERS = Queue.new
+    MODE = ENV.fetch("RACK_ENV", "development")
 
     def self.init!
         until INITIALIZERS.empty?
@@ -26,10 +27,10 @@ end
 # load config
 CONFIG = YAML.load File.read "data/config.yml" rescue {}
 
-def render path, args
+def render_template path, args
     if Acrylic::TEMPLATE_CACHE[path].nil?
         Acrylic::TEMPLATE_CACHE[path] = Tilt.new path
     end
     
-    return Acrylic::TEMPLATE_CACHE.render args
+    return Acrylic::TEMPLATE_CACHE[path].render args
 end

data/lib/cascade/errors.rb

@@ -27,80 +27,82 @@ module Acrylic
   end
 
   class Cascade
-    def self.default_error_body code, req, *args
-      mab = Markaby::Builder.new
-      
-      mab.html do
-        style <<-CSS
-          body,html            { font-family:"arial"; background-color:#fed; height:100%; display:flex; justify-content:center; align-items:center }
-          .pane                { padding:10px 20px; width:500px; background:#F004; border:5px solid #F006; border-radius:20px; position:absolute }
-          .pane .description   { padding:10px; background-color:#FFF4; display:flex;gap:5px; flex-direction:column; }
-          .pane .description p { margin:0 }
-        CSS
-
-        meta charset: 'utf-8'
-        body do
-          div.pane do
-            p do
-              span code, style: "font-size: 5em"
-              sub do
-                span (Rack::Utils::HTTP_STATUS_CODES[code]&.downcase), style: "font-size: 2em"
-              end
-            end
-
-            div.description do
-              case code
-                when 400
-                  p do "Your browser (or HTTP client) sent a request that completely bamboozled the server." end
-                  p do "If you're a developer, please <strong>RTFM</strong>. If you're a user, please tell the developer to fix their app." end
-
-                when 403
-                  p do "You are not allowed to access the resource at this address." end
-                  p do "A solution would be to mind your own damn business." end
-
-                when 404
-                  p do "You've stumbled on a path which maps to <em>nothing</em>." end
-                  p do "If someone sent you here, please tell them to <strong>fix their hyperlinks</strong>." end
-
-                when 410
-                  p "This resource has been deleted. Reduced to ashes. Thrown into the bit bucket - you get my point!"
-
-                when 418
-                  p "Your pathetic attempt at an HTTP Request was so humerous, it even made the webserver laugh."
-
-                when 429
-                  h1 "IT'S TIME TO STOP."
-                  h1 "IT'S TIME TO STOP, OKAY!???"
-                
-                when 500
-                  p "This is fine."
-
-                when 501
-                  p "i forgor 💀"
-                
-                when 502
-                  p "One of the applications that power this website probably imploded on itself."
-
-                else
-                  p do "An error has occured. I have no idea what it is though. ¯\\_(ツ)_/¯" end
-              end
-            end
-
-            small style: "color: #844; font-weight: bold; padding-top: 20px" do
-              em "served by acrylic #{Acrylic::Version.version}"
-            end
-          end
-        end
+    def self.default_error_body code, req
+      style = <<-CSS
+        body,html            { font-family:"arial"; background-color:#fed; height:100%; display:flex; justify-content:center; align-items:center }
+        .pane                { padding:10px 20px; width:500px; background:#F004; border:5px solid #F006; border-radius:20px; position:absolute }
+        .pane .description   { padding:10px; background-color:#FFF4; display:flex;gap:5px; flex-direction:column; }
+        .pane .description p { margin:0 }
+      CSS
+
+      description = case code
+        when 400
+          "<p>Your browser (or HTTP client) sent a request that completely bamboozled the server.</p>" +
+          "<p>If you're a developer, please <strong>RTFM</strong>. If you're a user, please tell the developer to fix their app.</p>"
+
+        when 403
+          "<p>You are not allowed to access the resource at this address.</p>" + 
+          "<p>A solution would be to mind your own damn business.</p>"
+
+        when 404
+          "<p>You've stumbled on a path which maps to <em>nothing</em>." +
+          "<p>If someone sent you here, please tell them to <strong>fix their hyperlinks</strong>.</p>"
+
+        when 410
+          "<p>This resource has been deleted. Reduced to ashes. Thrown into the bit bucket.</p>"
+
+        when 418
+          "<p>Your pathetic attempt at an HTTP Request was so humerous, it even made the webserver laugh.</p>"
+
+        when 429
+          "<h1>IT'S TIME TO STOP.</h1>" +
+          "<h1>IT'S TIME TO STOP, OKAY!???</h1>"
+        
+        when 500
+          "<p>This is fine.</p>"
+
+        when 501
+          "<p>i forgor 💀</p>"
+        
+        when 502
+          "<p>One of the applications that power this website probably imploded on itself.</p>"
+
+        else
+          "<p>An error has occured. I have no idea what it is though. ¯\\_(ツ)_/¯</p>"
       end
+
+      # it would've been really great if i was able to use markaby to save myself the trouble of using raw html
+      # unfortunately tho it's a buggy piece of shit that makes EVERYTHING IMPOSSIBLE TO FUCKING DEBUG WITH ITS METAPROGRAMMING BULLSHIT
+      return <<-HTML
+      <body>
+        <meta charset="utf-8">
+        <style>#{style}</style>
+
+        <div class="pane">
+          <p>
+            <span style="font-size: 5em">#{code}</span>
+            <sub>
+              <span style="font-size: 2em">#{Rack::Utils::HTTP_STATUS_CODES[code]&.downcase}</span>
+            </sub>
+          </p>
+
+          <div class="description"> #{description} </div>
+
+          <small style="color: #844; font-weight: bold; padding-top: 20px">
+            <em>served by acrylic #{Acrylic::Version.version}</em>
+          </div>
+        </div>
+      </body>
+      HTML
     end
 
     # returns body of response.
-    def self.error_body code, req, *args
+    def self.error_body code, req, *wargs
       route = ERROR_ROUTES.find do |route| route.match? code, req end
       if route.nil?
-        default_error_body code, req, *args
+        default_error_body(code, req)
       else
-        route.call req, *args
+        route.call(req)
       end
     end
   end

data/lib/cascade.rb

@@ -74,7 +74,7 @@ module Acrylic
                 res = catch(:response) { invoke route, config, req, *(route.args_for_path req.path) }
 
                 res = case true
-                    when (res.is_a? Exception)      then return error_body 500, req, config, res # also give it the exception
+                    when (res.is_a? Exception)      then return Rack::Response.new (error_body 500, req, config, res), 500 # also give it the exception
                     when (res.is_a? Rack::Response) then res
                     when (res.respond_to? :to_h)    then res.to_h
                     when (res.is_a? Integer)        then Rack::Response.new nil, res
@@ -130,7 +130,11 @@ def invoke route, conf, req, *args
     begin
         res = (route.call conf, req, *args)
     rescue => error
-        throw :response, error
+        if Acrylic::MODE == "development"
+            raise error # let rack handle it
+        else
+            throw :response, error
+        end
     end
     
     throw :response, res unless res.nil?

data/lib/version.rb

@@ -2,7 +2,7 @@ module Acrylic
   class Version
     MAJOR = 0
     MINOR = 6
-    HOTFIX = 1
+    HOTFIX = 3
 
     def self.semver
       "#{MAJOR}.#{MINOR}.#{HOTFIX}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: acrylic
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.3
 platform: ruby
 authors:
 - fmixolydian
 bindir: bin
 cert_chain: []
-date: 2026-01-14 00:00:00.000000000 Z
+date: 2026-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -23,20 +23,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: markaby
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.4
 - !ruby/object:Gem::Dependency
   name: ostruct
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +81,7 @@ files:
 - lib/palette.rb
 - lib/validator.rb
 - lib/version.rb
-homepage: https://codeberg.org/fmixolydian/acrylic
+homepage: https://git.disroot.org/acrylic/acrylic
 licenses:
 - BSD-3-Clause
 metadata: {}