lizarb 1.0.3 → 1.0.4

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

@@ -1,3 +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

@@ -9,4 +9,38 @@ class DevSystem::GeneratorPanelTest < Liza::PanelTest
     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/happy_system/happy/happy_box.rb

@@ -1,9 +1,8 @@
 class HappySystem::HappyBox < Liza::Box
 
-  # Set up your axo panel per the DSL in http://guides.lizarb.org/panels/axo.html
-  panel :axo do
+  # 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
 
-  has_controller :axo
 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/box.rb

@@ -56,7 +56,7 @@ class Liza::Box < Liza::Unit
     panels[symbol].started
   end
 
-  def self.panel symbol, panel_class = nil, &block
+  def self.has_panel symbol, panel_class = nil, &block
     raise ArgumentError, "block required" unless block_given?
 
     system_class = get :system
@@ -82,4 +82,9 @@ class Liza::Box < Liza::Unit
     controller_class.on_connected self, panel
   end
 
+  def self.configure name, &block
+    has_panel name, &block
+    has_controller name, name
+  end
+
 end

data/lib/liza/base/panel.rb

@@ -13,12 +13,27 @@ class Liza::Panel < Liza::Unit
     self.class.box
   end
 
+  #
+
   def initialize key
     @key = key
     @blocks = []
     @unstarted = true
+    @short = {}
   end
 
+  #
+
+  def short a, b = nil
+    if b
+      @short[a.to_s] = b.to_s
+    else
+      @short[a.to_s] || a.to_s
+    end
+  end
+
+  #
+
   def push block
     @unstarted = true
     @blocks.push block
@@ -28,27 +43,10 @@ class Liza::Panel < Liza::Unit
     return self unless defined? @unstarted
     remove_instance_variable :@unstarted
 
-    @blocks.each { |bl| instance_eval &bl }
+    @blocks.each { |bl| instance_eval(&bl) }
     @blocks.clear
 
     self
   end
-  
-  def log log_level = :normal, string
-    raise "invalid log_level `#{log_level}`" unless LOG_LEVELS.keys.include? log_level
-    return unless log_level? log_level
-
-    source = box.to_s
-
-    x = source.size
-    source = source.bold.colorize log_color
-
-    y = source.size
-    source = "#{source}[:#{@key}]".ljust(LOG_JUST+y-x)
-
-    string = "#{source} #{string}"
-    
-    DevBox[:log].call string
-  end
 
 end

data/lib/liza/base/panel_test.rb

@@ -4,11 +4,37 @@ class Liza::PanelTest < Liza::UnitTest
   end
 
   def subject
-    subject_class.new "name"
+    @subject ||= subject_class.new "name"
   end
 
   test :settings do
     assert subject_class.log_level == :normal
     assert subject_class.log_color == :white
   end
+
+  test :short do
+    assert_equality subject.short("m"), "m"
+    assert_equality subject.short("i"), "i"
+    assert_equality subject.short("n"), "n"
+    assert_equality subject.short("s"), "s"
+    assert_equality subject.short("w"), "w"
+    assert_equality subject.short("a"), "a"
+    assert_equality subject.short("n"), "n"
+
+    subject.short :m, :matz
+    subject.short :i, :is
+    subject.short :n, :nice
+    subject.short :s, :so
+    subject.short :w, :we
+    subject.short :a, :are
+
+    assert_equality subject.short("m"), "matz"
+    assert_equality subject.short("i"), "is"
+    assert_equality subject.short("n"), "nice"
+    assert_equality subject.short("s"), "so"
+    assert_equality subject.short("w"), "we"
+    assert_equality subject.short("a"), "are"
+    assert_equality subject.short("n"), "nice"
+  end
+
 end

data/lib/liza/base_parts/controller_renderer_part.rb

@@ -93,7 +93,7 @@ Did you forget to add ERB keys?
         s = erb.result the_binding, receiver
         _log_render_out key, s.length, t.diff
         s = wrap_comment_tags s, erb if App.mode == :code && erb.tags?
-        stack.push s.strip
+        stack.push s
       end
 
       stack.pop

data/lib/liza/ruby_tests/module_test.rb

@@ -8,14 +8,14 @@ class Liza::ModuleTest < Liza::RubyTest
     assert Object.source_location == []
 
     assert Liza::Command.source_location[1] == 1
-    assert AppCommand.source_location[1] == 1
+    assert TerminalCommand.source_location[1] == 1
   end
 
   test :source_location_radical do
     assert Object.source_location_radical == nil
 
     assert Liza::Command.source_location_radical.end_with? "/lib/dev_system/dev/controllers/command"
