lizarb 1.0.0 → 1.0.2

data/lib/lizarb.rb

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
 require "colorize"
+require "json"
 require "pathname"
 require "zeitwerk"
+require "lerb"
 
 require_relative "lizarb/version"
 
@@ -11,7 +13,8 @@ module Lizarb
 
   #
 
-  GEM_DIR = Gem::Specification.find_by_name("lizarb").gem_dir
+  SPEC    = Gem::Specification.find_by_name("lizarb")
+  GEM_DIR = SPEC.gem_dir
   CUR_DIR = Dir.pwd
 
   IS_APP_DIR = File.file? "#{CUR_DIR}/app.rb"
@@ -36,7 +39,10 @@ module Lizarb
 
     require "#{APP_DIR}/app"
 
-    VERSION
+    versions = {ruby: RUBY_VERSION, bundler: Bundler::VERSION, zeitwerk: Zeitwerk::VERSION, lizarb: VERSION}
+    bugs = SPEC.metadata["bug_tracker_uri"]
+    puts versions.to_s.green
+    puts "Report bugs at #{bugs}"
   end
 
   # called from "#{APP_DIR}/app"
@@ -65,4 +71,20 @@ module Lizarb
                   : "#{GEM_DIR}/exe/Gemfile"
   end
 
+  # threads
+
+  def thread_object_id
+    Thread.current.object_id
+  end
+
+  @thread_ids = {thread_object_id => 0}
+  @thread_ids_mutex = Mutex.new
+
+  def thread_id
+    @thread_ids[thread_object_id] ||=
+      @thread_ids_mutex.synchronize do
+        @thread_ids.count
+      end
+  end
+
 end

data/lib/net_system/net/controllers/{adapter/redis_adapter.rb → client/redis_client.rb}

@@ -1,10 +1,10 @@
 class NetSystem
-  class RedisAdapter < Adapter
+  class RedisClient < Client
 
     # https://redis.io/
     # https://github.com/redis/redis-rb
     def initialize *args
-      args = [url: Liza.const(:net_box).adapters.get(:redis_url)] if args.empty?
+      args = [url: Liza.const(:net_box).clients.get(:redis_url)] if args.empty?
       log "Connecting to #{args}"
       @conn = Redis.new *args
     end

data/lib/net_system/net/controllers/{adapter/redis_adapter_test.rb → client/redis_client_test.rb}

@@ -1,12 +1,12 @@
 class NetSystem
-  class RedisAdapterTest < AdapterTest
+  class RedisClientTest < ClientTest
 
     def subject
       @subject ||= subject_class.new
     end
 
     test :subject_class do
-      assert subject_class == Liza::RedisAdapter
+      assert subject_class == Liza::RedisClient
     end
 
     test :subject do

data/lib/net_system/net/controllers/{adapter/sqlite_adapter.rb → client/sqlite_client.rb}

@@ -1,10 +1,10 @@
 class NetSystem
-  class SqliteAdapter < Adapter
+  class SqliteClient < Client
 
     # https://www.sqlite.org/
     # https://github.com/sparklemotion/sqlite3-ruby
     def initialize *args
-      args = [Liza.const(:net_box).adapters.get(:sqlite)] if args.empty?
+      args = [Liza.const(:net_box).clients.get(:sqlite)] if args.empty?
       log "Connecting to #{args}"
       @conn = SQLite3::Database.new *args
     end

data/lib/net_system/net/controllers/{adapter/sqlite_adapter_test.rb → client/sqlite_client_test.rb}

@@ -1,12 +1,12 @@
 class NetSystem
-  class SqliteAdapterTest < AdapterTest
+  class SqliteClientTest < ClientTest
 
     def subject
       @subject ||= subject_class.new ":memory:"
     end
 
     test :subject_class do
-      assert subject_class == Liza::SqliteAdapter
+      assert subject_class == Liza::SqliteClient
     end
 
     test :subject do

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

@@ -0,0 +1,5 @@
+class NetSystem
+  class Client < Liza::Controller
+
+  end
+end

data/lib/net_system/net/controllers/{model_test.rb → client_test.rb}

@@ -1,8 +1,8 @@
 class NetSystem
-  class ModelTest < Liza::ControllerTest
+  class ClientTest < Liza::ControllerTest
 
     test :subject_class do
-      assert subject_class == NetSystem::Model
+      assert subject_class == NetSystem::Client
     end
 
     test :settings do

data/lib/net_system/net/controllers/database/redis_db.rb

@@ -1,9 +1,9 @@
 class NetSystem
   class RedisDb < Database
-    set_adapter :redis
+    set_client :redis
 
     def now
-      array = adapter.now
+      array = client.now
       Time.at array[0]
     end
 

data/lib/net_system/net/controllers/database/redis_db_test.rb

@@ -6,7 +6,7 @@ class NetSystem
     end
 
     test :subject do
-      assert subject.adapter.class == NetSystem::RedisAdapter
+      assert subject.client.class == NetSystem::RedisClient
     end
 
     test :now do

data/lib/net_system/net/controllers/database/sqlite_db.rb

@@ -1,9 +1,9 @@
 class NetSystem
   class SqliteDb < Database
-    set_adapter :sqlite
+    set_client :sqlite
 
     def now
-      array = adapter.now
+      array = client.now
       Time.parse array[1][0]
     end
 

data/lib/net_system/net/controllers/database/sqlite_db_test.rb

@@ -6,7 +6,7 @@ class NetSystem
     end
 
     test :subject do
-      assert subject.adapter.class == NetSystem::SqliteAdapter
+      assert subject.client.class == NetSystem::SqliteClient
     end
 
     test :now do

data/lib/net_system/net/controllers/database.rb

@@ -9,14 +9,14 @@ class NetSystem
       raise "please rename #{sub.name} to #{sub.name}Db"
     end
 
-    attr_reader :adapter
+    attr_reader :client
 
-    def initialize adapter: get(:adapter).new
-      @adapter = adapter
+    def initialize client: get(:client).new
+      @client = client
     end
 
-    def self.set_adapter adapter_id
-      set :adapter, Liza.const("#{adapter_id}_adapter")
+    def self.set_client client_id
+      set :client, Liza.const("#{client_id}_client")
     end
 
     def self.current
@@ -27,7 +27,7 @@ class NetSystem
     end
 
     def self.call(...); current.call(...); end
-    def call(...); @adapter.call(...); end
+    def call(...); @client.call(...); end
 
   end
 end

data/lib/net_system/net/controllers/record.rb

@@ -0,0 +1,31 @@
+class NetSystem
+  class Record < Liza::Controller
+
+    def self.inherited sub
+      super
+
+      return if sub.name.nil?
+      return if sub.name.end_with? "Record"
+      raise "please rename #{sub.name} to #{sub.name}Record"
+    end
+
+    def self.db database_id = nil
+      if database_id.nil?
+        db = get :db
+        if db
+          Liza.const(:NetBox).databases.get db
+        else
+          raise "please set a db to record #{self}"
+        end
+      else
+        valid = Liza.const(:NetBox).databases.settings.keys
+        if valid.include? database_id
+          set :db, database_id
+        else
+          raise "invalid db `#{database_id}`, valid options are #{valid}"
+        end
+      end
+    end
+
+  end
+end

data/lib/net_system/net/controllers/{adapter_test.rb → record_test.rb}

@@ -1,8 +1,8 @@
 class NetSystem
-  class AdapterTest < Liza::ControllerTest
+  class RecordTest < Liza::ControllerTest
 
     test :subject_class do
-      assert subject_class == NetSystem::Adapter
+      assert subject_class == NetSystem::Record
     end
 
     test :settings do

data/lib/net_system/net/net_box.rb

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

data/lib/net_system/net/net_box_test.rb

@@ -11,7 +11,7 @@ class NetSystem
     end
 
     test :panels do
