lizarb 1.0.1 → 1.0.3

data/lib/dev_system/dev/controllers/terminal/pry_terminal.rb

@@ -1,12 +1,10 @@
-class DevSystem
-  class PryTerminal < Terminal
+class DevSystem::PryTerminal < DevSystem::Terminal
 
-    def self.call args
-      log :higher, "Called #{self}.#{__method__} with args #{args}"
-
-      require "pry"
-      Pry.start
-    end
+  def self.call args
+    log :higher, "Called #{self}.#{__method__} with args #{args}"
 
+    require "pry"
+    Pry.start
   end
+
 end

data/lib/dev_system/dev/controllers/terminal/pry_terminal_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class PryTerminalTest < TerminalTest
+class DevSystem::PryTerminalTest < DevSystem::TerminalTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::PryTerminal
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::PryTerminal
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/controllers/terminal.rb

@@ -1,19 +1,17 @@
-class DevSystem
-  class Terminal < Liza::Controller
+class DevSystem::Terminal < Liza::Controller
 
-    # def self.call args
-    #   new.call args
-    # end
+  # def self.call args
+  #   new.call args
+  # end
 
-    # def initialize args
-    #   @args = args
-    # end
+  # def initialize args
+  #   @args = args
+  # end
 
-    # attr_reader :args
+  # attr_reader :args
 
-    # def call args
-    #
-    # end
+  # def call args
+  #
+  # end
 
-  end
 end

data/lib/dev_system/dev/controllers/terminal_test.rb

@@ -1,14 +1,12 @@
-class DevSystem
-  class TerminalTest < Liza::ControllerTest
+class DevSystem::TerminalTest < Liza::ControllerTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::Terminal
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::Terminal
+  end
 
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
   end
+
 end

data/lib/dev_system/dev/dev_box.rb

@@ -1,22 +1,39 @@
-class DevSystem
-  class DevBox < Liza::Box
-    has_panel :command, :commands
-    has_controller :command, :commands
-    has_controller :shell, :commands
-    has_controller :bench, :commands
-    has_controller :terminal, :commands
+class DevSystem::DevBox < Liza::Box
 
-    has_panel :log, :logs
+  # Set up your bench panel per the DSL in http://guides.lizarb.org/panels/bench.html
+  panel :bench do
+    # set :log_level, ENV["dev.bench.log_level"]
+  end
+
+  # Set up your command panel per the DSL in http://guides.lizarb.org/panels/command.html
+  panel :command do
+    # set :log_level, ENV["dev.command.log_level"]
+  end
+
+  # Set up your generator panel per the DSL in http://guides.lizarb.org/panels/generator.html
+  panel :generator do
+    # set :log_level, ENV["dev.generator.log_level"]
+  end
 
-    # Set up your command panel per the DSL in http://guides.lizarb.org/panels/command.html
-    commands do
-      # set :log_level, ENV["dev.command.log_level"]
-    end
+  # Set up your command panel per the DSL in http://guides.lizarb.org/panels/log.html
+  panel :log do
+    # set :log_level, ENV["dev.log.log_level"]
+  end
 
-    # Set up your command panel per the DSL in http://guides.lizarb.org/panels/log.html
-    logs do
-      # set :log_level, ENV["dev.log.log_level"]
-    end
+  # Set up your shell panel per the DSL in http://guides.lizarb.org/panels/shell.html
+  panel :shell do
+    # set :log_level, ENV["dev.shell.log_level"]
+  end
 
+  # Set up your terminal panel per the DSL in http://guides.lizarb.org/panels/terminal.html
+  panel :terminal do
+    # set :log_level, ENV["dev.terminal.log_level"]
   end
+
+  has_controller :bench, :bench
+  has_controller :command, :command
+  has_controller :generator, :generator
+  # has_controller :log, :log
+  has_controller :shell, :shell
+  has_controller :terminal, :terminal
 end

data/lib/dev_system/dev/dev_box_test.rb

@@ -1,19 +1,17 @@
-class DevSystem
-  class DevBoxTest < Liza::BoxTest
+class DevSystem::DevBoxTest < Liza::BoxTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::DevBox
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::DevBox
+  end
 
-    test :panels do
-      assert subject_class.commands.is_a? CommandPanel
-      assert subject_class.logs.is_a? LogPanel
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
 
