ree_lib 1.0.8 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21753e8008242096b9b9f780b264e6826a963d0b3e18ae04a2996ed00426ef6d
-  data.tar.gz: 5fc2d171c79e6c657358fec5caf57f0fde2adb19a19e95361290725144c9f4b3
+  metadata.gz: d1857f5c4388ddb54b06b96eec4dff68b48500010d6fe83c7745074c259e3ba6
+  data.tar.gz: 7b8c5bca28e57ee3da6fc6ccb1c032db43b9b1bfb516c23c7cb6be8aed0c2e5c
 SHA512:
-  metadata.gz: d345bf12b261d42a34cb0fcfe17345f012218a2eb63bef1b4c132283f3b87fd9285775ab36b246330573f5247515c156e2f76c784f34d790f1cf3ea4ed327d14
-  data.tar.gz: cbe232fb49e266695f68db6c60fbcf7568ceeae79a15bae9c73c051bd97ab44a255f26edf942fae9fafac99bbe474af9d1dbd0a5075aa344a519e8238a92e2c3
+  metadata.gz: cedd921b6f53e8d6510f8bf55d52a3414dda9440012277798aa5ff77429c01448520574377e28d36aa6784d6e6dec9509b5830670a6ef1d2c772e430db1dcead
+  data.tar.gz: c1df54e9603fbe776a4ce507bff3379e699592052735ed93caa9078232879b914957e611bdb5098efd1f5440488005cdcb60eaba8a8672559dd7e72f50104282

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.8)
+    ree_lib (1.0.11)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -36,9 +36,11 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     msgpack (1.5.4)
+    nokogiri (1.13.8-x86_64-darwin)
+      racc (~> 1.4)
     nokogiri (1.13.8-x86_64-linux)
       racc (~> 1.4)
-    oj (3.13.19)
+    oj (3.13.20)
     pg (1.4.2)
     public_suffix (4.0.7)
     racc (1.6.0)

data/lib/ree_lib/packages/ree_http/package/ree_http/functions/build_request_executor.rb

@@ -5,7 +5,7 @@ class ReeHttp::BuildRequestExecutor
 
   fn :build_request_executor do
     link 'ree_http/constants', -> {
-      DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
+      HTTPS & DEFAULT_TIMEOUT & DEFAULT_WRITE_TIMEOUT & DEFAULT_FORCE_SSL
     }
   end
 
@@ -47,7 +47,8 @@ class ReeHttp::BuildRequestExecutor
     request_executor.write_timeout = opts[:write_timeout]
     request_executor.read_timeout = opts[:timeout]
 
-    request_executor.use_ssl = opts[:force_ssl]
+    request_executor.use_ssl = opts[:force_ssl] || uri.scheme == HTTPS
+
 
     if opts[:ca_certs?]
       request_executor = build_ca_certs(request_executor, opts[:ca_certs?])

data/lib/ree_lib/packages/ree_json/package/ree_json/functions/from_json.rb

@@ -7,6 +7,8 @@ class ReeJson::FromJson
     }
   end
 
+  ParseJsonError = Class.new(StandardError)
+
   contract(
     Any,
     Kwargs[
@@ -16,7 +18,7 @@ class ReeJson::FromJson
       symbol_keys?: Bool,
       RestKeys => Any
     ] => Hash
-  ).throws(ArgumentError)
+  ).throws(ParseJsonError)
   def call(object, mode: :rails, **opts)
     options = DEFAULT_OPTIONS
       .dup
@@ -25,5 +27,7 @@ class ReeJson::FromJson
       )
 
     Oj.load(object, options)
+  rescue ArgumentError, EncodingError
+    raise ParseJsonError.new
   end
 end

data/lib/ree_lib/packages/ree_json/schemas/ree_json/functions/from_json.schema.json

@@ -10,7 +10,7 @@
     {
       "doc": "",
       "throws": [
-        "ArgumentError"
+        "ReeJson::FromJson::ParseJsonError"
       ],
       "return": "Hash",
       "args": [

data/lib/ree_lib/packages/ree_json/spec/ree_json/functions/from_json_spec.rb

@@ -11,4 +11,8 @@ RSpec.describe :from_json do
     result = from_json("{\":id\":{\"^o\":\"Object\"}}", mode: :object)
     expect(result[:id]).to be_a(Object)
   }
+
+  it {
+    expect{from_json("{213: \"123\"}")}.to raise_error(ReeJson::FromJson::ParseJsonError)
+  }
 end

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/dto/endpoint_dto.rb

@@ -13,6 +13,7 @@ class ReeSwagger::EndpointDto
     path: String,
     caster: Nilor[ReeMapper::Mapper],
     serializer: Nilor[ReeMapper::Mapper],
+    authenticate: Bool,
     summary: Nilor[String],
     description: Nilor[String],
     response_status: Integer,

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_endpoint_schema.rb

@@ -112,6 +112,7 @@ class ReeSwagger::BuildEndpointSchema
 
     method_schema[:parameters]  = parameters   if parameters
     method_schema[:requestBody] = request_body if request_body
+    method_schema[:security] = [{ ApiKeyAuth: [] }] if endpoint.authenticate
 
     schema = {endpoint.method => method_schema}
 

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_request_body_schema.rb

@@ -38,10 +38,11 @@ class ReeSwagger::BuildRequestBodySchema
 
     return if properties.empty?
 
-    {
+    obj = {
       type: 'object',
       properties: properties,
-      required: required_fields
     }
+    obj[:required] = required_fields if required_fields.size != 0
+    obj
   end
 end

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_schema.rb

@@ -8,8 +8,8 @@ class ReeSwagger::BuildSchema
     link 'ree_swagger/dto/endpoint_dto', -> { EndpointDto }
   end
 
-  contract(String, String, String, ArrayOf[EndpointDto] => Hash)
-  def call(title:, description:, version:, endpoints:)
+  contract(String, String, String, String, ArrayOf[EndpointDto] => Hash)
+  def call(title:, description:, version:, api_url:, endpoints:)
     {
       openapi: "3.0.0",
       info: {
@@ -17,6 +17,16 @@ class ReeSwagger::BuildSchema
         description: description,
         version:     version
       },
+      components: {
+        securitySchemes: {
+          ApiKeyAuth: {
+            type: 'apiKey',
+            in: 'header',
+            name: 'Authorization'
+          }
+        }
+      },
+      servers: [{ url: api_url }],
       paths: endpoints.each_with_object(Hash.new { _1[_2] = {} }) {
         path_dto = build_endpoint_schema(_1)
         _2[path_dto.path].merge!(path_dto.schema)

data/lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/build_schema.schema.json

@@ -26,6 +26,10 @@
           "arg": "version",
           "type": "String"
         },
+        {
+          "arg": "api_url",
+          "type": "String"
+        },
         {
           "arg": "endpoints",
           "type": "ArrayOf[ReeSwagger::EndpointDto]"

data/lib/ree_lib/packages/ree_swagger/spec/functions/build_endpoint_schema_spec.rb

@@ -71,6 +71,7 @@ RSpec.describe :build_endpoint_schema do
     schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
       method:          :post,
       respond_to:      :json,
+      authenticate:    false,
       path:            '/versions/:id',
       sections:        ["versions"],
       caster:          caster,
@@ -97,6 +98,7 @@ RSpec.describe :build_endpoint_schema do
     csv_schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
       method:          :get,
       respond_to:      :csv,
+      authenticate:    false,
       path:            '/files/:id',
       sections:        ["files"],
       caster:          file_caster,
@@ -226,6 +228,7 @@ RSpec.describe :build_endpoint_schema do
       path:            '/versions/:id',
       caster:          caster,
       respond_to:      :json,
+      authenticate:    false,
       serializer:      nil,
       response_status: 200,
       description:     nil,
@@ -288,6 +291,7 @@ RSpec.describe :build_endpoint_schema do
         method:          :get,
         path:            '/versions/:id',
         respond_to:      :json,
+        authenticate:    false,
         caster:          nil,
         serializer:      nil,
         response_status: 200,
@@ -311,6 +315,7 @@ RSpec.describe :build_endpoint_schema do
         method:          :get,
         path:            '/versions/:id',
         respond_to:      :json,
+        authenticate:    false,
         caster:          caster,
         serializer:      nil,
         response_status: 200,

data/lib/ree_lib/packages/ree_swagger/spec/functions/build_schema_spec.rb

@@ -6,8 +6,10 @@ RSpec.describe :build_schema do
       title: 'Sample API',
       description: 'Sample API description',
       version: '0.0.1',
+      api_url: 'https://some-api.com/api/v1',
       endpoints: [ReeSwagger::EndpointDto.new(
         method:          :get,
+        authenticate:    true,
         path:            '/version',
         respond_to:      :json,
         caster:          nil,
@@ -27,9 +29,24 @@ RSpec.describe :build_schema do
           description: 'Sample API description',
           version: '0.0.1'
         },
+        components: {
+          securitySchemes: {
+            bearerAuth: {
+              type: 'http',
+              scheme: 'bearer',
+              bearerFormat: 'JWT'
+            }
+          }
+        },
+        servers: [
+          { url: 'https://some-api.com/api/v1' }
+        ],
         paths: {
           '/version' => {
             get: {
+              security: [
+                {bearerAuth: []}
+              ],
               responses: {
                 200 => {
                   description: ''

data/lib/ree_lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ReeLib
-  VERSION = "1.0.8"
+  VERSION = "1.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.11
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-15 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree