acrylic 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0643134970d466fe2fe05ff4d844361c34316965ababe2347cf49da3d0f6d77f'
-  data.tar.gz: b0b715cbf01c62313b5914b679e387e1170843f2d7fd98cec510567ab1ca4010
+  metadata.gz: 3c867a949c6d7b81cf0e358387cf9ee06bb2cb460901eb089492f589e5c1e31f
+  data.tar.gz: c66069736873cab0183f99cb2832c8339eabb4540af63b8b99208678eaa81cc9
 SHA512:
-  metadata.gz: c5c35841c697d6ae533ee1545ba9b805e48199c79c87c462350237cdefe3aface8e32644b956ea0fdcee671916e9f5dd1d65ab4c335387fa41114c67fa1dbc3c
-  data.tar.gz: ab74056949e7966f2d686b49a99eda09fbc8620831a8ccae985db1132ac548a45966456e77de5eabb2b27a8367f6d0b229ac004ba2d926d4bc3549f8e2ba3aba
+  metadata.gz: '08c812a7ab32c4672692ad5989fc04a32467e0bab0ec6a4174b3d54f0bfd85d011e0ffe822f52ea889366156469d62e4bd9d30147ef680082f3ae2bbd5a40734'
+  data.tar.gz: f4f0f3326cba037385f1618733ae41f40ed7bd1e80bea879c9a368d940faeabcf7a245fed7ff5bc4a350570d5982828dfd4b14c048e618f0427ea3f91bec67d6

data/lib/bits.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 class Object
     def containerize
         if self.is_a? Array then self else [self].compact end
@@ -18,4 +20,29 @@ class Hash
     def self.from_keys keys, value = nil
         keys.map do |k| [k, value] end.to_h
     end
+
+    def self.from_values values
+        k = -1
+        values.map do |v|
+            k += 1
+            [k, v]
+        end.to_h
+    end
+
+    # recursively converts hash to ostruct.
+    def structize
+        OpenStruct.new (map do |k, v| [k, if v.is_a? Hash then v.structize else v end] end.to_h)
+    end
+
+    # recursively convert keys to symbols
+    def with_sym_keys
+        map do |k, v| [k.to_sym, if v.is_a? Hash then v.with_sym_keys else v end] end.to_h
+    end
+end
+
+class Array
+    # like sort by, but sorts entries with same index
+    def sort_by_stable &proc
+        Hash.from_values(self).sort_by do |k, v| [proc.call(v), k] end.to_h.values
+    end
 end

data/lib/cascade.rb

@@ -5,17 +5,15 @@ module Acrylic
     ROUTES = []
 
     class Route
-        # list of HTTP verbs the request will be matched against.
-        attr_reader :verbs
-
         # list of path rules (wildcards or regexps)
         attr_reader :paths
+        attr_reader :priority
 
         def initialize args, handler
             @handler = handler
 
+            @priority = args[:priority] or 0 # defualt priority
             @paths  = args[:path].containerize
-            @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
@@ -50,7 +48,7 @@ module Acrylic
 
         def match? req
             # match against paths
-            (path_match? req.path) and (@verbs.include? req.request_method.downcase.to_sym )
+            (path_match? req.path)
         end
 
         def call req, *args
@@ -66,8 +64,10 @@ module Acrylic
             config = OpenStruct.new
 
             # loop through all the routes to find a final one
-            Acrylic::ROUTES.each do |route|
+            # (and sort them by priority descending and index)
+            Acrylic::ROUTES.sort_by_stable do |route| route.priority end.each do |route|
                 next unless route.match? req
+                puts route.priority
                 
                 res = route.call config, req, *(route.args_for_path req.path)
 

data/lib/validator.rb

@@ -0,0 +1,76 @@
+module Acrylic
+
+    # a schema is a hash that validates another hash.
+    # values in the schema represent conditions to validate the object against.
+    # e.g.
+    # {
+    #   email:    [:email, [:length, (..32)]]
+    #   username: [:not_null, [:length, (..32)]]
+    #   password: [:not_null, [:length, (8..32)]]
+    # }
+    # 
+    # string keys in the object are automatically converted to symbols.
+    
+    module Validators
+        def email val
+            # shamelessly stolen from https://github.com/zombor/Validator/blob/master/lib/validation/rule/email.rb
+            email_address = begin
+                letter         = 'a-zA-Z'
+                digit          = '0-9'
+                atext          = "[#{letter}#{digit}\!\#\$\%\&\'\*+\/\=\?\^\_\`\{\|\}\~\-]"
+                dot_atom_text  = "#{atext}+([.]#{atext}*)+"
+                dot_atom       = dot_atom_text
+                no_ws_ctl      = '\x01-\x08\x11\x12\x14-\x1f\x7f'
+                qtext          = "[^#{no_ws_ctl}\\x0d\\x22\\x5c]"  # Non-whitespace, non-control character except for \ and "
+                text           = '[\x01-\x09\x11\x12\x14-\x7f]'
+                quoted_pair    = "(\\x5c#{text})"
+                qcontent       = "(?:#{qtext}|#{quoted_pair})"
+                quoted_string  = "[\"]#{qcontent}+[\"]"
+                atom           = "#{atext}+"
+                word           = "(?:#{atom}|#{quoted_string})"
+                obs_local_part = "#{word}([.]#{word})*"
+                local_part     = "(?:#{dot_atom}|#{quoted_string}|#{obs_local_part})"
+                dtext          = "[#{no_ws_ctl}\\x21-\\x5a\\x5e-\\x7e]"
+                dcontent       = "(?:#{dtext}|#{quoted_pair})"
+                domain_literal = "\\[#{dcontent}+\\]"
+                obs_domain     = "#{atom}([.]#{atom})+"
+                domain         = "(?:#{dot_atom}|#{domain_literal}|#{obs_domain})"
+                addr_spec      = "#{local_part}\@#{domain}"
+                pattern        = /\A#{addr_spec}\z/u
+            end
+
+            !!email_address.match(val)
+        end
+
+        def not_null val; not val.nil? end
+        def length   val, range; range.include? val.length end
+        def range    val, range; range.include? val end
+        def regex    val, expr;  expr.match? val end
+    end
+    
+    def valid? object, schema
+        object = object.with_sym_keys
+        schema.each do |key, conditions|
+            value = object[key]
+
+            # apply conditions
+            if conditions.is_a? Hash
+                return false unless value.is_a? Hash
+                return false unless valid? value, conditions
+            else
+                conditions = conditions.containerize
+
+                # check every condition (in order)
+                conditions.each do |condition|
+                    condition = condition.containerize
+                    opcode, *args = condition
+                    if opcode == :default then value = args[0] if value.nil?
+                    else return false unless Validators.instance_method(opcode).bind(nil).call value, *args
+                    end
+                end
+            end
+        end
+
+        return true
+    end
+end

data/lib/version.rb

@@ -1,8 +1,8 @@
 module Acrylic
   class Version
     MAJOR = 0
-    MINOR = 2
-    HOTFIX = 3
+    MINOR = 4
+    HOTFIX = 0
 
     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.3
+  version: 0.4.0
 platform: ruby
 authors:
 - fmixolydian
 bindir: bin
 cert_chain: []
-date: 2026-01-01 00:00:00.000000000 Z
+date: 2026-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -66,6 +66,7 @@ files:
 - lib/cascade.rb
 - lib/cascade/errors.rb
 - lib/kronos.rb
+- lib/validator.rb
 - lib/version.rb
 homepage: https://codeberg.org/fmixolydian/acrylic
 licenses: