lizarb 1.0.3 → 1.0.5

data/lib/lab_system/requests/kroki_request.rb

@@ -0,0 +1,182 @@
+class LabSystem::KrokiRequest < WebSystem::SimpleRequest
+
+  def call_index
+    @kroki_clients = []
+
+    @kroki_clients << KrokiClient.new_plantuml(:ab, :svg)
+    @kroki_clients << KrokiClient.new_nomnoml(:ab, :svg)
+
+    @kroki_clients.map &:call
+  end
+  
+  #
+
+  def call_plantuml
+    @kroki_clients = []
+    
+    @kroki_clients << KrokiClient.new_plantuml(:ab, :svg)
+
+    @kroki_clients.map &:call
+  end
+  
+  #
+
+  def call_nomnoml
+    @kroki_clients = []
+
+    @kroki_clients << KrokiClient.new_nomnoml(:ab, :svg)
+
+    @kroki_clients.map &:call
+  end
+  
+  #
+  
+  def call_plantuml_liza
+    @kroki_clients = []
+
+    Lizarb.loaders.map &:eager_load
+
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = Unit.subclasses.sort { _1.name <=> _2.name }.reverse
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Liza::System]
+      @systems_in_objects = [DevSystem, NetSystem, WebSystem]
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Liza::System]
+      @systems_in_objects = [HappySystem, LabSystem]
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Liza::System]
+      @systems_in_objects = App.systems.values
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Box]
+      @boxes = [DevBox]
+      @subs = []
+      @objects = []
+      @systems = (@boxes+@subs+@objects).map(&:system).uniq
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Box]
+      @boxes = [DevBox, NetBox, WebBox]
+      @subs = []
+      @objects = []
+      @systems = (@boxes+@subs+@objects).map(&:system).uniq
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Panel, Controller]
+      @subs = [Command, Shell]
+      @objects = []
+      @systems = (@subs+@objects).map(&:system).uniq
+    }
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Controller]
+      @subs = []
+      @objects = App.systems.values.map { _1.box.panels.values.map(&:division) }.flatten
+      @systems = (@subs+@objects).map(&:system).uniq
+    }
+
+    # NetSystem
+
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Controller]
+      @subs = []
+      @objects = [Command, Database, Client, DatabaseCommand, *Database.descendants, *Client.descendants]
+      @systems = (@subs+@objects).map(&:system).uniq
+    }
+
+    # WebSystem
+
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Controller]
+      @subs = [Command, WebSystem::Rack]
+      @objects = [RackCommand, MiddleRack, ServerRack, *MiddleRack.subclasses, *ServerRack.subclasses]
+      @systems = (@subs+@objects).map(&:system).uniq
+    }
+
+    @kroki_clients << LizaKrokiClient.new_plantuml(:liza_1, :svg) {
+      @units = [Controller]
+      @subs = []
+      @objects = [Command, Request, RequestCommand, *Request.descendants]
+      @systems = (@subs+@objects).map(&:system).uniq
+    }
+
+    @kroki_clients.map &:call
+  end
+
+end
+
+__END__
+
+# view index.html.erb
+<%= render :shared %>
+
+# view plantuml.html.erb
+<%= render :shared %>
+
+# view plantuml_liza.html.erb
+<%= render :shared %>
+
+# view nomnoml.html.erb
+<%= render :shared %>
+
+# view shared.html.erb
+<%= render :header %>
+
+<style>
+td {
+  border: 1px dashed black;
+  vertical-align: top;
+}
+td svg {
+  text-align: center;
+}
+td code {
+  text-align: left;
+}
+</style>
+
+<h3>plantuml</h3>
+
+<table>
+<tr>
+  <td>
+    template
+  </td>
+  <td>
+    code
+  </td>
+  <td>
+    SVG
+  </td>
+</tr>
+
+<% @kroki_clients.each do |kroki| %>
+<tr>
+  <td>
+    <%= kroki.action %>
+  </td>
+  <td style="min-width: 700px">
+    <code>
+    <%= kroki.code.gsub "\n", "<br/>" %>
+    </code>
+  </td>
+  <td>
+    <%= kroki.result %>
+  </td>
+</tr>
+<% end %>
+
+</table>
+
+# view header.html.erb
+
+<h1>KrokiClient</h1>
+<a href="/kroki">/kroki</a> |
+
+<a href="/kroki/plantuml">/kroki/plantuml</a> |
+<a href="/kroki/plantuml_liza">/kroki/plantuml_liza</a> |
+<a href="/kroki/nomnoml">/kroki/nomnoml</a>
+<hr/>

data/lib/lab_system/requests/kroki_request_test.rb

@@ -0,0 +1,11 @@
+class LabSystem::KrokiRequestTest < WebSystem::SimpleRequestTest
+
+  test :subject_class do
+    assert_equality subject_class, LabSystem::KrokiRequest
+  end
+
+  test :settings do
+    assert_equality subject_class.log_level, 0
+  end
+
+end

data/lib/lab_system/shells/docker_shell.rb

@@ -0,0 +1,60 @@
+class LabSystem::DockerShell < DevSystem::Shell
+
+  #
+
+  def self.hello_world
+    KernelShell.call_backticks "docker run hello-world"
+
+    true
+  end
+
+  # 
+
+  def self.hello_alpine
+    KernelShell.call_backticks "docker run alpine echo 'hello world'"
+
+    true
+  end
+
+  # 
+
+  def self.version
+    output = KernelShell.call_backticks "docker version"
+    parse_version output
+  end
+
+  def self.parse_version output
+    h = {}
+    current_section = current_sub = nil
+    
+    output.each_line do |line|
+      line = line.strip
+      next if line.empty?
+
+      if line.start_with?("Client:")
+
+        name = line.split(":", 2).last.strip
+        current_section = h["Client"] = {"Name" => name}
+        current_sub = current_section
+
+      elsif line.start_with?("Server:")
+        name = line.split(":", 2).last.strip
+        current_section = h["Server"] = {"Name" => name}
+
+      elsif current_section
+
+        if line.end_with?(":")
+          key = line.chomp(":")
+          current_sub = current_section[key] = {}
+        elsif line.include?(":")
+          key, value = line.split(":", 2).map(&:strip)
+          current_sub[key] = value
+        end
+
+      end
+    end
+
+    h
+  end
+
+end

data/lib/lab_system/shells/docker_shell_test.rb

@@ -0,0 +1,61 @@
+class LabSystem::DockerShellTest < DevSystem::ShellTest
+
+  test :subject_class do
+    assert_equality subject_class, LabSystem::DockerShell
+  end
+
+  test :settings do
+    assert_equality subject_class.log_level, 0
+  end
+
+  test :parse_version do
+    output = render :docker_version, format: :txt
+    h = subject_class.parse_version output
+
+    assert_equality h.keys, ["Client", "Server"]
+    # I mostly wanted to start a conversation about which version of docker we should be support.
+    assert_equality h.dig("Client", "Name"), "Docker Engine - Community"
+    assert_equality h.dig("Server", "Name"), "Docker Engine - Community"
+
+    assert_equality h["Client"].keys, ["Name", "Version", "API version", "Go version", "Git commit", "Built", "OS/Arch", "Context"]
+    assert_equality h["Server"].keys, ["Name", "Engine", "containerd", "runc", "docker-init"]
+    
+    assert_equality h["Server"]["Engine"].keys,      ["Version", "API version", "Go version", "Git commit", "Built", "OS/Arch", "Experimental"]
+    assert_equality h["Server"]["containerd"].keys,  ["Version", "GitCommit"]
+    assert_equality h["Server"]["runc"].keys,        ["Version", "GitCommit"]
+    assert_equality h["Server"]["docker-init"].keys, ["Version", "GitCommit"]
+  end
+
+end
+
+__END__
+
+# view docker_version.txt.erb
+
+Client: Docker Engine - Community
+ Version:           24.0.6
+ API version:       1.43
+ Go version:        go1.20.7
+ Git commit:        ed223bc
+ Built:             Mon Sep  4 12:31:44 2023
+ OS/Arch:           linux/amd64
+ Context:           default
+
+Server: Docker Engine - Community
+ Engine:
+  Version:          24.0.6
+  API version:      1.43 (minimum version 1.12)
+  Go version:       go1.20.7
+  Git commit:       1a79695
+  Built:            Mon Sep  4 12:31:44 2023
+  OS/Arch:          linux/amd64
+  Experimental:     false
+ containerd:
+  Version:          1.6.24
+  GitCommit:        61f9fd88f79f081d64d6fa3bb1a0dc71ec870523
+ runc:
+  Version:          1.1.9
+  GitCommit:        v1.1.9-0-gccaecfc
+ docker-init:
+  Version:          0.19.0
+  GitCommit:        de40ad0

data/lib/lab_system/shells/kroki_docker_shell.rb

@@ -0,0 +1,20 @@
+class LabSystem::KrokiDockerShell < LabSystem::DockerShell
+
+  #
+
+  set :port, 9001
+
+  def self.url
+    "http://localhost:#{get :port}"
+  end
+
+  def self.start_blocking_server
+    log "You can visit #{url} for your kroki server"
+
+    port = get :port
+    KernelShell.call_backticks "docker run -p#{port}:8000 yuzutech/kroki"
+
+    true
+  end
+
+end

data/lib/lab_system/shells/kroki_docker_shell_test.rb

@@ -0,0 +1,11 @@
+class LabSystem::KrokiDockerShellTest < LabSystem::DockerShellTest
+
+  test :subject_class do
+    assert_equality subject_class, LabSystem::KrokiDockerShell
+  end
+
+  test :settings do
+    assert_equality subject_class.log_level, 0
+  end
+
+end

data/lib/lab_system.rb

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

data/lib/lerb.rb

@@ -3,95 +3,141 @@
 # https://docs.ruby-lang.org/en/3.2/ERB.html
 require "erb"
 
+$LERB_VERBOSE = ENV["LERB_VERBOSE"]
+
 class LERB < ERB
   class Error < StandardError; end
   class BuildError < Error; end
   class ExecutionError < Error; end
 
-  # loaders
+  # output
 
-  def self.load path_radical
-    load_from_folder(path_radical) + load_from_file("#{path_radical}.rb")
+  def self.puts string=nil
+    super if $LERB_VERBOSE
   end
 
-  def self.load_from_file path
-    ret = []
-
-    fname = path
-    return ret unless File.exist? path
+  # loaders
 
-    lines = File.readlines fname
+  DEFAULT_KEY = "inline.txt.erb"
 
-    lineno = lines.index "__END__\n"
-    return ret if lineno.nil?
+  def self.load path_radical
+    erbs = []
 
-    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>"]
+    "#{path_radical}.rb".tap do |filename|
+      _load erbs, filename
+    end
 
-    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
+    Dir.glob("#{path_radical}.*.erb").each do |filename|
+      _load erbs, filename
     end
 
-    ret
-  end
+    Dir.glob("#{path_radical}/*.*.erb").each do |filename|
+      _load erbs, filename
+    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
+    puts "#{erbs.size} erbs".on_red
+    erbs.each do |h|
+      puts "key: #{h.key}".on_green
     end
 
-    ret
+    erbs
   end
 
-  # format
+  def self._load erbs, filename
+    is_erb = filename.end_with? ".erb"
+    is_ignoring_ruby = !is_erb
+    is_accepting_views = false
+    
+    puts
+    puts "LERB filename: #{filename}".on_red
+    
+    puts "LERB is_erb: #{is_erb}".on_red
+    puts "LERB is_ignoring_ruby: #{is_ignoring_ruby}".on_red
+    puts "LERB is_accepting_views: #{is_accepting_views}".on_red
+
+    current_lineno = 0
+    current_content = ""
+    current_key = is_erb ? filename.split("/").last : DEFAULT_KEY
+
+    if current_key
+      puts "LERB declare: #{current_key} | because not erb".green
+    end
 
