schemaless_rest_api 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 983c38081a6ee3d08a9d75b2e9425899329d1df050974088a5aac6eb21d924e5
-  data.tar.gz: 2ed42db41c915a2106da88ac4d9179ea5bc55a8a594ec47dd0bc89f93f3ca8ef
+  metadata.gz: c80f60796bfe046a8af8d4e4068ae847379ab7a6a2f78b03e06732f2b6b1d8a6
+  data.tar.gz: 1473a6597e940ad4949b306d6cb72b5b49badda3ec3b16b2e118407eaefaa45d
 SHA512:
-  metadata.gz: ceafb7b6ed5b550dd7aae21ab964ec181ccb2b82221aaaf931596c5a379bbd4a4881eecda5b9896fb4179adb8ab6f37197b320cf6018213fda5979e42c266474
-  data.tar.gz: 276bb03925b12bc91bebeee8344b863033b237b336880a799ee7f309a90e27d4d8f86ab0a3c4a532e2e23cc001eacf1c9d9b14d6d3dd8991c694edad4407c449
+  metadata.gz: b9d2068d71bef0434faa40fe237864fcb6fbebedbb0109013d995055a26975ca4109817215840b2cc22b178efdb3cdc1924e19d1450fcdda251f2ef5aad89e6a
+  data.tar.gz: ad9734ec4b544a6a686e791cacbb45cd70234e071f6af8d6d2ced82624e401d03a7d77ba33001a2cd0529a0ace33205c28eed296b853a8e728ed396c2ff0a7b1

data/lib/schemaless_rest_api/rest_server.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "sinatra"
-require "docdsl"
 require "puma"
 require "route_downcaser"
 
@@ -12,16 +11,28 @@ class RestServer < Sinatra::Base
   set :bind, "0.0.0.0"
   use RouteDowncaser::DowncaseRouteMiddleware
 
-  register Sinatra::DocDsl
+  SWAGGER_FILES = %w[index.css swagger.html swagger-initializer.js swagger-ui-bundle.js swagger-ui-standalone-preset.js swagger-ui.css]
 
-  page do
-    title "Schmaless REST API"
-    header "REST API using models #{Entities.models.keys}"
-    introduction "REST APIs allowing CRUD on:
-#{Entities.models.keys.join("\n")}"
+  SWAGGER_FILES.each do |filename|
+    get "/#{filename.gsub(".html", "")}" do
+      response["Access-Control-Allow-Origin"] = "*"
+      if filename.end_with? '.json'
+        content_type :json
+      elsif filename.end_with? '.css'
+        content_type :css
+      elsif filename.end_with? '.js'
+        content_type :js
+      end
+
+      File.read("./lib/schemaless_rest_api/swagger/#{filename}")
+    end
   end
 
-  doc_endpoint "/docs"
+  get "/swagger.json" do
+    response["Access-Control-Allow-Origin"] = "*"
+    content_type :json
+    SwaggerBuilder.build_swagger_for(Entities.models, request.host_with_port)
+  end
 
   def has_id?(model, id)
     Entities.models[model].key?(id)
@@ -31,27 +42,25 @@ class RestServer < Sinatra::Base
     [404, JSON.generate({ error: "'#{id}' not found" })]
   end
 
-  documentation "Get summary" do
-    response "Basic basic summary of API"
-  end
   get "/" do
     summary = { models: Entities.models.keys.to_s,
-                docs_url: "<a href=/docs>/docs</a>" }
+                docs_url: "<a href=/swagger>Swagger docs</a>" }
     summary[:db] = MongoClient.client.summary.to_s if ENV["mongodb"]
     JSON.generate(summary)
-  rescue Exception => e
+  rescue StandardError => e
     [500, e.message]
   end
 
   Entities.models.each_key do |model|
-    documentation "Create instance of #{model}" do
-      payload "Whatever JSON you want. Needs to be valid JSON"
-      response "Id of created #{model}"
-      status 201
-    end
     post "/#{model.downcase}" do
       response["Access-Control-Allow-Origin"] = "*"
