erio 0.0.1.1 → 0.0.2.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fad8b7185fc96b49a17922cc7f2c20e5efd44151b733b07de05a73bd193bd3b9
-  data.tar.gz: 82c45e8763b8c1ccf18845b411e9056ffcc30161ab15ebee7cb4f53643634cf9
+  metadata.gz: 5d5c1b80873792c4fa9836c67b117d086cf01af31293523432fad915e302861f
+  data.tar.gz: 14bd1442c2790407a3c88989badf46327b0faf387afc752a4ab0e3897dcdb328
 SHA512:
-  metadata.gz: 5f10bc473794c43f0bdbb07578cf754d6fa14462f00c763d3c12265b492848dff4ebcdc307fe5ca28d66c92d771a43993c65cd7972d16d652fe72feb069dfd4d
-  data.tar.gz: cec14bb2d9b93afb8e959fb76de8dc6a6a10dd7fd89404ae77747767a9258490ed27d13b2c1164a7ee13a1aaccf83e778132864907a33b3d7600a5c18b2d35b6
+  metadata.gz: 97c214cc70aaee7875f14bf0e61cf417b57d335f9b9964435066699c4adcfdfba68eae59078c668473797b87a370f526dcb2c4684d9c4657046cce1d06818c4f
+  data.tar.gz: 5328a3160bc2ece029bffa78af36f2571702d52275673d914e293136302d12c3a93c89ab93f66faf1d88eb389c793c0ff605982c1adf25ca673d09a3f4e7acd8

data/CHANGELOG.md

@@ -7,3 +7,8 @@
 ## [0.0.1] - 2025-03-14
 
 - Add a large of funs
+
+## [0.0.2] - 2025-03-23
+
+- Add a mapper for route
+- Add some demo

data/demo/blog.ru

@@ -0,0 +1,34 @@
+require './lib/erio'
+
+class Blog < Erio
+  enter do
+    # on 'hello' do
+    #   on 'daddy' do
+    #     on '' do
+    #       res.write 'hi, i\'m fine.'
+    #     end
+    #   end
+    #   on true do
+    #     res.write 'hi, nobody.'
+    #   end
+    # end
+    # on Integer do |id|
+    #   res.write "int: #{id}"
+    #   pp 'int'
+    # end
+    # on Numeric do |id|
+    #   res.write "num: #{id}"
+    #   pp 'num'
+    # end
+    # on '' do
+    #   res.write 'index'
+    # end
+    pp path
+    if path =~ /\A\/(\d+)\z/
+      res.write "Hi, Your ID is #{$1}!"
+      run proc { res.write 'Fuck you!' }
+    end
+  end
+end
+
+run Blog

data/demo/map.ru

@@ -0,0 +1,31 @@
+require './lib/erio'
+
+class App < Erio
+  enter do
+    is do
+      res.write 'home'
+    end
+    on 'hello' do
+      is do
+        res.write 'hi'
+      end
+      is 'me' do
+        res.write 'hello, self?'
+      end
+    end
+    
+    also
+    
+    on req.params.empty? do
+      res.write "\nNo Parameters."
+    end
+
+    also
+    
+    on accept? 'text' do
+      res.write "\nAccept: Text."
+    end
+  end
+end
+
+run App

data/lib/erio/short.rb

@@ -1,10 +1,10 @@
 class << Erio
-  def ip; @_env['REMOTE_ADDR'] end
-  def user_agent; @_env['HTTP_USER_AGENT'] end
-  def req_body; @_env['rack.input'].read end
-  def req_scheme; @_env['rack.url_scheme'] end
-  def req_host; @_env['HTTP_HOST'] end
-  def query; @_env['QUERY_STRING'] end
+  def ip; @env['REMOTE_ADDR'] end
+  def user_agent; @env['HTTP_USER_AGENT'] end
+  def req_body; @env['rack.input'].read end
+  def req_scheme; @env['rack.url_scheme'] end
+  def req_host; @env['HTTP_HOST'] end
+  def query; @env['QUERY_STRING'] end
 
   def decode_www str
     str.gsub('+','%2B').gsub(/%([\da-fA-F]{2})/) { $1.to_i(16).chr }
