lizarb 1.0.1 → 1.0.2

data/lib/web_system/dev/rack_command.rb

@@ -0,0 +1,26 @@
+class WebSystem
+  class RackCommand < Liza::Command
+
+    def self.call args
+      log "args #{args}"
+
+      strategy = nil
+      host = nil
+      port = nil
+
+      if args.any? && !args[0].include?("=")
+        strategy = args.shift
+      end
+
+      args.each do |arg|
+        host = arg.split("=")[1] if arg.start_with? "h="
+        port = arg.split("=")[1] if arg.start_with? "p="
+      end
+
+      log({strategy:, host:, port:})
+      
+      Liza.const(:web_box).rack.call strategy, host, port
+    end
+
+  end
+end

data/lib/web_system/dev/request_command.rb

@@ -0,0 +1,143 @@
+class WebSystem::RequestCommand < Liza::Command
+
+  VALID_ACTIONS = %w[find get post]
+
+  def self.call(args)
+    log "Called #{self}.#{__method__} with args #{args}"
+    new.call(args)
+  end
+
+  # instance methods
+
+  def call(args)
+    log "Called #{self}.#{__method__} with args #{args}"
+
+    @command = args.shift
+    @args = args
+    
+    return help unless VALID_ACTIONS.include? @command
+    perform
+  rescue StandardError => error
+    @error = error
+    handle
+  end
+
+  def perform
+    log "Called #{self}.#{__method__}"
+    
+    case @command
+    when "find"
+      find
+    when "get"
+      get_request
+    when "post"
+      post_request
+    end
+  end
+
+  def handle
+    log "Called #{self}.#{__method__}"
+    log render "error.txt"
+  end
+
+  def help
+    log "Called #{self}.#{__method__}"
+    log render "help.txt"
+  end
+
+  # actions
+
+  def find
+    log "Called #{self}.#{__method__}"
+    path = @args.first
+
+    @env = {}
+    @env["REQUEST_PATH"] = path
+
+    request_panel.find @env
+
+    @request_class = @env["LIZA_REQUEST_CLASS"]
+
+    puts render "find.txt"
+  end
+
+  def get_request
+    log "Called #{self}.#{__method__}"
+    path = @args.first
+    
+    @env = {}
+    @env["REQUEST_METHOD"] = "GET"
+    @env["REQUEST_PATH"]   = path
+
+    @status, @headers, @body = request_panel.call @env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render "response.http"
+  end
+
+  def post_request
+    log "Called #{self}.#{__method__}"
+    path = @args.first
+    
+    @env = {}
+    @env["REQUEST_METHOD"] = "POST"
+    @env["REQUEST_PATH"]   = path
+
+    @status, @headers, @body = request_panel.call @env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render "response.http"
+  end
+
+  # helpers
+
+  def request_panel
+    Liza.const(:web_box).requests
+  end
+end
+
+__END__
+
+# success.txt.erb
+
+RESULT:
+
+class      <%= @result.class %>
+value      <%= @result %>
+
+# error.txt.erb
+
+ERROR:
+
+class      <%= @error.class %>
+message    <%= @error.message %>
+backtrace  <%= @error.backtrace.select { |s| @stop = true if s.include?("/exe/lizarb:"); !defined? @stop }.join "\n           " %>
+
+# help.txt.erb
+
+USAGE:
+
+liza request find /path/to/action.format
+liza request get /path/to/action.format
+liza request post /path/to/action.format
+
+# find.txt.erb
+
+ENV:
+<% @env.each do |k, v| %>
+env["<%= k %>"] = <%= v.inspect -%>
+<% end %>
+
+REQUEST CLASS:
+
+# <%= @request_class.source_location.join ":" %>
+class <%= @request_class %> < <%= @request_class.superclass %>
+  # ...
+end
+
+# response.http.erb
+
+<%= @status %>
+<% @headers.each do |k, v| -%>
+<%= k %>: <%= v %>
+<% end -%>
+
+<%= @body.first %>

data/lib/web_system/dev/web_command.rb

@@ -1,41 +1,10 @@
 class WebSystem
   class WebCommand < Liza::Command
 
-    set :files, App.root.join("web_files")
-    set :host, "localhost"
-    set :port, 3000
-
     def self.call args
-      log :higher, "Called #{self} with args #{args}"
-
-      host = get :host
-      port = get :port
-
-      args.each do |arg|
-        host = arg.split("=")[1] if arg.start_with? "h="
-        port = arg.split("=")[1] if arg.start_with? "p="
-      end
-
-      if App.mode == :code
-        ENV["RACK_ENV"] = "development"
-        rack_app = method :_call
-      else
-        ENV["RACK_ENV"] = "production"
-        rack_app = ::WebBox.requests
-      end
-
-      rack_files = Rack::Files.new get(:files)
-      rack_app = Rack::Cascade.new [rack_files, rack_app]
-
-      require "rack/handler/puma"
-      Rack::Handler::Puma.run rack_app, Host: host, Port: port
-    end
-
-    def self._call app
-      App.reload do
-        log "reloading"
-        return ::WebBox.requests.call app
-      end
+      log "args #{args}"
+      log "DEPRECATED: please use `lizarb rack` instead"
+      RackCommand.call args
     end
 
   end

data/lib/web_system/web/controllers/rack.rb

@@ -0,0 +1,8 @@
+class WebSystem
+  class Rack < Liza::Controller
+
+    # def self.call rack_app, host, port
+    # end
+    
+  end
+end

data/lib/web_system/web/controllers/rack_test.rb

@@ -0,0 +1,18 @@
+class WebSystem
+  class RackTest < Liza::ControllerTest
+
+    test :subject_class do
+      assert subject_class == WebSystem::Rack
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :blue
+    end
+
+    # test :call do
+    #   todo "write this"
+    # end
+
+  end
+end

data/lib/web_system/web/controllers/request/client_error_request.rb

@@ -10,7 +10,6 @@ class WebSystem
 
       body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
-      log status
       [status, headers, [body]]
     end
 

data/lib/web_system/web/controllers/request/not_found_request.rb

@@ -10,7 +10,6 @@ class WebSystem
 
       body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
-      log status
       [status, headers, [body]]
     end
 

data/lib/web_system/web/controllers/request/server_error_request.rb

@@ -12,7 +12,6 @@ class WebSystem
 
       body = "Server Error #{status} - #{e.class} - #{e.message}"
 
-      log status
       [status, headers, [body]]
     end
 

data/lib/web_system/web/panels/rack_panel.rb

@@ -0,0 +1,44 @@
+class WebSystem
+  class RackPanel < Liza::Panel
+
+    def call strategy, host, port
+      puts
+      log({strategy:, host:, port:})
+
+      strategy ||= get :strategy
+      host ||= get :host
+      port ||= 3000
+      files ||= get :files
+
+      log({strategy:, host:, port:})
+      
+      x = App.mode == :code ? "development" : "production"
+      ENV["RACK_ENV"] = x
+      rack_app = send "get_rack_app_#{x}"
+
+      rack_files = Object::Rack::Files.new files
+      rack_app = Object::Rack::Cascade.new [rack_files, rack_app]
+
+      # TODO: PumaRack
+      # handler = Liza.const(:"#{strategy}_rack")
+      
+      require "rack/handler/puma"
+      handler = Object::Rack::Handler::Puma
+      handler.run rack_app, Host: host, Port: port
+    end
+
+    def get_rack_app_production()= Liza.const(:web_box).requests
+      
+    def get_rack_app_development
+      Proc.new do |env|
+        ret = nil
+        App.reload do
+          log "reloading"
+          ret = get_rack_app_production.call env
+        end
+        ret
+      end
+    end
+    
+  end
+end

data/lib/web_system/web/panels/rack_panel_test.rb

@@ -0,0 +1,14 @@
+class WebSystem
+  class RackPanelTest < Liza::PanelTest
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :blue
+    end
+
+    # test :call do
+    #   todo "write this"
+    # end
+
+  end
+end

data/lib/web_system/web/panels/request_panel.rb

@@ -2,53 +2,72 @@ class WebSystem
   class RequestPanel < Liza::Panel
 
     def call env
-      puts
-
-      # 1. LOG GET /
-
-      log "#{env["REQUEST_METHOD"]} #{env["REQUEST_PATH"]}"
+      t = Time.now
+      request_klass = find env
+      ret = request_klass.call env
+      _html_beautify env, ret
+      ret
+    rescue => e
+      request_klass = ServerErrorRequest
+      env["LIZA_ERROR"] = e
 
-      # 2. PREPARE env
+      ret = request_klass.call env
+    ensure
+      log "#{ret[0]} with #{ret[2].first.size} bytes in #{t.diff}s"
+      puts
+      ret
+    end
 
-      path = env["REQUEST_PATH"]
+    #
 
