lizarb 1.0.5 → 1.0.6

data/lib/web_system/{sub → subsystems}/rack/server_racks/thin_server_rack_test.rb

@@ -4,8 +4,4 @@ class WebSystem::ThinServerRackTest < WebSystem::ServerRackTest
     assert subject_class == WebSystem::ThinServerRack
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/web_system/{sub → subsystems}/request/commands/request_command.rb

@@ -1,66 +1,55 @@
-class WebSystem::RequestCommand < DevSystem::Command
+class WebSystem::RequestCommand < DevSystem::SimpleCommand
 
-  def self.call(args)
+  def call_default
     log "args = #{args.inspect}"
     path, qs = args.first.split("?")
 
-    help(args) # always show help
+    help # always show help
 
-    new.instance_exec do
-      @env = {}
+    @request_env = {}
+    @request_env["PATH_INFO"] = path
+    @request_env["QUERY_STRING"] = qs
+    request_panel.find @request_env
+    @request_class = @request_env["LIZA_REQUEST_CLASS"] || raise("No request class found")
 
-      @env["PATH_INFO"] = path
-      @env["QUERY_STRING"] = qs
-
-      request_panel.find @env
-
-      @request_class = @env["LIZA_REQUEST_CLASS"] || raise("No request class found")
-
-      puts render :find, format: :txt
-    end
+    puts render :find, format: :txt
   end
 
-  def self.help(args)
+  def help
     log "args = #{args.inspect}"
-    new.instance_exec do
-      puts render :help, format: :txt
-    end
+    puts render :help, format: :txt
   end
 
-  def self.get(args)
+  def call_get
     return superclass.method(__method__).call(args) unless args.is_a? Array
     log "args = #{args.inspect}"
     path, qs = args.first.split("?")
     return help if path.nil?
     
-    new.instance_exec do
-      @env = {}
-      @env["REQUEST_METHOD"] = "GET"
-      @env["PATH_INFO"]   = path
-      @env["QUERY_STRING"] = qs
-
-      @status, @headers, @body = request_panel.call! @env
-      log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
-      puts render :response, format: :http
-    end
+    @request_env = {}
+    @request_env["REQUEST_METHOD"] = "GET"
+    @request_env["PATH_INFO"]   = path
+    @request_env["QUERY_STRING"] = qs
+
+    @status, @headers, @body = request_panel.call! @request_env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render :response, format: :http
   end
 
-  def self.post(args)
+  def call_post
     return superclass.method(__method__).call(args) unless args.is_a? Array
     log "args = #{args.inspect}"
     path, qs = args.first.split("?")
     return help if path.nil?
     
-    new.instance_exec do
-      @env = {}
-      @env["REQUEST_METHOD"] = "POST"
-      @env["PATH_INFO"]   = path
-      @env["QUERY_STRING"] = qs
-
-      @status, @headers, @body = request_panel.call! @env
-      log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
-      puts render :response, format: :http
-    end
+    @request_env = {}
+    @request_env["REQUEST_METHOD"] = "POST"
+    @request_env["PATH_INFO"]   = path
+    @request_env["QUERY_STRING"] = qs
+
+    @status, @headers, @body = request_panel.call! @request_env
+    log "STATUS #{@status} with #{@headers.count} headers and a #{@body.first.size} byte body"
+    puts render :response, format: :http
   end
 
   # helpers
@@ -70,8 +59,8 @@ class WebSystem::RequestCommand < DevSystem::Command
   end
   
   # TODO: fix this
-  def self.get_command_signatures
-    super << OpenStruct.new({name: "get", description: "# no description"})
+  def self.call_get_command_sign
+    super << {name: "get", description: "# no description"}
   end
 end
 
@@ -104,7 +93,7 @@ liza request:help
 # view find.txt.erb
 
 ENV:
-<% @env.each do |k, v| %>
+<% @request_env.each do |k, v| %>
 env["<%= k %>"] = <%= v.inspect -%>
 <% end %>
 

data/lib/web_system/subsystems/request/commands/request_command_test.rb

@@ -0,0 +1,7 @@
+class WebSystem::RequestCommandTest < DevSystem::SimpleCommandTest
+
+  test :subject_class do
+    assert subject_class == WebSystem::RequestCommand
+  end
+
+end

data/lib/web_system/subsystems/request/generators/request_generator.rb

