psylone · supronva-github · Dec 22, 2023 · Jan 16, 2024 · Jan 23, 2024 · Feb 5, 2024
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/log/*
diff --git a/app/controllers/tests_controller.rb b/app/controllers/tests_controller.rb
@@ -2,10 +2,17 @@ class TestsController < Simpler::Controller
 
   def index
     @time = Time.now
+    render 'tests/list'
+    status 200
   end
 
   def create
-
+    render plain: "txt"
+    status 201
   end
 
+  def show
+    @test_id = params[:id]
+    render 'tests/list'
+  end
 end
diff --git a/app/views/tests/create.html.erb b/app/views/tests/create.html.erb
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Create | Simpler application</title>
+  </head>
+  <body>
+    <h1>Simpler framework at work!</h1>
+    <p><%= @time %></p>
+  </body>
+</html>
diff --git a/app/views/tests/list.html.erb b/app/views/tests/list.html.erb
@@ -6,7 +6,6 @@
   </head>
   <body>
     <h1>Simpler framework at work!</h1>
-
-    <p><%= @time %></p>
+    <p>Test id: <%= @test_id %></p>
   </body>
-</html>
+</html>
diff --git a/config.ru b/config.ru
@@ -1,3 +1,6 @@
 require_relative 'config/environment'
+require_relative 'lib/middleware/logger'
+
+use AppLogger, logdev: File.expand_path('log/app.log', __dir__)
 
 run Simpler.application
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,4 +1,5 @@
 Simpler.application.routes do
   get '/tests', 'tests#index'
   post '/tests', 'tests#create'
+  get '/tests/:id', 'tests#show'
 end
diff --git a/lib/middleware/logger.rb b/lib/middleware/logger.rb
@@ -0,0 +1,39 @@
+require 'logger'
+
+class AppLogger
+  def initialize(app, **options)
+    @logger = Logger.new(options[:logdev] || $stdout)
+    @app = app
+  end
+
+  def call(env)
+    status, headers, body = @app.call(env)
+    @logger.info(message(env, status, headers))
+    [status, headers, body]
+  end
+
+  def message(env, status, headers)
+
+    controller = env['simpler.controller']
+
+    if controller
+      <<~LOGGER
+
+      --------------------------------------------------------------
+        Request:    #{env['REQUEST_METHOD']} #{env['REQUEST_URI']}
+        Handler:    #{env['simpler.controller'].class}##{env['simpler.action']}
+        Parameters: #{env['simpler.params']}
+        Response:   #{status} [#{headers['Content-Type']}] #{env['simpler.template_path']}
+
+      LOGGER
+    else
+      <<~LOGGER
+
+      --------------------------------------------------------------
+        Request:    #{env['REQUEST_METHOD']} #{env['REQUEST_URI']}
+        Response:   #{}
+
+      LOGGER
+    end
+  end
+end
diff --git a/lib/simpler/application.rb b/lib/simpler/application.rb
@@ -3,6 +3,7 @@
 require 'sequel'
 require_relative 'router'
 require_relative 'controller'
+require 'pry'
 
 module Simpler
   class Application
@@ -28,6 +29,9 @@ def routes(&block)
 
     def call(env)
       route = @router.route_for(env)
+
+      return not_found if route.nil?
+      # binding.pry
       controller = route.controller.new(env)
       action = route.action
 
@@ -54,5 +58,8 @@ def make_response(controller, action)
       controller.make_response(action)
     end
 
+    def not_found
+      [404, { 'Content-Type' => 'text/plain' }, ['Not found']]
+    end
   end
 end
diff --git a/lib/simpler/controller.rb b/lib/simpler/controller.rb
@@ -1,4 +1,5 @@
 require_relative 'view'
+require 'pry'
 
 module Simpler
   class Controller
@@ -18,7 +19,6 @@ def make_response(action)
       set_default_headers
       send(action)
       write_response
-
       @response.finish
     end
 
@@ -29,7 +29,7 @@ def extract_name
     end
 
     def set_default_headers
-      @response['Content-Type'] = 'text/html'
+      headers['Content-Type'] = 'text/html'
     end
 
     def write_response
@@ -43,12 +43,26 @@ def render_body
     end
 
     def params
-      @request.params
+      @request.env['simpler.params'].merge!(@request.params)
     end
 
     def render(template)
+      case template
+      when Hash
+        headers['Content-Type'] = 'text/plain' if template.has_key?(:plain)
+      else
+        set_default_headers
+      end
+
       @request.env['simpler.template'] = template
     end
 
+    def headers
+      @response.headers
+    end
+
+    def status(code)
+      @response.status = code
+    end
   end
 end
diff --git a/lib/simpler/router.rb b/lib/simpler/router.rb
@@ -1,4 +1,5 @@
 require_relative 'router/route'
+require 'pry'
 
 module Simpler
   class Router
@@ -19,7 +20,7 @@ def route_for(env)
       method = env['REQUEST_METHOD'].downcase.to_sym
       path = env['PATH_INFO']
 
-      @routes.find { |route| route.match?(method, path) }
+      @routes.find { |route| route.match?(method, path, env) }
     end
 
     private

diff --git a/lib/simpler/router/route.rb b/lib/simpler/router/route.rb
@@ -11,8 +11,27 @@ def initialize(method, path, controller, action)
         @action = action
       end
 
-      def match?(method, path)
-        @method == method && path.match(@path)
+      def match?(method, path, env)
+        @method == method && parse_path(path, env)
+      end
+
+      private
+
+      def parse_path(path, env)
+        params = {}
+        request_path = path.split('/')
+        router_path = @path.split('/')
+
+        return false if request_path.size != router_path.size
+
+        router_path.each_with_index do |element, index|
+          if element.start_with?(':')
+            params[element[1..-1].to_sym] = request_path[index]
+          else
+            return false unless element == request_path[index]
+          end
+        end
+        env['simpler.params'] = params
       end
 
     end

diff --git a/lib/simpler/view.rb b/lib/simpler/view.rb
@@ -1,4 +1,5 @@
-require 'erb'
+require_relative 'view/html_render'
+require_relative 'view/plain_render'
 
 module Simpler
   class View
@@ -10,9 +11,7 @@ def initialize(env)
     end
 
     def render(binding)
-      template = File.read(template_path)
-
-      ERB.new(template).result(binding)
+      render_template.result(binding)
     end
 
     private
@@ -29,11 +28,23 @@ def template
       @env['simpler.template']
     end
 
+    def render_template
+      template = @env['simpler.template']
+
+      case template
+      when String
+        HtmlRender.new(template_path)
+      when Hash
+        PlainRender.new(template) if template.has_key?(:plain)
+      else
+        HtmlRender.new(template_path)
+      end
+    end
+
     def template_path
       path = template || [controller.name, action].join('/')
-
+      @env['simpler.template_path'] = "#{path}.html.erb"
       Simpler.root.join(VIEW_BASE_PATH, "#{path}.html.erb")
     end
-
   end
 end
diff --git a/lib/simpler/view/html_render.rb b/lib/simpler/view/html_render.rb
@@ -0,0 +1,17 @@
+require 'erb'
+
+module Simpler
+  class View
+
+    class HtmlRender
+      def initialize(template_path)
+        @path = template_path
+      end
+
+      def result(binding)
+        template = File.read(@path)
+        ERB.new(template).result(binding)
+      end
+    end
+  end
+end
diff --git a/lib/simpler/view/plain_render.rb b/lib/simpler/view/plain_render.rb
@@ -0,0 +1,14 @@
+module Simpler
+  class View
+
+    class PlainRender
+      def initialize(template)
+        @template = template
+      end
+
+      def result(_binding)
+        @template[:plain]
+      end
+    end
+  end
+end