acrylic 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa3dcf17f46e9e75b17e95c9ca52b0e82dd7bed3ce4f637cbbab1032f97826b
-  data.tar.gz: 5c4a8b1143cdb8c4d0a78287b2b60fde38873f5b7570b73e7fbe8227aceefe86
+  metadata.gz: 4a0411b437d94694ff9761a6f9466fa909d650eb933ecd5fc0b6438f66ff10fc
+  data.tar.gz: c04dd9a1311e53216b18600f0847dc6004895ae826daf36cea728ede98b59c70
 SHA512:
-  metadata.gz: cec1122bf513bce029509915c01c649675c830bc23509a593389a92124266b5d4e2a7d0f8c4124cc25099986dc599f0dd83ad4cae195b8a1fc0f0055f7d5ce1b
-  data.tar.gz: 9a3303e5e18660ffec7c13a484db93be42e6d4e37f345ef0cd5394fff2002ae0896678451da7247dc964a6e274116f241c32ece1e6cd5799b77d8e2a9266ff46
+  metadata.gz: 71b6752fa603ed57e4c2f30545456baf445a011a54d21b13c4223825b646d0e4c5fe2e0ef80a106eb6c1732611663e31b38c2b8e3fdcc8c0a69fd1723c1fe5b5
+  data.tar.gz: c7ebde805dd400055725b095ea7f1ce78e0ac6fafb03ec3904dcf8a777aadc3111d09e9a7d868623f377abf4387115fcc42af841386dfc936a34c47d3ed16750

data/lib/bits.rb

@@ -2,6 +2,10 @@ class Object
     def containerize
         if self.is_a? Array then self else [self].compact end
     end
+    
+    def fallback value
+        if nil? then value else self end
+    end
 end
 
 class Class
@@ -11,7 +15,7 @@ class Class
 end
 
 class Hash
-    def self.from_keys keys
-        keys.map do |k| [k, nil] end.to_h
+    def self.from_keys keys, value = nil
+        keys.map do |k| [k, value] end.to_h
     end
 end

data/lib/cascade/errors.rb

@@ -4,6 +4,10 @@
 #   response with an empty body.
 #   to add content to this empty response, Cascade.error_page will
 #   use a similar route definition system to regular Cascade routes to create error pages.
+require 'markaby'
+require 'rack/utils'
+
+Rack::Utils::HTTP_STATUS_CODES[418] = "I'm a Teapot"
 
 module Acrylic
     ERROR_ROUTES = []
@@ -22,17 +26,65 @@ module Acrylic
     end
 
     class Cascade
-        def default_error_body code, req
-            
+        def self.default_error_body code, req
+            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 RTFM. 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 418
+                        p do "You pathetic attempt at an HTTP Request was so humerous, it even made the server laugh." end
+
+                      when 429
+                        h1 do "IT'S TIME TO STOP." end
+                        h1 do "IT'S TIME TO STOP, OKAY!???" end
+                      
+                      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
+            end
         end
         
         # returns body of response.
-        def error_body code, req
+        def self.error_body code, req
             route = ERROR_ROUTES.find do |route| route.match? code, req end
-            body = if route.nil? then default_error_page code, req else route.call req end
-            
-            raise TypeError("return value of error_handler body must be a string") unless body.is_a? String
-            body
+            if route.nil? then default_error_body code, req else route.call req end
         end
     end
 end

data/lib/cascade.rb

@@ -41,7 +41,6 @@ module Acrylic
 
     class Cascade
         # returns a response based on the defined routes.
-        # if the response is empty, it shall be passed through Cascade.ServeError
         def self.handle req
             headers = {}
 
@@ -51,9 +50,12 @@ module Acrylic
                 
                 res = route.call req
                 res = case true
-                    when (res.nil?)          then next
-                    when (res.is_a? String)  then Rack::Response.new      res
-                    when (res.is_a? Integer) then Rack::Response.new nil, res
+                    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
+                    when (res.is_a? String)         then Rack::Response.new      res
+                    when (res.nil?)                 then next
+                    else                            raise TypeError
                 end
 
                 # if the returned route has a body, return it. else, add its headers to the existing response.
@@ -61,12 +63,12 @@ module Acrylic
                     res.headers.merge! headers
                     return res
                 elsif res.is_a? Hash
-                    headers.merge! res.headers
+                    headers.merge! res
                 end
             end
 
             # if no route returned a response, return a 404
-            return Rack::Response.new nil, 404
+            Rack::Response.new nil, 404, headers
         end
 
 
@@ -74,8 +76,17 @@ module Acrylic
             req = Rack::Request.new env
 
             res = handle req
-            res.body = error_page res.status, req if res.body.nil?
-            res
+            # apply a series of transformations to the response
+            # unfortunately since Response is immutable we have to make a copy
+                # 1. if res has an empty body, transform it into a full response with cascade/errors
+                    # why rack uses a goddamn empty array instead of nil i have no clue of
+                    # (it doesnt give a fuck about strings, but it TURNS NILS INTO ARRAYS!? WHY!? WHY!!!!!!?)
+                if res.body == [] then res.body = error_body res.status, req end
+                  
+                # 2. transform every header key of res into a string
+                headers = res.headers.map do |k, v| [k.to_s, v] end.to_h
+            
+            Rack::Response.new res.body, res.status, headers
         end
     end
 end

data/lib/version.rb

@@ -1,7 +1,7 @@
 module Acrylic
   class Version
     MAJOR = 0
-    MINOR = 1
+    MINOR = 2
     HOTFIX = 0
 
     def self.semver

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: acrylic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - fmixolydian
 bindir: bin
 cert_chain: []
-date: 2025-12-14 00:00:00.000000000 Z
+date: 2025-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -23,6 +23,26 @@ 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'
+    - - ">="
+      - !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'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.4
 description: |2
       Acrylic is a web framework that simplifies your life by automatically generating migrations,
       as well as providing several macros for repeating common operations (e.g. defining REST APIs).