lizarb 1.0.0 → 1.0.2

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lizarb
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Thiago Pinto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -70,34 +70,53 @@ description: Liza is a light, experimental framework primarily developed to help
   the Ruby language and the Ruby ecosystem.
 email: thiagopintodev@gmail.com
 executables:
+- lrb
 - liza
 - lizarb
 extensions: []
 extra_rdoc_files: []
 files:
 - ".ruby-version"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
+- README_SYSTEMS.md
 - Rakefile
 - app.code.env
 - app.env
 - app.rb
+- app/dev/benches/app_bench.rb
+- app/dev/benches/app_bench_test.rb
+- app/dev/benches/loops_bench.rb
+- app/dev/benches/loops_bench_test.rb
 - app/dev/commands/app_command.rb
 - app/dev/commands/app_command_test.rb
-- app/dev/commands/example_command.rb
-- app/dev/commands/example_command_test.rb
-- app/dev/commands/macro_child_command.rb
-- app/dev/commands/macro_child_command_test.rb
-- app/dev/commands/macro_parent_command.rb
-- app/dev/commands/macro_parent_command_test.rb
-- app/dev/commands/my_command.rb
-- app/dev/commands/my_command_test.rb
+- app/dev/commands/calculator_command.rb
+- app/dev/commands/calculator_command_test.rb
+- app/dev/commands/circle_command.rb
+- app/dev/commands/circle_command_test.rb
+- app/dev/commands/narrative_method_command.rb
+- app/dev/commands/narrative_method_command_test.rb
 - app/dev/commands/new_command.rb
 - app/dev/commands/new_command_test.rb
+- app/dev/commands/quadratic_command.rb
+- app/dev/commands/quadratic_command_test.rb
+- app/dev/generators/bench_generator.rb
+- app/dev/generators/bench_generator/bench.rb.erb
+- app/dev/generators/bench_generator/bench_test.rb.erb
+- app/dev/generators/bench_generator_test.rb
+- app/dev/generators/command_generator.rb
+- app/dev/generators/command_generator/command.rb.erb
+- app/dev/generators/command_generator/command_test.rb.erb
+- app/dev/generators/command_generator_test.rb
+- app/dev/generators/record_generator.rb
+- app/dev/generators/record_generator_test.rb
+- app/dev/generators/request_generator.rb
+- app/dev/generators/request_generator_test.rb
 - app/dev_box.rb
 - app/happy/axos/axo.rb
 - app/happy_box.rb
@@ -105,12 +124,12 @@ files:
 - app/net/databases/redis_db_test.rb
 - app/net/databases/sqlite_db.rb
 - app/net/databases/sqlite_db_test.rb
-- app/net/models/app_model.rb
-- app/net/models/app_model_test.rb
-- app/net/models/post_model.rb
-- app/net/models/post_model_test.rb
-- app/net/models/user_model.rb
-- app/net/models/user_model_test.rb
+- app/net/records/app_record.rb
+- app/net/records/app_record_test.rb
+- app/net/records/post_record.rb
+- app/net/records/post_record_test.rb
+- app/net/records/user_record.rb
+- app/net/records/user_record_test.rb
 - app/net_box.rb
 - app/web/requests/api_request.rb
 - app/web/requests/api_request_test.rb
@@ -128,18 +147,59 @@ files:
 - exe/Gemfile.lock
 - exe/liza
 - exe/lizarb
+- exe/lrb
 - lib/app.rb
 - lib/dev_system.rb
+- lib/dev_system/dev/controllers/bench.rb
+- lib/dev_system/dev/controllers/bench/not_found_bench.rb
+- lib/dev_system/dev/controllers/bench/not_found_bench_test.rb
+- lib/dev_system/dev/controllers/bench_dsl_main_part.rb
+- lib/dev_system/dev/controllers/bench_test.rb
 - lib/dev_system/dev/controllers/command.rb
-- lib/dev_system/dev/controllers/command/dev_command.rb
-- lib/dev_system/dev/controllers/command/dev_command_test.rb
+- lib/dev_system/dev/controllers/command/bench_command.rb
+- lib/dev_system/dev/controllers/command/bench_command_test.rb
 - lib/dev_system/dev/controllers/command/echo_command.rb
 - lib/dev_system/dev/controllers/command/echo_command_test.rb
+- lib/dev_system/dev/controllers/command/generate_command.rb
+- lib/dev_system/dev/controllers/command/generate_command_test.rb
+- lib/dev_system/dev/controllers/command/not_found_command.rb
+- lib/dev_system/dev/controllers/command/not_found_command_test.rb
+- lib/dev_system/dev/controllers/command/terminal_command.rb
+- lib/dev_system/dev/controllers/command/terminal_command_test.rb
 - lib/dev_system/dev/controllers/command/test_command.rb
 - lib/dev_system/dev/controllers/command/test_command_test.rb
 - lib/dev_system/dev/controllers/command/version_command.rb
 - lib/dev_system/dev/controllers/command/version_command_test.rb
 - lib/dev_system/dev/controllers/command_test.rb
+- lib/dev_system/dev/controllers/generator.rb
+- lib/dev_system/dev/controllers/generator_dsl_main_part.rb
+- lib/dev_system/dev/controllers/generator_test.rb
+- lib/dev_system/dev/controllers/generators/app_generator.rb
+- lib/dev_system/dev/controllers/generators/app_generator_test.rb
+- lib/dev_system/dev/controllers/generators/generator_generator.rb
+- lib/dev_system/dev/controllers/generators/generator_generator/generator.rb.erb
+- lib/dev_system/dev/controllers/generators/generator_generator/generator_test.rb.erb
+- lib/dev_system/dev/controllers/generators/generator_generator/template.rb.erb
+- lib/dev_system/dev/controllers/generators/generator_generator/template_test.rb.erb
+- lib/dev_system/dev/controllers/generators/generator_generator_test.rb
+- lib/dev_system/dev/controllers/generators/not_found_generator.rb
+- lib/dev_system/dev/controllers/generators/not_found_generator_test.rb
+- lib/dev_system/dev/controllers/shell.rb
+- lib/dev_system/dev/controllers/shell/bin_shell.rb
+- lib/dev_system/dev/controllers/shell/bin_shell_test.rb
+- lib/dev_system/dev/controllers/shell/dir_shell.rb
+- lib/dev_system/dev/controllers/shell/dir_shell_test.rb
+- lib/dev_system/dev/controllers/shell/file_shell.rb
+- lib/dev_system/dev/controllers/shell/file_shell_test.rb
+- lib/dev_system/dev/controllers/shell/text_shell.rb
+- lib/dev_system/dev/controllers/shell/text_shell_test.rb
+- lib/dev_system/dev/controllers/shell_test.rb
+- lib/dev_system/dev/controllers/terminal.rb
+- lib/dev_system/dev/controllers/terminal/irb_terminal.rb
+- lib/dev_system/dev/controllers/terminal/irb_terminal_test.rb
+- lib/dev_system/dev/controllers/terminal/pry_terminal.rb
+- lib/dev_system/dev/controllers/terminal/pry_terminal_test.rb
+- lib/dev_system/dev/controllers/terminal_test.rb
 - lib/dev_system/dev/dev_box.rb
 - lib/dev_system/dev/dev_box_test.rb
 - lib/dev_system/dev/panels/command_panel.rb
@@ -152,6 +212,7 @@ files:
 - lib/happy_system/happy/happy_box.rb
 - lib/happy_system/happy/happy_box_test.rb
 - lib/happy_system/happy/panels/axo_panel.rb
+- lib/lerb.rb
 - lib/liza.rb
 - lib/liza/base/box.rb
 - lib/liza/base/box_test.rb
@@ -159,59 +220,77 @@ files:
 - lib/liza/base/controller_test.rb
 - lib/liza/base/panel.rb
 - lib/liza/base/panel_test.rb
+- lib/liza/base_parts/controller_renderer_part.rb
+- lib/liza/base_parts/controller_renderer_part_test.rb
 - lib/liza/meta/part.rb
 - lib/liza/meta/part_extension.rb
 - lib/liza/meta/part_test.rb
 - lib/liza/meta/system.rb
 - lib/liza/meta/system_test.rb
+- lib/liza/ruby_test.rb
+- lib/liza/ruby_tests/module_test.rb
+- lib/liza/ruby_tests/string_test.rb
 - lib/liza/test/test.rb
 - lib/liza/test/test_test.rb
+- lib/liza/test_parts/test_assertions_advanced_part.rb
 - lib/liza/test_parts/test_assertions_part.rb
-- lib/liza/test_parts/test_context_part.rb
 - lib/liza/test_parts/test_dsl_part.rb
+- lib/liza/test_parts/test_log_part.rb
 - lib/liza/test_parts/test_subject_part.rb
+- lib/liza/test_parts/test_tree_part.rb
 - lib/liza/unit.rb
+- lib/liza/unit_parts/unit_procedure_part.rb
+- lib/liza/unit_parts/unit_procedure_part_test.rb
 - lib/liza/unit_test.rb
 - lib/lizarb.rb
 - lib/lizarb/ruby/class.rb
+- lib/lizarb/ruby/module.rb
+- lib/lizarb/ruby/proc.rb
 - lib/lizarb/ruby/string.rb
 - lib/lizarb/ruby/time.rb
 - lib/lizarb/version.rb
 - lib/net_system.rb
 - lib/net_system/dev/net_command.rb
-- lib/net_system/net/controllers/adapter.rb
-- lib/net_system/net/controllers/adapter/redis_adapter.rb
-- lib/net_system/net/controllers/adapter/redis_adapter_test.rb
-- lib/net_system/net/controllers/adapter/sqlite_adapter.rb
-- lib/net_system/net/controllers/adapter/sqlite_adapter_test.rb
-- lib/net_system/net/controllers/adapter_test.rb
+- lib/net_system/net/controllers/client.rb
+- lib/net_system/net/controllers/client/redis_client.rb
+- lib/net_system/net/controllers/client/redis_client_test.rb
+- lib/net_system/net/controllers/client/sqlite_client.rb
+- lib/net_system/net/controllers/client/sqlite_client_test.rb
+- lib/net_system/net/controllers/client_test.rb
 - lib/net_system/net/controllers/database.rb
 - lib/net_system/net/controllers/database/redis_db.rb
 - lib/net_system/net/controllers/database/redis_db_test.rb
 - lib/net_system/net/controllers/database/sqlite_db.rb
 - lib/net_system/net/controllers/database/sqlite_db_test.rb
 - lib/net_system/net/controllers/database_test.rb
-- lib/net_system/net/controllers/model.rb
-- lib/net_system/net/controllers/model_test.rb
+- lib/net_system/net/controllers/record.rb
+- lib/net_system/net/controllers/record_test.rb
 - lib/net_system/net/net_box.rb
 - lib/net_system/net/net_box_test.rb
-- lib/net_system/net/panels/adapter_panel.rb
-- lib/net_system/net/panels/adapter_panel_test.rb
+- lib/net_system/net/panels/client_panel.rb
+- lib/net_system/net/panels/client_panel_test.rb
 - lib/net_system/net/panels/database_panel.rb
 - lib/net_system/net/panels/database_panel_test.rb
 - lib/web_system.rb
+- lib/web_system/dev/rack_command.rb
+- lib/web_system/dev/request_command.rb
 - lib/web_system/dev/web_command.rb
+- lib/web_system/web/controllers/rack.rb
+- lib/web_system/web/controllers/rack_test.rb
 - lib/web_system/web/controllers/request.rb
 - lib/web_system/web/controllers/request/client_error_request.rb
 - lib/web_system/web/controllers/request/not_found_request.rb
 - lib/web_system/web/controllers/request/server_error_request.rb
 - lib/web_system/web/controllers/request_test.rb
+- lib/web_system/web/panels/rack_panel.rb
+- lib/web_system/web/panels/rack_panel_test.rb
 - lib/web_system/web/panels/request_panel.rb
 - lib/web_system/web/panels/request_panel_test.rb
 - lib/web_system/web/web_box.rb
 - lib/web_system/web/web_box_test.rb
 - lizarb.gemspec
 - sig/lizarb.rbs
+- tmp/.gitkeep
 - web_files/favicon.ico
 - web_files/favicon.svg
 homepage: http://lizarb.org
@@ -230,14 +309,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
 summary: Application Framework

data/app/dev/commands/example_command.rb

@@ -1,57 +0,0 @@
-class ExampleCommand < AppCommand
-
-  def self.call(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-
-    class_helper_method_1(args)
-    class_helper_method_2(args)
-    class_helper_method_3(args)
-
-    command = new(args)
-    command.helper_method_1(args)
-    command.helper_method_2(args)
-    command.helper_method_3(args)
-  end
-
-  #
-
-  def self.class_helper_method_1(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    1
-  end
-
-  def self.class_helper_method_2(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    2
-  end
-
-  def self.class_helper_method_3(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    3
-  end
-
-  #
-
-  def initialize(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    @init_args = args
-  end
-
-  #
-
-  def helper_method_1(args)
-    log :higher, "Called #{self}.#{__method__} (which has @init_args #{@init_args}) with args #{args}"
-    @init_args[0]
-  end
-
-  def helper_method_2(args)
-    log :higher, "Called #{self}.#{__method__} (which has @init_args #{@init_args}) with args #{args}"
-    @init_args[1]
-  end
-
-  def helper_method_3(args)
-    log :higher, "Called #{self}.#{__method__} (which has @init_args #{@init_args}) with args #{args}"
-    @init_args[2]
-  end
-
-end

data/app/dev/commands/example_command_test.rb

@@ -1,43 +0,0 @@
-class ExampleCommandTest < AppCommandTest
-
-  test :subject_class do
-    assert subject_class == ExampleCommand
-  end
-
-  group "class methods" do
-
-    test :class_helper_method_1 do
-      assert subject_class.class_helper_method_1([]) == 1
-    end
-
-    test :class_helper_method_2 do
-      assert subject_class.class_helper_method_2([]) == 2
-    end
-
-    test :class_helper_method_3 do
-      assert subject_class.class_helper_method_3([]) == 3
-    end
-
-  end
-
-  group "instance methods" do
-
-    before do
-      @subject = subject_class.new([1, 2, 3])
-    end
-
-    test :helper_method_1 do
-      assert @subject.helper_method_1([]) == 1
-    end
-
-    test :helper_method_2 do
-      assert @subject.helper_method_2([]) == 2
-    end
-
-    test :helper_method_3 do
-      assert @subject.helper_method_3([]) == 3
-    end
-
-  end
-
-end

data/app/dev/commands/macro_child_command.rb

@@ -1,32 +0,0 @@
-class MacroChildCommand < MacroParentCommand
-
-  class_macro_method_1 :important_thing
-  class_macro_method_2 :other_thing
-  class_macro_method_3 :other_important_thing
-  class_macro_method_4 :ruby_is_awesome
-
-  #
-
-  def call(args)
-    log :higher, "Called #{self}.#{__method__} (which has @init_args #{@init_args}) with args #{args}"
-
-    if @@class_macro_3
-      @result << :YES_from_instance_call
-    else
-      @result << :NO_from_instance_call
-    end
-
-    @result << helper_method(args)
-  end
-
-  def helper_method(args)
-    log :higher, "Called #{self}.#{__method__} (which has @init_args #{@init_args}) with args #{args}"
-
-    if @@class_macro_4
-      :Yes_from_helper_method
-    else
-      :No_from_helper_method
-    end
-  end
-
-end

data/app/dev/commands/macro_child_command_test.rb

@@ -1,7 +0,0 @@
-class MacroChildCommandTest < AppCommandTest
-
-  test :subject_class do
-    assert subject_class == MacroChildCommand
-  end
-
-end

data/app/dev/commands/macro_parent_command.rb

@@ -1,70 +0,0 @@
-class MacroParentCommand < AppCommand
-
-  def self.class_macro_method_1(arg)
-    log :higher, "Called #{self}.#{__method__} with arg #{arg}"
-    @@class_macro_1 = arg
-  end
-
-  def self.class_macro_method_2(arg)
-    log :higher, "Called #{self}.#{__method__} with arg #{arg}"
-    @@class_macro_2 = arg
-  end
-
-  def self.class_macro_method_3(arg)
-    log :higher, "Called #{self}.#{__method__} with arg #{arg}"
-    @@class_macro_3 = arg
-  end
-
-  def self.class_macro_method_4(arg)
-    log :higher, "Called #{self}.#{__method__} with arg #{arg}"
-    @@class_macro_4 = arg
-  end
-
-  #
-
-  def self.call(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-
-    if @@class_macro_1
-      args << :yes_from_class_call
-    else
-      args << :no_from_class_call
-    end
-
-    command = new(args)
-    result = command.call(args)
-
-    puts <<-OUTPUT
-
-      self: #{self}
-      args: #{args}
-      command: #{command}
-      result: #{result}
-
-    OUTPUT
-  end
-
-  #
-
-  attr_reader :result
-
-  def initialize(args)
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    @init_args = args
-
-    @result = [args]
-
-    if @@class_macro_2
-      @result << :yes_from_initialize
-    else
-      @result << :no_from_initialize
-    end
-  end
-
-  #
-
-  def call(args)
-    raise NotImplementedError, "implement this on MacroChildCommand"
-  end
-
-end