schemaless_rest_api 0.4.2 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95a3b730fded817e63c9d7d95ba4f658d22a1ed55b2d324b2dfe325d3624108
-  data.tar.gz: bb0514bb042bbcd277e6ceb240a4fe2f9f2b4ab72df7d881158c13ff53073e47
+  metadata.gz: 49fba7a856b268a6077d6597c20687d0d056cce2049fb5c0590da046acebf91f
+  data.tar.gz: 2ac45839af0b7d4e273812bcf6a4a9d3f750d958285c3f9fcfccf143ee4d8c57
 SHA512:
-  metadata.gz: 85a359eb6004862d9c2c85a78391635c3219e374779bbbc1a6276066c6886e39ccfde7841764fc1eae9bf175d4aa3ee4abcfe13ea5884deceddc1213d4bcefac
-  data.tar.gz: 5f832458ee8abe08bd102b106ab08204aeacc83dd8d90f171a4d297d7cdf96106bd08150f9bcedfc2adf5fd88f7921c92108eb51aa39e7bcbe788745e143fe1c
+  metadata.gz: 5c545f176d807dff6894b10a54aba45737968157247261b1a973ae471ec60155834a8847a43edb3c2ee50ad2a2b562846f5513479112402f3013b7da6a84a0c2
+  data.tar.gz: 35f4ed2bc211ac4bf163296b69c29362a7d13a3c705898e7a5a07438d3c8b071907acfd0792fb9b84e81519e74b6cfd95276156948ae422d27886a13ebb7421c

data/lib/schemaless_rest_api/rest_server.rb

@@ -14,29 +14,34 @@ class RestServer < Sinatra::Base
   helpers ServerUtils
 
   before do
-    @request_id = SecureRandom.uuid 
-    headers["X-Request-Id"] = @request_id    
+    @request_id = SecureRandom.uuid
+    headers["X-Correlation-Id"] = @request_id
     headers["Access-Control-Allow-Origin"] = "*"
-    log({ msg: "Request"}) if (request.fullpath != "")
+    log({ msg: "Request" }) if request.fullpath != ""
   end
 
-  after do    
-    log({ msg: "Response", status: response.status }) if (request.fullpath != "")
+  after do
+    log({ msg: "Response", status: response.status }) if request.fullpath != ""
   end
 
-  SWAGGER_FILES = %w[index.css swagger.html swagger-initializer.js swagger-ui-bundle.js swagger-ui-standalone-preset.js swagger-ui.css]
+  get "/favicon.ico" do
+    send_file File.join(__dir__, "rest.ico")
+  end
+
+  SWAGGER_FILES = %w[index.css swagger.html swagger-initializer.js swagger-ui-bundle.js swagger-ui-standalone-preset.js
+                     swagger-ui.css]
 
   SWAGGER_FILES.each do |filename|
     get "/#{filename.gsub(".html", "")}" do
-      if filename.end_with? '.json'
+      if filename.end_with? ".json"
         content_type :json
-      elsif filename.end_with? '.css'
+      elsif filename.end_with? ".css"
         content_type :css
-      elsif filename.end_with? '.js'
+      elsif filename.end_with? ".js"
         content_type :js
       end
 
-      File.read("./lib/schemaless_rest_api/swagger/#{filename}")
+      File.read(File.join(__dir__, "swagger", filename))
     end
   end
 
@@ -79,7 +84,7 @@ class RestServer < Sinatra::Base
       else
         Entities.models[model][id] = data
       end
-      log({msg: "Created #{id}"})
+      log({ msg: "Created #{id}" })
       [201, JSON.generate({ id: id })]
     end
 

data/lib/schemaless_rest_api/server_utils.rb

@@ -1,22 +1,27 @@
 # frozen_string_literal: true
 
-# typed: true
+# typed: false
 
+# Helper methods added to RestServer
 module ServerUtils
   def log(messages)
-	if SchemalessRestApi.log_type == :ougai
-	  log_msg = {
-		method: request.request_method,
-		path: request.fullpath, 
-		correlationId: @request_id
-	  }
-	  messages.each do |key, value|
-        log_msg[key] = value
-	  end
-	  SchemalessRestApi.logger.info(log_msg)
-	else
-	  message = messages.values.join(", ")	
-	  SchemalessRestApi.logger.info "#{message}, #{request.request_method} #{request.fullpath}, CorrelationId: #{@request_id}"
-	end
+    if SchemalessRestApi.log_type == :ougai
+      log_structured(messages)
+    else
+      message = messages.values.join(", ")
+      SchemalessRestApi.logger.info "#{message}, #{request.request_method} #{request.fullpath}, CorrelationId: #{@request_id}"
+    end
   end
-end
+
+  private def log_structured(messages)
+    log_msg = {
+      method: request.request_method,
+      path: request.fullpath,
+      correlationId: @request_id
+    }
+    messages.each do |key, value|
+      log_msg[key] = value
+    end
+    SchemalessRestApi.logger.info(log_msg)
+  end
+end

data/lib/schemaless_rest_api/version.rb

@@ -3,5 +3,5 @@
 # typed: true
 
 module SchemalessRestApi
-  VERSION = "0.4.2"
+  VERSION = "0.5.1"
 end

data/lib/schemaless_rest_api.rb

@@ -11,16 +11,18 @@ require "ougai"
 require "json"
 require "securerandom"
 
+ENV["APP_ENV"] ||= "production"
+
 # Global params for Schemalass REST API
 module SchemalessRestApi
-  if ENV["Log"] == 'structured'
+  if ENV["Log"] == "structured"
     @logger = Ougai::Logger.new($stdout)
     @log_type = :ougai
   else
     @logger = Logger.new($stdout)
     @log_type = :basic
   end
-  
+
   class << self
     # @return Logger
     attr_accessor :logger

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schemaless_rest_api
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel Garratt
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -122,6 +122,7 @@ files:
 - lib/schemaless_rest_api.rb
 - lib/schemaless_rest_api/entities.rb
 - lib/schemaless_rest_api/mongo_client.rb
+- lib/schemaless_rest_api/rest.ico
 - lib/schemaless_rest_api/rest_server.rb
 - lib/schemaless_rest_api/server_utils.rb
 - lib/schemaless_rest_api/swagger/index.css