acrylic 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ffa3dcf17f46e9e75b17e95c9ca52b0e82dd7bed3ce4f637cbbab1032f97826b
-  data.tar.gz: 5c4a8b1143cdb8c4d0a78287b2b60fde38873f5b7570b73e7fbe8227aceefe86
+  metadata.gz: c7f964f398be355711d7cd892038190775d049259f99570198a41a9ddfb36161
+  data.tar.gz: 6536f6f878d30c39ef30ffdb05f2d7e55be715ffcd0fd17b03cce62dac2ba004
 SHA512:
-  metadata.gz: cec1122bf513bce029509915c01c649675c830bc23509a593389a92124266b5d4e2a7d0f8c4124cc25099986dc599f0dd83ad4cae195b8a1fc0f0055f7d5ce1b
-  data.tar.gz: 9a3303e5e18660ffec7c13a484db93be42e6d4e37f345ef0cd5394fff2002ae0896678451da7247dc964a6e274116f241c32ece1e6cd5799b77d8e2a9266ff46
+  metadata.gz: 3b3a59a768344665563753be56e7ff6d1dd577cb1d0787a2c46fd09e4d30b1228e7b57e8c26f916f6e252f9e831d9437fd2cd88faab6d3a6c94dda509a6165d8
+  data.tar.gz: aba291196d77af51d3ccb79575d8a5cdab4dee0dcfc5a5b36062b0a7e90c56d97632483aa7beb4696eed9e4fb99e0a627f0bb1c02191b0b0fbef873a01efb3cd

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

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
+            return Rack::Response.new nil, 404, headers
         end
 
 
@@ -74,8 +76,16 @@ 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 is an error code, transform it into a full response with cascade/errors
+                body = res.body.fallback "" # (error_page res.status, req)
+                  
+                # 2. transform every header key of res into a string
+                headers = res.headers.map do |k, v| [k.to_s, v] end.to_h
+            
+            p body
+            Rack::Response.new body, res.status, headers
         end
     end
 end

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acrylic
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - fmixolydian