lizarb 1.0.2 → 1.0.4

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

@@ -1,30 +1,71 @@
-class DevSystem
-  class CommandPanel < Liza::Panel
+class DevSystem::CommandPanel < Liza::Panel
+  class Error < StandardError; end
+  class ParseError < Error; end
 
-    def call args
-      # 1. LOG
+  def call args
+    log "args = #{args.inspect}" if get :log_details
 
-      log "call #{args}"
+    return call_not_found args if args.none?
 
-      # 2. FIND command
+    struct = parse args[0]
+    struct.command = short struct.command
+    command = find struct.command
 
-      return call_not_found args if args.none?
+    case
+    when struct.class_method
+      _call_log "#{command}.#{struct.class_method}(#{args[1..-1]})"
+      command.public_send struct.class_method, args[1..-1]
+    when struct.instance_method
+      _call_log "#{command}.new.#{struct.instance_method}(#{args[1..-1]})"
+      command.new.public_send struct.instance_method, args[1..-1]
+    when struct.method
+      if command.respond_to?(struct.method)
+        _call_log "#{command}.#{struct.method}(#{args[1..-1]})"
+        command.public_send struct.method, args[1..-1]
+      else
+        _call_log "#{command}.new.#{struct.method}(#{args[1..-1]})"
+        command.new.public_send struct.method, args[1..-1]
+      end
+    else
+      _call_log "#{command}.call(#{args[1..-1]})"
+      command.call args[1..-1]
+    end
+  rescue ParseError
+    call_not_found args
+  end
 
-      command = args[0]
+  def _call_log string
+    log "#{string}" if get :log_details
+  end
 
-      log({command:})
+  #
 
-      command_klass = Liza.const "#{command}_command"
+  PARSE_REGEX = /(?<command>[A-Za-z_]+)(?::(?<class_method>[a-z_]+))?(?:#(?<instance_method>[a-z_]+))?(?:\.(?<method>[a-z_]+))?/
 
-      # 3. CALL
+  # OpenStruct command class_method instance_method method
+  def parse string
+    md = string.to_s.match PARSE_REGEX
+    raise ParseError if md.nil?
+    hash = md.named_captures
+    log "{#{hash.map { ":#{_1}=>#{_2.to_s.inspect}" }.join(", ") }}" if get :log_details
+    OpenStruct.new hash
+  end
 
-      command_klass.call args[1..-1]
-    rescue Liza::ConstNotFound
-      call_not_found args
-    end
+  #
 
-    def call_not_found args
-      Liza::NotFoundCommand.call args
-    end
+  def find string
+    k = Liza.const "#{string}_command"
+  rescue Liza::ConstNotFound
+    k = Liza::NotFoundCommand
+  ensure
+    log k.to_s if get :log_details
+    k
   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,46 @@
-class DevSystem
-  class CommandPanelTest < Liza::PanelTest
-
-    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 :call do
-      begin
-        subject.call ["echo", 1, 2, 3]
-        assert false
-      rescue RuntimeError => e
-        assert e.message == "[1, 2, 3]"
-      end
-    end
+class DevSystem::CommandPanelTest < Liza::PanelTest
 
+  test :subject_class do
+    assert_equality subject_class, DevSystem::CommandPanel
   end
+
+  test :settings do
+    assert_equality subject_class.log_level, :normal
+    assert_equality subject_class.log_color, :green
+  end
+
+  test :parse do
+    struct = subject.parse "generate"
+    assert_equality struct.command, "generate"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, nil
+
+    struct = subject.parse "generate:install"
+    assert_equality struct.command, "generate"
+    assert_equality struct.class_method, "install"
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, nil
+
+    struct = subject.parse "generate#install"
+    assert_equality struct.command, "generate"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, "install"
+    assert_equality struct.method, nil
+
+    struct = subject.parse "generate.install"
+    assert_equality struct.command, "generate"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, "install"
+  end
+
+  test :find do
+    klass = subject.find "generate"
+    assert_equality DevSystem::GenerateCommand, klass
+
+    klass = subject.find "g"
+    assert_equality DevSystem::NotFoundCommand, klass
+  end
+
 end

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

@@ -0,0 +1,73 @@
+class DevSystem::GeneratorPanel < Liza::Panel
+  class Error < StandardError; end
+  class ParseError < Error; end
+
+  #
+
+  def call args
+    log "args = #{args}"
+    
+    return call_not_found args if args.none?
+
+    struct = parse args[0]
+    struct.generator = short struct.generator
+    generator = find struct.generator
+
+    case
+    when struct.class_method
+      _call_log "#{generator}.#{struct.class_method}(#{args[1..-1]})"
+      generator.public_send struct.class_method, args[1..-1]
+    when struct.instance_method
+      _call_log "#{generator}.new.#{struct.instance_method}(#{args[1..-1]})"
+      generator.new.public_send struct.instance_method, args[1..-1]
+    when struct.method
+      if generator.respond_to?(struct.method)
+        _call_log "#{generator}.#{struct.method}(#{args[1..-1]})"
+        generator.public_send struct.method, args[1..-1]
+      else
+        _call_log "#{generator}.new.#{struct.method}(#{args[1..-1]})"
+        generator.new.public_send struct.method, args[1..-1]
+      end
+    else
+      _call_log "#{generator}.call(#{args[1..-1]})"
+      generator.call args[1..-1]
+    end
+  rescue ParseError
+    call_not_found args
+  end
+
+  def _call_log string
+    log "#{string}" if get :log_details
+  end
+
+  #
+
+  PARSE_REGEX = /(?<generator>[a-z_]+)(?::(?<class_method>[a-z_]+))?(?:#(?<instance_method>[a-z_]+))?(?:\.(?<method>[a-z_]+))?/
+
+  # OpenStruct generator class_method instance_method method
+  def parse string
+    md = string.to_s.match PARSE_REGEX
+    raise ParseError if md.nil?
+    hash = md.named_captures
+    log "{#{hash.map { ":#{_1} => #{_2.to_s.inspect}" }.join(", ") }}" if get :log_details
+    OpenStruct.new hash
+  end
+
+  #
+
+  def find string
+    k = Liza.const "#{string}_generator"
+  rescue Liza::ConstNotFound
+    k = Liza::NotFoundGenerator
+  ensure
+    log k.to_s if get :log_details
+    k
+  end
+
+  #
+
+  def call_not_found args
+    Liza[:NotFoundGenerator].call args
+  end
+
+end

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

@@ -0,0 +1,46 @@
+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
+
+  test :parse do
+    struct = subject.parse "system"
+    assert_equality struct.generator, "system"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, nil
+
+    struct = subject.parse "system:install"
+    assert_equality struct.generator, "system"
+    assert_equality struct.class_method, "install"
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, nil
+
+    struct = subject.parse "system#install"
+    assert_equality struct.generator, "system"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, "install"
+    assert_equality struct.method, nil
+
+    struct = subject.parse "system.install"
+    assert_equality struct.generator, "system"
+    assert_equality struct.class_method, nil
+    assert_equality struct.instance_method, nil
+    assert_equality struct.method, "install"
+  end
+
+  test :find do
+    klass = subject.find "command"
+    assert_equality DevSystem::CommandGenerator, klass
+
+    klass = subject.find "c"
+    assert_equality DevSystem::NotFoundGenerator, klass
+  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 "lizarb #{Lizarb.thread_id.to_s.rjust_zeroes 3} #{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,8 @@
-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
 
+  # Configure your axo panel per the DSL in http://guides.lizarb.org/panels/axo.html
+  configure :axo do
+    # set :log_level, ENV["happy.axo.log_level"]
   end
+
 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

@@ -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