-      data = JSON.parse(request.body.read)
+      request_id = SecureRandom.uuid 
+      headers["X-Request-Id"] = request_id
+      SchemalessRestApi.logger.info env
+      SchemalessRestApi.logger.info "POST #{request.fullpath}, CorrelationId: #{request_id}"
+      request_body = request.body.read
+      data = {}
+      data = JSON.parse(request_body) unless request_body.empty?
       id = ""
       if data["id"]
         id = data["id"].to_s
@@ -64,6 +73,7 @@ class RestServer < Sinatra::Base
       else
         Entities.models[model][id] = data
       end
+      SchemalessRestApi.logger.info "Created #{id}, CorrelationId: #{request_id}"
       [201, JSON.generate({ id: id })]
     end
 
@@ -74,14 +84,9 @@ class RestServer < Sinatra::Base
       response["Access-Control-Allow-Headers"] = "*"
     end
 
-    documentation "Retrieve all instances of #{model} or filtered by query param" do
-      response "Data in #{model}"
-      query_param :key_to_search_in_data, "Value of key"
-      status 200
-    end
     get "/#{model.downcase}" do
       response["Access-Control-Allow-Origin"] = "*"
-      SchemalessRestApi.logger.info request.fullpath
+      SchemalessRestApi.logger.info "GET #{request.fullpath}"
       if ENV["mongodb"]
         if params == {}
           JSON.generate(MongoClient.get_all(model))
@@ -96,18 +101,13 @@ class RestServer < Sinatra::Base
         end
         return JSON.generate(matching_values)
       end
-    rescue Exception => e
+    rescue StandardError => e
       [404, "Nothing found using #{params}. Only first param considered. #{e.message}"]
     end
 
-    documentation "Retrieve specific instance of #{model} by id" do
-      response "Data in #{model}"
-      status 200
-      status 404
-    end
     get "/#{model.downcase}/:id" do |id|
       response["Access-Control-Allow-Origin"] = "*"
-      puts request.path.downcase
+      SchemalessRestApi.logger.info "GET #{request.fullpath}"
       if ENV["mongodb"]
         results = MongoClient.find(model, id)
         return not_have(id) unless results.first
@@ -127,15 +127,9 @@ class RestServer < Sinatra::Base
       response["Access-Control-Allow-Headers"] = "*"
     end
 
-    documentation "Update id of #{model} to be provided data" do
-      payload "Whatever JSON you want updated to be. Needs to be valid JSON"
-      response "Data in #{model}"
-      status 204
-      status 404
-    end
     put "/#{model.downcase}/:id" do |id|
       response["Access-Control-Allow-Origin"] = "*"
-      puts request.path.downcase
+      SchemalessRestApi.logger.info "PUT #{request.fullpath}"
       data = JSON.parse(request.body.read)
       if ENV["mongodb"]
         results = MongoClient.find(model, id)
@@ -150,13 +144,9 @@ class RestServer < Sinatra::Base
       204
     end
 
-    documentation "Update id of #{model} to be deleted" do
-      response "Empty"
-      status 204
-    end
     delete "/#{model.downcase}/:id" do |id|
       response["Access-Control-Allow-Origin"] = "*"
-      puts request.path.downcase
+      SchemalessRestApi.logger.info "DEL #{request.fullpath}"
       if ENV["mongodb"]
         results = MongoClient.find(model, id)
         return not_have(id) unless results.first

data/lib/schemaless_rest_api/swagger/index.css

@@ -0,0 +1,16 @@
+html {
+    box-sizing: border-box;
+    overflow: -moz-scrollbars-vertical;
+    overflow-y: scroll;
+}
+
+*,
+*:before,
+*:after {
+    box-sizing: inherit;
+}
+
+body {
+    margin: 0;
+    background: #fafafa;
+}

data/lib/schemaless_rest_api/swagger/swagger-initializer.js

@@ -0,0 +1,19 @@
+window.onload = function() {
+  //<editor-fold desc="Changeable Configuration Block">
+
+  window.ui = SwaggerUIBundle({
+    url: "./swagger.json", 
+    dom_id: '#swagger-ui',
+    deepLinking: true,
+    presets: [
+      SwaggerUIBundle.presets.apis,
+      SwaggerUIStandalonePreset
+    ],
+    plugins: [
+      SwaggerUIBundle.plugins.DownloadUrl
+    ],
+    layout: "StandaloneLayout"
+  });
+
+  //</editor-fold>
+};