ree_lib 1.0.93 → 1.0.94

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/benchmarks/mapper_benchmark_spec.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 require 'benchmark'
 
+no_contracts = Ree::Contracts.no_contracts?
+Ree.disable_contracts
+
 package_require "ree_mapper"
 
 RSpec.xdescribe 'Mapper Benchmark' do
@@ -25,7 +28,44 @@ RSpec.xdescribe 'Mapper Benchmark' do
     obj = { my_field: { my_field: { my_field: 1 } } }
 
     _benchmark_res = Benchmark.bmbm do |x|
-      x.report('cast') { 1000.times { mapper.cast(obj) } }
+      x.report('cast') { 100000.times { mapper.cast(obj) } }
     end
   end
+
+  xit do
+    Ree.disable_contracts
+    require "ruby-prof"
+    package_require "ree_mapper"
+
+    mapper = ReeMapper::BuildMapperFactory.new.call(
+      strategies: [
+        ReeMapper::BuildMapperStrategy.new.call(method: :cast, dto: Hash),
+      ]
+    ).call.use(:cast) do
+      hash :my_field do
+        hash :my_field do
+          integer :my_field
+        end
+      end
+    end
+
+    obj = { my_field: { my_field: { my_field: 1 } } }
+
+    result = RubyProf::Profile.profile do
+      mapper.cast(obj)
+    end
+
+    RubyProf::FlatPrinter.new(result).print(STDOUT)
+  end
 end
+
+if !no_contracts
+  Ree.enable_contracts
+end
+
+# version main
+# cast   0.369019   0.001180   0.370199 (  0.370515)
+# cast   0.356124   0.001060   0.357184 (  0.357502)
+# version 1.0.93
+# cast   0.791664   0.004125   0.795789 (  0.796938)
+# cast   0.782544   0.016745   0.799289 (  0.799759)

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/mapper_factory_spec.rb

@@ -82,12 +82,17 @@ RSpec.describe ReeMapper::MapperFactory do
   describe '.register_wrapper' do
     let(:round_wrapper) {
       Class.new(ReeMapper::AbstractWrapper) do
-        def serialize(value, name:, location: nil, **opts)
+        def serialize(value, **opts)
           if !value.is_a?(Numeric)
-            raise ReeMapper::TypeError.new("`#{name}` should be a number, got `#{truncate(value.inspect)}`", location)
+            raise ReeMapper::TypeError.new("should be a number, got `#{truncate(value.inspect)}`")
           end
 
-          subject.type.serialize(value.round, name: name, location: subject.location, **opts)
+          begin
+            subject.type.serialize(value.round, **opts)
+          rescue ReeMapper::ErrorWithLocation => e
+            e.location ||= subject.location
+            raise e
+          end
         end
       end
     }
@@ -102,12 +107,18 @@ RSpec.describe ReeMapper::MapperFactory do
 
     it 'allow to register caster and serializer with the same name' do
       caster_round_wrapper = Class.new(ReeMapper::AbstractWrapper) do
-        def cast(value, name:, location: nil, **opts)
-          value = subject.type.cast(value, name: name, location: subject.location, **opts)
+        def cast(value, **opts)
+          value = begin
+            subject.type.cast(value, **opts)
+          rescue ReeMapper::ErrorWithLocation => e
+            e.location ||= subject.location
+            raise e
+          end
 
           if !value.is_a?(Numeric)
-            raise ReeMapper::TypeError.new("`#{name}` should be a number, got `#{truncate(value.inspect)}`", location)
+            raise ReeMapper::TypeError.new("should be a number, got `#{truncate(value.inspect)}`")
           end
+
           value.round
         end
       end

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/hash_spec.rb

@@ -27,7 +27,7 @@ RSpec.describe 'Mapper Hash' do
     }
 
     it {
-      expect { mapper.cast({ point: 1 }) }.to raise_error(ReeMapper::TypeError, /Missing required field `x` for `point`/)
+      expect { mapper.cast({ point: 1 }) }.to raise_error(ReeMapper::TypeError, /`point\[x\]` is missing required field/)
     }
 
     it {

data/lib/ree_lib/packages/ree_mapper/spec/ree_mapper/types/type_options_spec.rb

@@ -116,37 +116,18 @@ RSpec.describe 'ReeMapper::MapperFactory type options' do
       }
     end
 
-    context 'with invalid only' do
+    context "with empty nested filter" do
       let(:mapper) {
         mapper_factory.call.use(:cast) {
-          point :point
-        }
-      }
-
-      it {
-        expect {
-          mapper.cast({}, only: {})
-        }.to raise_error(
-          ReeMapper::ArgumentError,
-          "Invalid `only` format"
-        )
-      }
-    end
-
-    context 'with invalid except' do
-      let(:mapper) {
-        mapper_factory.call.use(:cast) {
-          point :point
+          hash :point_wrap do
+            point :point
+          end
         }
       }
 
       it {
-        expect {
-          mapper.cast({}, except: {})
-        }.to raise_error(
-          ReeMapper::ArgumentError,
-          "Invalid `except` format"
-        )
+        expect(mapper.cast({ point_wrap: { point: { x: 1, y: 1, z: 1 } } }, only: [point_wrap: [:point]]))
+          .to eq({ point_wrap: { point: { x: 1, y: 1, z: 1 } } })
       }
     end
   end