-  TAG_FORMATS = %w|xml html|
+    File.readlines(filename).each.with_index do |line, lineno|
+      is_line_end = line == "__END__\n"
+
+      # stop ignoring ruby lines if line is __END__
+      # move to next line if ignoring ruby lines
+
+      if is_ignoring_ruby
+        puts "LERB ignore: #{lineno}: #{line[0..-2]}".light_black
+        if is_line_end
+          is_ignoring_ruby = false
+          is_accepting_views = true
+          current_lineno = lineno + 1
+          puts "LERB declare: #{current_key} | current".green if current_key
+        end
+        next
+      end
+
+      if is_accepting_views && line[0..6] == "# view "
+        _load_into erbs, filename, current_lineno, current_key, current_content
+        current_key = line[7..-1].strip
+        current_lineno = lineno + 1
+        current_content = ""
+        puts "LERB declare: #{current_key} | #{lineno}: #{line[0..-2]}".green
+      else
+        current_content += line
+        puts "LERB keeping: #{lineno}: #{line[0..-2]}".bold.white
+      end
+
+      if is_line_end
+        puts "LERB warning: #{lineno}: #{line[0..-2]} found! No longer accepting views".light_yellow
+        is_accepting_views = false
+      end
+    end
 
-  def tags?
-    TAG_FORMATS.include? format
+    _load_into erbs, filename, current_lineno, current_key, current_content
+
+    erbs
   end
 
-  # source
+  def self._load_into erbs, filename, lineno, key, content
+    return unless key
+    return unless key.end_with? "erb"
+    return if content.strip.empty?
 
-  SOURCES = %i|file folder|
+    content += "\n" if content[-1] != "\n"
 
-  def file?
-    @source == :file
+    erbs.push new filename, lineno, key, content
   end
 
-  def folder?
-    @source == :folder
+  # format
+
+  TAG_FORMATS = %w|xml html|
+
+  def tags?
+    TAG_FORMATS.include? format
   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
+  attr_reader :key, :name, :format
 
+  def initialize filename, lineno, key, content
     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
+    if format.gsub(/[^a-z0-9]/, "") != format
+      raise BuildError, "key '#{key}' has an invalid format '#{format}'"
+    end
 
     super content, trim_mode: TRIM_MODE
-    @source, @key, @name, @format, self.filename, self.lineno = source, key, name, format, filename, lineno
+    self.filename, self.lineno, @key, @name, @format = filename, lineno, key, name, format
   end
 
   # result

data/lib/liza/base/controller.rb

@@ -1,27 +1,26 @@
 class Liza::Controller < Liza::Unit
-  part :controller_renderer
 
-  inherited_explicitly_sets_system
+  part :controller_subsystem
 
-  def self.on_connected box_klass, panel
-    set :box, box_klass
-    set :panel, panel
-  end
+  def self.on_connected
+    token = self.last_namespace.snakecase.to_sym
+    panel = system.const("#{token}_panel").new name
 
-  def self.box
-    get :box
+    subsystem! system.box, panel
+    division!
   end
 
-  def self.panel
-    get :panel
-  end
+  def self.inherited klass
+    super
 
-  def box
-    self.class.box
+    klass.on_connected if klass.superclass == Liza::Controller
   end
 
-  def panel
-    self.class.panel
+  # color
+
+  def self.color
+    return system.color if subsystem?
+    subsystem.color
   end
 
 end

data/lib/liza/base/controller_test.rb

@@ -3,8 +3,34 @@ class Liza::ControllerTest < Liza::UnitTest
     assert subject_class == Liza::Controller
   end
 
+  test_methods_defined do
+    on_self :box, \
+      :color,
+      :division!, :division?,
+      :inherited,
+      :on_connected,
+      :panel, :plural,
+      :puts,
+      :singular,
+      :subsystem, :subsystem!, :subsystem?,
+      :token
+    on_instance :box, :panel
+  end
+
+  test :erbs_defined do
+    erbs_defined = subject_class.erbs_defined.map(&:key)
+    expected = []
+    assert_equality erbs_defined, expected
+  end
+
+  test :erbs_available do
+    erbs_available = subject_class.erbs_available.map(&:key)
+    expected = []
+    assert_equality erbs_available, expected
+  end
+
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :white
+    assert_equality subject_class.log_level, 0
   end
+
 end