ree_lib 1.0.6 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6435a1a89e1206bbb9256d8b3f51c8b65116c7f4587c7a39da3e9abe1be80927
-  data.tar.gz: 2803a3779d1c97ba0f03d46d747dfdec525305f5a5949db87f1c9a4f1396b825
+  metadata.gz: 756ef68a2b67f69d7b39d4877f51bebef0bf9f16c2d826f75a66fa43784ac779
+  data.tar.gz: f9668ac762030ae0b4e0d53d9edafd7751396b30e4b1f4ae67188b889aef6360
 SHA512:
-  metadata.gz: d374c9f45acc8d5ba2c06b8646fe3959235b7270ae5d95738b26017622a475c06dd5666592ac80e57a7a0217a3086fe8e474c1480a623352eee91e1340df467b
-  data.tar.gz: 8b173afe2cdcc4b65f0b5424c9ed621c3f351206566ca801eb9edd1555ba8ff48532fcaa3f53407ecc78976b8c3a652ab4c0fb5e1555d2bbb63851b0b6a69911
+  metadata.gz: 7f0f85267b26e8249d4c8c9d46532717acc53a4378e19e20e5f07e2431b751cee6591ac97677ffc528b651fef7428f868a73e9d87ef44103f94a21b412ff5f6d
+  data.tar.gz: c31dd2b537126f8590b656002f169fbce184448bedc79d4c0c58b7de769a940e5f780a7d73e70595a68966bafda85a13ef73031da79df69808d3eea5fb224352

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.6)
+    ree_lib (1.0.9)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -40,7 +40,7 @@ GEM
       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_swagger/Package.schema.json

@@ -48,6 +48,10 @@
       "name": "get_caster_definition",
       "schema": "packages/ree_swagger/schemas/ree_swagger/functions/get_caster_definition.schema.json"
     },
+    {
+      "name": "get_mime_type",
+      "schema": "packages/ree_swagger/schemas/ree_swagger/functions/get_mime_type.schema.json"
+    },
     {
       "name": "get_serializer_definition",
       "schema": "packages/ree_swagger/schemas/ree_swagger/functions/get_serializer_definition.schema.json"

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

@@ -3,12 +3,17 @@ class ReeSwagger::EndpointDto
   include Ree::LinkDSL
 
   link 'ree_swagger/dto/error_dto', -> { ErrorDto }
+  link 'ree_swagger/functions/get_mime_type', -> { MIME_TYPES }
+
 
   properties(
     method: Or[:get, :post, :put, :patch, :delete],
+    respond_to: Or[*MIME_TYPES.keys],
+    sections: Nilor[ArrayOf[String]],
     path: String,
     caster: Nilor[ReeMapper::Mapper],
     serializer: Nilor[ReeMapper::Mapper],
+    summary: Nilor[String],
     description: Nilor[String],
     response_status: Integer,
     response_description: Nilor[String],

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

@@ -4,6 +4,7 @@ class ReeSwagger::BuildEndpointSchema
   include Ree::FnDSL
 
   fn :build_endpoint_schema do
+    link :get_mime_type
     link :build_parameters
     link :build_request_body_schema
     link :build_serializer_schema
@@ -14,7 +15,7 @@ class ReeSwagger::BuildEndpointSchema
   METHODS_WITH_BODY = [:post, :put, :patch].freeze
   MissingCasterError = Class.new(StandardError)
 
-  contract(EndpointDto => ReeSwagger::PathDto)
+  contract(EndpointDto => PathDto)
   def call(endpoint)
     path_params = []
 
@@ -31,6 +32,8 @@ class ReeSwagger::BuildEndpointSchema
       }
       .join('/')
 
+    mime_type = get_mime_type(endpoint.respond_to)
+
     missed_caster = path_params - endpoint.caster&.fields&.keys.to_a
 
     if missed_caster.any?
@@ -47,7 +50,7 @@ class ReeSwagger::BuildEndpointSchema
 
       request_body = request_body_schema && {
         content: {
-          :'application/json' => {
+          :"#{mime_type}" => {
             schema: request_body_schema
           }
         }
@@ -65,7 +68,7 @@ class ReeSwagger::BuildEndpointSchema
 
         request_body_schema && {
           content: {
-            :'application/json' => {
+            :"#{mime_type}" => {
               schema: request_body_schema
             }
           }
@@ -78,7 +81,7 @@ class ReeSwagger::BuildEndpointSchema
 
     if endpoint.serializer
       response_schema[:content] = {
-        :'application/json' => {
+        :"#{mime_type}" => {
           schema: build_serializer_schema(endpoint.serializer)
         }
       }
@@ -103,12 +106,16 @@ class ReeSwagger::BuildEndpointSchema
       responses: responses
     }
 
+    method_schema[:summary] =  endpoint.summary if endpoint.summary
+    method_schema[:description] =  endpoint.description if endpoint.description
+    method_schema[:tags] = endpoint.sections if endpoint.sections
+
     method_schema[:parameters]  = parameters   if parameters
     method_schema[:requestBody] = request_body if request_body
 
     schema = {endpoint.method => method_schema}
 
-    ReeSwagger::PathDto.new(
+    PathDto.new(
       path: path,
       schema: schema
     )

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

@@ -16,11 +16,14 @@ class ReeSwagger::BuildRequestBodySchema
       return get_caster_definition(mapper.type, method(:call).to_proc)
     end
 
+    required_fields = []
+
     properties = mapper.fields.each_with_object({}) do |(_name, field), acc|
       next if path_params.include?(field.name)
 
       swagger_field = {}
 
+      required_fields << field.name.to_s if !field.optional
       field_mapper = field.type
       swagger_type = call(field_mapper)
       swagger_field.merge!(swagger_type) if swagger_type
@@ -37,7 +40,8 @@ class ReeSwagger::BuildRequestBodySchema
 
     {
       type: 'object',
-      properties: properties
+      properties: properties,
+      required: required_fields
     }
   end
 end

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

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+class ReeSwagger::GetMimeType
+  include Ree::FnDSL
+
+  MIME_TYPES = {
+    :html => "text/html", 
+    :text => "text/plain", 
+    :js => "text/javascript", 
+    :css => "text/css", 
+    :ics => "text/calendar", 
+    :csv => "text/csv", 
+    :vcf => "text/vcard", 
+    :vtt => "text/vtt", 
+    :png => "image/png", 
+    :jpeg => "image/jpeg", 
+    :gif => "image/gif", 
+    :bmp => "image/bmp", 
+    :tiff => "image/tiff", 
+    :svg => "image/svg+xml", 
+    :mpeg => "video/mpeg", 
+    :mp3 => "audio/mpeg", 
+    :ogg => "audio/ogg", 
+    :m4a => "audio/aac", 
+    :webm => "video/webm", 
+    :mp4 => "video/mp4", 
+    :otf => "font/otf", 
+    :ttf => "font/ttf", 
+    :woff => "font/woff", 
+    :woff2 => "font/woff2", 
+    :xml => "application/xml", 
+    :rss => "application/rss+xml", 
+    :atom => "application/atom+xml", 
+    :yaml => "application/x-yaml", 
+    :multipart_form => "multipart/form-data", 
+    :url_encoded_form => "application/x-www-form-urlencoded", 
+    :json => "application/json", 
+    :pdf => "application/pdf", 
+    :zip => "application/zip", 
+    :gzip => "application/gzip"
+  }.freeze
+
+  fn :get_mime_type
+
+  contract(Or[*MIME_TYPES.keys] => String)
+  def call(type)
+    MIME_TYPES.fetch(type)
+  end
+end

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

@@ -44,6 +44,14 @@
       "as": "build_serializer_schema",
       "imports": [
 
+      ]
+    },
+    {
+      "target": "get_mime_type",
+      "package_name": "ree_swagger",
+      "as": "get_mime_type",
+      "imports": [
+
       ]
     }
   ]

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

@@ -0,0 +1,27 @@
+{
+  "schema_type": "object",
+  "schema_version": "1.0",
+  "name": "get_mime_type",
+  "path": "packages/ree_swagger/package/ree_swagger/functions/get_mime_type.rb",
+  "mount_as": "fn",
+  "class": "ReeSwagger::GetMimeType",
+  "factory": null,
+  "methods": [
+    {
+      "doc": "",
+      "throws": [
+
+      ],
+      "return": "String",
+      "args": [
+        {
+          "arg": "type",
+          "type": "Or[html, text, js, css, ics, csv, vcf, vtt, png, jpeg, gif, bmp, tiff, svg, mpeg, mp3, ogg, m4a, webm, mp4, otf, ttf, woff, woff2, xml, rss, atom, yaml, multipart_f..., url_encoded..., json, pdf, zip, gzip]"
+        }
+      ]
+    }
+  ],
+  "links": [
+
+  ]
+}

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

@@ -60,13 +60,24 @@ RSpec.describe :build_endpoint_schema do
       locales :locale
     end
 
+    file_caster = mapper_factory.call.use(:cast) do
+      integer :id
+    end
+
+    file_serializer = mapper_factory.call.use(:serialize) do
+      string :data
+    end
+
     schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
       method:          :post,
+      respond_to:      :json,
       path:            '/versions/:id',
+      sections:        ["versions"],
       caster:          caster,
       serializer:      serializer,
       response_status: 200,
-      description:     nil,
+      description:     "description",
+      summary:         "summary",
       errors:          [
         ReeSwagger::ErrorDto.new(
           status: 400,
@@ -83,6 +94,19 @@ RSpec.describe :build_endpoint_schema do
       ]
     ))
 
+    csv_schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
+      method:          :get,
+      respond_to:      :csv,
+      path:            '/files/:id',
+      sections:        ["files"],
+      caster:          file_caster,
+      serializer:      file_serializer,
+      response_status: 200,
+      description:     "file",
+      summary:         "file summary",
+      errors:          []
+    ))
+
     expect(schema).to eq(ReeSwagger::PathDto.new(
       path: '/versions/{id}',
       schema: {
@@ -107,13 +131,15 @@ RSpec.describe :build_endpoint_schema do
                       properties: {
                         name: { type: 'string' },
                         value: { type: 'string' }
-                      }
+                      },
+                      required: ['name', 'value']
                     },
                     locale: {
                       type: 'string',
                       enum: ['en', 'ru']
                     }
-                  }
+                  },
+                  required: ['name', 'tag', 'locale']
                 }
               }
             }
