lizarb 1.0.0 → 1.0.2

data/app/net/{models/app_model_test.rb → records/post_record_test.rb}

@@ -1,7 +1,7 @@
-class AppModelTest < Liza::ModelTest
+class PostRecordTest < Liza::RecordTest
 
   test :subject_class do
-    assert subject_class == AppModel
+    assert subject_class == PostRecord
     assert subject_class.db == SqliteDb.current
   end
 

data/app/net/records/user_record.rb

@@ -0,0 +1,4 @@
+class UserRecord < AppRecord
+  set :table, :users
+
+end

data/app/net/{models/user_model_test.rb → records/user_record_test.rb}

@@ -1,7 +1,7 @@
-class UserModelTest < Liza::ModelTest
+class UserRecordTest < Liza::RecordTest
 
   test :subject_class do
-    assert subject_class == UserModel
+    assert subject_class == UserRecord
     assert subject_class.db == SqliteDb.current
   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/app/web/requests/api_request.rb

@@ -31,31 +31,32 @@ class ApiRequest < AppRequest
       body = render_route_not_found env["LIZA_PATH"]
     end
 
-    log status
+    body = body.to_json
+
     [status, headers, [body]]
   end
 
   def self.render_route_api_auth_sign_up
-    "route: render_route_api_auth_sign_up"
+    {route: "render_route_api_auth_sign_up"}
   end
 
   def self.render_route_api_auth_sign_in
-    "route: render_route_api_auth_sign_in"
+    {route: "render_route_api_auth_sign_in"}
   end
 
   def self.render_route_api_auth_account
-    "route: render_route_api_auth_account"
+    {route: "render_route_api_auth_account"}
   end
 
   def self.render_route_api_auth_sign_out
-    "route: render_route_api_auth_sign_out"
+    {route: "render_route_api_auth_sign_out"}
   end
 
   def self.render_route_api_users
-    "route: render_route_api_users"
+    {route: "render_route_api_users"}
   end
 
   def self.render_route_not_found path
-    "route: render_route_not_found #{path}"
+    {route: "render_route_not_found #{path}"}
   end
 end

data/app/web/requests/assets_request.rb

@@ -10,33 +10,32 @@ class AssetsRequest < AppRequest
 
     #
 
-    @status = 200
-    @headers = {
+    status = 200
+    headers = {
       "Framework" => "Liza #{Lizarb::VERSION}"
     }
-    @body = ""
+    body = ""
 
-    render_action_admin_format_js  if action == :admin && format == :js
-    render_action_admin_format_css if action == :admin && format == :css
-    render_action_app_format_js    if action == :app   && format == :js
-    render_action_app_format_css   if action == :app   && format == :css
+    body = render_action_admin_format_js  if action == :admin && format == :js
+    body = render_action_admin_format_css if action == :admin && format == :css
+    body = render_action_app_format_js    if action == :app   && format == :js
+    body = render_action_app_format_css   if action == :app   && format == :css
 
-    log @status
-    [@status, @headers, [@body]]
+    [status, headers, [body]]
   end
 
   # helper methods
 
   def render_action_admin_format_js
-    @body = "alert('it works')"
+    "alert('it works')"
   end
 
   def render_action_admin_format_css
-    @body = "body { background: gray }"
+    "body { background: gray }"
   end
 
   def render_action_app_format_js
-    @body = <<-CODE
+    <<-CODE
 window.onload = () => {
   var h1 = document.createElement("h1");
   h1.setAttribute("style", "color: white");
@@ -47,7 +46,7 @@ window.onload = () => {
   end
 
   def render_action_app_format_css
-    @body = <<-CODE
+    <<-CODE
 body {
 background: ##{random_color};
 font-family: Roboto;

data/app/web/requests/root_request.rb

@@ -14,14 +14,13 @@ class RootRequest < AppRequest
 
     @body = ""
 
-    if action == "root"
-      render_action_root
+    if action == "index"
+      render_action_index
     else
       @status = 404
-      render_action_not_found
+      render_action_not_found action
     end
 
-    log @status
     [@status, @headers, [@body]]
   rescue => e
     @status = 500
@@ -31,7 +30,7 @@ class RootRequest < AppRequest
     [@status, @headers, [@body]]
   end
 
-  def self.render_action_root
+  def self.render_action_index
     h1 = "Ruby Works!"
 
     @body = <<~CODE
@@ -48,8 +47,8 @@ class RootRequest < AppRequest
     CODE
   end
 
-  def self.render_action_not_found
-    @body = "Ruby couldn't find your page!"
+  def self.render_action_not_found action
+    @body = "Ruby couldn't find your page! action: #{action}"
   end
 
 end

data/app/web/requests/root_request_test.rb

@@ -6,7 +6,7 @@ class RootRequestTest < AppRequestTest
 
   test :actions, :root do
     env = {
-      "LIZA_ACTION" => "root",
+      "LIZA_ACTION" => "index",
     }
 
     status, headers, body = subject_class.call env

data/app/web_box.rb

@@ -1,5 +1,13 @@
 class WebBox < Liza::WebBox
 
+  rack do
+    # Set up 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
+  end
+
   requests do
     # Set up your request panel per the DSL in http://guides.lizarb.org/panels/request.html
 

data/app_new/Procfile

@@ -1,3 +1,3 @@
 # FOR HEROKU
 
-web: LIZA_MODE=demo bundle exec liza web h=0.0.0.0 p=$PORT
+web: LIZA_MODE=demo bundle exec liza rack h=0.0.0.0 p=$PORT

data/exe/lrb

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+load "#{__dir__}/lizarb"

data/lib/app.rb

@@ -11,6 +11,10 @@ module App
     puts s.bold
   end
 
+  def logv s
+    log s if $VERBOSE
+  end
+
   # called from "#{APP_DIR}/app"
   def call argv, &block
     instance_exec &block
@@ -48,8 +52,8 @@ module App
     loader.tag = Liza.to_s
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-    loader.collapse "#{fname_for Liza}/**/*"
-    loader.push_dir "#{fname_for Liza}", namespace: Liza
+    loader.collapse "#{Liza.source_location_radical}/**/*"
+    loader.push_dir "#{Liza.source_location_radical}", namespace: Liza
 
     loader.enable_reloading
     loader.setup
@@ -69,8 +73,8 @@ module App
 
     @systems.each do |k, klass|
       # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
-      loader.collapse "#{fname_for klass}/**/*"
-      loader.push_dir "#{fname_for klass}", namespace: klass
+      loader.collapse "#{klass.source_location_radical}/**/*"
+      loader.push_dir "#{klass.source_location_radical}", namespace: klass
     end
 
     # ORDER MATTERS: IGNORE, COLLAPSE, PUSH
@@ -83,6 +87,8 @@ module App
     @systems.each do |k, klass|
       connect_system k, klass
     end
+
+    @systems.freeze
   end
 
   # loaders
@@ -133,7 +139,10 @@ module App
   end
 
   def self.require_system key
+    t = Time.now
+    logv "App.system :#{key}"
     require key
+    logv "App.system :#{key} takes #{t.diff}s"
   rescue LoadError => e
     def e.backtrace; []; end
     raise SystemNotFound, "FILE #{key}.rb not found on $LOAD_PATH", []
@@ -142,6 +151,10 @@ module App
   # parts
 
   def connect_part part_klass, key, system
+    t = Time.now
+    string = "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
+    logv string
+
     klass = if system.nil?
               Liza.const "#{key}_part"
             else
@@ -149,8 +162,6 @@ module App
                   .const "#{key}_part"
             end
 
-    log "CONNECTING PART #{part_klass.to_s.rjust 25}.part :#{key}"
-
     if klass.insertion
       part_klass.class_exec &klass.insertion
     end
@@ -159,6 +170,7 @@ module App
       klass.const_set :Extension, Class.new(Liza::PartExtension)
       klass::Extension.class_exec &klass.extension
     end
+    logv "#{string} takes #{t.diff}s"
   end
 
   # systems
@@ -189,12 +201,4 @@ module App
     log "CONNECTING SYSTEM - #{t.diff}s for #{color_system_klass} to connect to #{registrar_index} system parts"
   end
 
-  #
-
-  def fname_for klass
-    # /path/to/liza.rb
-    # /path/to/liza
-    Object.const_source_location(klass.name)[0][0..-4]
-  end
-
 end

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

@@ -0,0 +1,29 @@
+class DevSystem
+  class NotFoundBench < Bench
+
+    def self.call args
+      # 1. LOG
+
+      log :higher, "Called #{self}.#{__method__} with args #{args}"
+      puts
+
+      # 2. FIND generators
+
+      App.eager_load_all
+      benches = Liza::Bench.descendants
+
+      log "Liza comes with #{benches.count} benches you can use."
+      puts
+
+      log "Here they are:"
+      puts
+
+      # 3. LIST benches
+
+      keys = benches.map { |k| k.last_namespace.snakecase[0..-7] }.sort
+      keys.reject! { |s| s == "not_found" }
+      keys.each { |s| log "liza bench #{s}" }
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+class DevSystem
+  class NotFoundBenchTest < BenchTest
+
+    test :subject_class do
+        assert subject_class == DevSystem::NotFoundBench
+      end
+  
+      test :settings do
+        assert subject_class.log_level == :normal
+        assert subject_class.log_color == :green
+      end
+
+  end
+end

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

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

@@ -0,0 +1,60 @@
+class DevSystem
+  class 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
+end

data/lib/dev_system/dev/controllers/{command/dev_command_test.rb → bench_test.rb}

@@ -1,8 +1,8 @@
 class DevSystem
-  class DevCommandTest < CommandTest
+  class BenchTest < Liza::ControllerTest
 
     test :subject_class do
-      assert subject_class == DevSystem::DevCommand
+      assert subject_class == DevSystem::Bench
     end
 
     test :settings do

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

@@ -0,0 +1,34 @@
+class DevSystem
+  class BenchCommand < Command
+
+    def self.call args
+      # 1. LOG
+
+      log :higher, "args: #{args}"
+      puts
+
+      # 2. FIND bench
+
+      return call_not_found args if args.none?
+
+      bench = args[0]
+
+      log({bench:})
+
+      begin
+        bench_klass = Liza.const "#{bench}_bench"
+      rescue Liza::ConstNotFound
+        bench_klass = NotFoundBench
+      end
+
+      # 3. CALL
+
+      bench_klass.call args[1..-1]
+    end
+
+    def self.call_not_found args
+      Liza::NotFoundBench.call args
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+class DevSystem
+  class BenchCommandTest < CommandTest
+
+    test :subject_class do
+      assert subject_class == DevSystem::BenchCommand
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :green
+    end
+
+  end
+end

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

@@ -0,0 +1,35 @@
+class DevSystem
+  class GenerateCommand < Command
+
+    def self.call args
+      # 1. LOG
+
+      log :higher, "args: #{args}"
+      puts
+
+      # 2. FIND generator
+
+      return call_not_found args if args.none?
+
+      generator = args[0]
+
+      log({generator:})
+
+      #
+
+      begin
+        generator_class = Liza.const "#{generator}_generator"
+      rescue Liza::ConstNotFound
+        generator_class = NotFoundGenerator
+      end
+
+      # 3. CALL
+
+      generator_class.call args[1..-1]
+    end
+
+    def self.call_not_found args
+      Liza::NotFoundGenerator.call args
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+class DevSystem
+  class GenerateCommandTest < CommandTest
+
+    test :subject_class do
+      assert subject_class == DevSystem::GenerateCommand
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :green
+    end
+
+  end
+end

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

@@ -0,0 +1,29 @@
+class DevSystem
+  class NotFoundCommand < Command
+
+    def self.call args
+      # 1. LOG
+
+      log :higher, "Called #{self}.#{__method__} with args #{args}"
+      puts
+
+      # 2. FIND commands
+
+      App.eager_load_all
+      commands = Liza::Command.descendants
+
+      log "Liza comes with #{commands.count} commands you can use."
+      puts
+
+      log "Here they are:"
+      puts
+
+      # 3. LIST commands
+
+      keys = commands.map { |k| k.last_namespace.snakecase[0..-9] }.sort
+      keys.reject! { |s| s == "not_found" }
+      keys.each { |s| log "liza #{s}" }
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+class DevSystem
+  class NotFoundCommandTest < CommandTest
+
+    test :subject_class do
+      assert subject_class == DevSystem::NotFoundCommand
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :green
+    end
+
+  end
+end

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

@@ -0,0 +1,24 @@
+class DevSystem
+  class TerminalCommand < Command
+
+    def self.call args
+      # 1. LOG
+
+      log :higher, "args: #{args}"
+      puts
+
+      # 2. FIND terminal
+
+      terminal = args[0] || "irb"
+
+      log({terminal:})
+
+      terminal_klass = Liza.const "#{terminal}_terminal"
+
+      # 3. CALL
+
+      terminal_klass.call Array(args[1..-1])
+    end
+
+  end
+end

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

@@ -0,0 +1,14 @@
+class DevSystem
+  class TerminalCommandTest < CommandTest
+
+    test :subject_class do
+      assert subject_class == DevSystem::TerminalCommand
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :green
+    end
+
+  end
+end

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

@@ -8,6 +8,10 @@ class DevSystem
 
       now = Time.now
       test_classes = Liza::Test.descendants
+      
+      if Lizarb::IS_APP_DIR
+        test_classes = test_classes.select { |tc| tc.source_location[0].include? Lizarb::APP_DIR }
+      end
 
       test_classes = _call_sort test_classes
 
@@ -34,8 +38,8 @@ class DevSystem
       tc_liza   = tc_namespaced.select &proc_liza
       tc_system = tc_namespaced.reject &proc_liza
 
-      tc_app.sort_by! { |tc| Object.const_source_location(tc.name)[0] }
-      tc_liza.sort_by! { |tc| Object.const_source_location(tc.name)[0] }
+      tc_app.sort_by! &:source_location
+      tc_liza.sort_by! &:source_location
 
       [tc_liza, tc_system, tc_app].flatten
     end

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

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