-      assert subject_class.adapters.is_a? AdapterPanel
+      assert subject_class.clients.is_a? ClientPanel
       assert subject_class.databases.is_a? DatabasePanel
     end
 

data/lib/net_system/net/panels/client_panel.rb

@@ -0,0 +1,5 @@
+class NetSystem
+  class ClientPanel < Liza::Panel
+
+  end
+end

data/lib/net_system/net/panels/{adapter_panel_test.rb → client_panel_test.rb}

@@ -1,8 +1,8 @@
 class NetSystem
-  class AdapterPanelTest < Liza::PanelTest
+  class ClientPanelTest < Liza::PanelTest
 
     test :subject_class do
-      assert subject_class == NetSystem::AdapterPanel
+      assert subject_class == NetSystem::ClientPanel
     end
 
     test :settings do

data/lib/web_system/dev/rack_command.rb

@@ -0,0 +1,26 @@
+class WebSystem
+  class RackCommand < Liza::Command
+
+    def self.call args
+      log "args #{args}"
+
+      strategy = nil
+      host = nil
+      port = nil
+
+      if args.any? && !args[0].include?("=")
+        strategy = args.shift
+      end
+
+      args.each do |arg|
+        host = arg.split("=")[1] if arg.start_with? "h="
+        port = arg.split("=")[1] if arg.start_with? "p="
+      end
+
+      log({strategy:, host:, port:})
+      
+      Liza.const(:web_box).rack.call strategy, host, port
+    end
+
+  end
+end

data/lib/web_system/dev/request_command.rb

@@ -0,0 +1,143 @@
+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}"
+
+    @command = args.shift
+    @args = args
+    
+    return help unless VALID_ACTIONS.include? @command
+    perform
+  rescue StandardError => error
+    @error = error
+    handle
+  end
+
+  def perform
+    log "Called #{self}.#{__method__}"
+    
+    case @command
+    when "find"
+      find
+    when "get"
+      get_request
+    when "post"
+      post_request
+    end
+  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 = {}
+    @env["REQUEST_PATH"] = path
+
+    request_panel.find @env
+
+    @request_class = @env["LIZA_REQUEST_CLASS"]
+
+    puts render "find.txt"
+  end
+
+  def get_request
+    log "Called #{self}.#{__method__}"
+    path = @args.first
+    
+    @env = {}
+    @env["REQUEST_METHOD"] = "GET"
+    @env["REQUEST_PATH"]   = path
+
+    @status, @headers, @body = request_panel.call @env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render "response.http"
+  end
+
+  def post_request
+    log "Called #{self}.#{__method__}"
+    path = @args.first
+    
+    @env = {}
+    @env["REQUEST_METHOD"] = "POST"
+    @env["REQUEST_PATH"]   = path
+
+    @status, @headers, @body = request_panel.call @env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render "response.http"
+  end
+
+  # helpers
+
+  def request_panel
+    Liza.const(:web_box).requests
+  end
+end
+
+__END__
+
+# success.txt.erb
+
+RESULT:
+
+class      <%= @result.class %>
+value      <%= @result %>
+
+# error.txt.erb
+
+ERROR:
+
+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
+
+USAGE:
+
+liza request find /path/to/action.format
+liza request get /path/to/action.format
+liza request post /path/to/action.format
+
+# find.txt.erb
+
+ENV:
+<% @env.each do |k, v| %>
+env["<%= k %>"] = <%= v.inspect -%>
+<% end %>
+
+REQUEST CLASS:
+
+# <%= @request_class.source_location.join ":" %>
+class <%= @request_class %> < <%= @request_class.superclass %>
+  # ...
+end
+
+# response.http.erb
+
+<%= @status %>
+<% @headers.each do |k, v| -%>
+<%= k %>: <%= v %>
+<% end -%>
+
+<%= @body.first %>

data/lib/web_system/dev/web_command.rb

@@ -1,41 +1,10 @@
 class WebSystem
   class WebCommand < Liza::Command
 
