macaw_framework 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6b667252e1efbbe7114b4450c894f15e33721d7686c2455108e99a7211e385
-  data.tar.gz: 07f927d324da0be33031108bc85c564f1a62bd42de7b5a017cf3bfca05dee992
+  metadata.gz: b2191d627ee06b38338eeef5d88e16791ad96c9ac94fd3b4f8a917cb7a4fd1d6
+  data.tar.gz: 8572db3e03300d28013c29f2bc5238d2f2a4907b087cfc1fe60ff6a8b2369026
 SHA512:
-  metadata.gz: db686066c7e051021c0d088b715a9509bc65f08ea07d53bf7790c786c2da6c27c85f6a47b2bf7f4c39521f78e9439a63152aa077108cc708e6758205dc2931fa
-  data.tar.gz: 64e5602bab74ed50d94da1935222c9d86a4c7fce04026061d7ac2585ba146959eb9b108b2db142d15a4f658de8aa67f8cdeca3577096bad1add1192015f7f592
+  metadata.gz: 58cc6a8c9fe40d4f2fead09cf8188ac440dce1444b387a737283285ba1d823b9604ada962305d7c9279bfe0195215b891ecf417715dc755f1b027f75ffa07c13
+  data.tar.gz: 6e8b48c28f83a5eb33f5166c37dc1bbacc2831a3fd31f494e75a5ded27410d006475f12b684da06051b4a6ffe27a3067b1c8dfd5ab0acdaf12ecaba8b444ca60

data/.rubocop.yml

@@ -16,4 +16,13 @@ Metrics/MethodLength:
   Max: 30
 
 Metrics/AbcSize:
-  Max: 35
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Max: 15
+
+Metrics/PerceivedComplexity:
+  Enabled: false

data/CHANGELOG.md

@@ -24,3 +24,13 @@
 - Adding log by aspect on endpoint calls to improve observability
 - Moving the server for a new separate class to respect single responsibility
 - Improved the data filtering middleware to sanitize inputs
+
+## [0.1.5] - 2023-04-16
+
+- Adding support to path variables
+
+## [0.2.0] - 2023-04-22
+
+- Adding middleware for integration with Prometheus to collect metrics
+- Adding a simple caching mechanism that can be enabled separately for each endpoint
+- Performance and functional optimizations

data/Gemfile

@@ -10,3 +10,7 @@ gem "rake", "~> 13.0"
 gem "minitest", "~> 5.0"
 
 gem "rubocop", "~> 1.21"
+
+gem "simplecov", "~> 0.22.0"
+
+gem "prometheus-client", "~> 4.1"

data/README.md

@@ -1,7 +1,9 @@
 # MacawFramework
 
+<img src="macaw_logo.png" alt= “” style="width: 30%;height: 30%;margin-left: 35%">
+
 This is a framework for developing web applications. Please have in mind that this is still a work in progress and
-it is strongly advised to not use it for production purposes for now. Actualy it supports only HTTP. HTTPS and SSL
+it is strongly advised to not use it for production purposes for now. Actually it supports only HTTP. and HTTPS/SSL
 support will be implemented soon. Anyone who wishes to contribute is welcome.
 
 ## Installation
@@ -17,7 +19,6 @@ If bundler is not being used to manage dependencies, install the gem by executin
 ## Usage
 
 The usage of the framework still very simple. Actually it support 5 HTTP verbs: GET, POST, PUT, PATCH and DELETE.
-For now, the framework can't resolve client request body and headers. The support for this will be included soon.
 
 The default server port is 8080. To choose a different port, create a file with the name `application.json` 
 in the same directory of the script that will start the application with the following content:
@@ -26,11 +27,18 @@ in the same directory of the script that will start the application with the fol
 {
   "macaw": {
     "port": 8080,
-    "bind": "localhost"
+    "bind": "localhost",
+    "threads": 10,
+    "cache": {
+      "cache_invalidation": 3600
+    }
   }
 }
 ```
 
+Cache invalidation time should be specified in seconds. In order to enable caching, The application.json file
+should exist in the app main directory and it need the `cache_invalidation` config set.
+
 Example of usage:
 
 ```ruby
@@ -39,17 +47,32 @@ require 'json'
 
 m = MacawFramework::Macaw.new
 
