lizarb 1.0.4 → 1.0.6

data/lib/web_system/subsystems/request/generators/request_generator.rb.base.rb.erb

@@ -0,0 +1,14 @@
+# view base.rb.erb
+
+def self.call(env)
+  super
+  path = env["REQUEST_PATH"]
+
+  status = 200
+  headers = {
+    "Framework" => "Liza \#{Lizarb::VERSION}"
+  }
+  body = "It works! <%= controller_name.camelize %>Request"
+
+  [status, headers, [body]]
+end

data/lib/web_system/subsystems/request/generators/request_generator.rb.simple_actions.rb.erb

@@ -0,0 +1,16 @@
+# view simple_actions.rb.erb
+<% arg_action_names.each do |action_name|
+  route = action_name == "index" ? "/#{controller_name}" : "/#{controller_name}/#{action_name}"
+%>
+  # GET <%= route %>
+
+  def call_<%= action_name %>
+    log "."
+  end
+
+  # POST <%= route %>
+
+  # def call_<%= action_name %>!
+  #   log "."
+  # end
+<% end -%>

data/lib/web_system/subsystems/request/generators/request_generator.rb.simple_view.html.erb

@@ -0,0 +1,9 @@
+# view simple_view.html.erb
+<h1><%%= self.class %></h1>
+<h2><%%= action %></h2>
+<p>request: <%%= request %></p>
+<p>action: <%%= action %></p>
+<p>format: <%%= format %></p>
+<p>http_method: <%%= http_method %></p>
+<p>qs: <%%= qs %></p>
+<p>segments: <%%= segments %></p>

data/lib/web_system/subsystems/request/generators/request_generator.rb.test.rb.erb

@@ -0,0 +1,2 @@
+# view test.rb.erb
+<%= render "subject" -%>

data/lib/web_system/subsystems/request/generators/request_generator_test.rb

@@ -0,0 +1,15 @@
+class WebSystem::RequestGeneratorTest < DevSystem::SimpleGeneratorTest
+
+  test :subject_class do
+    assert_equality subject_class, WebSystem::RequestGenerator
+    assert_equality subject.class, WebSystem::RequestGenerator
+  end
+
+  test_erbs_defined(
+    "base.rb.erb",
+    "simple_actions.rb.erb",
+    "simple_view.html.erb",
+    "test.rb.erb"
+  )
+  
+end

data/lib/web_system/subsystems/request/request_panel.rb

@@ -0,0 +1,75 @@
+class WebSystem::RequestPanel < Liza::Panel
+
+  def call env, allow_raise: false
+    t = Time.now
+    log "#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
+
+    request_klass = find env
+    ret = request_klass.call env
+    
+    log "#{ret[0]} with #{ret[2].first.size} bytes in #{t.diff}s"
+    ret
+  rescue => e
+    raise e if allow_raise
+    request_klass = WebSystem::ServerErrorRequest
+    env["LIZA_ERROR"] = e
+
+    ret = request_klass.call env
+    log "#{ret[0]} with #{ret[2].first.size} bytes in #{t.diff}s"
+    puts
+    ret
+  end
+
+  def call! env
+    call env, allow_raise: true
+  end
+
+  #
+
+  def router(name, &block)
+    _routers[name] ||= []
+    _routers[name].push block if block_given?
+  end
+
+  def routers
+    @routers ||= _routers.map do |name, blocks|
+      router = Liza.const "#{name}_router_request"
+      blocks.each do |block|
+        router.instance_eval(&block)
+      end
+      [name, router]
+    end.to_h
+  end
+
+  def _routers
+    @_routers ||= {}
+  end
+
+  #
+
+  def find env
+    _prepare env
+
+    routers.values.each do |router|
+      request_class = router.call env
+      return request_class if request_class
+    end
+
+    NotFoundRequest
+  end
+
+  #
+
+  def _prepare env
+    path = env["PATH_INFO"]
+    path, _sep, format = path.lpartition "."
+    format = "html" if format.empty?
+
+    segments = Array path.split("/")[1..-1]
+
+    env["LIZA_PATH"]     = path
+    env["LIZA_FORMAT"]   = format
+    env["LIZA_SEGMENTS"] = segments
+  end
+
+end