@@ -139,7 +165,44 @@ RSpec.describe :build_endpoint_schema do
             401 => {
               description: "- 401 error",
             }
-          }
+          },
+          summary: "summary",
+          description: "description",
+          tags: ["versions"]
+        }
+      }
+    ))
+
+    expect(csv_schema).to eq(ReeSwagger::PathDto.new(
+      path: '/files/{id}',
+      schema: {
+        get: {
+          parameters: [
+            {
+              name: 'id',
+              in: 'path',
+              required: true,
+              schema: { type: 'integer' }
+            }
+          ],
+          responses: {
+            200 => {
+              description: '',
+              content: {
+                :'text/csv' => {
+                  schema: {
+                    type: 'object',
+                    properties: {
+                      data: { type: 'string' }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          summary: "file summary",
+          description: "file",
+          tags: ["files"]
         }
       }
     ))
@@ -162,9 +225,11 @@ RSpec.describe :build_endpoint_schema do
       method:          :get,
       path:            '/versions/:id',
       caster:          caster,
+      respond_to:      :json,
       serializer:      nil,
       response_status: 200,
       description:     nil,
+      summary:         nil,
       errors:          []
     ))
 
@@ -198,9 +263,11 @@ RSpec.describe :build_endpoint_schema do
                     properties: {
                       x: { type: 'integer' },
                       y: { type: 'integer' }
-                    }
+                    },
+                    required: ['x', 'y']
                   }
-                }
+                },
+                required: ['text', 'point']
               },
               style: 'deepObject'
             }