-m.get('/hello_world') do |headers, body, parameters|
+m.get('/hello_world', cache: true) do |context|
+  context[:body] # Returns the request body as string
+  context[:params] # Returns query parameters and path variables as a hash
+  context[:headers] # Returns headers as a hash
+  return JSON.pretty_generate({ hello_message: 'Hello World!' }), 200
+end
+
+m.post('/hello_world/:path_variable') do |context|
+  context[:body] # Returns the request body as string
+  context[:params] # Returns query parameters and path variables as a hash
+  context[:headers] # Returns headers as a hash
+  context[:params][:path_variable] # The defined path variable can be found in :params
   return JSON.pretty_generate({ hello_message: 'Hello World!' }), 200
 end
 
 m.start!
 ```
 
-The above example will start a server and will create a GET endpoint at localhost/hello_world.
+The example above starts a server and creates a GET endpoint at localhost/hello_world.
+
+If prometheus is enabled, a get endpoint will be defined at path `/metrics` to collect prometheus metrics. This path
+is configurable via the `application.json` file.
 
-The verb methods must always return a String or nil (Used as response) and a number corresponding the 
-HTTP Status Code to be returned to the client.
+The verb methods must always return a string or nil (used as the response) and a number corresponding to the HTTP status 
+code to be returned to the client. If an endpoint doesn't return a value or returns nil for both the string and the 
+code, a default 200 OK status will be sent as the response.
 
 ## Contributing
 

data/lib/macaw_framework/aspects/cache_aspect.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+##
+# Aspect that provide cache for the endpoints.
+module CacheAspect
+  def call_endpoint(cache, endpoints_to_cache, *args)
+    return super(*args) unless endpoints_to_cache.include?(args[0]) && !cache.nil?
+    return cache.cache[args[2..].to_s.to_sym][0] unless cache.cache[args[2..].to_s.to_sym].nil?
+
+    response = super(*args)
+    cache.cache[args[2..].to_s.to_sym] = [response, Time.now]
+    response
+  end
+end

data/lib/macaw_framework/aspects/logging_aspect.rb

@@ -8,9 +8,17 @@ require "logger"
 # in the framework.
 module LoggingAspect
   def call_endpoint(logger, *args)
-    logger.info("Input of #{args[0]}: #{args}")
-    response = super(*args)
-    logger.info("Output of #{args[0]} #{response}")
+    endpoint_name = args[2].split(".")[1..].join("/")
+    logger.info("Request received for #{endpoint_name} with arguments: #{args[3..]}")
+
+    begin
+      response = super(*args)
+      logger.info("Response for #{endpoint_name}: #{response}")
+    rescue StandardError => e
+      logger.error("Error processing #{endpoint_name}: #{e.message}\n#{e.backtrace.join("\n")}")
+      raise e
+    end
+
     response
   end
 end

data/lib/macaw_framework/aspects/prometheus_aspect.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+##
+# Aspect that provides application metrics using prometheus.
+module PrometheusAspect
+  def call_endpoint(prometheus_middleware, *args)
+    return super(*args) if prometheus_middleware.nil?
+
+    start_time = Time.now
+
+    begin
+      response = super(*args)
+    ensure
+      duration = (Time.now - start_time) * 1_000
+
+      endpoint_name = args[3].split(".").join("/")
+
+      prometheus_middleware.request_duration_milliseconds.with_labels(endpoint: endpoint_name).observe(duration)
+      prometheus_middleware.request_count.with_labels(endpoint: endpoint_name).increment
+      if response
+        prometheus_middleware.response_count.with_labels(endpoint: endpoint_name,
+                                                         status: response[1]).increment
+      end
+    end
+
+    response
+  end
+end

data/lib/macaw_framework/core/server.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require_relative "../aspects/prometheus_aspect"
+require_relative "../aspects/logging_aspect"
+require_relative "../utils/http_status_code"
+require_relative "../aspects/cache_aspect"
+
+##
+# Class responsible for providing a default
+# webserver.
+class Server
+  prepend CacheAspect
+  prepend LoggingAspect
+  prepend PrometheusAspect
+  include HttpStatusCode
+  # rubocop:disable Metrics/ParameterLists
+
+  ##
+  # Create a new instance of Server.
+  # @param {Macaw} macaw
+  # @param {Logger} logger
+  # @param {Integer} port
+  # @param {String} bind
+  # @param {Integer} num_threads
+  # @param {CachingMiddleware} cache
+  # @param {Prometheus::Client:Registry} prometheus
+  # @return {Server}
+  def initialize(macaw, logger, port, bind, num_threads, endpoints_to_cache = nil, cache = nil, prometheus = nil,
+                 prometheus_middleware = nil)
+    @port = port
+    @bind = bind
+    @macaw = macaw
+    @macaw_log = logger
+    @num_threads = num_threads
+    @work_queue = Queue.new
+    @endpoints_to_cache = endpoints_to_cache || []
+    @cache = cache
+    @prometheus = prometheus
+    @prometheus_middleware = prometheus_middleware
+    @workers = []
+  end
+
+  # rubocop:enable Metrics/ParameterLists
+
+  ##
+  # Start running the webserver.
+  def run
+    @server = TCPServer.new(@bind, @port)
+    @num_threads.times do
+      @workers << Thread.new do
+        loop do
+          client = @work_queue.pop
+          break if client == :shutdown
+
+          handle_client(client)
+        end
+      end
+    end
+
+    loop do
+      @work_queue << @server.accept
+    rescue IOError, Errno::EBADF
+      break
+    end
+  end
+
+  ##
+  # Method Responsible for closing the TCP server.
+  def close
+    @server.close
+    @num_threads.times { @work_queue << :shutdown }
+    @workers.each(&:join)
+  end
+
+  private
+
+  def handle_client(client)
+    path, method_name, headers, body, parameters = RequestDataFiltering.parse_request_data(client, @macaw.routes)
+    raise EndpointNotMappedError unless @macaw.respond_to?(method_name)
+
+    @macaw_log.info("Running #{path.gsub("\n", "").gsub("\r", "")}")
+    message, status = call_endpoint(@prometheus_middleware, @macaw_log, @cache, @endpoints_to_cache,
+                                    method_name, headers, body, parameters)
+    status ||= 200
+    message ||= nil
+    client.puts "HTTP/1.1 #{status} #{HTTP_STATUS_CODE_MAP[status]} \r\n\r\n#{message}"
+  rescue EndpointNotMappedError
+    client.print "HTTP/1.1 404 Not Found\r\n\r\n"
+  rescue StandardError => e
+    client.print "HTTP/1.1 500 Internal Server Error\r\n\r\n"
+    @macaw_log.info("Error: #{e}")
+  ensure
+    client.close
+  end
+
+  def call_endpoint(name, headers, body, parameters)
+    @macaw.send(name.to_sym, { headers: headers, body: body, params: parameters })
+  end
+end

data/lib/macaw_framework/middlewares/caching_middleware.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+##
+# Middleware responsible for storing and
+# invalidating cache.
+class CachingMiddleware
+  attr_accessor :cache
+
+  def initialize(inv_time_seconds = 3_600)
+    @cache = {}
+    Thread.new do
+      loop do
+        sleep(1)
+        @cache.each_pair do |key, value|
+          @cache.delete(key) if Time.now - value[1] >= inv_time_seconds
+        end
+      end
+    end
+    sleep(2)
+  end
+end

data/lib/macaw_framework/middlewares/prometheus_middleware.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "prometheus/client"
+require "prometheus/client/formats/text"
+
+##
+# Middleware responsible to configure prometheus
+# defining metrics and an endpoint to access them.
+class PrometheusMiddleware
+  attr_accessor :request_duration_milliseconds, :request_count, :response_count
+
+  def configure_prometheus(prometheus_registry, configurations, macaw)
+    return nil unless prometheus_registry
+
+    @request_duration_milliseconds = Prometheus::Client::Histogram.new(
+      :request_duration_milliseconds,
+      docstring: "The duration of each request in milliseconds",
+      labels: [:endpoint],
+      buckets: (100..1000).step(100).to_a + (2000..10_000).step(1000).to_a
+    )
+
+    @request_count = Prometheus::Client::Counter.new(
+      :request_count,
+      docstring: "The total number of requests received",
+      labels: [:endpoint]
+    )
+
+    @response_count = Prometheus::Client::Counter.new(
+      :response_count,
+      docstring: "The total number of responses sent",
+      labels: %i[endpoint status]
+    )
+
+    prometheus_registry.register(@request_duration_milliseconds)
+    prometheus_registry.register(@request_count)
+    prometheus_registry.register(@response_count)
+    prometheus_endpoint(prometheus_registry, configurations, macaw)
+  end
+
+  private
+
+  def prometheus_endpoint(prometheus_registry, configurations, macaw)
+    endpoint = configurations["macaw"]["prometheus"]["endpoint"] || "/metrics"
+    macaw.get(endpoint) do |_context|
+      [Prometheus::Client::Formats::Text.marshal(prometheus_registry), 200]
+    end
+  end
+end

data/lib/macaw_framework/middlewares/request_data_filtering.rb

@@ -1,24 +1,62 @@
 # frozen_string_literal: true
 
+require_relative "../errors/endpoint_not_mapped_error"
+
 ##
 # Module containing methods to filter Strings
 module RequestDataFiltering
+  VARIABLE_PATTERN = %r{:[^/]+}.freeze
+
   ##
   # Method responsible for extracting information
   # provided by the client like Headers and Body
-  def self.parse_request_data(client)
+  def self.parse_request_data(client, routes)
     path, parameters = extract_url_parameters(client.gets.gsub("HTTP/1.1", ""))
+    parameters = {} if parameters.nil?
+
     method_name = sanitize_method_name(path)
+    method_name = select_path(method_name, routes, parameters)
     body_first_line, headers = extract_headers(client)
     body = extract_body(client, body_first_line, headers["Content-Length"].to_i)
     [path, method_name, headers, body, parameters]
   end
 
+  def self.select_path(method_name, routes, parameters)
+    return method_name if routes.include?(method_name)
+
+    selected_route = nil
+    routes.each do |route|
+      split_route = route.split(".")
+      split_name = method_name.split(".")
+
+      next unless split_route.length == split_name.length
+      next unless match_path_with_route(split_name, split_route)
+
+      selected_route = route
+      split_route.each_with_index do |var, index|
+        parameters[var[1..].to_sym] = split_name[index] if var =~ VARIABLE_PATTERN
+      end
+      break
+    end
+
+    raise EndpointNotMappedError if selected_route.nil?
+
+    selected_route
+  end
+
+  def self.match_path_with_route(split_path, split_route)
+    split_route.each_with_index do |var, index|
+      return false if var != split_path[index] && !var.match?(VARIABLE_PATTERN)
+    end
+
+    true
+  end
+
   ##
   # Method responsible for sanitizing the method name
   def self.sanitize_method_name(path)
     path = extract_path(path)
-    method_name = path.gsub("/", "_").strip.downcase
+    method_name = path.gsub("/", ".").strip.downcase
     method_name.gsub!(" ", "")
     method_name
   end
@@ -26,7 +64,7 @@ module RequestDataFiltering
   ##
   # Method responsible for extracting the path from URI
   def self.extract_path(path)
-    path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
+    path[0] == "/" ? path[1..].gsub("/", ".") : path.gsub("/", ".")
   end
 
   ##

data/lib/macaw_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MacawFramework
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/macaw_framework.rb

@@ -1,9 +1,12 @@
 # frozen_string_literal: true
 
 require_relative "macaw_framework/errors/endpoint_not_mapped_error"
+require_relative "macaw_framework/middlewares/prometheus_middleware"
 require_relative "macaw_framework/middlewares/request_data_filtering"
-require_relative "macaw_framework/middlewares/server"
+require_relative "macaw_framework/middlewares/caching_middleware"
+require_relative "macaw_framework/core/server"
 require_relative "macaw_framework/version"
+require "prometheus/client"
 require "logger"
 require "socket"
 require "json"
@@ -13,20 +16,37 @@ module MacawFramework
   # Class responsible for creating endpoints and
   # starting the web server.
   class Macaw
+    ##
+    # Array containing the routes defined in the application
+    attr_reader :routes
+
     ##
     # @param {Logger} custom_log
     def initialize(custom_log: nil, server: Server)
       begin
+        @routes = []
         @macaw_log ||= custom_log.nil? ? Logger.new($stdout) : custom_log
         config = JSON.parse(File.read("application.json"))
-        @port = config["macaw"]["port"]
-        @bind = config["macaw"]["bind"]
+        @port = config["macaw"]["port"] || 8080
+        @bind = config["macaw"]["bind"] || "localhost"
+        @threads = config["macaw"]["threads"] || 5
+        unless config["macaw"]["cache"].nil?
+          @cache = CachingMiddleware.new(config["macaw"]["cache"]["cache_invalidation"].to_i || 3_600)
+        end
+        @prometheus = Prometheus::Client::Registry.new if config["macaw"]["prometheus"]
+        @prometheus_middleware = PrometheusMiddleware.new if config["macaw"]["prometheus"]
+        @prometheus_middleware.configure_prometheus(@prometheus, config, self) if config["macaw"]["prometheus"]
       rescue StandardError => e
         @macaw_log.error(e.message)
       end
       @port ||= 8080
       @bind ||= "localhost"
-      @server = server.new(self, @macaw_log, @port, @bind)
+      @threads ||= 5
+      @endpoints_to_cache = []
+      @prometheus ||= nil
+      @prometheus_middleware ||= nil
+      @server = server.new(self, @macaw_log, @port, @bind, @threads, @endpoints_to_cache, @cache, @prometheus,
+                           @prometheus_middleware)
     end
 
     ##
@@ -35,18 +55,19 @@ module MacawFramework
     # @param {String} path
     # @param {Proc} block
     # @return {Integer, String}
-    def get(path, &block)
-      map_new_endpoint("get", path, &block)
+    def get(path, cache: false, &block)
+      map_new_endpoint("get", cache, path, &block)
     end
 
     ##
     # Creates a POST endpoint associated
     # with the respective path.
     # @param {String} path
+    # @param {Boolean} cache
     # @param {Proc} block
     # @return {String, Integer}
-    def post(path, &block)
-      map_new_endpoint("post", path, &block)
+    def post(path, cache: false, &block)
+      map_new_endpoint("post", cache, path, &block)
     end
 
     ##
@@ -55,8 +76,8 @@ module MacawFramework
     # @param {String} path
     # @param {Proc} block
     # @return {String, Integer}
-    def put(path, &block)
-      map_new_endpoint("put", path, &block)
+    def put(path, cache: false, &block)
+      map_new_endpoint("put", cache, path, &block)
     end
 
     ##
@@ -65,8 +86,8 @@ module MacawFramework
     # @param {String} path
     # @param {Proc} block
     # @return {String, Integer}
-    def patch(path, &block)
-      map_new_endpoint("patch", path, &block)
+    def patch(path, cache: false, &block)
+      map_new_endpoint("patch", cache, path, &block)
     end
 
     ##
@@ -75,16 +96,17 @@ module MacawFramework
     # @param {String} path
     # @param {Proc} block
     # @return {String, Integer}
-    def delete(path, &block)
-      map_new_endpoint("delete", path, &block)
+    def delete(path, cache: false, &block)
+      map_new_endpoint("delete", cache, path, &block)
     end
 
     ##
     # Starts the web server
     def start!
+      @macaw_log.info("---------------------------------")
       @macaw_log.info("Starting server at port #{@port}")
-      time = Time.now
-      @macaw_log.info("Server started in #{Time.now - time} seconds.")
+      @macaw_log.info("Number of threads: #{@threads}")
+      @macaw_log.info("---------------------------------")
       server_loop(@server)
     rescue Interrupt
       @macaw_log.info("Stopping server")
@@ -98,10 +120,14 @@ module MacawFramework
       server.run
     end
 
-    def map_new_endpoint(prefix, path, &block)
+    def map_new_endpoint(prefix, cache, path, &block)
+      @endpoints_to_cache << "#{prefix}.#{RequestDataFiltering.sanitize_method_name(path)}" if cache
       path_clean = RequestDataFiltering.extract_path(path)
       @macaw_log.info("Defining #{prefix.upcase} endpoint at /#{path}")
-      define_singleton_method("#{prefix}_#{path_clean}", block)
+      define_singleton_method("#{prefix}.#{path_clean}", block || lambda {
+        |context = { headers: {}, body: "", params: {} }|
+                                                         })
+      @routes << "#{prefix}.#{path_clean}"
     end
   end
 end

data/sig/caching_middleware.rbs

@@ -0,0 +1,5 @@
+class CachingMiddleware
+  @cache: Hash[String, Array[string]]
+
+  attr_accessor cache: Hash[String, Array[string]]
+end

data/sig/macaw_framework/macaw.rbs

@@ -1,11 +1,18 @@
 module MacawFramework
   class Macaw
     @bind: string
+    @cache: untyped
+    @endpoints_to_cache: Array[String]
     @macaw_log: Logger
     @port: int
 
+    @prometheus: untyped
     @server: Server
 
+    @threads: Integer
+
+    attr_reader routes: Array[String]
+
     def delete: -> nil
 
     def get: -> nil

data/sig/request_data_filtering.rbs

@@ -0,0 +1,3 @@
+module RequestDataFiltering
+  VARIABLE_PATTERN: Regexp
+end

data/sig/server.rbs

@@ -1,11 +1,22 @@
 class Server
   @bind: String
+  @cache: CachingMiddleware
+  @endpoints_to_cache: Array[String]
   @macaw: MacawFramework::Macaw
   @macaw_log: Logger
+  @num_threads: Integer
   @port: Integer
 
+  @prometheus: untyped
+  @prometheus_middleware: untyped
   @server: TCPServer
 
+  @threads: Integer
+
+  @work_queue: Thread::Queue
+
+  @workers: Array[Thread]
+
   def close: -> nil
 
   def run: -> nil
@@ -13,4 +24,6 @@ class Server
   private
 
   def call_endpoint: -> Array[untyped]
+
+  def handle_client: -> nil
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: macaw_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Aria Diniz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-09 00:00:00.000000000 Z
-dependencies: []
+date: 2023-04-22 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: prometheus-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: A project started for study purpose that I intend to keep working on.
 email:
 - aria.diniz.dev@gmail.com
@@ -25,16 +39,23 @@ files:
 - README.md
 - Rakefile
 - lib/macaw_framework.rb
+- lib/macaw_framework/aspects/cache_aspect.rb
 - lib/macaw_framework/aspects/logging_aspect.rb
+- lib/macaw_framework/aspects/prometheus_aspect.rb
+- lib/macaw_framework/core/server.rb
 - lib/macaw_framework/errors/endpoint_not_mapped_error.rb
+- lib/macaw_framework/middlewares/caching_middleware.rb
+- lib/macaw_framework/middlewares/prometheus_middleware.rb
 - lib/macaw_framework/middlewares/request_data_filtering.rb
-- lib/macaw_framework/middlewares/server.rb
 - lib/macaw_framework/utils/http_status_code.rb
 - lib/macaw_framework/version.rb
+- macaw_logo.png
+- sig/caching_middleware.rbs
 - sig/http_status_code.rbs
 - sig/logging_aspect.rbs
 - sig/macaw_framework.rbs
 - sig/macaw_framework/macaw.rbs
+- sig/request_data_filtering.rbs
 - sig/server.rbs
 homepage: https://github.com/ariasdiniz/macaw_framework
 licenses:

data/lib/macaw_framework/middlewares/server.rb

@@ -1,64 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "../aspects/logging_aspect"
-require_relative "../utils/http_status_code"
-
-##
-# Class responsible for providing a default
-# webserver.
-class Server
-  prepend LoggingAspect
-  include HttpStatusCode
-
-  ##
-  # Create a new instance of Server.
-  # @param {Macaw} macaw
-  # @param {Logger} logger
-  # @param {Integer} port
-  # @param {String} bind
-  # @return {Server}
-  def initialize(macaw, logger, port, bind)
-    @port = port
-    @bind = bind
-    @macaw = macaw
-    @macaw_log = logger
-  end
-
-  ##
-  # Start running the webserver.
-  def run
-    @server = TCPServer.new(@bind, @port)
-    loop do
-      Thread.start(@server.accept) do |client|
-        path, method_name, headers, body, parameters = RequestDataFiltering.parse_request_data(client)
-        raise EndpointNotMappedError unless @macaw.respond_to?(method_name)
-
-        @macaw_log.info("Running #{path.gsub("\n", "").gsub("\r", "")}")
-        message, status = call_endpoint(@macaw_log, method_name, headers, body, parameters)
-        status ||= 200
-        message ||= "Ok"
-        client.puts "HTTP/1.1 #{status} #{HTTP_STATUS_CODE_MAP[status]} \r\n\r\n#{message}"
-        client.close
-      rescue EndpointNotMappedError
-        client.print "HTTP/1.1 404 Not Found\r\n\r\n"
-        client.close
-      rescue StandardError => e
-        client.print "HTTP/1.1 500 Internal Server Error\r\n\r\n"
-        @macaw_log.info("Error: #{e}")
-        client.close
-      end
-    end
-  end
-
-  ##
-  # Method Responsible for closing the TCP server.
-  def close
-    @server.close
-  end
-
-  private
-
-  def call_endpoint(name, *arg_array)
-    @macaw.send(name.to_sym, *arg_array)
-  end
-end