+  test :panels do
+    assert subject_class[:command].is_a? DevSystem::CommandPanel
+    assert subject_class[:log].is_a? DevSystem::LogPanel
   end
+
 end

data/lib/dev_system/dev/panels/bench_panel.rb

@@ -0,0 +1,3 @@
+class DevSystem::BenchPanel < Liza::Panel
+
+end

data/lib/dev_system/dev/panels/bench_panel_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::BenchPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::BenchPanel
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/panels/command_panel.rb

@@ -1,10 +1,28 @@
-class DevSystem
-  class CommandPanel < Liza::Panel
+class DevSystem::CommandPanel < Liza::Panel
 
-    def call args
-      command_klass = Liza.const "#{args[0]}_command"
-      command_klass.call args[1..-1]
-    end
+  def call args
+    # 1. LOG
 
+    log "call #{args}"
+
+    # 2. FIND command
+
+    return call_not_found args if args.none?
+
+    command = args[0]
+
+    log({command:})
+
+    command_klass = Liza.const "#{command}_command"
+
+    # 3. CALL
+
+    command_klass.call args[1..-1]
+  rescue Liza::ConstNotFound
+    call_not_found args
+  end
+
+  def call_not_found args
+    Liza::NotFoundCommand.call args
   end
 end

data/lib/dev_system/dev/panels/command_panel_test.rb

@@ -1,23 +1,21 @@
-class DevSystem
-  class CommandPanelTest < Liza::PanelTest
+class DevSystem::CommandPanelTest < Liza::PanelTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::CommandPanel
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::CommandPanel
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
 
-    test :call do
-      begin
-        subject.call ["echo", 1, 2, 3]
-        assert false
-      rescue RuntimeError => e
-        assert e.message == "[1, 2, 3]"
-      end
+  test :call do
+    begin
+      subject.call ["echo", 1, 2, 3]
+      assert false
+    rescue RuntimeError => e
+      assert e.message == "[1, 2, 3]"
     end
-
   end
+
 end

data/lib/dev_system/dev/panels/generator_panel.rb

@@ -0,0 +1,3 @@
+class DevSystem::GeneratorPanel < Liza::Panel
+
+end

data/lib/dev_system/dev/panels/generator_panel_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::GeneratorPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::GeneratorPanel
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/panels/log_panel.rb

@@ -1,10 +1,13 @@
-class DevSystem
-  class LogPanel < Liza::Panel
+class DevSystem::LogPanel < Liza::Panel
 
-    # https://rubyapi.org/3.1/o/logger
-    def call string
-      puts string
+  # https://rubyapi.org/3.1/o/logger
+  def call string
+    unless App.mode == :code
+      pid = Process.pid
+      tid = Lizarb.thread_id.to_s.rjust_zeroes 3
+      string = "#{pid} #{tid} #{string}"
     end
-
+    puts string
   end
+
 end

data/lib/dev_system/dev/panels/log_panel_test.rb

@@ -1,18 +1,16 @@
-class DevSystem
-  class LogPanelTest < Liza::PanelTest
+class DevSystem::LogPanelTest < Liza::PanelTest
 
-    test :subject_class do
-      assert subject_class == DevSystem::LogPanel
-    end
+  test :subject_class do
+    assert subject_class == DevSystem::LogPanel
+  end
 
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :green
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
 
-    # test :call do
-    #   todo "write this"
-    # end
+  # test :call do
+  #   todo "write this"
+  # end
 
-  end
 end

data/lib/dev_system/dev/panels/shell_panel.rb

@@ -0,0 +1,3 @@
+class DevSystem::ShellPanel < Liza::Panel
+
+end

data/lib/dev_system/dev/panels/shell_panel_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::ShellPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::ShellPanel
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/dev_system/dev/panels/terminal_panel.rb

@@ -0,0 +1,3 @@
+class DevSystem::TerminalPanel < Liza::Panel
+
+end

data/lib/dev_system/dev/panels/terminal_panel_test.rb

@@ -0,0 +1,12 @@
+class DevSystem::TerminalPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert subject_class == DevSystem::TerminalPanel
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/lib/happy_system/happy/controllers/axo.rb

@@ -1,8 +1,7 @@
-class HappySystem
-  class Axo < Liza::Controller
+class HappySystem::Axo < Liza::Controller
 
-    def self.call args
-      #
-    end
+  def self.call args
+    #
   end
+  
 end

data/lib/happy_system/happy/happy_box.rb

@@ -1,12 +1,9 @@
-class HappySystem
-  class HappyBox < Liza::Box
-    has_panel :axo
-    has_controller :axo
-
-    # Set up your axo panel per the DSL in http://guides.lizarb.org/panels/axo.html
-    axo do
-      # set :log_level, ENV["happy.axo.log_level"]
-    end
+class HappySystem::HappyBox < Liza::Box
 
+  # Set up your axo panel per the DSL in http://guides.lizarb.org/panels/axo.html
+  panel :axo do
+    # set :log_level, ENV["happy.axo.log_level"]
   end
+
+  has_controller :axo
 end

data/lib/happy_system/happy/happy_box_test.rb

@@ -1,18 +1,16 @@
-class HappySystem
-  class HappyBoxTest < Liza::BoxTest
+class HappySystem::HappyBoxTest < Liza::BoxTest
 
-    test :subject_class do
-      assert subject_class == HappySystem::HappyBox
-    end
-
-    test :settings do
-      assert subject_class.log_level == :normal
-      assert subject_class.log_color == :magenta
-    end
+  test :subject_class do
+    assert subject_class == HappySystem::HappyBox
+  end
 
-    test :panels do
-      assert subject_class.axo.is_a? AxoPanel
-    end
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :magenta
+  end
 
+  test :panels do
+    assert subject_class[:axo].is_a? HappySystem::AxoPanel
   end
+
 end

data/lib/happy_system/happy/panels/axo_panel.rb

@@ -1,5 +1,3 @@
-class HappySystem
-  class AxoPanel < Liza::Panel
+class HappySystem::AxoPanel < Liza::Panel
 
-  end
 end

data/lib/lerb.rb

@@ -0,0 +1,106 @@
+# frozen_string_literal: true
+
+# https://docs.ruby-lang.org/en/3.2/ERB.html
+require "erb"
+
+class LERB < ERB
+  class Error < StandardError; end
+  class BuildError < Error; end
+  class ExecutionError < Error; end
+
+  # loaders
+
+  def self.load path_radical
+    load_from_folder(path_radical) + load_from_file("#{path_radical}.rb")
+  end
+
+  def self.load_from_file path
+    ret = []
+
+    fname = path
+    return ret unless File.exist? path
+
+    lines = File.readlines fname
+
+    lineno = lines.index "__END__\n"
+    return ret if lineno.nil?
+
+    content = lines[lineno+1..-1].join
+    array = content.split(/^# (\w*).(\w*).(\w*)$/)
+    # => ["", "a", "html", "erb", "\n<html>\n<a></a>\n</html>\n", "b", "html", "erb", "\n<html>\n<b></b>\n</html>"]
+
+    while (chunk = array.pop 4; chunk.size == 4)
+      # => ["b", "html", "erb", "\n<html>\n<b></b>\n</html>"]
+      # => ["a", "html", "erb", "\n<html>\n<a></a>\n</html>\n"]
+      key = "#{chunk[0]}.#{chunk[1]}.#{chunk[2]}"
+      content = chunk[3]
+      ret.push new :file, key, content, fname, lineno
+    end
+
+    ret
+  end
+
+  def self.load_from_folder path
+    ret = []
+
+    lineno = 0
+    fnames = Dir.glob "#{path}/*.*.erb"
+    fnames.map do |fname|
+      key = fname.split("/").last
+      content = File.read fname
+      ret.push new :folder, key, content, fname, lineno
+    end
+
+    ret
+  end
+
+  # format
+
+  TAG_FORMATS = %w|xml html|
+
+  def tags?
+    TAG_FORMATS.include? format
+  end
+
+  # source
+
+  SOURCES = %i|file folder|
+
+  def file?
+    @source == :file
+  end
+
+  def folder?
+    @source == :folder
+  end
+
+  # constructor
+
+  TRIM_MODE = "<>-"
+
+  attr_reader :source, :key, :name, :format
+
+  def initialize source, key, content, filename, lineno
+    raise BuildError, "source :#{source} must be one of #{SOURCES}" unless SOURCES.include? source
+
+    segments = key.split("/").last.split(".")
+    name, format = segments[0..1]
+
+    # raise BuildError, "key '#{key}' must be formatted as <name>.<format>.erb" unless segments.count == 3
+    # raise BuildError, "key '#{key}' must be formatted as <name>.<format>.erb" unless segments[2] == "erb"
+    raise BuildError, "key '#{key}' has an invalid format '#{format}'" unless format.gsub(/[^a-z0-9]/, "") == format
+
+    super content, trim_mode: TRIM_MODE
+    @source, @key, @name, @format, self.filename, self.lineno = source, key, name, format, filename, lineno
+  end
+
+  # result
+
+  def result the_binding, receiver=:unset
+    super the_binding
+  rescue NameError => e
+    raise unless e.receiver == receiver
+    message = "ERB template for a #{e.receiver.class} instance could not find method '#{e.name}'"
+    raise ExecutionError, message, [e.backtrace[0]]
+  end
+end

data/lib/liza/base/box.rb

@@ -1,40 +1,85 @@
-module Liza
-  class Box < Unit
-    inherited_explicitly_sets_system
+class Liza::Box < Liza::Unit
+  inherited_explicitly_sets_system
 
-    def self.has_panel symbol, panel_name = symbol
-      system_klass = get :system
-      panel_class = system_klass.const "#{symbol}_panel"
+  # def self.has_panel symbol, panel_name = symbol
+  #   system_klass = get :system
+  #   panel_class = system_klass.const "#{symbol}_panel"
 
-      _has_panel_define panel_name, "get(:panels)[:#{panel_name}]"
+  #   _has_panel_define panel_name, "get(:panels)[:#{panel_name}]"
 
-      panel = panel_class.new panel_name
-      add :panels, panel_name, panel
+  #   panel = panel_class.new panel_name
+  #   add :panels, panel_name, panel
 
-      panel_class.on_connected self
-    end
+  #   panel_class.on_connected self
+  # end
 
-    def self.has_controller symbol, panel_name = symbol
-      system_klass = get :system
-      controller_class = system_klass.const symbol
+  # def self.has_controller symbol, panel_name = symbol
+  #   system_klass = get :system
+  #   controller_class = system_klass.const symbol
 
-      panel = public_send panel_name
+  #   panel = public_send panel_name
 
-      controller_class.on_connected self, panel
-    end
+  #   controller_class.on_connected self, panel
+  # end
+
+  # def self.method_missing symbol, *args, &block
+  #   if panels.has_key? symbol
+  #     panels[symbol]
+  #   else
+  #     super
+  #   end
+  # end
+
+  # def self.respond_to_missing? symbol, include_private = false
+  #   get(:panels).keys.include?(symbol) || super
+  # end
 
-    def self._has_panel_define name, resource
-      class_eval <<-CODE, __FILE__, __LINE__ + 1
+#     def self._has_panel_define name, resource
+#       class_eval <<-CODE, __FILE__, __LINE__ + 1
 
-def self.#{name} &block
-  if block_given?
-    #{resource}.instance_eval &block
-  else
-    #{resource}
+# def self.#{name} &block
+#   if block_given?
+#     #{resource}.instance_eval &block
+#   else
+#     #{resource}
+#   end
+# end
+
+#       CODE
+#     end
+
+  def self.panels
+    get :panels
+  end
+
+  def self.[] symbol
+    panels[symbol].started
   end
-end
 
-      CODE
+  def self.panel symbol, panel_class = nil, &block
+    raise ArgumentError, "block required" unless block_given?
+
+    system_class = get :system
+    panel_class ||= system_class.const "#{symbol}_panel"
+
+    if Hash(get :panels).has_key? symbol
+      panel = panels[symbol]
+    else
+      panel_class.on_connected self
+      panel = panel_class.new symbol
+      add :panels, symbol, panel
     end
+
+    panel.push block
   end
+
+  def self.has_controller symbol, panel_name = symbol
+    system_klass = get :system
+    controller_class = system_klass.const symbol
+
+    panel = self[panel_name]
+
+    controller_class.on_connected self, panel
+  end
+
 end