macaw_framework 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20f895377b3f0eea2494e091fab22b81734f6625d840ed2414c557db4db29ac2
-  data.tar.gz: 0ce55bbbbb41a5da4ab1622c72ced7300bfc4cb8b75091702fffb21822415ce2
+  metadata.gz: 8d2934b530ed442004aaecbd13430dc250fe2fde52c2b9abf2e0f95eed6c606a
+  data.tar.gz: 8989aaff7cf4be554e18edb4cee3928b918c263b35cbb9886f9df94ef8a5b0f9
 SHA512:
-  metadata.gz: 033b20344e924fb6cf66a75df40dd18fcee89967738392529b7f6dbab02e7301af275156d81a5601222428a03ae9796af751b048ab09632debfe87fcc5c86516
-  data.tar.gz: c2c09a27334e8904f2b7e714a6ac71df95140fe7e088ddcf23e71a29a125c0cc72cce2395939ce18d2e5ebb3998fb28c8a8a0a912de99c9e070004a0b78483a9
+  metadata.gz: 04ac3f80610994da626fef59bd5554bc2535c693357bca3fe8891170478cdf7b65af4552c83b8532c40ae704e6d50fafe9457afa2c03b6177080742e15e11611
+  data.tar.gz: 245ef53c503e22eea1c2f5a3e4a8a8ccf48a7444cba36c393fed048973415d1ff4dea8bba53c3bb5dd892422898e0284ca8a6d3b3f70ddaed0c3823d191df792

data/CHANGELOG.md

@@ -3,3 +3,7 @@
 ## [0.1.0] - 2022-12-05
 
 - Initial release
+
+## [0.1.0] - 2022-12-06
+
+- Adding support for headers and body

data/README.md

@@ -35,9 +35,9 @@ Example of usage:
 require 'macaw_framework'
 require 'json'
 
-m = Macaw.new
+m = MacawFramework::Macaw.new
 
-m.get('/hello_world') do
+m.get('/hello_world') do |headers, body|
   return JSON.pretty_generate({ hello_message: 'Hello World!' }), 200
 end
 

data/lib/macaw_framework/version.rb

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

data/lib/macaw_framework.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative 'macaw_framework/endpoint_not_mapped_error'
-require_relative 'macaw_framework/http_status_code'
-require_relative 'macaw_framework/version'
-require 'socket'
-require 'json'
+require_relative "macaw_framework/endpoint_not_mapped_error"
+require_relative "macaw_framework/http_status_code"
+require_relative "macaw_framework/version"
+require "socket"
+require "json"
 
 module MacawFramework
   ##
@@ -14,8 +14,8 @@ module MacawFramework
     include(HttpStatusCode)
     def initialize
       begin
-        config = JSON.parse(File.read('application.json'))
-        @port = config['macaw']['port']
+        config = JSON.parse(File.read("application.json"))
+        @port = config["macaw"]["port"]
       rescue StandardError
         @port ||= 8080
       end
@@ -29,7 +29,7 @@ module MacawFramework
     # @param {Proc} block
     # @return {Integer, String}
     def get(path, &block)
-      path_clean = path[0] == '/' ? path[1..].gsub('/', '_') : path.gsub('/', '_')
+      path_clean = path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
       define_singleton_method("get_#{path_clean}", block)
     end
 
@@ -40,7 +40,7 @@ module MacawFramework
     # @param {Proc} block
     # @return {String, Integer}
     def post(path, &block)
-      path_clean = path[0] == '/' ? path[1..].gsub('/', '_') : path.gsub('/', '_')
+      path_clean = path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
       define_singleton_method("post_#{path_clean}", block)
     end
 
@@ -51,7 +51,7 @@ module MacawFramework
     # @param {Proc} block
     # @return {String, Integer}
     def put(path, &block)
-      path_clean = path[0] == '/' ? path[1..].gsub('/', '_') : path.gsub('/', '_')
+      path_clean = path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
       define_singleton_method("put_#{path_clean}", block)
     end
 
