acrylic 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e739118d6cf518903dd20c939bd18552f9fcf0699b8648efc863141123aba5e
-  data.tar.gz: 7ca4592977d596c485a66e5a5c1b274fac907424890db3c2f4dd983895b67ea0
+  metadata.gz: 580055a09b23911e2449a8a676b3fa9889914a67c1d28582db1f569ec31c9713
+  data.tar.gz: 55db4c45b279807036c3bfde7174849bf196e485f46d6c4d4eddaf5264d025c0
 SHA512:
-  metadata.gz: 640a3ba084793e287b67e84218538bbba1cab1d3a5d808d7cbfae9e5c3221584eca5c641292dd5cb239b812eddf7235db951de76905b1e878797385206e45670
-  data.tar.gz: fe8a542ad92db75e0cab799fea386b88bb193332e4594458a105bbc078f24f7bb5ddae13908610a42c3769dd73b3d77c86cc4107b0d601eff51df2d69940a09a
+  metadata.gz: 4c8309dbd48e90a28078e1fbff90993b1914bc667d3a6ffb64ce6e4c0c200cb753154577073b97011bc60bf2e0e8dc55525d3495109b100f25a66dfea24a4c3e
+  data.tar.gz: b406bc59fb25686c0f6836bef6dbcb874f3842453ea4298b23b75ee7c479967d623621fb1cf38c6c5883e8b3febc18d68a20efda119e23d3dd8844d36f0d3944

data/lib/acrylic.rb

@@ -4,7 +4,32 @@ require_relative 'cascade'
 require_relative 'validator'
 require_relative 'palette'
 
+require 'tilt'
 require 'yaml'
 
+module Acrylic
+    TEMPLATE_CACHE = {}
+    INITIALIZERS = Queue.new
+
+    def self.init!
+        until INITIALIZERS.empty?
+            INITIALIZERS.deq.call
+        end
+    end
+end
+
+# creates an initializer.
+def on_init &proc
+    Acrylic::INITIALIZERS << proc
+end
+
+# load config
 CONFIG = YAML.load File.read "data/config.yml" rescue {}
-module Acrylic; end
+
+def render path, args
+    if Acrylic::TEMPLATE_CACHE[path].nil?
+        Acrylic::TEMPLATE_CACHE[path] = Tilt.new path
+    end
+    
+    return Acrylic::TEMPLATE_CACHE.render args
+end

data/lib/cascade/errors.rb

@@ -11,90 +11,103 @@ require_relative '../version'
 Rack::Utils::HTTP_STATUS_CODES[418] = "I'm a Teapot"
 
 module Acrylic
-    ERROR_ROUTES = []
+  ERROR_ROUTES = []
 
-    class ErrorRoute < Route
-        attr_reader :code
+  class ErrorRoute < Route
+    attr_reader :code
 
-        def initialize code, args, handler
-            @code = code
-            super args, handler
-        end
+    def initialize code, args, handler
+      @code = code
+      super args, handler
+    end
 
-        def match? code, req
-            (@code == code) and super req
-        end
+    def match? code, req
+      (@code == code) and super req
     end
+  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
 
-    class Cascade
-        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 <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 418
-                        p do "You pathetic attempt at an HTTP Request was so humerous, it even made the webserver laugh." end
-
-                      when 451
-                        p do "Sorry, but you live in an authoritarian dystopia, and they do not allow you to access this website." 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
+            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
-        end
 
-        # returns body of response.
-        def self.error_body code, req
-            route = ERROR_ROUTES.find do |route| route.match? code, req end
-            if route.nil? then default_error_body code, req else route.call req 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 self.error_body code, req, *args
+      route = ERROR_ROUTES.find do |route| route.match? code, req end
+      if route.nil?
+        default_error_body code, req, *args
+      else
+        route.call req, *args
+      end
     end
+  end
 end
 
 # route should return body of response
 def error_handler code, *wargs, **kwargs, &route
-    args = (Hash.from_keys wargs).merge kwargs
-    Acrylic::ERROR_ROUTES << (Acrylic::ErrorRoute.new code, args, route)
+  args = (Hash.from_keys wargs).merge kwargs
+  Acrylic::ERROR_ROUTES << (Acrylic::ErrorRoute.new code, args, route)
 end

data/lib/cascade.rb

@@ -8,12 +8,13 @@ module Acrylic
         # list of path rules (wildcards or regexps)
         attr_reader :paths
         attr_reader :priority
+        attr_reader :name
 
         def initialize args, handler
-            @handler = handler
-
-            @priority = args[:priority] or 0 # defualt priority
-            @paths  = args[:path].containerize
+            @handler  = handler
+            @name     = args[:name]
+            @priority = args[:priority] || 0
+            @paths    = args[:path].containerize
         end
 
         # transforms a rule from string (e.g. "/User/<id>") to wildcard
@@ -62,16 +63,18 @@ module Acrylic
         def self.handle req
             headers = {}
             config = OpenStruct.new
+            config.route_chain = []
 
             # loop through all the routes to find a final one
             # (and sort them by priority descending and index)
-            Acrylic::ROUTES.sort_by_stable do |route| route.priority end.each do |route|
+            Acrylic::ROUTES.sort_by_stable { |route| (0 - route.priority) }.each do |route|
                 next unless route.match? req
-                puts route.priority
                 
-                res = route.call config, req, *(route.args_for_path req.path)
+                config.route_chain << route
+                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? 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
@@ -103,19 +106,35 @@ module Acrylic
                 # 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
+                if res.body == [] then res.body = error_body res.status, nil, req end
                 
                 # 3. transform every header key of res into a string
-                headers = res.headers.map do |k, v| [k.to_s, v] end.to_h
+                headers = res.headers.map { |k, v| [k.to_s, v] }.to_h
             
             Rack::Response.new res.body, res.status, headers
         end
     end
 end
 
+# finds the route with a given name
+def route_with_name name
+    Acrylic::ROUTES.find { |route| route.name = name }
+end
+
 def route *wargs, **kwargs, &route
     args = (Hash.from_keys wargs).merge kwargs
     Acrylic::ROUTES << (Acrylic::Route.new args, Proc.new(&route))
 end
 
+def invoke route, conf, req, *args
+    begin
+        res = (route.call conf, req, *args)
+    rescue => error
+        throw :response, error
+    end
+    
+    throw :response, res unless res.nil?
+    throw :response, nil
+end
+
 require_relative 'cascade/errors'

data/lib/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: acrylic
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - fmixolydian
 bindir: bin
 cert_chain: []
-date: 2026-01-08 00:00:00.000000000 Z
+date: 2026-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -65,14 +65,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.99'
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 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).
+      Acrylic is a web micro-framework (akin to Sinatra) that simplifies and expedites
+      development by using cascading routes.
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- COPYING.md
 - README.md
 - VERSION.md
 - lib/acrylic.rb
@@ -84,7 +97,7 @@ files:
 - lib/version.rb
 homepage: https://codeberg.org/fmixolydian/acrylic
 licenses:
-- LicenseRef-COPYING.md OR EUPL-1.2
+- BSD-3-Clause
 metadata: {}
 rdoc_options: []
 require_paths:

data/COPYING.md

@@ -1,2 +0,0 @@
-This project is licensed under any version of the PICO License greater or equal to v2.0.
-https://codeberg.org/Pictrel/License/src/branch/v2/PICOLICENSE-2.0