@@ -193,7 +174,7 @@ RSpec.describe 'ReeMapper::MapperFactory type options' do
     }
 
     it {
-      expect { mapper.cast({}) }.to raise_error(ReeMapper::TypeError, /Missing required field `number` for `root`/)
+      expect { mapper.cast({}) }.to raise_error(ReeMapper::TypeError, /`number` is missing required field/)
     }
 
     it {

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

@@ -7,6 +7,9 @@
     "ree_swagger"
   ],
   "depends_on": [
+    {
+      "name": "ree_array"
+    },
     {
       "name": "ree_dto"
     },

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

@@ -6,6 +6,7 @@ class ReeSwagger::BuildParameters
   fn :build_parameters do
     link :get_caster_definition
     link :build_request_body_schema
+    link :wrap, from: :ree_array
   end
 
   ObjectPathParamError = Class.new(StandardError)
@@ -36,7 +37,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, [], [field.fields_filter]) || {}
+        schema: build_request_body_schema(field.type, [], wrap(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

@@ -10,9 +10,9 @@ class ReeSwagger::BuildRequestBodySchema
   contract(
     ReeMapper::Mapper,
     ArrayOf[Symbol],
-    ArrayOf[ReeMapper::FieldsFilter] => Nilor[Hash]
+    Nilor[ArrayOf[ReeMapper::FieldsFilter]] => Nilor[Hash]
   )
-  def call(mapper, path_params = [], fields_filters = [])
+  def call(mapper, path_params = [], fields_filters = nil)
     if mapper.type
       return get_caster_definition(mapper.type, method(:call).to_proc)
     end
@@ -20,7 +20,7 @@ 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 unless fields_filters.nil? || fields_filters.all? { _1.allow?(field.name) }
 
       next if path_params.include?(field.name)
 
@@ -34,8 +34,15 @@ class ReeSwagger::BuildRequestBodySchema
       required_fields << field.name.to_s if !field.optional
       field_mapper = field.type
 
-      nested_fields_filters = fields_filters.map { _1.filter_for(field.name) }
-      nested_fields_filters += [field.fields_filter]
+      nested_fields_filters = fields_filters&.filter_map { _1.filter_for(field.name) }
+
+      if field.fields_filter
+        nested_fields_filters = if nested_fields_filters
+          nested_fields_filters + [field.fields_filter]
+        else
+          [field.fields_filter]
+        end
+      end
 
       swagger_type = call(field_mapper, [], nested_fields_filters)
 

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

@@ -7,14 +7,14 @@ class ReeSwagger::BuildSerializerSchema
     link :get_serializer_definition
   end
 
-  contract(ReeMapper::Mapper, ArrayOf[ReeMapper::FieldsFilter] => Nilor[Hash])
-  def call(mapper, fields_filters = [])
+  contract(ReeMapper::Mapper, Nilor[ArrayOf[ReeMapper::FieldsFilter]] => Nilor[Hash])
+  def call(mapper, fields_filters = nil)
     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) }
+      next unless fields_filters.nil? || fields_filters.all? { _1.allow?(field.name) }
 
       if field.type == mapper
         acc[field.name] = {}
@@ -25,8 +25,15 @@ class ReeSwagger::BuildSerializerSchema
 
       field_mapper = field.type
 
-      nested_fields_filters = fields_filters.map { _1.filter_for(field.name) }
-      nested_fields_filters += [field.fields_filter]
+      nested_fields_filters = fields_filters&.filter_map { _1.filter_for(field.name) }
+
+      if field.fields_filter
+        nested_fields_filters = if nested_fields_filters
+          nested_fields_filters + [field.fields_filter]
+        else
+          [field.fields_filter]
+        end
+      end
 
       swagger_type = call(field_mapper, nested_fields_filters)
 

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

@@ -2,6 +2,7 @@ module ReeSwagger
   include Ree::PackageDSL
 
   package do
+    depends_on :ree_array
     depends_on :ree_mapper
     depends_on :ree_dto
     depends_on :ree_hash

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

@@ -47,6 +47,14 @@
       "as": "get_caster_definition",
       "imports": [
 
+      ]
+    },
+    {
+      "target": "wrap",
+      "package_name": "ree_array",
+      "as": "wrap",
+      "imports": [
+
       ]
     }
   ]

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

@@ -27,7 +27,7 @@
         {
           "arg": "fields_filters",
           "arg_type": "opt",
-          "type": "ArrayOf[ReeMapper::FieldsFilter]"
+          "type": "Nilor[ArrayOf[ReeMapper::FieldsFilter]]"
         }
       ]
     }

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

@@ -22,7 +22,7 @@
         {
           "arg": "fields_filters",
           "arg_type": "opt",
-          "type": "ArrayOf[ReeMapper::FieldsFilter]"
+          "type": "Nilor[ArrayOf[ReeMapper::FieldsFilter]]"
         }
       ]
     }

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.93
+  version: 1.0.94
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-05-29 00:00:00.000000000 Z
+date: 2024-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree