lizarb 1.0.2 → 1.0.4

data/lib/web_system/dev/request_command.rb

@@ -2,15 +2,8 @@ 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}"
+    log "args = #{args.inspect}"
 
     @command = args.shift
     @args = args
@@ -23,8 +16,6 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def perform
-    log "Called #{self}.#{__method__}"
-    
     case @command
     when "find"
       find
@@ -36,19 +27,16 @@ class WebSystem::RequestCommand < Liza::Command
   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 = {}
@@ -56,13 +44,12 @@ class WebSystem::RequestCommand < Liza::Command
 
     request_panel.find @env
 
-    @request_class = @env["LIZA_REQUEST_CLASS"]
+    @request_class = @env["LIZA_REQUEST_CLASS"] || raise("No request class found")
 
     puts render "find.txt"
   end
 
   def get_request
-    log "Called #{self}.#{__method__}"
     path = @args.first
     
     @env = {}
@@ -75,7 +62,6 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def post_request
-    log "Called #{self}.#{__method__}"
     path = @args.first
     
     @env = {}
@@ -90,20 +76,20 @@ class WebSystem::RequestCommand < Liza::Command
   # helpers
 
   def request_panel
-    Liza.const(:web_box).requests
+    @request_panel ||= WebBox[:request]
   end
 end
 
 __END__
 
-# success.txt.erb
+# view success.txt.erb
 
 RESULT:
 
 class      <%= @result.class %>
 value      <%= @result %>
 
-# error.txt.erb
+# view error.txt.erb
 
 ERROR:
 
@@ -111,7 +97,7 @@ 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
+# view help.txt.erb
 
 USAGE:
 
@@ -119,7 +105,7 @@ liza request find /path/to/action.format
 liza request get /path/to/action.format
 liza request post /path/to/action.format
 
-# find.txt.erb
+# view find.txt.erb
 
 ENV:
 <% @env.each do |k, v| %>
@@ -133,7 +119,7 @@ class <%= @request_class %> < <%= @request_class.superclass %>
   # ...
 end
 
-# response.http.erb
+# view response.http.erb
 
 <%= @status %>
 <% @headers.each do |k, v| -%>

data/lib/web_system/dev/web_command.rb

@@ -1,11 +1,9 @@
-class WebSystem
-  class WebCommand < Liza::Command
-
-    def self.call args
-      log "args #{args}"
-      log "DEPRECATED: please use `lizarb rack` instead"
-      RackCommand.call args
-    end
+class WebSystem::WebCommand < Liza::Command
 
+  def self.call args
+    log "args #{args}"
+    log "DEPRECATED: please use `lizarb rack` instead"
+    RackCommand.call args
   end
+
 end

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

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

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

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

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

@@ -1,17 +1,15 @@
-class WebSystem
-  class ClientErrorRequest < Request
+class WebSystem::ClientErrorRequest < WebSystem::Request
 
-    def self.call env
-      status = 400
+  def self.call env
+    status = 400
 
-      headers = {
-        "Framework" => "Liza #{Lizarb::VERSION}"
-      }
+    headers = {
+      "Framework" => "Liza #{Lizarb::VERSION}"
+    }
 
-      body = "Client Error #{status} - #{env["LIZA_PATH"]}"
-
-      [status, headers, [body]]
-    end
+    body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
+    [status, headers, [body]]
   end
+
 end

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

@@ -1,17 +1,15 @@
-class WebSystem
-  class NotFoundRequest < Request
+class WebSystem::NotFoundRequest < WebSystem::Request
 
-    def self.call env
-      status = 404
+  def self.call env
+    status = 404
 
-      headers = {
-        "Framework" => "Liza #{Lizarb::VERSION}"
-      }
+    headers = {
+      "Framework" => "Liza #{Lizarb::VERSION}"
+    }
 
-      body = "Client Error #{status} - #{env["LIZA_PATH"]}"
-
-      [status, headers, [body]]
-    end
+    body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
+    [status, headers, [body]]
   end
+
 end

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

@@ -1,19 +1,17 @@
-class WebSystem
-  class ServerErrorRequest < Request
+class WebSystem::ServerErrorRequest < WebSystem::Request
 
-    def self.call env
-      status = 500
+  def self.call env
+    status = 500
 
-      headers = {
-        "Framework" => "Liza #{Lizarb::VERSION}"
-      }
+    headers = {
+      "Framework" => "Liza #{Lizarb::VERSION}"
+    }
 
-      e = env["LIZA_ERROR"]
+    e = env["LIZA_ERROR"]
 
-      body = "Server Error #{status} - #{e.class} - #{e.message}"
-
-      [status, headers, [body]]
-    end
+    body = "Server Error #{status} - #{e.class} - #{e.message}"
 
+    [status, headers, [body]]
   end
+
 end

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

@@ -1,5 +1,3 @@
-class WebSystem
-  class Request < Liza::Controller
+class WebSystem::Request < Liza::Controller
 
-  end
 end

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

@@ -1,18 +1,16 @@
-class WebSystem
-  class RequestTest < Liza::ControllerTest
+class WebSystem::RequestTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == WebSystem::Request
-    end
+  test :subject_class do
+    assert subject_class == WebSystem::Request
+  end
 
-    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 :call do
+  #   todo "write this"
+  # end
 
-  end
 end

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

@@ -1,44 +1,42 @@
-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
+class WebSystem::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]
 
-    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
+    # 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()= WebBox[:request]
+
+  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

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

@@ -1,14 +1,12 @@
-class WebSystem
-  class RackPanelTest < Liza::PanelTest
+class WebSystem::RackPanelTest < 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 :call do
+  #   todo "write this"
+  # end
 
-  end
 end

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

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

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

@@ -8,7 +8,7 @@ class WebSystem::RequestPanelTest < Liza::PanelTest
   #
 
   test :_prepare do
-    subject = WebSystem::WebBox.requests
+    subject = WebBox[:request]
     env = {}
     env["REQUEST_PATH"]   = "/foo/bar/baz"
     subject._prepare env

data/lib/web_system/web/web_box.rb

@@ -1,24 +1,18 @@
-class WebSystem
-  class WebBox < Liza::Box
-    has_panel :rack, :rack
-    has_controller :rack, :rack
-    has_panel :request, :requests
-    has_controller :request, :requests
+class WebSystem::WebBox < Liza::Box
 
-    # 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
+  # Configure your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
+  configure :rack do
+    # set :log_level, ENV["web.rack.log_level"]
 
-    # 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"]
+    set :files, App.root.join("web_files")
+    set :host, "localhost"
+    set :port, 3000
+  end
 
-    end
+  # Configure your request panel per the DSL in http://guides.lizarb.org/panels/request.html
+  configure :request do
+    # set :log_level, ENV["web.request.log_level"]
 
   end
+
 end

data/lib/web_system/web/web_box_test.rb

@@ -1,18 +1,16 @@
-class WebSystem
-  class WebBoxTest < Liza::BoxTest
+class WebSystem::WebBoxTest < Liza::BoxTest
 
-    test :subject_class do
-      assert subject_class == WebSystem::WebBox
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :blue
-    end
+  test :subject_class do
+    assert subject_class == WebSystem::WebBox
+  end
 
-    test :panels do
-      assert subject_class.requests.is_a? RequestPanel
-    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
+
 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.2.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata = {
     "homepage_uri"    => "https://github.com/rubyonrails-brasil/lizarb",