-      path, _sep, format = path.lpartition "."
-      format = "html" if format.empty?
+    def find env
+      _prepare env
 
-      segments = Array path.split("/")[1..-1]
+      path = env["LIZA_PATH"]
 
-      case segments.count
-      when 0
-        request, action = "root", "root"
-      when 1
-        request, action = "root", segments[0]
-      else
-        request, action = segments[0..1]
-      end
+      segments = env["LIZA_SEGMENTS"].dup
+      request = segments.shift || "root"
+      action  = segments.shift || "index"
 
-      env["LIZA_PATH"] = path
       env["LIZA_REQUEST"] = request
       env["LIZA_ACTION"] = action
-      env["LIZA_FORMAT"] = format
+      format = env["LIZA_FORMAT"]
 
       log({request:, action:, format:})
 
-      # 3. FIND request
+      env["LIZA_REQUEST_CLASS"] = _find_request_class request
+    end
 
-      begin
-        request_klass = Liza.const "#{request}_request"
-      rescue NameError
-        request_klass = NotFoundRequest
-      end
+    def _find_request_class request
+      Liza.const "#{request}_request"
+    rescue NameError
+      NotFoundRequest
+    end
 
-      # 4. CALL
+    #
 
-      request_klass.call env
-    rescue => e
-      request_klass = ServerErrorRequest
-      env["LIZA_ERROR"] = e
+    def _html_beautify env, ret
+      return unless defined? HtmlBeautifier
+      return unless env["LIZA_FORMAT"] == "html"
+
+      body = ret[2].first
+      body = HtmlBeautifier.beautify body
+      ret[2] = [body] 
+    end
+
+    def _prepare env
+      log "#{env["REQUEST_METHOD"]} #{env["REQUEST_PATH"]}"
+
+      path = env["REQUEST_PATH"]
+
+      path, _sep, format = path.lpartition "."
+      format = "html" if format.empty?
+
+      segments = Array path.split("/")[1..-1]
 
-      request_klass.call env
+      env["LIZA_PATH"]     = path
+      env["LIZA_FORMAT"]   = format
+      env["LIZA_SEGMENTS"] = segments
     end
 
   end

data/lib/web_system/web/panels/request_panel_test.rb

@@ -1,14 +1,33 @@
-class WebSystem
-  class RequestPanelTest < Liza::PanelTest
+class WebSystem::RequestPanelTest < Liza::PanelTest
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :blue
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :blue
+  end
+
+  #
 
-    # test :call do
-    #   todo "write this"
-    # end
+  test :_prepare do
+    subject = WebSystem::WebBox.requests
+    env = {}
+    env["REQUEST_PATH"]   = "/foo/bar/baz"
+    subject._prepare env
+    assert_equality env, {
+      "REQUEST_PATH"=>"/foo/bar/baz",
+      "LIZA_PATH"=>"/foo/bar/baz",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>["foo", "bar", "baz"]
+    }
 
+    env = {}
+    env["REQUEST_PATH"]   = "/"
+    subject._prepare env
+    assert_equality env, {
+      "REQUEST_PATH"=>"/",
+      "LIZA_PATH"=>"/",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>[]
+    }
   end
+
 end

data/lib/web_system/web/web_box.rb

@@ -1,11 +1,23 @@
 class WebSystem
   class WebBox < Liza::Box
+    has_panel :rack, :rack
+    has_controller :rack, :rack
     has_panel :request, :requests
     has_controller :request, :requests
 
+    # Set up your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
+    rack do
+      # set :log_level, ENV["web.rack.log_level"]
+      
+      set :files, App.root.join("web_files")
+      set :host, "localhost"
+      set :port, 3000
+    end
+
     # Set up your request panel per the DSL in http://guides.lizarb.org/panels/request.html
     requests do
       # set :log_level, ENV["web.request.log_level"]
+
     end
 
   end

data/lizarb.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description = "Liza is a light, experimental framework primarily developed to help study the Ruby language and the Ruby ecosystem."
   spec.homepage = "http://lizarb.org"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 3.1.0"
+  spec.required_ruby_version = ">= 3.2.0"
 
   spec.metadata = {
     "homepage_uri"    => "https://github.com/rubyonrails-brasil/lizarb",
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
     end
   end
   spec.bindir = "exe"
-  spec.executables = ["liza", "lizarb"]
+  spec.executables = ["lrb", "liza", "lizarb"]
   spec.require_paths = ["lib"]
 
   # dependencies