ree_lib 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d39c69499684b2f63a3dfc5636265aceab2d0935cd4f6dfed10195cff8131989
-  data.tar.gz: 464e780303d9b8f1d1f8b786e507c87e708d5ba242520390fbf4f2643061d73d
+  metadata.gz: ff525a1db86ff974abe2f0095d70921fa49e324b808723042b1671140b372809
+  data.tar.gz: 899723f369a42828b8dc094cdcaf96c10d78704e23f95b9500ed76d453858f3b
 SHA512:
-  metadata.gz: ac7641c5e60d758ac4aa3e4fe6237c7758e5c6a53dd096acbf3bd5ca266aa48a5fffe0b0e5e50b0b2ad54493482365fdf3a6de2bf6b938abff626b7864b5016b
-  data.tar.gz: 329fb7390b7183e14ee2d1b52a2d236e3afdf45d7a65ad3fa31ec871c01c0637716b72479f9de6e90e5d1a1b5eb5b1fae5630747509875387f17274689bdf3fd
+  metadata.gz: 8a8630ad6fbb14f70ffef61be34708befd543be814a29fb81afda8a9020b8b46222e4aca37662e8504dbab8d43d408e9850168acc50595962245c93a4b377155
+  data.tar.gz: 1eb4b5d094c9b5aabf5882f5c055594348ea7a818920a1e55e87f48765e66dd0e2718a6643d7d4ba65f70ded911dd2a5575ad401497a5c69765f0700f34804cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.2)
+    ree_lib (1.0.3)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)

data/lib/ree_lib/packages/ree_enum/Package.schema.json

@@ -10,6 +10,9 @@
     {
       "name": "ree_mapper"
     },
+    {
+      "name": "ree_swagger"
+    },
     {
       "name": "ree_validator"
     }

data/lib/ree_lib/packages/ree_enum/package/ree_enum/dsl.rb

@@ -1,3 +1,5 @@
+package_require 'ree_swagger/functions/register_type'
+
 module ReeEnum
   module DSL
     def self.included(base)
@@ -92,7 +94,26 @@ module ReeEnum
         end
       end
 
+      def register_as_swagger_type
+        swagger_type_registrator = ReeSwagger::RegisterType.new
+
+        [:casters, :serializers].each do |kind|
+          swagger_type_registrator.call(
+            kind,
+            type_for_mapper.class,
+            ->(*) {
+              {
+                type: 'string',
+                enum: values.all.map(&:to_s)
+              }
+            }
+          )
+        end
+      end
+
       def register_as_mapper_type
+        register_as_swagger_type
+
         mapper_factory = ReeMapper.get_mapper_factory(
           Object.const_get(self.name.split('::').first)
         )

data/lib/ree_lib/packages/ree_enum/package/ree_enum.rb

@@ -5,6 +5,7 @@ module ReeEnum
 
   package do
     depends_on :ree_mapper
+    depends_on :ree_swagger
     depends_on :ree_validator
   end
 end

data/lib/ree_lib/packages/ree_swagger/Package.schema.json

@@ -10,6 +10,9 @@
     {
       "name": "ree_dto"
     },
+    {
+      "name": "ree_enum"
+    },
     {
       "name": "ree_hash"
     },

data/lib/ree_lib/packages/ree_swagger/package/ree_swagger/beans/type_definitions_repo.rb

@@ -9,40 +9,40 @@ class ReeSwagger::TypeDefinitionsRepo
   def build
     {
       serializers: {
-        'ReeMapper::Integer' => ->(*) {
+        ReeMapper::Integer => ->(*) {
           { type: 'integer' }
         },
-        'ReeMapper::String' => ->(*) {
+        ReeMapper::String => ->(*) {
           { type: 'string' }
         },
-        'ReeMapper::Bool' => ->(*) {
+        ReeMapper::Bool => ->(*) {
           { type: 'boolean' }
         },
-        'ReeMapper::Float' => ->(*) {
+        ReeMapper::Float => ->(*) {
           {
             type: 'number',
             format: 'float'
           }
         },
-        'ReeMapper::Array' => ->(type, build_serializer_schema) {
+        ReeMapper::Array => ->(type, build_serializer_schema) {
           {
             type: 'array',
             items: build_serializer_schema.(type.of.type)
           }
         },
-        'ReeMapper::DateTime' => ->(*) {
+        ReeMapper::DateTime => ->(*) {
           {
             type: 'string',
             format: 'date-time'
           }
         },
-        'ReeMapper::Date' => ->(*) {
+        ReeMapper::Date => ->(*) {
           {
             type: 'string',
             format: 'date'
           }
         },
-        'ReeMapper::Time' => ->(*) {
+        ReeMapper::Time => ->(*) {
           {
             type: 'string',
             format: 'date-time'
@@ -50,40 +50,40 @@ class ReeSwagger::TypeDefinitionsRepo
         }
       },
       casters: {
-        'ReeMapper::Integer' => ->(*) {
+        ReeMapper::Integer => ->(*) {
           { type: 'integer' }
         },
-        'ReeMapper::String' => ->(*) {
+        ReeMapper::String => ->(*) {
           { type: 'string' }
         },
-        'ReeMapper::Bool' => ->(*) {
+        ReeMapper::Bool => ->(*) {
           { type: 'boolean' }
         },
-        'ReeMapper::Float' => ->(*) {
+        ReeMapper::Float => ->(*) {
           {
             type: 'number',
             format: 'float'
           }
         },
-        'ReeMapper::Array' => ->(type, build_caster_schema) {
+        ReeMapper::Array => ->(type, build_caster_schema) {
           {
             type: 'array',
             items: build_caster_schema.(type.of.type)
           }
         },
-        'ReeMapper::DateTime' => ->(*) {
+        ReeMapper::DateTime => ->(*) {
           {
             type: 'string',
             format: 'date-time'
           }
         },
-        'ReeMapper::Date' => ->(*) {
+        ReeMapper::Date => ->(*) {
           {
             type: 'string',
             format: 'date'
           }
         },
-        'ReeMapper::Time' => ->(*) {
+        ReeMapper::Time => ->(*) {
           {
             type: 'string',
             format: 'date-time'

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

@@ -90,30 +90,12 @@ class ReeSwagger::BuildEndpointSchema
 
     endpoint.errors.each do |error|
       if responses.key?(error.status)
-        responses[error.status][:description] += "\n\n#{error.description}"
+        responses[error.status][:description] += "\n- #{error.description}"
         next
       end
 
       responses[error.status] = {
-        description: error.description,
-        content: {
-          :'application/json' => {
-            schema: {
-              type: 'object',
-              properties: {
-                code: {
-                  type: "string"
-                },
-                message: {
-                  type: "string"
-                },
-                type: {
-                  type: "string"
-                }
-              }
-            }
-          }
-        }
+        description: "- #{error.description}",
       }
     end
 

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

@@ -10,7 +10,7 @@ class ReeSwagger::GetCasterDefinition
   contract(Any, Proc => Nilor[Hash])
   def call(type, schema_builder)
     type_definitions_repo
-      .dig(:casters, type.class.name)
+      .dig(:casters, type.class)
       &.(type, schema_builder)
   end
 end

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

@@ -10,7 +10,7 @@ class ReeSwagger::GetSerializerDefinition
   contract(Any, Proc => Nilor[Hash])
   def call(type, build_serializer_schema)
     type_definitions_repo
-      .dig(:serializers, type.class.name)
+      .dig(:serializers, type.class)
       &.(type, build_serializer_schema)
   end
 end

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

@@ -12,7 +12,7 @@ class ReeSwagger::RegisterType
   contract(Or[:casters, :serializers], Any, Proc => nil)
   def call(kind, type, definition)
     SEMAPHORE.synchronize do
-      type_definitions_repo[kind][type.name] = definition
+      type_definitions_repo[kind][type] = definition
     end
 
     nil

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

@@ -5,5 +5,6 @@ module ReeSwagger
     depends_on :ree_mapper
     depends_on :ree_dto
     depends_on :ree_hash
+    depends_on :ree_enum
   end
 end

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

@@ -3,6 +3,14 @@ RSpec.describe :build_endpoint_schema do
   link :build_mapper_factory, from: :ree_mapper
   link :build_mapper_strategy, from: :ree_mapper
 
+  before :all do
+    Ree.enable_irb_mode
+  end
+
+  after :all do
+    Ree.disable_irb_mode
+  end
+
   let(:mapper_factory) {
     strategies = [
       build_mapper_strategy(method: :serialize, output: :symbol_key_hash),
@@ -15,6 +23,27 @@ RSpec.describe :build_endpoint_schema do
   }
 
   it {
+    module ReeSwaggerTest
+      include Ree::PackageDSL
+
+      package
+
+      class Locales
+        include ReeEnum::DSL
+
+        enum :locales
+
+        val :en, 0
+        val :ru, 1
+      end
+    end
+
+    mapper_factory.register_type(
+      :locales, ReeSwaggerTest::Locales.type_for_mapper
+    )
+
+    ReeSwaggerTest::Locales.register_as_swagger_type
+
     serializer = mapper_factory.call.use(:serialize) do
       integer :id
     end
@@ -28,6 +57,7 @@ RSpec.describe :build_endpoint_schema do
       integer :id
       string :name
       tag    :tag
+      locales :locale
     end
 
     schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
@@ -78,6 +108,10 @@ RSpec.describe :build_endpoint_schema do
                         name: { type: 'string' },
                         value: { type: 'string' }
                       }
+                    },
+                    locale: {
+                      type: 'string',
+                      enum: ['en', 'ru']
                     }
                   }
                 }
@@ -99,46 +133,11 @@ RSpec.describe :build_endpoint_schema do
               }
             },
             400 => {
-              description: "1st 400 error\n\n2nd 400 error",
-              content: {
-                :'application/json' => {
-                  schema: {
-                    type: 'object',
-                    properties: {
-                      code: {
-                        type: "string"
-                      },
-                      message: {
-                        type: "string"
-                      },
-                      type: {
-                        type: "string"
-                      }
-                    }
-                  }
-                }
-              }
+              description: "- 1st 400 error\n- 2nd 400 error",
+
             },
             401 => {
-              description: "401 error",
-              content: {
-                :'application/json' => {
-                  schema: {
-                    type: 'object',
-                    properties: {
-                      code: {
-                        type: "string"
-                      },
-                      message: {
-                        type: "string"
-                      },
-                      type: {
-                        type: "string"
-                      }
-                    }
-                  }
-                }
-              }
+              description: "- 401 error",
             }
           }
         }

data/lib/ree_lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ruslan Gatiyatov