-    set :files, App.root.join("web_files")
-    set :host, "localhost"
-    set :port, 3000
-
     def self.call args
-      log :higher, "Called #{self} with args #{args}"
-
-      host = get :host
-      port = get :port
-
-      args.each do |arg|
-        host = arg.split("=")[1] if arg.start_with? "h="
-        port = arg.split("=")[1] if arg.start_with? "p="
-      end
-
-      if App.mode == :code
-        ENV["RACK_ENV"] = "development"
-        rack_app = method :_call
-      else
-        ENV["RACK_ENV"] = "production"
-        rack_app = ::WebBox.requests
-      end
-
-      rack_files = Rack::Files.new get(:files)
-      rack_app = Rack::Cascade.new [rack_files, rack_app]
-
-      require "rack/handler/puma"
-      Rack::Handler::Puma.run rack_app, Host: host, Port: port
-    end
-
-    def self._call app
-      App.reload do
-        log "reloading"
-        return ::WebBox.requests.call app
-      end
+      log "args #{args}"
+      log "DEPRECATED: please use `lizarb rack` instead"
+      RackCommand.call args
     end
 
   end

data/lib/web_system/web/controllers/rack.rb

@@ -0,0 +1,8 @@
+class WebSystem
+  class Rack < Liza::Controller
+
+    # def self.call rack_app, host, port
+    # end
+    
+  end
+end

data/lib/web_system/web/controllers/rack_test.rb

@@ -0,0 +1,18 @@
+class WebSystem
+  class RackTest < Liza::ControllerTest
+
+    test :subject_class do
+      assert subject_class == WebSystem::Rack
+    end
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :blue
+    end
+
+    # test :call do
+    #   todo "write this"
+    # end
+
+  end
+end

data/lib/web_system/web/controllers/request/client_error_request.rb

@@ -10,7 +10,6 @@ class WebSystem
 
       body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
-      log status
       [status, headers, [body]]
     end
 

data/lib/web_system/web/controllers/request/not_found_request.rb

@@ -10,7 +10,6 @@ class WebSystem
 
       body = "Client Error #{status} - #{env["LIZA_PATH"]}"
 
-      log status
       [status, headers, [body]]
     end
 

data/lib/web_system/web/controllers/request/server_error_request.rb

@@ -12,7 +12,6 @@ class WebSystem
 
       body = "Server Error #{status} - #{e.class} - #{e.message}"
 
-      log status
       [status, headers, [body]]
     end
 

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

@@ -0,0 +1,44 @@
+class WebSystem
+  class RackPanel < Liza::Panel
+
+    def call strategy, host, port
+      puts
+      log({strategy:, host:, port:})
+
+      strategy ||= get :strategy
+      host ||= get :host
+      port ||= 3000
+      files ||= get :files
+
+      log({strategy:, host:, port:})
+      
+      x = App.mode == :code ? "development" : "production"
+      ENV["RACK_ENV"] = x
+      rack_app = send "get_rack_app_#{x}"
+
+      rack_files = Object::Rack::Files.new files
+      rack_app = Object::Rack::Cascade.new [rack_files, rack_app]
+
+      # TODO: PumaRack
+      # handler = Liza.const(:"#{strategy}_rack")
+      
+      require "rack/handler/puma"
+      handler = Object::Rack::Handler::Puma
+      handler.run rack_app, Host: host, Port: port
+    end
+
+    def get_rack_app_production()= Liza.const(:web_box).requests
+      
+    def get_rack_app_development
+      Proc.new do |env|
+        ret = nil
+        App.reload do
+          log "reloading"
+          ret = get_rack_app_production.call env
+        end
+        ret
+      end
+    end
+    
+  end
+end

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

@@ -0,0 +1,14 @@
+class WebSystem
+  class RackPanelTest < Liza::PanelTest
+
+    test :settings do
+      assert subject_class.log_level == :normal
+      assert subject_class.log_color == :blue
+    end
+
+    # test :call do
+    #   todo "write this"
+    # end
+
+  end
+end