@@ -0,0 +1,39 @@
+class WebSystem::RequestGenerator < DevSystem::ControllerGenerator
+
+  section :actions
+  
+  # liza g request name action_1 action_2 action_3 place=app views=adjacent
+
+  def call_default
+    call_simple
+  end
+
+  # liza g request:simple name
+  
+  def call_simple
+    set_default_super "simple"
+    set_default_require ""
+    set_default_views "adjacent"
+
+    create_controller do |unit, test|
+      unit.section name: :actions, render_key: :simple_actions
+      arg_action_names.each do |action_name|
+        unit.view name: action_name, render_key: :simple_view, format: :html
+      end
+      test.section name: :test
+    end
+  end
+
+  # liza g request:base name
+
+  def call_base
+    set_default_super ""
+    set_default_require ""
+
+    create_controller do |unit, test|
+      unit.section name: :base
+      test.section name: :test
+    end
+  end
+
+end

data/lib/web_system/subsystems/request/generators/request_generator.rb.base.rb.erb

@@ -0,0 +1,14 @@
+# view base.rb.erb
+
+def self.call(env)
+  super
+  path = env["REQUEST_PATH"]
+
+  status = 200
+  headers = {
+    "Framework" => "Liza \#{Lizarb::VERSION}"
+  }
+  body = "It works! <%= controller_name.camelize %>Request"
+
+  [status, headers, [body]]
+end

data/lib/web_system/subsystems/request/generators/request_generator.rb.simple_actions.rb.erb

@@ -0,0 +1,16 @@
+# view simple_actions.rb.erb
+<% arg_action_names.each do |action_name|
+  route = action_name == "index" ? "/#{controller_name}" : "/#{controller_name}/#{action_name}"
+%>
+  # GET <%= route %>
+
+  def call_<%= action_name %>
+    log "."
+  end
+
+  # POST <%= route %>
+
+  # def call_<%= action_name %>!
+  #   log "."
+  # end
+<% end -%>

data/lib/web_system/subsystems/request/generators/request_generator.rb.simple_view.html.erb

@@ -0,0 +1,9 @@
+# view simple_view.html.erb
+<h1><%%= self.class %></h1>
+<h2><%%= action %></h2>
+<p>request: <%%= request %></p>
+<p>action: <%%= action %></p>
+<p>format: <%%= format %></p>
+<p>http_method: <%%= http_method %></p>
+<p>qs: <%%= qs %></p>
+<p>segments: <%%= segments %></p>

data/lib/web_system/subsystems/request/generators/request_generator.rb.test.rb.erb

@@ -0,0 +1,2 @@
+# view test.rb.erb
+<%= render "subject" -%>

data/lib/web_system/subsystems/request/generators/request_generator_test.rb

@@ -0,0 +1,15 @@
+class WebSystem::RequestGeneratorTest < DevSystem::SimpleGeneratorTest
+
+  test :subject_class do
+    assert_equality subject_class, WebSystem::RequestGenerator
+    assert_equality subject.class, WebSystem::RequestGenerator
+  end
+
+  test_erbs_defined(
+    "base.rb.erb",
+    "simple_actions.rb.erb",
+    "simple_view.html.erb",
+    "test.rb.erb"
+  )
+  
+end

data/lib/web_system/{sub → subsystems}/request/request_panel.rb

@@ -2,9 +2,11 @@ class WebSystem::RequestPanel < Liza::Panel
 
   def call env, allow_raise: false
     t = Time.now
+    log "#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
+
     request_klass = find env
     ret = request_klass.call env
-    _format env, ret
+    
     log "#{ret[0]} with #{ret[2].first.size} bytes in #{t.diff}s"
     ret
   rescue => e
@@ -25,12 +27,22 @@ class WebSystem::RequestPanel < Liza::Panel
   #
 
   def router(name, &block)
-    router = routers[name] ||= Liza.const "#{name}_router_request"
-    router.instance_eval(&block) if block_given?
+    _routers[name] ||= []
+    _routers[name].push block if block_given?
   end
 
   def routers
-    @routers ||= {}
+    @routers ||= _routers.map do |name, blocks|
+      router = Liza.const "#{name}_router_request"
+      blocks.each do |block|
+        router.instance_eval(&block)
+      end
+      [name, router]
+    end.to_h
+  end
+
+  def _routers
+    @_routers ||= {}
   end
 
   #
@@ -38,24 +50,18 @@ class WebSystem::RequestPanel < Liza::Panel
   def find env
     _prepare env
 
-    routers.values.first.call(env)
+    routers.values.each do |router|
+      request_class = router.call env
+      return request_class if request_class
+    end
+
+    NotFoundRequest
   end
 
   #
 
