lizarb 1.0.3 → 1.0.4

data/lib/net_system/dev/net_command.rb

@@ -1,22 +1,22 @@
 class NetSystem::NetCommand < Liza::Command
 
   def self.call args
-    log :higher, "Called #{self} with args #{args}"
+    log "args = #{args.inspect}"
 
     ruby_time   = Time.now
-    redis_time  = ::NetBox.databases.redis.now
-    sqlite_time = ::NetBox.databases.sqlite.now
+    redis_time  = NetBox[:database].redis.new.now
+    sqlite_time = NetBox[:database].sqlite.new.now
     # redis_time  = ::RedisDb.current.now
     # sqlite_time = ::SqliteDb.current.now
 
-      puts <<-OUTPUT.bold
 
-          Time for Ruby:    #{ruby_time.to_s.light_red}
-          Time for Redis:   #{redis_time.to_s.light_red}
-          Time for Sqlite:  #{sqlite_time.to_s.light_red}
+    log "Time for Ruby:    #{_red ruby_time}".bold
+    log "Time for Redis:   #{_red redis_time}".bold
+    log "Time for Sqlite:  #{_red sqlite_time}".bold
+  end
 
-      OUTPUT
-    Liza::DevCommand.call []
+  def self._red s
+    s.to_s.light_red
   end
 
 end

data/lib/net_system/net/controllers/client/redis_client.rb

@@ -5,7 +5,7 @@ class NetSystem::RedisClient < NetSystem::Client
   def initialize *args
     args = [url: NetBox[:client].get(:redis_url)] if args.empty?
     log "Connecting to #{args}"
-    @conn = Redis.new *args
+    @conn = Redis.new(*args)
   end
 
   attr_reader :conn

data/lib/net_system/net/controllers/client/sqlite_client.rb

@@ -5,7 +5,7 @@ class NetSystem::SqliteClient < NetSystem::Client
   def initialize *args
     args = [NetBox[:client].get(:sqlite_path)] if args.empty?
     log "Connecting to #{args}"
-    @conn = SQLite3::Database.new *args
+    @conn = SQLite3::Database.new(*args)
   end
 
   attr_reader :conn

data/lib/net_system/net/net_box.rb

@@ -1,15 +1,13 @@
 class NetSystem::NetBox < Liza::Box
 
-  # Set up your client panel per the DSL in http://guides.lizarb.org/panels/client.html
-  panel :client do
+  # Configure your client panel per the DSL in http://guides.lizarb.org/panels/client.html
+  configure :client do
     # set :log_level, ENV["net.client.log_level"]
   end
 
-  # Set up your database panel per the DSL in http://guides.lizarb.org/panels/database.html
-  panel :database do
+  # Configure your database panel per the DSL in http://guides.lizarb.org/panels/database.html
+  configure :database do
     # set :log_level, ENV["net.database.log_level"]
   end
 
-  has_controller :client, :client
-  has_controller :database, :database
 end

data/lib/web_system/dev/rack_command.rb

@@ -1,14 +1,7 @@
 class WebSystem::RackCommand < Liza::Command
 
-  def self.call args
-    log "Called #{self}.#{__method__} with args #{args}"
-    new.call args
-  end
-
-  # instance methods
-
   def call args
-    log "Called #{self}.#{__method__} with args #{args}"
+    log "args = #{args.inspect}"
 
     strategy = nil
     host = nil

data/lib/web_system/dev/request_command.rb

@@ -2,15 +2,8 @@ class WebSystem::RequestCommand < Liza::Command
 
   VALID_ACTIONS = %w[find get post]
 
-  def self.call(args)
-    log "Called #{self}.#{__method__} with args #{args}"
-    new.call(args)
-  end
-
-  # instance methods
-
   def call(args)
-    log "Called #{self}.#{__method__} with args #{args}"
+    log "args = #{args.inspect}"
 
     @command = args.shift
     @args = args
@@ -23,8 +16,6 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def perform
-    log "Called #{self}.#{__method__}"
-    
     case @command
     when "find"
       find
@@ -36,19 +27,16 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def handle
-    log "Called #{self}.#{__method__}"
     log render "error.txt"
   end
 
   def help
-    log "Called #{self}.#{__method__}"
     log render "help.txt"
   end
 
   # actions
 
   def find
-    log "Called #{self}.#{__method__}"
     path = @args.first
 
     @env = {}
@@ -62,7 +50,6 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def get_request
-    log "Called #{self}.#{__method__}"
     path = @args.first
     
     @env = {}
@@ -75,7 +62,6 @@ class WebSystem::RequestCommand < Liza::Command
   end
 
   def post_request
-    log "Called #{self}.#{__method__}"
     path = @args.first
     
     @env = {}
@@ -96,14 +82,14 @@ end
 
 __END__
 
-# success.txt.erb
+# view success.txt.erb
 
 RESULT:
 
 class      <%= @result.class %>
 value      <%= @result %>
 
-# error.txt.erb
+# view error.txt.erb
 
 ERROR:
 
@@ -111,7 +97,7 @@ class      <%= @error.class %>
 message    <%= @error.message %>
 backtrace  <%= @error.backtrace.select { |s| @stop = true if s.include?("/exe/lizarb:"); !defined? @stop }.join "\n           " %>
 
-# help.txt.erb
+# view help.txt.erb
 
 USAGE:
 
@@ -119,7 +105,7 @@ liza request find /path/to/action.format
 liza request get /path/to/action.format
 liza request post /path/to/action.format
 
-# find.txt.erb
+# view find.txt.erb
 
 ENV:
 <% @env.each do |k, v| %>
@@ -133,7 +119,7 @@ class <%= @request_class %> < <%= @request_class.superclass %>
   # ...
 end
 
-# response.http.erb
+# view response.http.erb
 
 <%= @status %>
 <% @headers.each do |k, v| -%>

data/lib/web_system/web/panels/request_panel.rb

@@ -22,8 +22,6 @@ class WebSystem::RequestPanel < Liza::Panel
   def find env
     _prepare env
 
-    path = env["LIZA_PATH"]
-
     segments = env["LIZA_SEGMENTS"].dup
     request = segments.shift || "root"
     action  = segments.shift || "index"

data/lib/web_system/web/web_box.rb

@@ -1,7 +1,7 @@
 class WebSystem::WebBox < Liza::Box
 
-  # Set up your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
-  panel :rack do
+  # Configure your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
+  configure :rack do
     # set :log_level, ENV["web.rack.log_level"]
 
     set :files, App.root.join("web_files")
@@ -9,12 +9,10 @@ class WebSystem::WebBox < Liza::Box
     set :port, 3000
   end
 
-  # Set up your request panel per the DSL in http://guides.lizarb.org/panels/request.html
-  panel :request do
+  # Configure your request panel per the DSL in http://guides.lizarb.org/panels/request.html
+  configure :request do
     # set :log_level, ENV["web.request.log_level"]
 
   end
 
-  has_controller :rack, :rack
-  has_controller :request, :request
 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.2.0"
+  spec.required_ruby_version = ">= 3.1.0"
 
   spec.metadata = {
     "homepage_uri"    => "https://github.com/rubyonrails-brasil/lizarb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lizarb
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Thiago Pinto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-06 00:00:00.000000000 Z
+date: 2023-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -76,7 +76,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".ruby-version"
 - ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -89,34 +88,6 @@ files:
 - 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/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
@@ -140,8 +111,27 @@ files:
 - app/web/requests/root_request.rb
 - app/web/requests/root_request_test.rb
 - app/web_box.rb
-- exe/Gemfile
-- exe/Gemfile.lock
+- app_global.gemfile.rb
+- app_global.gemfile.rb.lock
+- app_global.rb
+- app_new.rb
+- app_new/dev/benches/loops_bench.rb
+- app_new/dev/benches/loops_bench_test.rb
+- app_new/dev/benches/objects_bench.rb
+- app_new/dev/benches/objects_bench_test.rb
+- app_new/dev/benches/sorted_bench.rb
+- app_new/dev/benches/sorted_bench_test.rb
+- app_new/dev/benches/variables_bench.rb
+- app_new/dev/benches/variables_bench_test.rb
+- app_new/dev/commands/calculator_command.rb
+- app_new/dev/commands/calculator_command_test.rb
+- app_new/dev/commands/circle_command.rb
+- app_new/dev/commands/circle_command_test.rb
+- app_new/dev/commands/narrative_method_command.rb
+- app_new/dev/commands/narrative_method_command_test.rb
+- app_new/dev/commands/quadratic_command.rb
+- app_new/dev/commands/quadratic_command_test.rb
+- app_new/dev_box.rb
 - exe/liza
 - exe/lizarb
 - exe/lrb
@@ -150,37 +140,50 @@ files:
 - 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/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/new_command.rb
+- lib/dev_system/dev/controllers/command/new_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/bench_generator.rb
+- lib/dev_system/dev/controllers/generators/bench_generator/controller.rb.erb
+- lib/dev_system/dev/controllers/generators/bench_generator/controller_test.rb.erb
+- lib/dev_system/dev/controllers/generators/bench_generator_test.rb
+- lib/dev_system/dev/controllers/generators/command_generator.rb
+- lib/dev_system/dev/controllers/generators/command_generator/controller.rb.erb
+- lib/dev_system/dev/controllers/generators/command_generator/controller_test.rb.erb
+- lib/dev_system/dev/controllers/generators/command_generator_test.rb
+- lib/dev_system/dev/controllers/generators/controller_generator.rb
+- lib/dev_system/dev/controllers/generators/controller_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/new_generator.rb
+- lib/dev_system/dev/controllers/generators/new_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/generators/record_generator.rb
+- lib/dev_system/dev/controllers/generators/record_generator_test.rb
+- lib/dev_system/dev/controllers/generators/request_generator.rb
+- lib/dev_system/dev/controllers/generators/request_generator_test.rb
+- lib/dev_system/dev/controllers/log.rb
+- lib/dev_system/dev/controllers/log_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
@@ -246,6 +249,8 @@ files:
 - lib/liza/unit.rb
 - lib/liza/unit_parts/unit_procedure_part.rb
 - lib/liza/unit_parts/unit_procedure_part_test.rb
+- lib/liza/unit_parts/unit_settings_part.rb
+- lib/liza/unit_parts/unit_settings_part_test.rb
 - lib/liza/unit_test.rb
 - lib/lizarb.rb
 - lib/lizarb/ruby/class.rb
@@ -314,7 +319,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.ruby-version

@@ -1 +0,0 @@
-3.2.0

data/app/dev/benches/app_bench.rb

@@ -1,5 +0,0 @@
-class AppBench < Liza::Bench
-
-  # Set up your bench controllers per the DSL in http://guides.lizarb.org/controllers/bench.html
-
-end

data/app/dev/benches/app_bench_test.rb

@@ -1,7 +0,0 @@
-class AppBenchTest < Liza::BenchTest
-
-  test :subject_class do
-    assert subject_class == AppBench
-  end
-
-end

data/app/dev/benches/loops_bench_test.rb

@@ -1,11 +0,0 @@
-class LoopsBenchTest < AppBenchTest
-
-  test :subject_class do
-    assert subject_class == LoopsBench
-  end
-
-  test :marks do
-    assert subject_class.marks.keys.count.positive?
-  end
-
-end

data/app/dev/commands/app_command.rb

@@ -1,5 +0,0 @@
-class AppCommand < Liza::Command
-
-  # Set up your command controllers per the DSL in http://guides.lizarb.org/controllers/command.html
-
-end

data/app/dev/commands/app_command_test.rb

@@ -1,7 +0,0 @@
-class AppCommandTest < Liza::CommandTest
-
-  test :subject_class do
-    assert subject_class == AppCommand
-  end
-
-end

data/app/dev/commands/new_command.rb

@@ -1,9 +0,0 @@
-class NewCommand < AppCommand
-
-  def self.call args
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-
-    Liza::GenerateCommand.call ["app", *args]
-  end
-
-end

data/app/dev/commands/new_command_test.rb

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

data/app/dev/generators/bench_generator.rb

@@ -1,18 +0,0 @@
-class BenchGenerator < Liza::Generator
-  main_dsl
-
-  FOLDER = "app/dev/benches"
-
-  generate :controller do
-    folder FOLDER
-    filename "#{name}_bench.rb"
-    content render "bench.rb"
-  end
-
-  generate :controller_test do
-    folder FOLDER
-    filename "#{name}_bench_test.rb"
-    content render "bench_test.rb"
-  end
-
-end

data/app/dev/generators/command_generator/command.rb.erb

@@ -1,26 +0,0 @@
-class <%= name.camelize %>Command < AppCommand
-
-  def self.call args
-    log :higher, "Called #{self}.#{__method__} with args #{args}"
-    new(args).call
-  end
-
-  def initialize args
-    @args = args
-  end
-
-  def call
-    log :higher, "Called #{self}.#{__method__}"
-
-    text = render "text.txt"
-
-    log :higher, "text: #{text}"
-  end
-
-end
-
-__END__
-
-# text.txt.erb
-Called <%%= self %>.<%%= __method__ %>
-@args: <%%= @args %>

data/app/dev/generators/command_generator.rb

@@ -1,18 +0,0 @@
-class CommandGenerator < Liza::Generator
-  main_dsl
-
-  FOLDER = "app/dev/commands"
-
-  generate :controller do
-    folder FOLDER
-    filename "#{name}_command.rb"
-    content render "command.rb"
-  end
-
-  generate :controller_test do
-    folder FOLDER
-    filename "#{name}_command_test.rb"
-    content render "command_test.rb"
-  end
-
-end

data/exe/Gemfile.lock

@@ -1,13 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    colorize (0.8.1)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  colorize (~> 0.8.1)
-
-BUNDLED WITH
-   2.3.9

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

@@ -1,58 +0,0 @@
-class DevSystem::BenchDslMainPart < Liza::Part
-
-  insertion do
-
-    def self.call args
-      log :higher, "Called #{self}.#{__method__} with args #{args}"
-
-      # https://rubyapi.org/3.1/o/benchmark
-      require "benchmark"
-
-      if @setup_bl
-        log "Setting up..."
-        instance_exec &@setup_bl
-        log "Set up"
-      end
-
-      log "Benchmarking #{marks.count} Ruby Blocks"
-      puts
-
-      length = marks.keys.map(&:length).max
-
-      marks.each do |label, bl|
-        log "Benchmarking #{label}"
-        marks[label] = Benchmark.measure label, &bl
-      end
-
-      puts
-
-      log "#{"Reporting".ljust_blanks(length + 17)} App CPU Time   Kernel CPU Time    Total CPU Time"
-      puts
-
-      sorted = marks.sort_by { |_k, tms| tms.total }.to_h
-
-      sorted.each.with_index do |(label, tms), i|
-        tms = tms.format "%10.6u     %10.6y         %10.6t"
-        s = "[#{i.next.to_s.rjust_zeroes 2}/#{marks.count.to_s.rjust_zeroes 2}]      #{label.rjust_blanks length}   #{tms}"
-
-        s = s.green if i == 0
-        s = s.red if i == marks.count-1
-        log s
-      end
-      puts
-      log "Done"
-    end
-
-    #
-
-    def self.marks()= @marks ||= {}
-
-    def self.mark(label, &block)= marks[label] = block
-
-    def self.setup &block
-      @setup_bl = block if block_given?
-    end
-
-  end
-
-end

data/lib/dev_system/dev/controllers/command/echo_command.rb

@@ -1,9 +0,0 @@
-class DevSystem::EchoCommand < DevSystem::Command
-
-  def self.call args
-    log :higher, "Called #{self} with args #{args}"
-
-    raise RuntimeError, args.to_s
-  end
-
-end

data/lib/dev_system/dev/controllers/command/echo_command_test.rb

@@ -1,12 +0,0 @@
-class DevSystem::EchoCommandTest < DevSystem::CommandTest
-
-  test :subject_class do
-    assert subject_class == DevSystem::EchoCommand
-  end
-
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
-end

data/lib/dev_system/dev/controllers/command/version_command.rb

@@ -1,7 +0,0 @@
-class DevSystem::VersionCommand < DevSystem::Command
-
-  def self.call args
-    puts Lizarb::VERSION
-  end
-
-end

data/lib/dev_system/dev/controllers/command/version_command_test.rb

@@ -1,12 +0,0 @@
-class DevSystem::VersionCommandTest < DevSystem::CommandTest
-
-  test :subject_class do
-    assert subject_class == DevSystem::VersionCommand
-  end
-
-  test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
-  end
-
-end