@@ -62,7 +62,7 @@ module MacawFramework
     # @param {Proc} block
     # @return {String, Integer}
     def patch(path, &block)
-      path_clean = path[0] == '/' ? path[1..].gsub('/', '_') : path.gsub('/', '_')
+      path_clean = path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
       define_singleton_method("patch_#{path_clean}", block)
     end
 
@@ -73,7 +73,7 @@ module MacawFramework
     # @param {Proc} block
     # @return {String, Integer}
     def delete(path, &block)
-      path_clean = path[0] == '/' ? path[1..].gsub('/', '_') : path.gsub('/', '_')
+      path_clean = path[0] == "/" ? path[1..].gsub("/", "_") : path.gsub("/", "_")
       define_singleton_method("delete_#{path_clean}", block)
     end
 
@@ -84,12 +84,13 @@ module MacawFramework
       puts "Starting server at port #{@port}"
       loop do
         Thread.start(server.accept) do |client|
-          method_name = extract_client_info(client)
+          client.select
+          method_name, headers, body = extract_client_info(client)
           raise EndpointNotMappedError unless respond_to?(method_name)
 
-          message, status = send(method_name)
+          message, status = send(method_name, headers, body)
           status ||= 200
-          message ||= 'Ok'
+          message ||= "Ok"
           client.puts "HTTP/1.1 #{status} #{HTTP_STATUS_CODE_MAP[status]} \r\n\r\n#{message}"
           client.close
         rescue EndpointNotMappedError
@@ -100,18 +101,39 @@ module MacawFramework
           client.close
         end
       end
+    rescue Interrupt
+      puts "Macaw stop flying for some seeds..."
     end
 
     private
 
     ##
-    # Method for extracting headers and body from client request
-    # STILL IN DEVELOPMENT
-    # @todo finish implementation
+    # Method responsible for extracting information
+    # provided by the client like Headers and Body
     def extract_client_info(client)
-      method_name = client.gets.gsub('HTTP/1.1', '').gsub('/', '_').strip!.downcase
-      method_name.gsub!(' ', '')
-      method_name
+      method_name = client.gets.gsub("HTTP/1.1", "").gsub("/", "_").strip!.downcase
+      method_name.gsub!(" ", "")
+      body_first_line, headers = extract_headers(client)
+      body = extract_body(client, body_first_line, headers["Content-Length"].to_i)
+      [method_name, headers, body]
+    end
+
+    ##
+    # Extract application headers
+    def extract_headers(client)
+      header = client.gets.delete("\n").delete("\r")
+      headers = {}
+      while header.match(%r{[a-zA-Z0-9\-/*]*: [a-zA-Z0-9\-/*]})
+        split_header = header.split(":")
+        headers[split_header[0]] = split_header[1][1..]
+        header = client.gets.delete("\n").delete("\r")
+      end
+      [header, headers]
+    end
+
+    def extract_body(client, body_first_line, content_length)
+      body = client.read(content_length)
+      body_first_line << body.to_s
     end
   end
 end

data/sig/macaw_framework/macaw.rbs

@@ -16,6 +16,10 @@ module MacawFramework
 
     private
 
+    def extract_body: -> string
+
     def extract_client_info: -> nil
+
+    def extract_headers: -> string
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaw_framework
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aria Diniz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-12-06 00:00:00.000000000 Z
+date: 2022-12-07 00:00:00.000000000 Z
 dependencies: []
 description: A project started for study purpose that I intend to keep working on.
 email:
@@ -34,6 +34,7 @@ homepage: https://github.com/ariasdiniz/macaw_framework
 licenses:
 - MIT
 metadata:
+  documentation_uri: https://rubydoc.info/gems/macaw_framework
   homepage_uri: https://github.com/ariasdiniz/macaw_framework
   source_code_uri: https://github.com/ariasdiniz/macaw_framework
 post_install_message: 
@@ -44,7 +45,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="