erio 0.0.1.2 → 0.0.2.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 638a10ff758c90f93f55e06c6669f4f1e1004ec48f3ef702401946fdd6e7d875
-  data.tar.gz: ab019f99ccb8a61aff045f09c5452ba7d87eafb6734df1636bf0ef44dbeb8406
+  metadata.gz: c793930761cbd3b6dcedf1c21ed6ac9a428aecb1090217776c3c52fd17a5f397
+  data.tar.gz: a40ce8b6e6474695be33182ad90a4c30f8ba221cb629c9108f2f64fcfd659e2d
 SHA512:
-  metadata.gz: d949429201575b6c2aa51a6247b8dd2bb9549347b3cde38679e1da131e11e7bd9f2b8be7a6512df6b2fdd6f36c8acead689884c077ab1424fed1607b71d0cffd
-  data.tar.gz: ebc90caff591150bac0f0290d14b94d2fe0d114da3e4ba837ccd75a40fe0d9bccd9320b5cec5886a8ebb85175e13cebec167a4a8a98f55eb577656b79e1aaac6
+  metadata.gz: 15ae3a24e4d181d3b8cfdf227700d4b2534cdbc3cbec903a3d0999f5e70b8b135b2d8f49e592f64833722f934caab0e9744db7b3d0b924ca125289efeac1d2f4
+  data.tar.gz: 1a52c104b6ff1042df2bb11d8a96784c8f443f433e1fe7ea1055d6accb8a03bea51309ce5028f8f55edc4cc32cf47c1cb1b5053aba2d0f8bdafc42eea2cbb86e

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/README.md

@@ -4,6 +4,12 @@ A very chubby, tiny and lightweight Web Framework(base on Rack)
 
 凄く小さいなウェブ・フラムワーク。
 
+<style>
+  [cols-2] { column-count: 2 }
+  [cols-3] { column-count: 3 }
+  [cols-4] { column-count: 4 }
+</style>
+
 ## インストール :: Installation
 
 ```bash
@@ -78,11 +84,187 @@ end
 Erio.run!
 ```
 
+### 迷う宮ノ様な回路ニ作ろう :: Nested Page Sugar
+
+
+複雑ノ回路もサポートします。
+同じのコードを繰り返し書き込みの面倒も遠慮なく。
+
+<figure cols-2>
+
+タイプ·Ｍ
+
+```yaml
+- user
+  - 123
+    - album
+      - 23
+```
+
+タイプ·Ｓ
+
+```yaml
+- /user
+- /user/123
+- /user/123/album
+- /user/123/album/23
+
+```
+
+</figure>
+
+そして、処理に引きされば...
+
+<figure cols-2>
+
+タイプ·Ｍ
+
+```yaml
+- user
+  # 処理 user
+  - ''
+      # 処理
+  - 123
+    # 処理 123
+    - ''
+      # 処理
+    - album
+      # 処理 album
+      # 処理
+      - 23
+        # 処理 23
+```
+
+タイプ·Ｓ
+
+```yaml
+- /user
+  # 処理 user
+- /user/123
+  # 処理 user
+  # 処理 123
+- /user/123/album
+  # 処理 user
+  # 処理 123
+  # 処理 album
+- /user/123/album/23
+  # 処理 user
+  # 処理 123
+  # 処理 album
+  # 処理 23
+
+```
+
+</figure>
+
+#### 実のコードご覧。
+
+
+<figure cols-2>
+
+回路ニ使える
+
+```ruby
+on 'user'
+  content_type 'html'
+  is do
+    echoln 'userlist...'
+  end
+
+  on Integer do |uid|
+    @uid = uid
+    is do
+      echoln "user: #{uid}"
+    end
+
+    on 'album' do
+      echoln "user #{uid}'s album"
+      is do
+        echoln "pics..."
+        for pic in Dir["asset/user/#{@uid}/*.png"]
+          echoln "<img src=\"#{pic}\">"
+        end
+      end
+
+      is Integer do |pn|
+        echoln "pic #{pn}"
+        echoln "<img src=\"asset/#{@uid}/#{@pn}.png\">"
+      end
+    end
+  end
+end
+```
+
+回路に使えないならば...線性パス
+
+```ruby
+on '/user' do
+  echoln 'userlist...'
+end
+
+on '/user/:uid' do |uid|
+  @uid = uid
+  echoln "user: #{uid}"
+end
+
+on '/user/:uid/album' do |uid|
+  @uid = uid
+  echoln "user #{uid}'s album"
+  echoln "pics..."
+  for pic in Dir["asset/user/#{@uid}/*.png"].map
+    echoln "<img src=\"#{pic}\">"
+  end
+end
+
+on '/user/:uid/album/:pn' do |uid, pn|
+  @uid = uid
+  @pn = pn
+  echoln "user #{uid}'s album"
+  echoln "pic #{pn}"
+  echoln "<img src=\"asset/#{@uid}/#{@pn}.png\">"
+end
+```
+
+</figure>
+
+試験コードご覧ください
+
+```ruby
+
+Erio.enter do
+  # 唯ルト、残されパスは無いノ場合。
+  is do
+    echo 'home'
+  end
+  # 前に合わせてならば... そして引数を取って。
+  on 'user', Integer do |_, uid|
+    # 唯此れニ合わせて
+    is do
+      echo "space of user: #{uid}."
+    end
+    # リクエストのパラメータも取って。
+    is 'album', param(pn: Integer) do |_, pn|
+      content_type 'html'
+      echo "picture of user: #{uid} <img src=\"#{pn}.png\">"
+    end
+  end
+
+  # 後ノ条件も合わせてしたい。
+  also
+
+  # ご報告ニ送りします
+  on param(:warn) do
+    puts "warn #{ip} - #{verb} #{path}"
+  end
+end
+
+```
+
 ## 作ル人 :: Creator
 
 __SAISUI__ :: 彩穂
 
-tip from `rack`, `sinatra`
+tip from `rack`, `sinatra`, `rum`
 
 ## コード協力 :: Contributing
 

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/kaki.rb

@@ -0,0 +1,8 @@
+class << Erio
+  def echo(*s)
+    s.each {|s| res.write s }
+  end
+  def echoln(*s)
+    s.each {|s| res.write s; res.write "\n"}
+  end
+end

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 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) : path end
-  def verb word=nil; block_given? ? (yield if verb == word) : @_env['REQUEST_METHOD'] 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,7 +56,7 @@ 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
@@ -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/
+            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 eq obj
+      -> { _1 == obj }
+    end
+
+    def match(pat)
+      case pat
+      when eq(Numeric); path('\\d+(?:\\.\\d+)?').call
+      when eq(Integer); path('\\d+').call
+      when eq(String); path('[^\\/]+').call
+      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.2"
+  VERSION = "0.0.2.0-2"
 end

data/lib/erio.rb

@@ -2,6 +2,8 @@
 
 require_relative "erio/version"
 require_relative "erio/short"
+require_relative "erio/topo"
+require_relative "erio/kaki"
 require'rack'
 require'rack/handler/puma'
 
@@ -57,22 +59,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.2
+  version: 0.0.2.0.pre.2
 platform: ruby
 authors:
 - kozmozEnjel
 bindir: exe
 cert_chain: []
-date: 2025-03-16 00:00:00.000000000 Z
+date: 2025-03-23 00:00:00.000000000 Z
 dependencies: []
 description: For Education but powerful and useful.
 email:
@@ -24,8 +24,12 @@ files:
 - README.md
 - Rakefile
 - config.ru
+- demo/blog.ru
+- demo/map.ru
 - lib/erio.rb
+- lib/erio/kaki.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 +54,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: []