Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simpler #171

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/controllers/tests_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ def index
@time = Time.now
end

def show
render plain: params['id']
end

def create

end

end
2 changes: 2 additions & 0 deletions config.ru
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
require_relative 'config/environment'
require_relative 'middleware/logger'

use Logger
run Simpler.application
1 change: 1 addition & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Simpler.application.routes do
get '/tests', 'tests#index'
get '/tests/:id', 'tests#show'
post '/tests', 'tests#create'
end
1 change: 0 additions & 1 deletion lib/simpler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ def root
Pathname.new(File.expand_path('..', __dir__))
end
end

end
3 changes: 3 additions & 0 deletions lib/simpler/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ def routes(&block)

def call(env)
route = @router.route_for(env)
return @router.not_found(env) unless route

route.extract_params(env)
controller = route.controller.new(env)
action = route.action

Expand Down
40 changes: 39 additions & 1 deletion lib/simpler/controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ class Controller
def initialize(env)
@name = extract_name
@request = Rack::Request.new(env)
@request.params.merge!(env['params'])
@response = Rack::Response.new
@rendered = false
end

def make_response(action)
Expand All @@ -17,7 +19,7 @@ def make_response(action)

set_default_headers
send(action)
write_response
write_response unless @rendered

@response.finish
end
Expand All @@ -36,6 +38,7 @@ def write_response
body = render_body

@response.write(body)
@rendered = true
end

def render_body
Expand All @@ -47,8 +50,43 @@ def params
end

def render(template)
case template
when String
render_string(template)
when Hash
render_hash(template)
else
render_error("Template rendering error #{template.class}")
end
@rendered = true
end

def render_string(template)
@request.env['simpler.template'] = template
end

def render_error(error_message)
status 500
@response.write(error_message)
@response.finish
end

def render_hash(params)
if params.key?(:plain)
@request.env['simpler.render'] = :plain
@response.write(params[:plain].to_s)
@response.finish
else
render_error("The template with #{params.keys} option cannot be displayed")
end
end

def status(status)
response.status = status
end

def headers
@response.headers
end
end
end
10 changes: 10 additions & 0 deletions lib/simpler/router.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@ def route_for(env)
@routes.find { |route| route.match?(method, path) }
end

def not_found(env)
method = env['REQUEST_METHOD'].downcase.to_sym
path = env['PATH_INFO']
Rack::Response.new.then do |response|
response.status = 404
response.write("[#{method} #{path}] route not found\n")
response.finish
end
end

private

def add_route(method, path, route_point)
Expand Down
19 changes: 18 additions & 1 deletion lib/simpler/router/route.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,26 @@ def initialize(method, path, controller, action)
end

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
1 change: 0 additions & 1 deletion lib/simpler/view.rb
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ def template_path

Simpler.root.join(VIEW_BASE_PATH, "#{path}.html.erb")
end

end
end
34 changes: 34 additions & 0 deletions middleware/logger.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
class Logger
def initialize(app)
@app = app
end

def call(env)
@env = env
status, headers, body = @app.call(env)

log_content = collect_logs(status, headers, body)
log(log_content)

[status, headers, body]
end

def log(content)
filepath = File.expand_path('log/log.txt')
write_mode = File.exist?(filepath) ? 'a' : 'w'
File.write(filepath, content, mode: write_mode)
end

def collect_logs(status, headers, _body)
controller = @env['simpler.controller'].class.name
action = @env['simpler.action']
template = @env['simpler.template'] || @env['simpler.render']
parameters = @env['params']
"""
Request: #{@env['REQUEST_METHOD']}
Handler: #{controller}##{action}
Parameters: #{parameters}
Response: #{status} [#{headers['Content-Type']}] #{template}
"""
end
end