-  def _format env, ret
-    format = env["LIZA_FORMAT"]
-
-    body = ret[2][0]
-    body = DevBox.format format, body
-    ret[2][0] = body
-  end
-
   def _prepare env
-    log "#{env["REQUEST_METHOD"]} #{env["PATH_INFO"]}"
-
     path = env["PATH_INFO"]
-
     path, _sep, format = path.lpartition "."
     format = "html" if format.empty?
 

data/lib/web_system/subsystems/request/request_panel_test.rb

@@ -0,0 +1,82 @@
+class WebSystem::RequestPanelTest < Liza::PanelTest
+
+  test :subject_class do
+    assert_equality subject_class, WebSystem::RequestPanel
+    refute_equality subject, WebBox[:request]
+  end
+
+  test_methods_defined do
+    on_self
+    on_instance \
+      :call, :call!,
+      :find,
+      :router, :routers
+  end
+
+  #
+
+  test :call! do
+    env = {}
+    env["PATH_INFO"] = "/foo/bar/baz"
+    status, _headers, _body = subject.call! env
+    assert_equality status, 404
+  end
+
+  test :call do
+    env = {}
+    env["PATH_INFO"] = "/foo/bar/baz"
+    status, _headers, body = subject.call env
+    assert_equality status, 404
+    assert_equality body, ["Client Error 404 - /foo/bar/baz"]
+  end
+
+  #
+
+  test :_prepare do
+    env = {}
+    env["PATH_INFO"]   = "/foo/bar/baz"
+    subject._prepare env
+    assert_equality env, {
+      "PATH_INFO"=>"/foo/bar/baz",
+      "LIZA_PATH"=>"/foo/bar/baz",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>["foo", "bar", "baz"]
+    }
+
+    env = {}
+    env["PATH_INFO"]   = "/"
+    subject._prepare env
+    assert_equality env, {
+      "PATH_INFO"=>"/",
+      "LIZA_PATH"=>"/",
+      "LIZA_FORMAT"=>"html",
+      "LIZA_SEGMENTS"=>[]
+    }
+  end
+
+  test :find, :invalid do
+    env = {}
+    env["PATH_INFO"]   = "/foo/bar/baz"
+    request_class = subject.find env
+    assert_equality subject.routers.keys, []
+    assert_equality request_class, WebSystem::NotFoundRequest
+  end
+
+  test :find, :valid do
+    env = {}
+    env["PATH_INFO"]   = "/"
+    subject.router :simple
+    assert_equality subject.routers.keys, [:simple]
+    request_class = subject.find env
+    assert_equality request_class, RootRequest
+  end
+
+  test :router do
+    todo "write this"
+  end
+
+  test :routers do
+    todo "write this"
+  end
+
+end

data/lib/web_system/{sub → subsystems}/request/request_test.rb

@@ -4,10 +4,6 @@ class WebSystem::RequestTest < Liza::ControllerTest
     assert subject_class == WebSystem::Request
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
   # test :call do
   #   todo "write this"
   # end