@@ -220,10 +287,12 @@ RSpec.describe :build_endpoint_schema do
       build_endpoint_schema(ReeSwagger::EndpointDto.new(
         method:          :get,
         path:            '/versions/:id',
+        respond_to:      :json,
         caster:          nil,
         serializer:      nil,
         response_status: 200,
         description:     nil,
+        summary:         nil,
         errors:          []
       ))
     }.to raise_error(
@@ -241,10 +310,12 @@ RSpec.describe :build_endpoint_schema do
       build_endpoint_schema(ReeSwagger::EndpointDto.new(
         method:          :get,
         path:            '/versions/:id',
+        respond_to:      :json,
         caster:          caster,
         serializer:      nil,
         response_status: 200,
         description:     nil,
+        summary:         nil,
         errors:          []
       ))
     }.to raise_error(

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

@@ -0,0 +1,35 @@
+RSpec.describe :build_request_body_schema_spec do
+  link :build_request_body_schema, from: :ree_swagger
+  link :build_mapper_factory, from: :ree_mapper
+  link :build_mapper_strategy, from: :ree_mapper
+
+  let(:mapper_factory) {
+    strategies = [
+      build_mapper_strategy(method: :cast, output: :symbol_key_hash),
+    ]
+
+    build_mapper_factory(
+      strategies: strategies
+    )
+  }
+
+  it {
+    caster = mapper_factory.call.use(:cast) do
+      string :name
+      string :email
+      string? :last_name
+    end
+
+    schema = {
+      type: "object",
+      properties: {
+        name: { type: "string" },
+        email: { type: "string" },
+        last_name: { type: "string" }
+      },
+      required: ["name", "email"]
+    }
+
+    expect(build_request_body_schema(caster)).to eq(schema)
+  }
+end

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

@@ -9,10 +9,12 @@ RSpec.describe :build_schema do
       endpoints: [ReeSwagger::EndpointDto.new(
         method:          :get,
         path:            '/version',
+        respond_to:      :json,
         caster:          nil,
         serializer:      nil,
         response_status: 200,
         description:     nil,
+        summary:         nil,
         errors:          []
       )]
     )

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.9
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-05 00:00:00.000000000 Z
+date: 2022-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -1122,6 +1122,7 @@ files:
 - lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_schema.rb
 - lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/build_serializer_schema.rb
 - lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/get_caster_definition.rb
+- lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/get_mime_type.rb
 - lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/get_serializer_definition.rb
 - lib/ree_lib/packages/ree_swagger/package/ree_swagger/functions/register_type.rb
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/beans/type_definitions_repo.schema.json
@@ -1131,10 +1132,12 @@ files:
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/build_schema.schema.json
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/build_serializer_schema.schema.json
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/get_caster_definition.schema.json
+- lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/get_mime_type.schema.json
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/get_serializer_definition.schema.json
 - lib/ree_lib/packages/ree_swagger/schemas/ree_swagger/functions/register_type.schema.json
 - lib/ree_lib/packages/ree_swagger/spec/functions/build_endpoint_schema_spec.rb
 - lib/ree_lib/packages/ree_swagger/spec/functions/build_parameters_spec.rb
+- lib/ree_lib/packages/ree_swagger/spec/functions/build_request_body_spec.rb
 - lib/ree_lib/packages/ree_swagger/spec/functions/build_schema_spec.rb
 - lib/ree_lib/packages/ree_swagger/spec/functions/build_serializer_schema_spec.rb
 - lib/ree_lib/packages/ree_swagger/spec/functions/register_type_spec.rb