lizarb 1.0.4 → 1.0.5

data/app/net/databases/redis_db_test.rb

@@ -1,12 +1,12 @@
-class RedisDbTest < Liza::RedisDbTest
+class RedisDbTest < NetSystem::RedisDbTest
 
   test :subject_class do
     assert subject_class == RedisDb
     assert RedisDb.current.class == RedisDb
-    assert Liza::RedisDb.current.class == RedisDb
-    assert RedisDb.current == Liza::RedisDb.current
-    assert RedisDb.current.client == Liza::RedisDb.current.client
-    assert RedisDb.current.client.conn == Liza::RedisDb.current.client.conn
+    assert NetSystem::RedisDb.current.class == RedisDb
+    assert RedisDb.current == NetSystem::RedisDb.current
+    assert RedisDb.current.client == NetSystem::RedisDb.current.client
+    assert RedisDb.current.client.conn == NetSystem::RedisDb.current.client.conn
   end
 
 end

data/app/net/databases/sqlite_db.rb

@@ -1,4 +1,4 @@
-class SqliteDb < Liza::SqliteDb
+class SqliteDb < NetSystem::SqliteDb
 
   # Set up your database controllers per the DSL in http://guides.lizarb.org/controllers/database.html
 

data/app/net/databases/sqlite_db_test.rb

@@ -1,12 +1,12 @@
-class SqliteDbTest < Liza::SqliteDbTest
+class SqliteDbTest < NetSystem::SqliteDbTest
 
   test :subject_class do
     assert subject_class == SqliteDb
     # assert SqliteDb.current.class == SqliteDb
-    # assert Liza::SqliteDb.current.class == SqliteDb
-    # assert SqliteDb.current == Liza::SqliteDb.current
-    # assert SqliteDb.current.client == Liza::SqliteDb.current.client
-    # assert SqliteDb.current.client.conn == Liza::SqliteDb.current.client.conn
+    # assert NetSystem::SqliteDb.current.class == SqliteDb
+    # assert SqliteDb.current == NetSystem::SqliteDb.current
+    # assert SqliteDb.current.client == NetSystem::SqliteDb.current.client
+    # assert SqliteDb.current.client.conn == NetSystem::SqliteDb.current.client.conn
   end
 
 end

data/app/net/records/app_record.rb

@@ -1,4 +1,4 @@
-class AppRecord < Liza::Record
+class AppRecord < NetSystem::Record
   db :sqlite
 
   def self.create_tables!

data/app/net/records/app_record_test.rb

@@ -1,4 +1,4 @@
-class AppRecordTest < Liza::RecordTest
+class AppRecordTest < NetSystem::RecordTest
 
   test :subject_class do
     assert subject_class == AppRecord

data/app/net/records/post_record_test.rb

@@ -1,4 +1,4 @@
-class PostRecordTest < Liza::RecordTest
+class PostRecordTest < NetSystem::RecordTest
 
   test :subject_class do
     assert subject_class == PostRecord

data/app/net/records/user_record_test.rb

@@ -1,4 +1,4 @@
-class UserRecordTest < Liza::RecordTest
+class UserRecordTest < NetSystem::RecordTest
 
   test :subject_class do
     assert subject_class == UserRecord

data/app/net_box.rb

@@ -1,21 +1,44 @@
-class NetBox < Liza::NetBox
+class NetBox < NetSystem::NetBox
 
-  configure :client do
-    # Configure your client panel per the DSL in http://guides.lizarb.org/panels/client.html
+  # Configure your client panel
 
+  configure :client do
     set :redis_url, "redis://localhost:6379/15"
-    set :sqlite_path, "tmp/app.#{Time.now.to_i}.sqlite" if App.mode == :code
+    set :mongo_hash,  host: "localhost",
+                      port: 27017,
+                      connect: :direct,
+                      database: "app_1_#{App.mode}"
+    set :sqlite_path, "tmp/app.#{Time.now.to_i}.sqlite" if $coding
     set :sqlite_path, "app.#{App.mode}.sqlite"
+    set :mysql_hash,  host:     "localhost",
+                      port:     3306,
+                      username: "root",
+                      password: "123123123",
+                      database: "app_1_#{App.mode}"
+    set :pgsql_hash,  host:     "localhost",
+                      port:     5432,
+                      user:     "postgres",
+                      password: "postgres",
+                      dbname:   "app_1_#{App.mode}"
 
   end
 
-  configure :database do
-    # Configure your database panel per the DSL in http://guides.lizarb.org/panels/database.html
+  # Configure your database panel
 
+  configure :database do
     define :redis, RedisDb
+    define :mongo, MongoDb
     define :sql, SqliteDb
     define :sqlite, SqliteDb
+    define :mysql, MysqlDb
+    define :pgsql, PgsqlDb
 
   end
 
+  # Configure your record panel
+
+  configure :record do
+
+  end
+  
 end

data/app/web/requests/app_request.rb

@@ -1,5 +1,5 @@
 # Set up your request controllers per the DSL in http://guides.lizarb.org/controllers/request.html
 
-class AppRequest < Liza::Request
+class AppRequest < WebSystem::Request
 
 end

data/app/web/requests/app_request_test.rb

@@ -1,4 +1,4 @@
-class AppRequestTest < Liza::RequestTest
+class AppRequestTest < WebSystem::RequestTest
 
   test :subject_class do
     assert subject_class == AppRequest

data/app/web/requests/foo_request.rb

@@ -0,0 +1,26 @@
+class FooRequest < WebSystem::SimpleRequest
+
+  # GET /foo
+
+  def call_index
+    log "."
+  end
+
+  # POST /foo
+
+  def call_index!
+    log "."
+  end
+
+end
+
+__END__
+
+# view index.html.erb
+<h1><%= self.class %></h1>
+<h2><%= action %></h2>
+<p>request: <%= request %></p>
+<p>action: <%= action %></p>
+<p>format: <%= format %></p>
+<p>qs: <%= qs %></p>
+<p>segments: <%= segments %></p>

data/app/web/requests/foo_request_test.rb

@@ -0,0 +1,7 @@
+class FooRequestTest < WebSystem::SimpleRequestTest
+
+  test :subject_class do
+    assert_equality subject_class, FooRequest
+  end
+
+end

data/app/web_box.rb

@@ -1,16 +1,24 @@
-class WebBox < Liza::WebBox
+class WebBox < WebSystem::WebBox
+
+  # Configure your rack panel
 
   configure :rack do
-    # Configure your rack panel per the DSL in http://guides.lizarb.org/panels/rack.html
-    
-    # set :files, App.root.join("web_files")
-    # set :host, "localhost"
-    # set :port, 3000
+    # server (pick one, check gemfile)
+    # server :agoo
+    # server :falcon
+    # server :iodine
+    server :puma
+    # server :thin
+
+    set :files, App.root.join("web_files")
+    set :host, "localhost"
+    set :port, 3000
   end
 
-  configure :request do
-    # Configure your request panel per the DSL in http://guides.lizarb.org/panels/request.html
+  # Configure your request panel
 
+  configure :request do
+    router :simple
   end
 
 end

data/app.rb

@@ -1,16 +1,48 @@
+# ENV["VERBOSE"] ||= "1"
+
 class App
 
-  # Modes help you organize your application's behavior and settings.
+  # Choose your Application Directory
+
+  folder "app"
+  
+  # Choose your level of log opacity
+
+  # log_boot :highest
+  # log_boot :higher
+  # log_boot :high
+  # log_boot :normal # default
+  # log_boot :low
+  # log_boot :lower
+  # log_boot :lowest
 
-  mode :code
-  mode :demo
+  # Choose your level of log opacity
+
+  # log_level :highest
+  # log_level :higher
+  # log_level :high
+  # log_level :normal # default
+  # log_level :low
+  # log_level :lower
+  # log_level :lowest
+
+  # Your mode is where you get global environment variables from
+
+  # mode :code # default
+  # mode :demo
   
   # Systems help you organize your application's dependencies and RAM memory usage.
 
-  system :dev
-  system :happy
+  system :dev # default
+  system :happy if coding?
   system :net
   system :web
-
+  system :work
+  system :micro
+  system :desk
+  system :crypto
+  system :art
+  system :deep
+  system :lab
 
 end

data/app_global.gemfile.rb

@@ -2,4 +2,4 @@
 
 source "https://rubygems.org"
 
-gem "lizarb", "~> 1.0"
+gem "lizarb", "~> 1.0"

data/app_global.gemfile.rb.lock

@@ -1,13 +1,35 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     colorize (0.8.1)
+    diff-lcs (1.5.0)
     dotenv (2.8.1)
-    lizarb (1.0.4)
+    lizarb (1.0.5)
       colorize (~> 0.8)
+      diff-lcs (~> 1.5)
       dotenv (~> 2.8)
+      pry (~> 0.14.2)
+      tty-prompt (~> 0.23.1)
       zeitwerk (~> 2.6)
-    zeitwerk (2.6.8)
+    method_source (1.0.0)
+    pastel (0.8.0)
+      tty-color (~> 0.5)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    tty-color (0.6.0)
+    tty-cursor (0.7.1)
+    tty-prompt (0.23.1)
+      pastel (~> 0.8)
+      tty-reader (~> 0.8)
+    tty-reader (0.9.0)
+      tty-cursor (~> 0.7)
+      tty-screen (~> 0.8)
+      wisper (~> 2.0)
+    tty-screen (0.8.1)
+    wisper (2.0.1)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   x86_64-linux
@@ -16,4 +38,4 @@ DEPENDENCIES
   lizarb (~> 1.0)
 
 BUNDLED WITH
-   2.4.1
+   2.3.22

data/app_global.rb

@@ -1,4 +1,5 @@
 class App
+  folder "../lizarb_blank/app"
   mode :code
   system :dev
 end

data/{app_new → examples/bench/app}/dev/benches/loops_bench.rb

@@ -1,16 +1,22 @@
 class LoopsBench < SortedBench
 
+  repetitions 100
+  # repetitions 1_000
+  # repetitions 10_000
+
   setup do
-    N = 1_000_000
+    log "repetitions: #{repetitions}"
+
+    N = 1_000
     RANGE = 1..N
     ARRAY = Array RANGE
     HASH_INT = RANGE.map { |i| [i, i] }.to_h
     HASH_STR = RANGE.map { |i| ["a#{i}", i] }.to_h
     HASH_SYM = RANGE.map { |i| [:"a#{i}", i] }.to_h
-    
-    log "setup N = #{N}"
   end
 
+  #
+
   mark "for i in RANGE" do
     for i in RANGE
       a = "1"
@@ -142,6 +148,7 @@ class LoopsBench < SortedBench
     # end
   end
 
+
   mark "loop break" do
     i = 0
 

data/{app_new → examples/bench/app}/dev/benches/loops_bench_test.rb

@@ -5,8 +5,7 @@ class LoopsBenchTest < SortedBenchTest
   end
 
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
+    assert subject_class.log_level == 0
   end
 
 end

data/examples/bench/app/dev/benches/objects_bench.rb

@@ -0,0 +1,48 @@
+class ObjectsBench < SortedBench
+
+  repetitions 1_000_000
+  # repetitions 10_000_000
+  # repetitions 100_000_000
+
+  setup do
+    log "repetitions: #{repetitions}"
+  end
+  #
+
+  mark "BasicObject.new" do
+    BasicObject.new
+  end
+
+  mark "Object.new" do
+    Object.new
+  end
+
+  mark "String.new" do
+    String.new
+  end
+
+  mark "Numeric.new" do
+    Numeric.new
+  end
+
+  mark "Time.new" do
+    Time.new
+  end
+
+  mark "Proc.new {}" do
+    Proc.new {}
+  end
+
+  mark "Set.new" do
+    Set.new
+  end
+
+  mark "Array.new" do
+    Array.new
+  end
+
+  mark "Hash.new" do
+    Hash.new
+  end
+
+end

data/{app_new → examples/bench/app}/dev/benches/objects_bench_test.rb

@@ -5,8 +5,7 @@ class ObjectsBenchTest < SortedBenchTest
   end
 
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
+    assert subject_class.log_level == 0
   end
 
 end

data/{app_new → examples/bench/app}/dev/benches/sorted_bench.rb

@@ -1,25 +1,32 @@
-class SortedBench < Liza::Bench
+class SortedBench < DevSystem::Bench
 
   def self.call args
+    t = Time.now
+    
     log "args = #{args.inspect}"
 
     # https://rubyapi.org/3.1/o/benchmark
     require "benchmark"
 
+    log stick system.color, :b, (" MEASURE, DO NOT GUESS ".center 80, "-")
+    log "repetitions #{repetitions}"
+
     if @setup_bl
       log "Setting up..."
-      instance_exec &@setup_bl
-      log "Set up"
+      @setup_bl.call
     end
 
     log "Benchmarking #{marks.count} Ruby Blocks"
     puts
 
-    length = marks.keys.map(&:length).max
+    length = marks.keys.map(&:length).max || 0
 
     marks.each do |label, bl|
       log "Benchmarking #{label}"
-      marks[label] = Benchmark.measure label, &bl
+      marks[label] = Benchmark.measure label do
+        i = 0
+        bl.call while (i += 1) <= repetitions
+      end
     end
 
     puts
@@ -38,17 +45,30 @@ class SortedBench < Liza::Bench
       log s
     end
     puts
-    log "Done"
+  ensure
+    log "#{t.diff}s | #{marks.count} marks | #{repetitions} repetitions"
   end
 
   #
 
-  def self.marks()= @marks ||= {}
+  def self.repetitions n = nil
+    if n
+      @repetitions = n
+    else
+      @repetitions ||= 1
+    end
+  end
 
-  def self.mark(label, &block)= marks[label] = block
+  #
 
   def self.setup &block
     @setup_bl = block if block_given?
   end
 
+  #
+
+  def self.marks()= @marks ||= {}
+
+  def self.mark(label, &block)= marks[label] = block
+
 end

data/examples/bench/app/dev/benches/sorted_bench_test.rb

@@ -0,0 +1,11 @@
+class SortedBenchTest < DevSystem::BenchTest
+
+  test :subject_class do
+    assert_equality subject_class, SortedBench
+  end
+
+  test :settings do
+    assert_equality subject_class.log_level, 0
+  end
+
+end

data/{app_new → examples/bench/app}/dev/benches/variables_bench.rb

@@ -1,14 +1,20 @@
 class VariablesBench < SortedBench
 
   setup do
+    log "repetitions: #{repetitions}"
+    
     LETTERS = (Array("a".."z")+Array("A".."Z"))
+
     N = 1_000
     # N = 10_000
     # N = 100_000
-    
-    log "setup N = #{N}"
+    # N = 1_000_000
+    # N = 10_000_000
+    # N = 100_000_000
   end
 
+  #
+
   mark "local variable" do
     i = 0
     a = nil

data/{app_new → examples/bench/app}/dev/benches/variables_bench_test.rb

@@ -5,8 +5,7 @@ class VariablesBenchTest < SortedBenchTest
   end
 
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
+    assert subject_class.log_level == 0
   end
 
 end

data/examples/client/app/net/clients/news_client.rb

@@ -0,0 +1,42 @@
+class NewsClient < NetSystem::Client
+
+  #
+  
+  def self.ruby_news
+    new.call "https://www.ruby-lang.org/en/feeds/news.rss"
+  end
+
+  def self.ruby_weekly
+    new.call "https://cprss.s3.amazonaws.com/rubyweekly.com.xml"
+  end
+
+  #
+
+  def call url
+    t = Time.now
+    body = http_get url
+    hash = xml_to_hash body
+    log "rss channel title: #{ hash.dig :rss, :channel, :title }"
+    hash
+  ensure
+    log "#{t.diff}s to request #{url}"
+    hash
+  end
+
+  def http_get url
+    require "net/http"
+    request_uri = URI(url)
+    log "GET #{request_uri}"
+    Net::HTTP.get(request_uri)
+  end
+
+  def xml_to_hash string
+    # https://github.com/savonrb/nori
+    gem "nori"
+    gem "rexml"
+    require "nori"
+    require "rexml"
+    Nori.new(:parser => :rexml).parse string
+  end
+  
+end

data/examples/client/app/net/clients/news_client_test.rb

@@ -0,0 +1,24 @@
+class NewsClientTest < NetSystem::ClientTest
+  
+  # 
+
+  test :subject_class, :subject do
+    assert_equality NewsClient, subject_class
+    assert_equality NewsClient, subject.class
+  end
+
+  test :subject_class, :ruby_news do
+    hash = subject_class.ruby_news
+    a = hash.dig("rss", "channel", "title")
+    b = "Ruby News"
+    assert_equality a, b
+  end
+
+  test :subject_class, :ruby_weekly do
+    hash = subject_class.ruby_weekly
+    a = hash.dig("rss", "channel", "title")
+    b = "Ruby Weekly"
+    assert_equality a, b
+  end
+
+end

data/{app_new → examples/command/app}/dev/commands/calculator_command.rb

@@ -33,7 +33,7 @@ class CalculatorCommand < NarrativeMethodCommand
       when :/ then self.class.div(@a, @b)
       end
     log "RESULT: #{@result}"
-    log render "success.txt"
+    log render(:success, format: :txt)
   end
 
 end

data/{app_new → examples/command/app}/dev/commands/calculator_command_test.rb

@@ -5,8 +5,7 @@ class CalculatorCommandTest < NarrativeMethodCommandTest
   end
 
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
+    assert subject_class.log_level == 0
   end
 
   test :subject_class, :sum do

data/{app_new → examples/command/app}/dev/commands/circle_command.rb

@@ -38,7 +38,7 @@ class CircleCommand < NarrativeMethodCommand
       when :circumference then self.class.circumference(@radius)
       end
     log "RESULT: #{@result}"
-    log render "success.txt"
+    log render(:success, format: :txt)
   end
 
 end

data/{app_new → examples/command/app}/dev/commands/circle_command_test.rb

@@ -5,8 +5,7 @@ class CircleCommandTest < NarrativeMethodCommandTest
   end
 
   test :settings do
-    assert subject_class.log_level == :normal
-    assert subject_class.log_color == :green
+    assert subject_class.log_level == 0
   end
 
   test :subject_class, :area do

data/{app_new → examples/command/app}/dev/commands/narrative_method_command.rb

@@ -1,4 +1,4 @@
-class NarrativeMethodCommand < Liza::Command
+class NarrativeMethodCommand < DevSystem::Command
   class Error < StandardError; end
   class Invalid < Error; end
 
@@ -32,11 +32,11 @@ class NarrativeMethodCommand < Liza::Command
   end
 
   def handle
-    log render "error.txt"
+    log render(:error, format: :txt)
   end
 
   def help
-    log render "help.txt"
+    log render(:help, format: :txt)
   end
 end