@@ -14,7 +14,7 @@ class << Erio
   end
 
   def queries q_str=nil
-    (q_str || @_env['QUERY_STRING']).split('&')
+    (q_str || @env['QUERY_STRING']).split('&')
     .map { k,v = [*_1.split('='),''][0,2]; [k, decode_www(v)] }.to_h
   end
 
@@ -40,14 +40,14 @@ class << Erio
     File.binread filename
   end
 
-  def request; Rack::Request.new(@_env) end
-  def header(**kws); kws.empty? ? @header : @header.merge!(kws.to_a.map { [_1.to_s.gsub('_','-'),_2] }.to_h) end
-  def status(s=nil); s ? @status=s : @status end
-  def path; @_env['PATH_INFO'] end
-  def path? pattern=nil; block_given? ? (yield if pattern === path) : path end
-  def verb word=nil; block_given? ? (yield if verb == word) : @_env['REQUEST_METHOD'] end
+  def req; Rack::Request.new(@env) end
+  def header **kws; kws.empty? ? @header : @header.merge!(kws.to_a.map { [_1.to_s.tr('_','-'),_2] }.to_h) end
+  def status s=nil; s ? @status=s : @status end
+  def path; @env['REQUEST_PATH'] end
+  def path? pattern=nil; block_given? ? (yield if pattern === path) : pattern === path end
+  def verb word=nil; block_given? ? (yield if verb == word) : @env['REQUEST_METHOD'] end
   def body str=nil; str ? @body=str : @body end
-  def accept; @_env['HTTP_ACCEPT'] end
+  def accept; @env['HTTP_ACCEPT'] end
 
   def status? s=200, &block
     bool = s === @status
@@ -56,19 +56,19 @@ class << Erio
   end
 
   def ip? cond, &block
-    bool = cond === @_env['REMOTE_ADDR']
+    bool = cond === @env['REMOTE_ADDR']
     return bool unless bool && block
     block.call
   end
 
   def header? **kws, &block
-    bool = kws.keys.map { kws[_1] === @header[_1] ? return false : true }.all?
+    bool = kws.keys.map { k=_1.to_s.tr('_','-'); kws[k] === @header[k] ? return false : true }.all?
     return bool unless bool && block
     block.call
   end
 
   def host? url, &block
-    bool = url === env['HOST']
+    bool = url === env['HTTP_HOST']
     return bool unless bool && block
     block.call
   end
@@ -82,7 +82,7 @@ class << Erio
   end
 
   def accept? *types, &block
