ree_lib 1.0.21 → 1.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ae0f9daf43194e577174cd9d39c1516e301a5c53b05f0ab5a3467b0cb4b704
-  data.tar.gz: e333d78c1cf0f28bee7797be4b2718898f094c431a5abec04256f93e9ff6e450
+  metadata.gz: 6a07548e9d6406a91f8b9ba8781ac7a42add43a8283225fec7147cebceaf3135
+  data.tar.gz: 277351000a4834065e02a5011966726d3121fac4451ec0dcfdb8d41a6ca2316c
 SHA512:
-  metadata.gz: f7282239063aebfcf7c1c6552980ef933ac48efc47cc28afdf28b65ad82913af52c71f6b8b0f45f733967633033235e2e82856d95b91b9935ed98b13c4656199
-  data.tar.gz: 4eae3f07e6a0808da7f32c791ff06ec9c414f7cb6c818ec845bd79b7825983e58a0baec5f63a403d7ae660ebbea07fdc9b1873d6ed34cdd0424bc212d6943fd9
+  metadata.gz: 0d241902046d98abbe9affdecac2ed8d4c8ab588b078413a611b32b6b3054ae400296a96605a54ed7354a33106a5651d02bae1d6e7ef464570bac7c6cd11b897
+  data.tar.gz: d8f809aec0100f1727c0d8e411a6a1f192c4120b7e60dcdb4c00fea1f1503137cb368a1064aa3e74e0d25d94354090b4f2200ec1e0337074493bf08bf837a57c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.21)
+    ree_lib (1.0.22)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.12.0)
       loofah (~> 2.18.0)
@@ -35,32 +35,34 @@ GEM
     loofah (2.18.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    msgpack (1.5.4)
-    nokogiri (1.13.8-x86_64-linux)
+    msgpack (1.6.0)
+    nokogiri (1.13.9-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     oj (3.13.21)
-    pg (1.4.3)
+    pg (1.4.4)
     public_suffix (5.0.0)
     racc (1.6.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    ree (1.0.5)
+    ree (1.0.6)
       commander (~> 4.6.0)
     rexml (3.2.5)
-    rollbar (3.3.1)
+    rollbar (3.3.2)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
       rspec-mocks (~> 3.11.0)
     rspec-core (3.11.0)
       rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.0)
+    rspec-expectations (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+    rspec-mocks (3.11.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
+    rspec-support (3.11.1)
     sequel (5.58.0)
     sqlite3 (1.4.4)
     timecop (0.9.5)

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

@@ -36,7 +36,7 @@ class ReeSwagger::BuildParameters
         name: field.name_as_str,
         in: is_path_param ? 'path' : 'query',
         required: is_path_param || !field.optional,
-        schema: build_request_body_schema(field.type) || {}
+        schema: build_request_body_schema(field.type, [], [field.fields_filter]) || {}
       }
 
       schema[:style] = 'deepObject' if field.type.type.nil?

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

@@ -9,9 +9,10 @@ class ReeSwagger::BuildRequestBodySchema
 
   contract(
     ReeMapper::Mapper,
-    ArrayOf[Symbol] => Nilor[Hash]
+    ArrayOf[Symbol],
+    ArrayOf[ReeMapper::FieldsFilter] => Nilor[Hash]
   )
-  def call(mapper, path_params = [])
+  def call(mapper, path_params = [], fields_filters = [])
     if mapper.type
       return get_caster_definition(mapper.type, method(:call).to_proc)
     end
@@ -19,13 +20,20 @@ class ReeSwagger::BuildRequestBodySchema
     required_fields = []
 
     properties = mapper.fields.each_with_object({}) do |(_name, field), acc|
+      next unless fields_filters.all? { _1.allow?(field.name) }
+
       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)
+
+      nested_fields_filters = fields_filters.map { _1.filter_for(field.name) }
+      nested_fields_filters += [field.fields_filter]
+
+      swagger_type = call(field_mapper, [], nested_fields_filters)
+
       swagger_field.merge!(swagger_type) if swagger_type
 
       description = field.doc

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

@@ -7,17 +7,24 @@ class ReeSwagger::BuildSerializerSchema
     link :get_serializer_definition
   end
 
-  contract(ReeMapper::Mapper => Nilor[Hash])
-  def call(mapper)
+  contract(ReeMapper::Mapper, ArrayOf[ReeMapper::FieldsFilter] => Nilor[Hash])
+  def call(mapper, fields_filters = [])
     if mapper.type
       return get_serializer_definition(mapper.type, method(:call).to_proc)
     end
 
     properties = mapper.fields.each_with_object({}) do |(_name, field), acc|
+      next unless fields_filters.all? { _1.allow?(field.name) }
+
       swagger_field = {}
 
       field_mapper = field.type
-      swagger_type = call(field_mapper)
+
+      nested_fields_filters = fields_filters.map { _1.filter_for(field.name) }
+      nested_fields_filters += [field.fields_filter]
+
+      swagger_type = call(field_mapper, nested_fields_filters)
+
       swagger_field.merge!(swagger_type) if swagger_type
 
       description = field.doc

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

@@ -21,6 +21,10 @@
         {
           "arg": "path_params",
           "type": "ArrayOf[Symbol]"
+        },
+        {
+          "arg": "fields_filters",
+          "type": "ArrayOf[ReeMapper::FieldsFilter]"
         }
       ]
     }

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

@@ -17,6 +17,10 @@
         {
           "arg": "mapper",
           "type": "ReeMapper::Mapper"
+        },
+        {
+          "arg": "fields_filters",
+          "type": "ArrayOf[ReeMapper::FieldsFilter]"
         }
       ]
     }

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

@@ -51,23 +51,16 @@ RSpec.describe :build_endpoint_schema do
     _tag_caster = mapper_factory.call(register_as: :tag).use(:cast) do
       string :name
       string :value
+      string :excluded
     end
 
     caster = mapper_factory.call.use(:cast) do
       integer :id
       string :name
-      tag    :tag
+      tag    :tag, except: [:excluded]
       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,
@@ -95,20 +88,6 @@ 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,
-      serializer:      file_serializer,
-      response_status: 200,
-      description:     "file",
-      summary:         "file summary",
-      errors:          []
-    ))
-
     expect(schema).to eq(ReeSwagger::PathDto.new(
       path: '/versions/{id}',
       schema: {
@@ -174,6 +153,116 @@ RSpec.describe :build_endpoint_schema do
         }
       }
     ))
+  }
+
+  it {
+    serializer = mapper_factory.call.use(:serialize) do
+      integer :id
+    end
+
+    _tag_caster = mapper_factory.call(register_as: :tag).use(:cast) do
+      string :name
+      string :value
+      string :excluded
+    end
+
+    caster = mapper_factory.call.use(:cast) do
+      integer :id
+      string :name
+      tag    :tag, except: [:excluded]
+    end
+
+    schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
+      method:          :get,
+      respond_to:      :json,
+      authenticate:    false,
+      path:            '/versions/:id',
+      sections:        ["versions"],
+      caster:          caster,
+      serializer:      serializer,
+      response_status: 200,
+      description:     "description",
+      summary:         "summary",
+      errors:          []
+    ))
+
+    expect(schema).to eq(ReeSwagger::PathDto.new(
+      path: '/versions/{id}',
+      schema: {
+        get: {
+          parameters: [
+            {
+              name: 'id',
+              in: 'path',
+              required: true,
+              schema: { type: 'integer' }
+            },
+            {
+              name: 'name',
+              in: 'query',
+              required: true,
+              schema: { type: 'string' }
+            },
+            {
+              name: 'tag',
+              in: 'query',
+              required: true,
+              style: 'deepObject',
+              schema: {
+                type: 'object',
+                properties: {
+                  name: { type: 'string' },
+                  value: { type: 'string' }
+                },
+                required: ['name', 'value']
+              }
+            }
+          ],
+          responses: {
+            200 => {
+              description: '',
+              content: {
+                :'application/json' => {
+                  schema: {
+                    type: 'object',
+                    properties: {
+                      id: { type: 'integer' }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          summary: "summary",
+          description: "description",
+          tags: ["versions"]
+        }
+      }
+    ))
+  }
+
+  it {
+    file_caster = mapper_factory.call.use(:cast) do
+      integer :id
+    end
+
+    file_serializer = mapper_factory.call.use(:serialize) do
+      string :data
+    end
+
+    csv_schema = build_endpoint_schema(ReeSwagger::EndpointDto.new(
+      method:          :get,
+      respond_to:      :csv,
+      authenticate:    false,
+      path:            '/files/:id',
+      sections:        ["files"],
+      caster:          file_caster,
+      serializer:      file_serializer,
+      response_status: 200,
+      description:     "file",
+      summary:         "file summary",
+      errors:          []
+    ))
 
     expect(csv_schema).to eq(ReeSwagger::PathDto.new(
       path: '/files/{id}',

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

@@ -25,6 +25,17 @@ RSpec.describe :build_serializer_schema do
   }
 
   let(:mapper) {
+    nested_partial_mapper = mapper_factory.call(register_as: :nested_partial).use(:serialize) do
+      string :included
+      string :excepted
+      string :nested_excepted
+    end
+
+    partial_mapper = mapper_factory.call(register_as: :partial).use(:serialize) do
+      string :excepted
+      nested_partial :nested_partial_value, except: [:excepted]
+    end
+
     setting_mapper = mapper_factory.call(register_as: :setting).use(:serialize) do
       string :name
       string :value
@@ -55,6 +66,8 @@ RSpec.describe :build_serializer_schema do
       integer :test_null, null: true
 
       unregistered_type :test_unregistered_type
+
+      partial :partial_value, except: [:excepted, nested_partial_value: [:nested_excepted]]
     end
   }
 
@@ -102,7 +115,18 @@ RSpec.describe :build_serializer_schema do
             type: 'integer',
             nullable: true
           },
-          test_unregistered_type: {}
+          test_unregistered_type: {},
+          partial_value: {
+            type: 'object',
+            properties: { 
+              nested_partial_value: {
+                type: 'object',
+                properties: { 
+                  included: { type: 'string' }
+                }
+              }
+            }
+          },
         }
       }
     )

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-07 00:00:00.000000000 Z
+date: 2022-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree