lizarb 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c859781b1927e69f516b2b6d057b19a4e8d6603945636ce0ec7306640fbd1956
-  data.tar.gz: d5849f4bcbf610ee5a94df16dbd92feab78a4f724e2ac77eeae05e93aebfbef5
+  metadata.gz: c4e73803f6fe207c86ff2e6799e3bdbe50979bbe9fb409750c067ef6ce299c5b
+  data.tar.gz: 46c590ae60a43c0fd0b901f800da5f8761cc70baae0ace96e64a772941c6512f
 SHA512:
-  metadata.gz: 4e4ffd81acfddf2a8aadebc0fcc10911141b3a8fc55e164d050fc3c8156a7ee560a7a84133c12d19e1491ff9c720b8a6afd857b6c22bdf14844ac03550c2dc6e
-  data.tar.gz: bd421065bc059d7ebeac4d3d805e2133a18d0bb31745bc95a4b62d785f2b2368fbd80482cd2a7cac2cec03a239dc58b988844c1a234f4a0aa9a84ef99fc77256
+  metadata.gz: 1c83f9babff78a0487784c8c62bf98cf3dd44e64a01267c57bcb1bd4938c980ec09759f4069ef6819088511e25ef6e29f6acc3920ae950c71d00e43d362970c9
+  data.tar.gz: 043bbe7ac4dc5102f3a2b8b261ff13e7a8784d6217a5474b40d8110005b4060d281cf73f938172e0487564c80427d7f63f3e2c1df6c9a3b252f6fd214052070a

data/Gemfile

@@ -7,6 +7,7 @@ gemspec
 
 group :dev do
   # gems you only want to load if DevSystem is loaded
+  gem "pry", "~> 0.14.1"
 end
 
 group :happy do

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lizarb (1.0.0)
+    lizarb (1.0.1)
       colorize (~> 0.8)
       dotenv (~> 2.8)
       zeitwerk (~> 2.6)
@@ -9,10 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.3)
     colorize (0.8.1)
     connection_pool (2.3.0)
     dotenv (2.8.1)
+    method_source (1.0.0)
     nio4r (2.5.8)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     puma (5.6.5)
       nio4r (~> 2.0)
     rack (3.0.0)
@@ -24,15 +29,18 @@ GEM
       redis-client (>= 0.9.0)
     redis-client (0.10.0)
       connection_pool
-    sqlite3 (1.5.2-x86_64-linux)
+    sqlite3 (1.5.3-arm64-darwin)
+    sqlite3 (1.5.3-x86_64-linux)
     webrick (1.7.0)
     zeitwerk (2.6.1)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-linux
 
 DEPENDENCIES
   lizarb!
+  pry (~> 0.14.1)
   puma (~> 5.6)
   rack (~> 3.0)
   rackup (~> 0.2.2)

data/README.md

@@ -39,8 +39,8 @@ Try Liza to connect with Sqlite and Redis
 
 ```ruby
 
-NetBox.adapters.get :sqlite
-NetBox.adapters.get :redis_url
+NetBox.clients.get :sqlite
+NetBox.clients.get :redis_url
 
 NetBox.databases.sql
 NetBox.databases.sqlite

data/app/dev/benches/app_bench.rb

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

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

data/app/dev/benches/loops_bench.rb

@@ -0,0 +1,148 @@
+class LoopsBench < AppBench
+  main_dsl
+
+  setup do
+    N = 1_000_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
+  end
+
+  mark "for i in RANGE" do
+    for i in RANGE
+      a = "1"
+    end
+  end
+
+  mark "for i in ARRAY" do
+    for i in ARRAY
+      a = "1"
+    end
+  end
+
+  mark "for i, iv in HASH_INT" do
+    for i, iv in HASH_INT
+      a = "1"
+    end
+  end
+
+  mark "for i, iv in HASH_STR" do
+    for i, iv in HASH_STR
+      a = "1"
+    end
+  end
+
+  mark "for i, iv in HASH_SYM" do
+    for i, iv in HASH_SYM
+      a = "1"
+    end
+  end
+
+  mark "RANGE.each do |i|" do
+    RANGE.each do |i|
+      a = "1"
+    end
+  end
+
+  mark "ARRAY.each do |i|" do
+    ARRAY.each do |i|
+      a = "1"
+    end
+  end
+
+  mark "HASH_INT.each do |i, iv|" do
+    HASH_INT.each do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "HASH_STR.each do |i, iv|" do
+    HASH_STR.each do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "HASH_SYM.each do |i, iv|" do
+    HASH_SYM.each do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "RANGE.map do |i|" do
+    RANGE.map do |i|
+      a = "1"
+    end
+  end
+
+  mark "ARRAY.map do |i|" do
+    ARRAY.map do |i|
+      a = "1"
+    end
+  end
+
+  mark "HASH_INT.map do |i, iv|" do
+    HASH_INT.map do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "HASH_STR.map do |i, iv|" do
+    HASH_STR.map do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "HASH_SYM.map do |i, iv|" do
+    HASH_SYM.map do |i, iv|
+      a = "1"
+    end
+  end
+
+  mark "N.times do |i|" do
+    N.times do |i|
+      a = "1"
+    end
+  end
+
+  mark "1.upto N do |i|" do
+    1.upto N do |i|
+      a = "1"
+    end
+  end
+
+  mark "loop break" do
+    i = 0
+
+    loop do
+      a = "1"
+      break unless (i += 1) <= N
+    end
+  end
+
+  mark "while" do
+    i = 0
+
+    while (i += 1) <= N
+      a = "1"
+    end
+  end
+
+  mark "begin end while" do
+    i = 0
+
+    begin
+      a = "1"
+    end while (i += 1) <= N
+  end
+
+  mark "begin end until" do
+    i = 0
+
+    begin
+      a = "1"
+    end until (i += 1) == N
+  end
+
+end

data/app/dev/benches/loops_bench_test.rb

@@ -0,0 +1,11 @@
+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/new_command.rb

@@ -3,67 +3,7 @@ class NewCommand < AppCommand
   def self.call args
     log :higher, "Called #{self}.#{__method__} with args #{args}"
 
-    # setup
-
-    name = args.shift || "app_1"
-
-    from = "#{Lizarb::APP_DIR}/app_new"
-    to = name
-
-    return log "Directory #{to.light_green} already exists." if Dir.exist? to
-
-    log "Liza Application initializing at `#{to}`"
-
-    # init
-
-    require "fileutils"
-    FileUtils.cp_r from, to, verbose: true
-
-    `cd #{to}; git init .`
-
-    # extra
-
-    puts
-    FileUtils.mkdir_p "#{to}/app", verbose: true
-
-    FileUtils.mkdir_p "#{to}/lib", verbose: true
-    FileUtils.touch "#{to}/lib/.gitkeep", verbose: true
-    FileUtils.mkdir_p "#{to}/tmp", verbose: true
-    FileUtils.touch "#{to}/tmp/.gitkeep", verbose: true
-
-    # systems
-
-    App.systems.keys.each { |system_name| copy name, system_name }
-
-    FileUtils.rm "#{to}/app/dev/commands/new_command.rb"
-    FileUtils.rm "#{to}/app/dev/commands/new_command_test.rb"
-
-    FileUtils.cp_r "#{Lizarb::APP_DIR}/.ruby-version", "#{to}/.ruby-version", verbose: true
-    FileUtils.cp_r "#{Lizarb::APP_DIR}/README.md", "#{to}/README.md", verbose: true
-    FileUtils.cp_r "#{Lizarb::APP_DIR}/app.rb", "#{to}/app.rb", verbose: true
-    FileUtils.cp_r "#{Lizarb::APP_DIR}/app.env", "#{to}/app.env", verbose: true
-    FileUtils.cp_r "#{Lizarb::APP_DIR}/app.code.env", "#{to}/app.code.env", verbose: true
-    puts
-
-    log "Liza Application initialized at `#{to}`"
-  end
-
-  def self.copy name, system_name
-    from = "#{Lizarb::APP_DIR}/app/#{system_name}_box.rb"
-    to = "#{name}/app"
-    if File.exist? from
-      FileUtils.cp_r from, to, verbose: true
-    else
-      puts "file not found #{from}"
-    end
-
-    from = "#{Lizarb::APP_DIR}/app/#{system_name}"
-    to = "#{name}/app"
-    if File.exist? from
-      FileUtils.cp_r from, to, verbose: true
-    else
-      puts "file not found #{from}"
-    end
+    Liza::GenerateCommand.call ["app", *args]
   end
 
 end

data/app/dev/generators/bench_generator.rb

@@ -0,0 +1,67 @@
+class BenchGenerator < Liza::Generator
+  main_dsl
+
+  FOLDER = "app/dev/benches"
+
+  generate :controller do
+    folder FOLDER
+    filename "#{name}_bench.rb"
+    content bench_content
+  end
+
+  generate :controller_test do
+    folder FOLDER
+    filename "#{name}_bench_test.rb"
+    content bench_test_content
+  end
+
+  # helper methods
+
+  def bench_content
+    <<~CODE
+class #{name.camelize}Bench < AppBench
+
+  main_dsl
+
+  setup do
+    N = 1_000_000
+  end
+
+  mark "alternative 1" do
+    i = 0
+
+    while (i += 1) <= N
+      a = "1".to_sym
+    end
+  end
+
+  mark "alternative 2" do
+    i = 0
+
+    while (i += 1) <= N
+      a = :"1"
+    end
+  end
+
+end
+    CODE
+  end
+
+  def bench_test_content
+    <<~CODE
+class #{name.camelize}BenchTest < Liza::BenchTest
+
+  test :subject_class do
+    assert subject_class == #{name.camelize}Bench
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end
+    CODE
+  end
+
+end

data/app/dev/generators/bench_generator_test.rb

@@ -0,0 +1,12 @@
+class BenchGeneratorTest < Liza::GeneratorTest
+
+  test :subject_class do
+    assert subject_class == BenchGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/dev/generators/command_generator.rb

@@ -0,0 +1,51 @@
+class CommandGenerator < Liza::Generator
+  main_dsl
+
+  FOLDER = "app/dev/commands"
+
+  generate :controller do
+    folder FOLDER
+    filename "#{name}_command.rb"
+    content command_content
+  end
+
+  generate :controller_test do
+    folder FOLDER
+    filename "#{name}_command_test.rb"
+    content command_test_content
+  end
+
+  # helper methods
+
+  def command_content
+    <<~CODE
+class #{name.camelize}Command < Liza::Command
+
+  def self.call args
+    log :higher, "Called \#{self}.\#{__method__} with args \#{args}"
+
+    #
+  end
+
+end
+    CODE
+  end
+
+  def command_test_content
+    <<~CODE
+class #{name.camelize}CommandTest < Liza::CommandTest
+
+  test :subject_class do
+    assert subject_class == #{name.camelize}Command
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end
+    CODE
+  end
+
+end

data/app/dev/generators/command_generator_test.rb

@@ -0,0 +1,12 @@
+class CommandGeneratorTest < Liza::GeneratorTest
+
+  test :subject_class do
+    assert subject_class == CommandGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/dev/generators/model_generator.rb

@@ -0,0 +1,46 @@
+class ModelGenerator < Liza::Generator
+  main_dsl
+
+  FOLDER = "app/net/models"
+
+  generate :controller do
+    folder FOLDER
+    filename "#{name}_model.rb"
+    content model_content name
+  end
+
+  generate :controller_test do
+    folder FOLDER
+    filename "#{name}_model_test.rb"
+    content model_test_content name
+  end
+
+  # helper methods
+
+  def model_content name
+    <<~CODE
+class #{name.camelize}Model < AppModel
+  set :table, :#{name}s
+
+end
+    CODE
+  end
+
+  def model_test_content name
+    <<~CODE
+class #{name.camelize}ModelTest < Liza::ModelTest
+
+  test :subject_class do
+    assert subject_class == #{name.camelize}Model
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :red
+  end
+
+end
+    CODE
+  end
+
+end

data/app/dev/generators/model_generator_test.rb

@@ -0,0 +1,12 @@
+class ModelGeneratorTest < Liza::GeneratorTest
+
+  test :subject_class do
+    assert subject_class == ModelGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/dev/generators/request_generator.rb

@@ -0,0 +1,63 @@
+class RequestGenerator < Liza::Generator
+  main_dsl
+
+  FOLDER = "app/web/requests"
+
+  generate :controller do
+    folder "app/web/requests"
+    filename "#{name}_request.rb"
+    content request_content name
+  end
+
+  generate :controller_test do
+    folder "app/web/requests"
+    filename "#{name}_request_test.rb"
+    content request_test_content name
+  end
+
+  # helper methods
+
+  def request_content name
+    <<~CODE
+class #{name.camelize}Request < Liza::Request
+
+  def self.call env
+    path = env["REQUEST_PATH"]
+    log :higher, "Called \#{self}.\#{__method__} with path \#{path}"
+
+    #
+
+    status = 200
+    headers = {
+      "Framework" => "Liza \#{Lizarb::VERSION}"
+    }
+    body = "It works!"
+
+    #
+
+    log status
+    [status, headers, [body]]
+  end
+
+end
+    CODE
+  end
+
+  def request_test_content name
+    <<~CODE
+class #{name.camelize}RequestTest < Liza::RequestTest
+
+  test :subject_class do
+    assert subject_class == #{name.camelize}Request
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :blue
+  end
+
+end
+    CODE
+  end
+
+end

data/app/dev/generators/request_generator_test.rb

@@ -0,0 +1,12 @@
+class RequestGeneratorTest < Liza::GeneratorTest
+
+  test :subject_class do
+    assert subject_class == RequestGenerator
+  end
+
+  test :settings do
+    assert subject_class.log_level == :normal
+    assert subject_class.log_color == :green
+  end
+
+end

data/app/net/databases/redis_db_test.rb

@@ -5,8 +5,8 @@ class RedisDbTest < Liza::RedisDbTest
     assert RedisDb.current.class == RedisDb
     assert Liza::RedisDb.current.class == RedisDb
     assert RedisDb.current == Liza::RedisDb.current
-    assert RedisDb.current.adapter == Liza::RedisDb.current.adapter
-    assert RedisDb.current.adapter.conn == Liza::RedisDb.current.adapter.conn
+    assert RedisDb.current.client == Liza::RedisDb.current.client
+    assert RedisDb.current.client.conn == Liza::RedisDb.current.client.conn
   end
 
 end

data/app/net/databases/sqlite_db_test.rb

@@ -5,8 +5,8 @@ class SqliteDbTest < Liza::SqliteDbTest
     assert SqliteDb.current.class == SqliteDb
     assert Liza::SqliteDb.current.class == SqliteDb
     assert SqliteDb.current == Liza::SqliteDb.current
-    assert SqliteDb.current.adapter == Liza::SqliteDb.current.adapter
-    assert SqliteDb.current.adapter.conn == Liza::SqliteDb.current.adapter.conn
+    assert SqliteDb.current.client == Liza::SqliteDb.current.client
+    assert SqliteDb.current.client.conn == Liza::SqliteDb.current.client.conn
   end
 
 end

data/app/net_box.rb

@@ -1,7 +1,7 @@
 class NetBox < Liza::NetBox
 
-  adapters do
-    # Set up your adapter panel per the DSL in http://guides.lizarb.org/panels/adapter.html
+  clients do
+    # Set up your client panel per the DSL in http://guides.lizarb.org/panels/client.html
 
     set :redis_url, "redis://localhost:6379/15"
     set :sqlite, "tmp/app.#{Time.now.to_i}.sqlite" if App.mode == :code

data/lib/app.rb

@@ -149,7 +149,7 @@ module App
                   .const "#{key}_part"
             end
 
-    log "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
+    log "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}" if $VERBOSE
 
     if klass.insertion
       part_klass.class_exec &klass.insertion

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

@@ -0,0 +1,11 @@
+class DevSystem
+  class Bench < Liza::Controller
+
+    # DSLS
+
+    def self.main_dsl
+      part :"bench_dsl_main", system: :dev
+    end
+
+  end
+end