-    acc = @_env['HTTP_ACCEPT']
+    acc = @env['HTTP_ACCEPT']
     bool = types.map do |type|
       rt = %r[\b#{type}\b]
       case type

data/lib/erio/topo.rb

@@ -0,0 +1,106 @@
+class << Erio
+  
+  # a map router for Erio.
+  # nested with `on`
+  # root in `is`
+  # repeated slashes(/) is 1 slash:
+  # `////` == `/`
+  # `/hello/` == `/hello`
+  #
+  #   on 'hello' # match '/hello', '/hello/mine', '/hello/'
+  #              # not '/helloabc'
+  #   on param? :a # match '/?a'
+  #   on accept? 'text' # match Header[Accept-Type] like Text.
+  #
+  #   class App < Erio
+  #     enter do
+  #       on 'hello' do
+  #         res.write 'hi'
+  #         on String, res.params.empty? do |name|
+  #           res.write "hi, #{name}!"
+  #         end
+  #       end
+  #     end
+  #   end
+  #
+  # @param Bool, String, Class, Proc match path-pattern or any condition then run
+  # @yield take matched args and run.
+  def on(*arg)
+    def path(p)
+      if @_isis
+        lambda {
+          if env['PATH_INFO'] =~ /\A(\/*#{p}\/*)\z/
+          # if env['PATH_INFO'] =~ /\A\/*\z/
+            env['SCRIPT_NAME'] += $1||''
+            env['PATH_INFO'] = ''
+            $1
+          end
+        }
+      else
+        lambda {
+          if env['PATH_INFO'] =~ /\A\/(#{p})(\/|\z)/
+            env['SCRIPT_NAME'] += "/#{$1}"
+            env['PATH_INFO'] = $2 + $'
+            $1
+          end
+        }
+      end
+    end
+  
+    def match(pat)
+      case pat
+      when Class
+        case pat
+        when Numeric; path('\\d+(?:\\.\\d+)?').call
+        when Integer; path('\\d+').call
+        when String; path('[^\\/]+').call
+        end
+      when String, Numeric; path(pat).call
+      when Regexp; path(pat.source).call
+      when true, false; pat
+      when Proc; pat.call
+      end
+    end
+
+    return if @_matched
+    s, p = env['SCRIPT_NAME'], env['PATH_INFO']
+    yield *arg.map { |pat| match(pat) || (@_isis=false; return) }
+    env['SCRIPT_NAME'], env['PATH_INFO'] = s, p
+    @_matched = true
+  end
+  # 
+  # match path excluded rest characters
+  
+  #   is 'hi' # match '/hi' not match '/hi/123'
+  #   is 'hi/mine' # match '/hi/mine'
+  #
+  # @param String, Regexp whole match
+  # @yield run if matched
+  def is(s='', &block)
+    @_isis = true
+    on(s, &block)
+  end
+
+  # matched but also match another for run block
+  def also; @_matched = false; end
+
+  # alias res.finish, app needed
+  def finish; res.finish; end
+
+  def _call(env)
+    @env = env
+    @res = Rack::Response.new
+    @req = Rack::Request.new(env)
+    catch :erio_run_next_app do
+      @res.status = 404 unless @_matched
+      enter
+      return @res.finish
+    end.call(env)
+  end
+
+  attr :env, :req, :res
+
+  def run(app)
+    throw :erio_run_next_app, app
+  end
+end

data/lib/erio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Erio
-  VERSION = "0.0.1.1"
+  VERSION = "0.0.2.0-1"
 end

data/lib/erio.rb

@@ -2,6 +2,7 @@
 
 require_relative "erio/version"
 require_relative "erio/short"
+require_relative "erio/topo"
 require'rack'
 require'rack/handler/puma'
 
@@ -57,22 +58,28 @@ class << Erio
   #
   # @yield run for rack-triad
   # @return [String, Object] maybe response body
-  def enter &blk; blk ? @_enter = blk : @_enter.arity == 1 ? @_enter.call(self) : class_exec(&@_enter) end
-
-  def _call env
-    @_env = env
-    @header = {}
-    @status = nil
-    @body = nil
-    last_res = enter
-    @body ||= last_res || ''
-    [@status, @header, [@body]]
+  def enter(&blk)
+    if blk
+      @_enter = blk
+    else
+      @_enter.arity == 1 ? @_enter.call(self) : class_exec(&@_enter)
+    end
   end
 
+  # def _call env
+  #   @_env = env
+  #   @header = {}
+  #   @status = nil
+  #   @body = nil
+  #   last_res = enter
+  #   @body ||= last_res || ''
+  #   [@status, @header, [@body]]
+  # end
+
   # create a dup to indiv variables scope
   # and call its enter.
   # returns rack-triad for rack
-  #
+  
   # @param env
   # @return Array<Numeric, Hash, Array<String>> triad of 
   def call env

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: erio
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.2.0.pre.1
 platform: ruby
 authors:
 - kozmozEnjel
 bindir: exe
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 2025-03-22 00:00:00.000000000 Z
 dependencies: []
 description: For Education but powerful and useful.
 email:
@@ -24,8 +24,11 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- demo/blog.ru
+- demo/map.ru
 - lib/erio.rb
 - lib/erio/short.rb
+- lib/erio/topo.rb
 - lib/erio/version.rb
 - sig/erio.rbs
 homepage: https://github.com/saisui/erio-rb
@@ -50,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Touwa Erio - A very tiny and lightweight web framework using Rack.
 test_files: []