-    assert AppCommand.source_location_radical.end_with? "/app/dev/commands/app_command"
+    assert TerminalCommand.source_location_radical.end_with? "/lib/dev_system/dev/controllers/command/terminal_command"
   end
 
 end

data/lib/liza/test/test_test.rb

@@ -74,7 +74,11 @@ class Liza::TestTest < Liza::Test
   
   group :instance_variables do
     test :instance_variables do
-      assert_equality instance_variables, [:@test_words, :@before_stack, :@after_stack, :@test_block]
+      if Shell.jruby?
+        todo "jruby!"
+      else
+        assert_equality instance_variables, [:@test_words, :@before_stack, :@after_stack, :@test_block]
+      end
     end
 
     test :test_block do

data/lib/liza/test_parts/test_assertions_part.rb

@@ -56,7 +56,7 @@ class Liza::TestAssertionsPart < Liza::Part
       block_given? || raise(ArgumentError, "No block given")
 
       _groups << block
-      instance_exec &block
+      instance_exec(&block)
       _groups.pop
 
       kaller ||= caller

data/lib/liza/test_parts/test_dsl_part.rb

@@ -40,20 +40,20 @@ class Liza::TestDslPart < Liza::Part
           log "               calling stacked before blocks #{stack.map { |bl| _log_test_block bl }}".magenta if log_test_building?
           stack.each do |bl|
             log_test_call "B&", &bl if log_test_call_block?
-            instance_exec &bl
+            instance_exec(&bl)
           end
         end
 
         bl = @test_block
         log "                         calling test block #{_log_test_block bl}".magenta if log_test_building?
         log_test_call "T&", &bl if log_test_call_block?
-        instance_exec &bl
+        instance_exec(&bl)
 
         @after_stack.each do |stack|
           log "                calling stacked after blocks #{stack.map { |bl| _log_test_block bl }}".magenta if log_test_building?
           stack.each do |bl|
             log_test_call "A&", &bl if log_test_call_block?
-            instance_exec &bl
+            instance_exec(&bl)
           end
         end
       end

data/lib/liza/test_parts/test_tree_part.rb

@@ -17,7 +17,7 @@ class Liza::TestTreePart < Liza::Part
       raise ArgumentError, "No block given" unless block_given?
       previous = test_node
       @test_node = test_node.branch_out words
-      instance_exec &block
+      instance_exec(&block)
       @test_node = previous
     end
 
@@ -28,12 +28,12 @@ class Liza::TestTreePart < Liza::Part
 
     def self.before &block
       raise ArgumentError, "No block given" unless block_given?
-      test_node.add_before &block
+      test_node.add_before(&block)
     end
 
     def self.after &block
       raise ArgumentError, "No block given" unless block_given?
-      test_node.add_after &block
+      test_node.add_after(&block)
     end
 
   end
@@ -41,7 +41,7 @@ class Liza::TestTreePart < Liza::Part
   extension do
     
     def log *args
-      self.class.solder.log *args
+      self.class.solder.log(*args)
     end
 
     def log_test_building?
@@ -50,51 +50,6 @@ class Liza::TestTreePart < Liza::Part
 
     attr_reader :tests, :parent, :children, :before_stack, :after_stack
 
-    def initialize parent, before_stack, after_stack
-      @parent = parent || self
-
-      @children, @tests = [], []
-      @before_top, @after_top = [], []
-
-      @before_stack = before_stack.push @before_top
-      @after_stack  = after_stack.unshift @after_top
-
-      @parent.children << self if @parent != self
-    end
-
-    def initialize parent, before_stack, after_stack
-      @parent = parent || self
-
-      @children, @tests, @before_top, @after_top = [], [], [], []
-
-      @before_stack = before_stack.push @before_top
-      @after_stack  = after_stack.unshift @after_top
-
-      @parent.children << self if @parent != self
-    end
-
-    def initialize parent, before_stack, after_stack
-      @parent = parent || self
-      @children, @tests = [], []
-      @parent.children << self if @parent != self
-
-      @before_top, @after_top = [], []
-      @before_stack = before_stack.push @before_top
-      @after_stack  = after_stack.unshift @after_top
-    end
-
-    def initialize parent, before_stack, after_stack
-      @tests = []
-
-      @parent = parent || self
-      @children = []
-      @parent.children << self if @parent != self
-
-      @before_top, @after_top = [], []
-      @before_stack = before_stack.push @before_top
-      @after_stack  = after_stack.unshift @after_top
-    end
-
     def initialize parent, before_stack, after_stack
       @tests = []
       initialize_parenting parent