data/lib/web_system/{sub → subsystems}/request/requests/client_error_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::ClientErrorRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 400
 
     headers = {

data/lib/web_system/{sub → subsystems}/request/requests/not_found_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::NotFoundRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 404
 
     headers = {

data/lib/web_system/{sub → subsystems}/request/requests/server_error_request.rb

@@ -1,6 +1,7 @@
 class WebSystem::ServerErrorRequest < WebSystem::Request
 
   def self.call env
+    super
     status = 500
 
     headers = {

data/lib/web_system/{sub → subsystems}/request/requests/simple_request.rb

@@ -3,6 +3,7 @@ class WebSystem::SimpleRequest < WebSystem::Request
   #
   
   def self.call env
+    super
     new.call env
   end
 
@@ -18,7 +19,13 @@ class WebSystem::SimpleRequest < WebSystem::Request
     }
 
     _call_action
-    @body ||= render format, action, format: format
+    @body ||=
+      render format,
+        action,
+        format: format,
+        converted: true,
+        formatted: true
+    
     [@status, @headers, [@body]]
   end
 

data/lib/web_system/{sub → subsystems}/request/requests/simple_request_test.rb

@@ -4,8 +4,4 @@ class WebSystem::SimpleRequestTest < WebSystem::RequestTest
     assert subject_class == WebSystem::SimpleRequest
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/web_system/{sub → subsystems}/request/router_requests/router_request_test.rb

@@ -4,8 +4,4 @@ class WebSystem::RouterRequestTest < WebSystem::RequestTest
     assert subject_class == WebSystem::RouterRequest
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/web_system/{sub → subsystems}/request/router_requests/simple_router_request.rb

@@ -2,17 +2,20 @@ class WebSystem::SimpleRouterRequest < WebSystem::RouterRequest
   class RequestNotFound < Error; end
 
   def self.call(env)
+    super
     segments = env["LIZA_SEGMENTS"].dup
     request = segments.shift || "root"
     action  = segments.shift || "index"
+    format = env["LIZA_FORMAT"]
 
+    log "request: #{request.inspect}, action: #{action.inspect}, format: #{format.inspect}"
+    request_class = _find_request_class request
+    
     env["LIZA_REQUEST"] = request
     env["LIZA_ACTION"] = action
-    format = env["LIZA_FORMAT"]
+    env["LIZA_REQUEST_CLASS"] = request_class
 
-    log({request:, action:, format:})
-    
-    env["LIZA_REQUEST_CLASS"] = _find_request_class request
+    request_class
   end
 
   def self._find_request_class request

data/lib/web_system/{sub → subsystems}/request/router_requests/simple_router_request_test.rb

@@ -4,8 +4,4 @@ class WebSystem::SimpleRouterRequestTest < WebSystem::RouterRequestTest
     assert subject_class == WebSystem::SimpleRouterRequest
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
 end

data/lib/web_system/web_box.rb

@@ -1,16 +1,36 @@
 class WebSystem::WebBox < Liza::Box
 
-  # Preconfigure your rack panel
+  preconfigure :rack do
+    # RackPanel.instance gives you read-access to this instance
+  end
+
+  preconfigure :request do
+    # RequestPanel.instance gives you read-access to this instance
+  end
+
+end
+
+__END__
+
+# view default.rb.erb
+class WebBox < WebSystem::WebBox
 
   configure :rack do
+    # RackPanel.instance gives you read-access to this instance
+    # 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
 
-  # Preconfigure your request panel
-
   configure :request do
+    # RequestPanel.instance gives you read-access to this instance
     router :simple
   end
 

data/lib/web_system/web_box_test.rb

@@ -4,10 +4,6 @@ class WebSystem::WebBoxTest < Liza::BoxTest
     assert subject_class == WebSystem::WebBox
   end
 
-  test :settings do
-    assert_equality subject_class.log_level, 0
-  end
-
   test :panels do
     assert subject_class[:request].is_a? WebSystem::RequestPanel
   end

data/lib/web_system/web_system_test.rb

@@ -0,0 +1,3 @@
+class WebSystem::WebSystemTest < Liza::SystemTest
+
+end

data/lib/web_system.rb

@@ -5,7 +5,7 @@ class WebSystem < Liza::System
 
   color :dark_cerulean
 
-  sub :rack
-  sub :request
+  panel :rack
+  panel :request
 
 end

data/lib/work_system/work_system_test.rb

@@ -0,0 +1,3 @@
+class WorkSystem::WorkSystemTest < Liza::SystemTest
+
+end

data/lizarb.gemspec

@@ -5,8 +5,8 @@ require_relative "lib/lizarb/version"
 Gem::Specification.new do |spec|
   spec.name = "lizarb"
   spec.version = Lizarb::VERSION
-  spec.authors = "Thiago Pinto"
-  spec.email = "thiagopintodev@gmail.com"
+  spec.authors = "Thiago Almeida"
+  spec.email = "thiago@lizarb.org"
 
   spec.summary = "Application Framework"
   spec.description = "Liza is a light, experimental framework primarily developed to help study the Ruby language and the Ruby ecosystem."
@@ -32,19 +32,5 @@ Gem::Specification.new do |spec|
   spec.executables = ["liza", "lizarb"]
   spec.require_paths = ["lib"]
 
-  # dependencies (Lizarb)
-
-  spec.add_dependency "dotenv", "~> 2.8"
-  spec.add_dependency "zeitwerk", "~> 2.6"
-
-  # dependencies (DevSystem)
-
-  spec.add_dependency "colorize", "~> 0.8"
-  spec.add_dependency "pry", "~> 0.14.2"
-  spec.add_dependency "diff-lcs", "~> 1.5"
-  spec.add_dependency "tty-prompt", "~> 0.23.1"
-
-  # development dependencies
-
   spec.add_development_dependency "rake", "~> 13.0"
 end