psylone · fingersi · Dec 3, 2023 · Mar 8, 2024
diff --git a/app/controllers/error_controller.rb b/app/controllers/error_controller.rb
@@ -0,0 +1,7 @@
+class ErrorController < Simpler::Controller
+
+  def no_page
+    render plain: "Page not found"
+    status 404
+  end
+end
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: "Text for render"
+    status 201
+    headers['Content-Type'] = 'text/plain'
   end
 
   def create
+  end
 
+  def show
+    render plain: "id #{@request.env[:id]}"
   end
 
 end
diff --git a/app/views/tests/show.html.erb b/app/views/tests/show.html.erb
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Show | Simpler application</title>
+  </head>
+  <body>
+    <h1>Simpler framework at work!</h1>
+    <p><%= @time %></p>
+  </body>
+</html>
diff --git a/config.ru b/config.ru
@@ -1,3 +1,5 @@
 require_relative 'config/environment'
+require_relative 'logger/logger'
 
+use Applogger
 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,10 +28,13 @@ def routes(&block)
 
     def call(env)
       route = @router.route_for(env)
-      controller = route.controller.new(env)
-      action = route.action
-
-      make_response(controller, action)
+      begin
+        controller = route.controller.new(env)
+        action = route.action
+        make_response(controller, action)
+      rescue => e 
+        make_response(ErrorController.new(env), 'no_page')
+      end
     end
 
     private

diff --git a/lib/simpler/controller.rb b/lib/simpler/controller.rb
@@ -13,7 +13,9 @@ def initialize(env)
 
     def make_response(action)
       @request.env['simpler.controller'] = self
+      @request.env['simpler.controllername'] = self.class.name
       @request.env['simpler.action'] = action
+      @request.env[:id] = get_id(@request.env) 
 
       set_default_headers
       send(action)
@@ -24,6 +26,18 @@ def make_response(action)
 
     private
 
+    def get_id(env)
+      env['PATH_INFO'].match('\d+').to_s.to_i
+    end
+
+    def headers
+      @response
+    end
+
+    def status(status)  
+      @response.status = status
+    end
+
     def extract_name
       self.class.name.match('(?<name>.+)Controller')[:name].downcase
     end
@@ -49,6 +63,6 @@ def params
     def render(template)
       @request.env['simpler.template'] = template
     end
-
   end
+
 end
diff --git a/lib/simpler/router.rb b/lib/simpler/router.rb
@@ -18,12 +18,15 @@ 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) }
+      route = @routes.find { |route| route.match?(method, path) }
     end
 
     private
 
+    def no_route
+      Route.new('get', '/no_page', ErrorController, 'no_page')
+    end
+
     def add_route(method, path, route_point)
       route_point = route_point.split('#')
       controller = controller_from_string(route_point[0])

diff --git a/lib/simpler/router/route.rb b/lib/simpler/router/route.rb
@@ -6,13 +6,17 @@ class Route
 
       def initialize(method, path, controller, action)
         @method = method
-        @path = path
+        @path = path_for_id(path)
         @controller = controller
         @action = action
       end
 
+      def path_for_id(path) 
+        path.gsub(/:id/, '\d+')
+      end
+
       def match?(method, path)
-        @method == method && path.match(@path)
+        @method == method && path.match(@path + '\z')
       end
 
     end

diff --git a/lib/simpler/view.rb b/lib/simpler/view.rb
@@ -10,13 +10,19 @@ def initialize(env)
     end
 
     def render(binding)
-      template = File.read(template_path)
+      template = check_plain || File.read(template_path)
 
       ERB.new(template).result(binding)
     end
 
     private
 
+    def check_plain
+      return nil if @env['simpler.template'].nil?
+
+      @env['simpler.template'][:plain]
+    end
+
     def controller
       @env['simpler.controller']
     end

diff --git a/log/app.log b/log/app.log
@@ -0,0 +1,16 @@
+I, [2024-03-08T20:57:11.299500 #42217]  INFO -- request: GET/tests/312
+I, [2024-03-08T20:57:11.303658 #42217]  INFO -- Handler: TestsController
+I, [2024-03-08T20:57:11.303703 #42217]  INFO -- Parameter: #show
+I, [2024-03-08T20:57:11.303720 #42217]  INFO -- Responce: 200 OK [text/html] id 312
+I, [2024-03-08T20:57:15.189928 #42217]  INFO -- request: GET/tests/303
+I, [2024-03-08T20:57:15.190177 #42217]  INFO -- Handler: TestsController
+I, [2024-03-08T20:57:15.190203 #42217]  INFO -- Parameter: #show
+I, [2024-03-08T20:57:15.190219 #42217]  INFO -- Responce: 200 OK [text/html] id 303
+I, [2024-03-08T20:57:19.222804 #42217]  INFO -- request: GET/tests/500
+I, [2024-03-08T20:57:19.223113 #42217]  INFO -- Handler: TestsController
+I, [2024-03-08T20:57:19.223143 #42217]  INFO -- Parameter: #show
+I, [2024-03-08T20:57:19.223162 #42217]  INFO -- Responce: 200 OK [text/html] id 500
+I, [2024-03-08T20:57:23.190205 #42217]  INFO -- request: GET/tests/999
+I, [2024-03-08T20:57:23.190521 #42217]  INFO -- Handler: TestsController
+I, [2024-03-08T20:57:23.190555 #42217]  INFO -- Parameter: #show
+I, [2024-03-08T20:57:23.190575 #42217]  INFO -- Responce: 200 OK [text/html] id 999
diff --git a/logger/logger.rb b/logger/logger.rb
@@ -0,0 +1,21 @@
+require 'logger'
+
+class Applogger
+
+  def initialize(app)
+    file = File.open(File.expand_path(File.dirname(__dir__)) + '/log/app.log', File::WRONLY | File::APPEND | File::CREAT)
+    @logger = Logger.new(file)
+    @app = app
+  end
+
+  def call(env)
+    @logger.info('request'){ env['REQUEST_METHOD'] + env['PATH_INFO']}
+    responce = @app.call(env) 
+
+    @logger.info('Handler'){env['simpler.controllername']}
+    @logger.info('Parameter'){env['QUERY_STRING'] + '#' + env['simpler.action']}
+    @logger.info('Responce'){responce[0].to_s + ' ' + Rack::Utils::HTTP_STATUS_CODES[responce[0]] + ' [' + responce[1]['Content-Type'] + '] ' + responce[2][0]}
+    responce
+  end
+
+end