data/lib/web_system/subsystems/request/request_panel_test.rb

@@ -0,0 +1,82 @@
+class WebSystem::RequestPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert_equality subject_class, WebSystem::RequestPanel
+    refute_equality subject, WebBox[:request]
+  end
+
+  test_methods_defined do
+    on_self
+    on_instance \
+      :call, :call!,
+      :find,
+      :router, :routers
+  end
+
+  #
+
+  test :call! do
+    env = {}
+    env["PATH_INFO"] = "/foo/bar/baz"
+    status, _headers, _body = subject.call! env
+    assert_equality status, 404
+  end
+
+  test :call do
+    env = {}
+    env["PATH_INFO"] = "/foo/bar/baz"
+    status, _headers, body = subject.call env
+    assert_equality status, 404
+    assert_equality body, ["Client Error 404 - /foo/bar/baz"]
+  end
+
+  #
+
+  test :_prepare do
+    env = {}
+    env["PATH_INFO"]   = "/foo/bar/baz"
+    subject._prepare env
+    assert_equality env, {
+      "PATH_INFO"=>"/foo/bar/baz",
+      "LIZA_PATH"=>"/foo/bar/baz",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>["foo", "bar", "baz"]
+    }
+
+    env = {}
+    env["PATH_INFO"]   = "/"
+    subject._prepare env
+    assert_equality env, {
+      "PATH_INFO"=>"/",
+      "LIZA_PATH"=>"/",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>[]
+    }
+  end
+
+  test :find, :invalid do
+    env = {}
+    env["PATH_INFO"]   = "/foo/bar/baz"
+    request_class = subject.find env
+    assert_equality subject.routers.keys, []
+    assert_equality request_class, WebSystem::NotFoundRequest
+  end
+
+  test :find, :valid do
+    env = {}
+    env["PATH_INFO"]   = "/"
+    subject.router :simple
+    assert_equality subject.routers.keys, [:simple]
+    request_class = subject.find env
+    assert_equality request_class, RootRequest
+  end
+
+  test :router do
+    todo "write this"
+  end
+
+  test :routers do
+    todo "write this"
+  end
+
+end

data/lib/web_system/{web/controllers → subsystems/request}/request_test.rb

@@ -4,11 +4,6 @@ class WebSystem::RequestTest < Liza::ControllerTest
     assert subject_class == WebSystem::Request
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :blue
-  end
-
   # test :call do
   #   todo "write this"
   # end

