acrylic 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a0411b437d94694ff9761a6f9466fa909d650eb933ecd5fc0b6438f66ff10fc
-  data.tar.gz: c04dd9a1311e53216b18600f0847dc6004895ae826daf36cea728ede98b59c70
+  metadata.gz: f8251c55a20aa3b06422986f9b1cac67ab1fe1d9da8fbc15340b0ecad2fdfe22
+  data.tar.gz: 7671c90e53d8afdca28c41f9f19dfb0cb124e6ecedd2b18d2add9d39f0648480
 SHA512:
-  metadata.gz: 71b6752fa603ed57e4c2f30545456baf445a011a54d21b13c4223825b646d0e4c5fe2e0ef80a106eb6c1732611663e31b38c2b8e3fdcc8c0a69fd1723c1fe5b5
-  data.tar.gz: c7ebde805dd400055725b095ea7f1ce78e0ac6fafb03ec3904dcf8a777aadc3111d09e9a7d868623f377abf4387115fcc42af841386dfc936a34c47d3ed16750
+  metadata.gz: b4963caac24597a63e8c817e4dbe48e56a02a1bd710a26ba2200ee97aa482cffb831026e162b5b6c5f4c311e34bf371d6316cb0c5b5633b568845b323401d89e
+  data.tar.gz: ea7340afbce3d8e8e6dc530a13495328ff3e34f867cea23b7e0ba71242572b0957127e833ec68260ff9c2c10088da85b55f3947eecb3f9db168f1b7a22a2ed66

data/lib/acrylic.rb

@@ -1,3 +1,9 @@
 require 'rack'
 require_relative 'bits'
 require_relative 'cascade'
+
+require 'yaml'
+
+module Acrylic
+    CONFIG = YAML.load File.read "data/config.yml"
+end

data/lib/cascade/errors.rb

@@ -51,7 +51,7 @@ module Acrylic
                     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
+                        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
@@ -62,12 +62,15 @@ module Acrylic
                         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
+                        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
@@ -80,7 +83,7 @@ module Acrylic
               end
             end
         end
-        
+
         # returns body of response.
         def self.error_body code, req
             route = ERROR_ROUTES.find do |route| route.match? code, req end

data/lib/cascade.rb

@@ -1,4 +1,5 @@
 require 'rack'
+require 'ostruct'
 
 module Acrylic
     ROUTES = []
@@ -17,38 +18,59 @@ module Acrylic
             @verbs  = (args[:verb] or :GET).containerize.map do |verb| verb.downcase.to_sym end
         end
 
+        # transforms a rule from string (e.g. "/User/<id>") to wildcard
+        def make_into_wildcard rule
+            rule.gsub /<.*?>/, '*'
+        end
+
         # checks if a path matches one of the rules.
+        # returns false if no match, else rule that matched.
         def path_match? path
             @paths.each do |rule|
-                if     ((rule.is_a? Regexp) and (rule.match? path)) \
-                    or ((rule.is_a? Proc)   and (rule.call path))   \
-                    or ((rule.is_a? String) and (File.fnmatch rule, path, File::Constants::FNM_EXTGLOB | File::Constants::FNM_PATHNAME))
-                then return true end
+                if     ((rule.is_a? Regexp)      and (rule.match? path)) \
+                    or ((rule.respond_to? :call) and (rule.call path))   \
+                    or ((rule.respond_to? :to_s) and (File.fnmatch make_into_wildcard(rule.to_s), path, 0b10010))
+                then return rule end
             end
 
             return false
         end
 
+        def args_for_path path
+            rule = path_match? path
+            return [] unless rule.is_a? String
+
+            rule_tokens = rule.split '/'
+            path_tokens = path.split '/'
+            
+            rule_tokens.map.with_index do |rule_token, i|
+                path_tokens[i] if /<.*?>/.match? rule_token
+            end.compact
+        end
+
         def match? req
             # match against paths
             (path_match? req.path) and (@verbs.include? req.request_method.downcase.to_sym )
         end
 
-        def call req
-            @handler.call req
+        def call req, *args
+            @handler.call req, *args
         end
     end
 
     class Cascade
+
         # returns a response based on the defined routes.
         def self.handle req
             headers = {}
+            config = OpenStruct.new
 
             # loop through all the routes to find a final one
             Acrylic::ROUTES.each do |route|
                 next unless route.match? req
                 
-                res = route.call req
+                res = route.call config, req, *(route.args_for_path req.path)
+
                 res = case true
                     when (res.is_a? Rack::Response) then res
                     when (res.respond_to? :to_h)    then res.to_h
@@ -82,8 +104,8 @@ module Acrylic
                     # 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
+                
+                # 3. 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
@@ -91,7 +113,6 @@ module Acrylic
     end
 end
 
-
 def route *wargs, **kwargs, &route
     args = (Hash.from_keys wargs).merge kwargs
     Acrylic::ROUTES << (Acrylic::Route.new args, route)

data/lib/version.rb

@@ -2,7 +2,7 @@ module Acrylic
   class Version
     MAJOR = 0
     MINOR = 2
-    HOTFIX = 0
+    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.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - fmixolydian
 bindir: bin
 cert_chain: []
-date: 2025-12-16 00:00:00.000000000 Z
+date: 2025-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,9 +28,6 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
   type: :runtime
@@ -38,11 +35,22 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 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).