psylone · Eduard-Gimaev · Jun 4, 2024 · Jun 4, 2024 · Jun 7, 2024 · Jun 10, 2024
diff --git a/.DS_Store b/.DS_Store
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,16 @@ class TestsController < Simpler::Controller
 
   def index
     @time = Time.now
+    # render plain: 'Plain text response'
   end
 
   def create
 
   end
+
+  def show
+    status(201)
+    @test = Test.first(id: params['id'])
+  end
 
 end
diff --git a/app/views/tests/show.html.erb b/app/views/tests/show.html.erb
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Show | Simpler application</title>
+  </head>
+  <body>
+    <h1>Simpler framework at work!</h1>
+
+    <p>Test: <%= @test_id %></p>
+  </body>
+</html>
diff --git a/config.ru b/config.ru
@@ -1,3 +1,7 @@
+require_relative 'middleware/simpler_logger'
 require_relative 'config/environment'
 
+use Middleware::SimplerLogger, 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/simpler/application.rb b/lib/simpler/application.rb
@@ -28,6 +28,7 @@ def routes(&block)
 
     def call(env)
       route = @router.route_for(env)
+      return not_found if route.nil?
       controller = route.controller.new(env)
       action = route.action
 
@@ -36,6 +37,12 @@ def call(env)
 
     private
 
+    def not_found
+      [ 404, 
+      { 'Content-Type' => 'text/html' }, 
+       ['<h1> 404 - Page Not Found</h1>'] ]
+    end
+
     def require_app
       Dir["#{Simpler.root}/app/**/*.rb"].each { |file| require file }
     end

diff --git a/lib/simpler/controller.rb b/lib/simpler/controller.rb
@@ -29,6 +29,12 @@ def extract_name
     end
 
     def set_default_headers
+      if @request.env['simpler.template'].is_a?(Hash)
+        return @response['Content-Type'] =  case @request.env['simpler.template'].first[0]
+                                              when :plain then 'text/plain'
+                                              else 'text/html'
+                                            end
+      end
       @response['Content-Type'] = 'text/html'
     end
 
@@ -50,5 +56,17 @@ def render(template)
       @request.env['simpler.template'] = template
     end
 
+    def headers(hash)
+      hash.each_pair { |key, value| header(key, value) }
+    end
+
+    def header(key, value)
+      @response[key.to_s] = value.to_s
+    end
+
+    def status(status)
+      @response.status = status
+    end
+
   end
 end
diff --git a/lib/simpler/router.rb b/lib/simpler/router.rb
@@ -18,7 +18,6 @@ def post(path, route_point)
     def route_for(env)
       method = env['REQUEST_METHOD'].downcase.to_sym
       path = env['PATH_INFO']
-
       @routes.find { |route| route.match?(method, path) }
     end
 

diff --git a/lib/simpler/router/route.rb b/lib/simpler/router/route.rb
@@ -13,8 +13,25 @@ def initialize(method, path, controller, action)
 
       def match?(method, path)
         @method == method && path.match(@path)
+        @method == method && path.match(to_regex(@path))
       end
+      def extract_params(env)
+        request_path_items = env['PATH_INFO'].split('/')
+        path_items = @path.split('/').map { |item| item.sub(':', '') }
 
+        params = Hash[path_items.zip(request_path_items)].delete_if { |k, v| k == v }
+        env['params'] = params
+      end
+
+      private
+
+      def to_regex(path)
+        path.split('/')
+            .map { |string| string.start_with?(':') ? '\d+' : string }
+            .join('/')
+            .concat('$')
+            .then { |regex| Regexp.new (regex) }
+      end
     end
   end
 end
diff --git a/lib/simpler/view.rb b/lib/simpler/view.rb
@@ -30,9 +30,11 @@ def template
     end
 
     def template_path
+
       path = template || [controller.name, action].join('/')
 
       Simpler.root.join(VIEW_BASE_PATH, "#{path}.html.erb")
+      # Simpler.root.join('app/views/tests/index.html.erb')
     end
 
   end

diff --git a/middleware/simpler_logger.rb b/middleware/simpler_logger.rb
@@ -0,0 +1,24 @@
+require 'logger'
+
+module Middleware 
+  class SimplerLogger
+    def initialize(app, _logger)
+      @app = app
+      @logger = Logger.new(File.expand_path('../log/app.log', __dir__) || STDOUT)
+    end
+
+    def call(env)
+      request = Rack::Request.new(env)
+      @app.call(env).tap do |response|
+        controller = env['simpler.controller']
+        handler = "#{controller.class.name}##{env['simpler.action']}"
+        status, headers = *response
+
+        @logger.info "Request: #{env['REQUEST_METHOD']} #{env['REQUEST_PATH']}"
+        @logger.info "Handler: #{handler}"
+        @logger.info "Params:  GET: #{env['simpler.route_params']}, POST: #{request.body.read}"
+        @logger.info "Response: #{status} #{headers['Content-Type']} #{env['simpler.template']}\n"
+      end
+    end
+  end
+end