data/lib/web_system/{web/controllers/request → subsystems/request/requests}/client_error_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::ClientErrorRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 400
 
     headers = {

data/lib/web_system/{web/controllers/request → subsystems/request/requests}/not_found_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::NotFoundRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 404
 
     headers = {

data/lib/web_system/{web/controllers/request → subsystems/request/requests}/server_error_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::ServerErrorRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 500
 
     headers = {

data/lib/web_system/subsystems/request/requests/simple_request.rb

@@ -0,0 +1,102 @@
+class WebSystem::SimpleRequest < WebSystem::Request
+
+  #
+  
+  def self.call env
+    super
+    new.call env
+  end
+
+  #
+
+  attr_reader :env
+
+  def call env
+    @env = env
+    @status = 200
+    @headers = {
+      "Framework" => "Liza #{Lizarb::VERSION}"
+    }
+
+    _call_action
+    @body ||=
+      render format,
+        action,
+        format: format,
+        converted: true,
+        formatted: true
+    
+    [@status, @headers, [@body]]
+  end
+
+  #
+
+  def _call_action
+    return public_send "call_#{action}!" if http_method == "POST" and respond_to? "call_#{action}!"
+    return public_send "call_#{action}"  if respond_to? "call_#{action}"
+
+    response_404
+  end
+
+  def response_404
+    @status = 404
+    @body = "404"
+  end
+  
+  # env
+
+  def http_method
+    env["REQUEST_METHOD"]
+  end
+
+  def request
+    @request ||= env["LIZA_REQUEST"].to_sym
+  end
+
+  def action
+    @action ||= env["LIZA_ACTION"].to_sym
+  end
+
+  def format
+    @format ||= env["LIZA_FORMAT"].to_sym
+  end
+
+  def segments
+    @segments ||= env["LIZA_SEGMENTS"]
+  end
+
+  def qs
+    @qs ||= (env["QUERY_STRING"] || "").split("&").map { _1.split("=") }.to_h
+  end
+
+end
+
+__END__
+
+# view html.html.erb
+<!DOCTYPE html>
+<html lang="en">
+  <%= render "head" %>
+  <%= render "body" %>
+</html>
+
+# view head.html.erb
+<head>
+  <meta charset="UTF-8">
+  <title><%= get :title %></title>
+</head>
+
+# view body.html.erb
+<body>
+  <%= render %>
+</body>
+
+# view index.html.erb
+<h1><%= self.class %></h1>
+<h2><%= action %></h2>
+<p>http_method: <%= http_method %></p>
+<p>request: <%= request %></p>
+<p>action: <%= action %></p>
+<p>format: <%= format %></p>
+<p>qs: <%= qs %></p>
+<p>segments: <%= segments %></p>

data/lib/web_system/subsystems/request/requests/simple_request_test.rb

@@ -0,0 +1,7 @@
+class WebSystem::SimpleRequestTest < WebSystem::RequestTest
+
+  test :subject_class do
+    assert subject_class == WebSystem::SimpleRequest
+  end
+
+end

data/lib/web_system/subsystems/request/router_requests/router_request.rb

@@ -0,0 +1,7 @@
+class WebSystem::RouterRequest < WebSystem::Request
+
+  #
+
+  division!
+
+end

data/lib/web_system/subsystems/request/router_requests/router_request_test.rb

@@ -0,0 +1,7 @@
+class WebSystem::RouterRequestTest < WebSystem::RequestTest
+
+  test :subject_class do
+    assert subject_class == WebSystem::RouterRequest
+  end
+
+end

data/lib/web_system/subsystems/request/router_requests/simple_router_request.rb

@@ -0,0 +1,27 @@
+class WebSystem::SimpleRouterRequest < WebSystem::RouterRequest
+  class RequestNotFound < Error; end
+
+  def self.call(env)
+    super
+    segments = env["LIZA_SEGMENTS"].dup
+    request = segments.shift || "root"
+    action  = segments.shift || "index"
+    format = env["LIZA_FORMAT"]
+
+    log "request: #{request.inspect}, action: #{action.inspect}, format: #{format.inspect}"
+    request_class = _find_request_class request
+    
+    env["LIZA_REQUEST"] = request
+    env["LIZA_ACTION"] = action
+    env["LIZA_REQUEST_CLASS"] = request_class
+
+    request_class
+  end
+
+  def self._find_request_class request
+    Liza.const "#{request}_request"
+  rescue Liza::ConstNotFound
+    raise RequestNotFound
+  end
+
+end

data/lib/web_system/subsystems/request/router_requests/simple_router_request_test.rb

@@ -0,0 +1,7 @@
+class WebSystem::SimpleRouterRequestTest < WebSystem::RouterRequestTest
+
+  test :subject_class do
+    assert subject_class == WebSystem::SimpleRouterRequest
+  end
+
+end

data/lib/web_system/web_box.rb

@@ -0,0 +1,37 @@
+class WebSystem::WebBox < Liza::Box
+
+  preconfigure :rack do
+    # RackPanel.instance gives you read-access to this instance
+  end
+
+  preconfigure :request do
+    # RequestPanel.instance gives you read-access to this instance
+  end
+
+end
+
+__END__
+
+# view default.rb.erb
+class WebBox < WebSystem::WebBox
+
+  configure :rack do
+    # RackPanel.instance gives you read-access to this instance
+    # server (pick one, check gemfile)
+    # server :agoo
+    # server :falcon
+    # server :iodine
+    server :puma
+    # server :thin
+
+    set :files, App.root.join("web_files")
+    set :host, "localhost"
+    set :port, 3000
+  end
+
+  configure :request do
+    # RequestPanel.instance gives you read-access to this instance
+    router :simple
+  end
+
+end

data/lib/web_system/{web/web_box_test.rb → web_box_test.rb}

@@ -4,11 +4,6 @@ class WebSystem::WebBoxTest < Liza::BoxTest
     assert subject_class == WebSystem::WebBox
   end
 
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :blue
-  end
-
   test :panels do
     assert subject_class[:request].is_a? WebSystem::RequestPanel
   end

data/lib/web_system/web_system_test.rb

@@ -0,0 +1,3 @@
+class WebSystem::WebSystemTest < Liza::SystemTest
+
+end

data/lib/web_system.rb

@@ -1,5 +1,11 @@
-require "uri"
-
 class WebSystem < Liza::System
-  set :log_color, :blue
+  class Error < Error; end
+
+  require "uri"
+
+  color :dark_cerulean
+
+  panel :rack
+  panel :request
+
 end

data/lib/work_system/work_box.rb

@@ -0,0 +1,5 @@
+class WorkSystem::WorkBox < Liza::Box
+
+  #
+  
+end

data/lib/work_system/work_box_test.rb

@@ -0,0 +1,8 @@
+class WorkSystem::WorkBoxTest < Liza::BoxTest
+  
+  test :subject_class, :subject do
+    assert_equality WorkSystem::WorkBox, subject_class
+    assert_equality WorkSystem::WorkBox, subject.class
+  end
+
+end

data/lib/work_system/work_system_test.rb

@@ -0,0 +1,3 @@
+class WorkSystem::WorkSystemTest < Liza::SystemTest
+
+end

data/lib/work_system.rb

@@ -0,0 +1,8 @@
+class WorkSystem < Liza::System
+  class Error < Liza::Error; end
+
+  #
+
+  color :saffron
+
+end

data/lizarb.gemspec

@@ -5,8 +5,8 @@ require_relative "lib/lizarb/version"
 Gem::Specification.new do |spec|
   spec.name = "lizarb"
   spec.version = Lizarb::VERSION
-  spec.authors = "Thiago Pinto"
-  spec.email = "thiagopintodev@gmail.com"
+  spec.authors = "Thiago Almeida"
+  spec.email = "thiago@lizarb.org"
 
   spec.summary = "Application Framework"
   spec.description = "Liza is a light, experimental framework primarily developed to help study the Ruby language and the Ruby ecosystem."
@@ -15,10 +15,10 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata = {
-    "homepage_uri"    => "https://github.com/rubyonrails-brasil/lizarb",
-    "changelog_uri"   => "https://github.com/rubyonrails-brasil/lizarb/blob/main/CHANGELOG.md",
-    "source_code_uri" => "https://github.com/rubyonrails-brasil/lizarb",
-    "bug_tracker_uri" => "https://github.com/rubyonrails-brasil/lizarb/issues"
+    "homepage_uri"    => "https://github.com/lizarb/lizarb",
+    "changelog_uri"   => "https://github.com/lizarb/lizarb/blob/main/CHANGELOG.md",
+    "source_code_uri" => "https://github.com/lizarb/lizarb",
+    "bug_tracker_uri" => "https://github.com/lizarb/lizarb/issues"
   }
 
   # Specify which files should be added to the gem when it is released.
@@ -29,16 +29,8 @@ Gem::Specification.new do |spec|
     end
   end
   spec.bindir = "exe"
-  spec.executables = ["lrb", "liza", "lizarb"]
+  spec.executables = ["liza", "lizarb"]
   spec.require_paths = ["lib"]
 
-  # dependencies
-
-  spec.add_dependency "colorize", "~> 0.8"
-  spec.add_dependency "dotenv", "~> 2.8"
-  spec.add_dependency "zeitwerk", "~> 2.6"
-
-  # development dependencies
-
   spec.add_development_dependency "rake", "~> 13.0"
 end