ree_lib 1.0.105 → 1.0.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 442200670979210f1a6c213d404dc6f7739055cf22bf5b11705af43aea6eee35
-  data.tar.gz: d310e3ca905adf0dca68296732d5050f24cb82e1bcef6f0405afef3024f8ba7e
+  metadata.gz: 558dbd22038f40db477b968aa0595ca664484c05606827276b2d872ad6eb5dab
+  data.tar.gz: f190528d1cf21d60f1403252fd16d6e9e62beb291b4cddcca2af03f77bddce85
 SHA512:
-  metadata.gz: cd6611723dcb21b52ec19bf3d095417261eebfdc1ac9a7b063ba2ef87a223593227a8e5a57e815108be6fc92529b5c1c5c422bef987bceee5330f5e5e6ea0b64
-  data.tar.gz: db2b6aae15c2c18531ffe160c903acc3c5f559853c66da2acbdb53ae8239ab828c63af4d8a2bd6c535ef50a6b4ea51a97d4ea6595118592e42bc93ee91197985
+  metadata.gz: b5f0cf27786a919265f1c01982c7f8640e5b27edf837ed9a207243e6c513f3a97ab2487ad4c16ebc01feb7d7641509d38b336ef77024fb325b059aa32a61d96e
+  data.tar.gz: 6ddd53ea7f83cded5374da832c06ef845062c2574e832ccfec241602722a63a32390f78f02fc50f2d030f94b7e1cf404e976c00fa3237c11607cd2fa96504ee7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ree_lib (1.0.105)
+    ree_lib (1.0.106)
       bigdecimal (~> 3.1.6)
       binding_of_caller (~> 1.0.0)
       i18n (~> 1.14.1)

data/lib/ree_lib/packages/ree_dao/package/ree_dao/dataset_extensions.rb

@@ -44,7 +44,8 @@ module ReeDao
       end
 
       def put(entity)
-        raw = opts[:schema_mapper].db_dump(entity)
+        raw = dump_entity(entity)
+
         remove_null_primary_key(raw)
         key = insert(raw)
 
@@ -71,7 +72,6 @@ module ReeDao
         end
 
         key = insert_conflict(conflict_opts).insert(raw)
-        return if key.nil?
 
         set_entity_primary_key(entity, raw, key)
         set_persistence_state(entity, raw)
@@ -82,7 +82,6 @@ module ReeDao
       def import_all(entities, batch_size: IMPORT_BATCH_SIZE)
         return if entities.empty?
 
-        mapper = opts[:schema_mapper]
         columns = self.columns
         raw = {}
 
@@ -90,7 +89,7 @@ module ReeDao
         columns.delete(:row)
 
         data = entities.map do |entity|
-          hash = mapper.db_dump(entity)
+          hash = dump_entity(entity)
           raw[entity] = hash
 
           columns.map { hash[_1] }
@@ -116,16 +115,22 @@ module ReeDao
       end
 
       def update(hash_or_entity)
-        return __original_update(hash_or_entity) if !opts[:schema_mapper]
-        return __original_update(hash_or_entity) if hash_or_entity.is_a?(Hash)
+        if !opts[:schema_mapper] || hash_or_entity.is_a?(Hash)
+          return __original_update(hash_or_entity)
+        end
 
-        raw = opts[:schema_mapper].db_dump(hash_or_entity)
-        raw = extract_changes(hash_or_entity, raw)
+        dump = dump_entity(hash_or_entity)
+        raw = extract_changes(hash_or_entity, dump)
 
-        unless raw.empty?
-          update_persistence_state(hash_or_entity, raw)
+        if !raw.empty?
           key_condition = prepare_key_condition_from_entity(hash_or_entity)
           where(key_condition).__original_update(raw)
+
+          if is_ree_dto?(hash_or_entity)
+            hash_or_entity.reset_changes
+          else
+            update_persistence_state(hash_or_entity, raw)
+          end
         end
 
         hash_or_entity
@@ -160,9 +165,7 @@ module ReeDao
 
             if m
               entity = m.db_load(hash)
-
               self.set_persistence_state(entity, hash)
-
               entity
             else
               hash
@@ -206,6 +209,8 @@ module ReeDao
       end
 
       def set_persistence_state(entity, raw)
+        return if is_ree_dto?(entity)
+
         if !entity.is_a?(Integer) && !entity.is_a?(Symbol)
           entity.instance_variable_set(PERSISTENCE_STATE_VARIABLE, raw)
         end
@@ -220,22 +225,26 @@ module ReeDao
       end
 
       def extract_changes(entity, hash)
-        return hash unless entity.instance_variable_defined?(PERSISTENCE_STATE_VARIABLE)
-        changes = {}
+        if is_ree_dto?(entity)
+          hash.slice(*entity.changed_fields)
+        else
+          return hash unless entity.instance_variable_defined?(PERSISTENCE_STATE_VARIABLE)
+          changes = {}
 
-        persistence_state = entity.instance_variable_get(PERSISTENCE_STATE_VARIABLE)
+          persistence_state = entity.instance_variable_get(PERSISTENCE_STATE_VARIABLE)
 
-        hash.each do |column, value|
-          previous_column_value = persistence_state[column]
+          hash.each do |column, value|
+            previous_column_value = persistence_state[column]
 
-          if persistence_state.has_key?(column)
-            if previous_column_value != value || value.respond_to?(:each)
-              changes[column] = value
+            if persistence_state.has_key?(column)
+              if previous_column_value != value || value.respond_to?(:each)
+                changes[column] = value
+              end
             end
           end
-        end
 
-        changes
+          changes
+        end
       end
 
       def set_entity_primary_key(entity, raw, key)
@@ -247,10 +256,19 @@ module ReeDao
           else
             entity.instance_variable_set("@#{primary_key}", key)
           end
+
           raw[primary_key] = key
         end
       end
 
+      def dump_entity(entity_or_hash)
+        opts[:schema_mapper].db_dump(entity_or_hash)
+      end
+
+      def is_ree_dto?(entity)
+        entity.class.include?(ReeDto::DSL)
+      end
+
       def prepare_key_condition_from_entity(entity)
         key_condition = {}
 

data/lib/ree_lib/packages/ree_dao/spec/ree_dao/functions/one_to_one_spec.rb

@@ -45,6 +45,7 @@ RSpec.describe :one_to_one do
 
       package do
         depends_on :ree_dao
+        depends_on :ree_dto
       end
 
       class Db
@@ -89,16 +90,11 @@ RSpec.describe :one_to_one do
       end
 
       class ProjectUser
-        include ReeDto::EntityDSL
-
-        properties(
-          id: Nilor[Integer],
-          project_id: Nilor[Integer]
-        )
+        include ReeDto::DSL
 
-        contract Integer => Integer
-        def project_id=(id)
-          @project_id = id
+        build_dto do
+          field :id, Nilor[Integer], default: nil
+          field :project_id, Nilor[Integer]
         end
       end
 

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

@@ -7,12 +7,27 @@
     "ree_dto"
   ],
   "depends_on": [
-
+    {
+      "name": "ree_object"
+    }
   ],
   "env_vars": [
 
   ],
   "objects": [
-
+    {
+      "name": "build_dto",
+      "schema": "packages/ree_dto/schemas/ree_dto/functions/build_dto.schema.json",
+      "tags": [
+        "fn"
+      ]
+    },
+    {
+      "name": "build_dto_collection_class",
+      "schema": "packages/ree_dto/schemas/ree_dto/functions/build_dto_collection_class.schema.json",
+      "tags": [
+        "fn"
+      ]
+    }
   ]
 }

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module ReeDto::DSL
+  def self.included(base)
+    base.include Ree::LinkDSL
+    base.link :build_dto, from: :ree_dto
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/collection_filter.rb

@@ -0,0 +1,49 @@
+class ReeDto::CollectionFilter
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+  include Enumerable
+
+  InvalidFilterItemErr = Class.new(ArgumentError)
+
+  contract Any, Symbol, Proc => Any
+  def initialize(collection, name, filter_proc)
+    @collection = collection
+    @name = name
+    @filter_proc = filter_proc
+  end
+
+  contract Optblock => Any
+  def each(&block)
+    @collection.select(&@filter_proc).each(&block)
+  end
+
+  contract Any => Any
+  def add(item)
+    check_item(item)
+    @collection.add(item)
+  end
+
+  contract None => Integer
+  def size
+    count
+  end
+
+  contract Any => Any
+  def remove(item)
+    check_item(item)
+    @collection.remove(item)
+  end
+
+  alias :<< :add
+  alias :push :add
+
+  private
+
+  def check_item(item)
+    if !@filter_proc.call(item)
+      raise InvalidFilterItemErr.new(
+        "invalid item for #{@collection.parent_class}##{@name} filter"
+      )
+    end
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/collection_meta.rb

@@ -0,0 +1,13 @@
+class ReeDto::CollectionMeta
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+
+  attr_reader :name, :contract, :filter_proc
+
+  contract Symbol, Any, Proc => Any
+  def initialize(name, contract, filter_proc)
+    @name = name
+    @contract = contract
+    @filter_proc = filter_proc
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_builder.rb

@@ -0,0 +1,42 @@
+class ReeDto::DtoBuilder
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+  include Ree::LinkDSL
+
+  link "ree_dto/dto/field_meta", -> { FieldMeta }
+  link "ree_dto/dto/collection_meta", -> { CollectionMeta }
+
+  attr_reader :fields, :collections
+
+  def initialize(klass)
+    @klass = klass
+    @fields = []
+    @collections = []
+  end
+
+  contract(Symbol, Any, Kwargs[setter: Bool, default: Any] => FieldMeta)
+  def field(name, contract, setter: true, default: FieldMeta::NONE)
+    existing = @fields.find { _1.name == name }
+
+    if existing
+      raise ArgumentError.new("field :#{name} already defined for #{@klass}")
+    end
+
+    field = FieldMeta.new(name, contract, setter, default)
+    @fields << field
+    field
+  end
+
+  contract Symbol, Any, Optblock => CollectionMeta
+  def collection(name, contract, &proc)
+    existing = @collections.find { _1.name == name }
+
+    if existing
+      raise ArgumentError.new("collection :#{name} already defined for #{@klass}")
+    end
+
+    collection = CollectionMeta.new(name, contract, proc)
+    @collections.push(collection)
+    collection
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_class_methods.rb

@@ -0,0 +1,27 @@
+require_relative "./field_meta"
+require_relative "./collection_meta"
+
+module ReeDto::DtoClassMethods
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+
+  contract None => ArrayOf[ReeDto::FieldMeta]
+  def fields
+    @fields ||= []
+  end
+
+  contract None => ArrayOf[ReeDto::CollectionMeta]
+  def collections
+    @collections ||= []
+  end
+
+  private
+
+  def set_fields(v)
+    @fields = v
+  end
+
+  def set_collections(v)
+    @collections = v
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_collection.rb

@@ -0,0 +1,45 @@
+require_relative "./collection_filter"
+
+class ReeDto::DtoCollection
+  include Enumerable
+
+  LoadError = Class.new(ArgumentError)
+
+  attr_reader :name, :contract, :parent_class
+
+  contract Symbol, Any, Any => Any
+  def initialize(name, contract, parent_class)
+    @parent_class = parent_class
+    @contract = contract
+    @name = name
+    @list = nil
+  end
+
+  contract None => nil
+  def reset
+    @list = []
+    nil
+  end
+
+  contract Optblock => Any
+  def each(&block)
+    if @list.nil?
+      raise LoadError.new("collection :#{@name} for #{@parent_class} is not loaded")
+    end
+
+    @list.each(&block)
+  end
+
+  contract None => Integer
+  def size
+    @list.size
+  end
+
+  class << self
+    def filter(name, filter_proc)
+      define_method name do
+        ReeDto::CollectionFilter.new(self, name, filter_proc)
+      end
+    end
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_instance_methods.rb

@@ -0,0 +1,111 @@
+require_relative "./field_meta"
+
+module ReeDto::DtoInstanceMethods
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+
+  FieldNotSetError = Class.new(ArgumentError)
+
+  if ReeDto.debug_mode?
+    contract Hash, Ksplat[RestKeys => Any] => Any
+    def initialize(attrs = nil, **kwargs)
+      @_attrs = attrs || kwargs
+      list = self.class.fields.map(&:name)
+      extra = attrs.keys - list
+
+      if !extra.empty?
+        puts("WARNING: #{self.class}.new does not have definition for #{extra.inspect} fields")
+      end
+    end
+  else
+    contract Hash, Ksplat[RestKeys => Any] => Any
+    def initialize(attrs = nil, **kwargs)
+      @_attrs = attrs || kwargs
+    end
+  end
+
+  contract None => nil
+  def reset_changes
+    @changed_fields = nil
+  end
+
+  contract Symbol => ReeDto::FieldMeta
+  def get_meta(name)
+    self
+      .class
+      .fields
+      .find { _1.name == name} || (raise ArgumentError.new("field :#{name} not defined for :#{self.class}"))
+  end
+
+  contract Symbol => Any
+  def get_value(name)
+    @_attrs.fetch(name) do
+      meta = get_meta(name)
+
+      if !meta.has_default?
+        raise FieldNotSetError.new("field :#{name} not set for:#{self}")
+      else
+        @_attrs[name] = meta.default
+      end
+    end
+  end
+
+  contract None => Hash
+  def attrs
+    @_attrs
+  end
+
+  contract Symbol, Any => Any
+  def set_attr(name, val)
+    @_attrs[name] = val
+  end
+
+  contract Symbol, Any => Any
+  def set_value(name, val)
+    if has_value?(name)
+      old = get_value(name)
+      return if old == val
+    end
+
+    @changed_fields ||= Set.new
+    @changed_fields << name
+    @_attrs[name] = val
+  end
+
+  contract Symbol => Bool
+  def has_value?(name)
+    @_attrs.key?(name) || get_meta(name).has_default?
+  end
+
+  contract None => ArrayOf[Symbol]
+  def changed_fields
+    @changed_fields.to_a
+  end
+
+  contract Block => Any
+  def each_field(&proc)
+    self.class.fields.select { has_value?(_1.name) }.each do |field|
+      proc.call(field.name, get_value(field.name))
+    end
+  end
+
+  contract None => String
+  def to_s
+    fields = self.class.fields
+    max_length = fields.map(&:name).sort_by(&:size).last.size
+    result     = "\n#{self.class}\n"
+
+    data = fields.select { has_value?(_1.name) }.map do |field|
+      name = field.name.to_s
+      extra_spaces = ' ' * (max_length - name.size)
+      %Q(  #{name}#{extra_spaces} = #{get_value(field.name).inspect})
+    end
+
+    result << data.join("\n")
+  end
+
+  contract None => String
+  def inspect
+    to_s
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/dto/field_meta.rb

@@ -0,0 +1,21 @@
+class ReeDto::FieldMeta
+  include Ree::Contracts::Core
+  include Ree::Contracts::ArgContracts
+
+  NONE = Object.new.freeze
+
+  attr_reader :name, :contract, :setter, :default
+
+  contract Symbol, Any, Bool, Any => Any
+  def initialize(name, contract, setter, default)
+    @name = name
+    @contract = contract
+    @setter = setter
+    @default = default
+  end
+
+  contract None => Bool
+  def has_default?
+    @default != NONE
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+class ReeDto::BuildDto
+  include Ree::FnDSL
+
+  fn :build_dto do
+    target :class
+    with_caller
+    link :build_dto_collection_class
+    link "ree_dto/dto/dto_instance_methods", -> { DtoInstanceMethods }
+    link "ree_dto/dto/dto_class_methods", -> { DtoClassMethods }
+    link "ree_dto/dto/dto_builder", -> { DtoBuilder }
+  end
+
+  contract(Block => nil)
+  def call(&proc)
+    klass = get_caller
+    klass.include DtoInstanceMethods
+    klass.extend DtoClassMethods
+
+    builder = DtoBuilder.new(self)
+    builder.instance_exec(&proc)
+
+    klass.send(:set_fields, builder.fields)
+    klass.send(:set_collections, builder.collections)
+
+    builder.fields.each do |field|
+      klass.instance_exec do
+        contract None => field.contract
+      end
+
+      klass.define_method field.name do
+        get_value(field.name)
+      end
+
+      if field.setter
+        klass.instance_exec do
+          contract field.contract => field.contract
+        end
+
+        klass.define_method :"#{field.name}=" do |val|
+          set_value(field.name, val)
+        end
+      end
+    end
+
+    builder.collections.each do |collection|
+      col_class = build_dto_collection_class(collection.contract)
+      col_class.class_exec(&collection.filter_proc)
+
+      klass.define_method collection.name do
+        @collections ||= {}
+
+        @collections[collection.name] ||= col_class.new(
+          collection.name, collection.contract, klass
+        )
+      end
+    end
+
+    nil
+  end
+end

data/lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto_collection_class.rb

@@ -0,0 +1,27 @@
+class ReeDto::BuildDtoCollectionClass
+  include Ree::FnDSL
+
+  fn :build_dto_collection_class do
+    link "ree_dto/dto/dto_collection", -> { DtoCollection }
+  end
+
+  contract Any => Class
+  def call(entity_contract)
+    Class.new(DtoCollection) do
+      contract entity_contract => nil
+      def add(item)
+        @list ||= []
+        @list.push(item)
+        nil
+      end
+
+      contract entity_contract => Nilor[entity_contract]
+      def remove(item)
+        @list.delete(item)
+      end
+
+      alias :<< :add
+      alias :push :add
+    end
+  end
+end

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

@@ -1,7 +1,20 @@
 module ReeDto
   include Ree::PackageDSL
-	
-  package
+
+  package do
+    depends_on :ree_object
+  end
+
+  class << self
+    def set_debug_mode
+      @debug_mode = true
+    end
+
+    def debug_mode?
+      !!@debug_mode
+    end
+  end
 end
 
-require_relative 'ree_dto/entity_dsl'
+require_relative 'ree_dto/entity_dsl'
+require_relative 'ree_dto/dsl'

data/lib/ree_lib/packages/ree_dto/spec/ree_dto/dsl_spec.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+package_require("ree_dto/dsl")
+
+RSpec.describe ReeDto::DSL do
+  class ReeDto::DtoClass
+    include ReeDto::DSL
+
+    User = Struct.new(:id, :name, :status)
+
+    build_dto do
+      field :with_default, Nilor[Integer], default: 1
+      field :string, String
+      field :without_setter, Integer, setter: false
+
+      collection :numbers, Integer do
+        filter :odd, -> { _1.odd? }
+
+        def to_s
+          "odd_collection"
+        end
+      end
+
+      collection :users, User do
+        filter :active, -> { _1.status == "active" }
+        filter :inactive, -> { _1.status != "active" }
+      end
+    end
+  end
+
+  context "fields" do
+    it {
+      dto = ReeDto::DtoClass.new
+      expect(dto.with_default).to eq(1)
+
+      dto = ReeDto::DtoClass.new({})
+      expect(dto.with_default).to eq(1)
+      expect(dto.get_value(:with_default)).to eq(1)
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new
+      expect(dto.has_value?(:with_default)).to eq(true)
+      expect(dto.has_value?(:string)).to eq(false)
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new({with_default: 1, string: "string", without_setter: 22})
+      expect(dto.to_s).to include("ReeDto::DtoClass")
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new
+
+      expect {
+        dto.string
+      }.to raise_error do |e|
+        expect(e.message).to eq("field :string not set for:\nReeDto::DtoClass\n  with_default   = 1")
+      end
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new(string: "string")
+      expect(dto.string).to eq("string")
+
+      dto.string = "changed"
+      expect(dto.string).to eq("changed")
+      expect(dto.changed_fields).to eq([:string])
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new
+      fields = []
+      values = []
+
+      dto.each_field do |name, value|
+        fields << name
+        values << value
+      end
+
+      expect(fields).to eq([:with_default])
+      expect(values).to eq([1])
+    }
+  end
+
+  context "collections" do
+    it {
+      dto = ReeDto::DtoClass.new
+
+      dto.numbers << 1
+      dto.numbers << 2
+      expect(dto.numbers.sum).to eq(3)
+      expect(dto.numbers.to_s).to eq("odd_collection")
+    }
+
+    it {
+      dto = ReeDto::DtoClass.new
+
+      dto.users.push(ReeDto::DtoClass::User.new(1, "John", "active"))
+      dto.users.push(ReeDto::DtoClass::User.new(1, "Adam", "inactive"))
+
+      expect(dto.users.active.size).to eq(1)
+
+      peter = ReeDto::DtoClass::User.new(1, "Peter", "active")
+      dto.users.active << peter
+
+      expect(dto.users.size).to eq(3)
+
+      expect {
+        dto.users.active << ReeDto::DtoClass::User.new(1, "John", "inactive")
+      }.to raise_error(ReeDto::CollectionFilter::InvalidFilterItemErr)
+
+      dto.users.active.remove(peter)
+      expect(dto.users.size).to eq(2)
+      expect(dto.users.active.size).to eq(1)
+    }
+  end
+end

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

@@ -10,6 +10,9 @@
     {
       "name": "ree_datetime"
     },
+    {
+      "name": "ree_dto"
+    },
     {
       "name": "ree_string"
     }

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/mapper.rb

@@ -55,7 +55,7 @@ class ReeMapper::Mapper
                 else
                   if !field.optional && !@#{method}_strategy.always_optional
                     raise ReeMapper::TypeError.new(
-                      "is missing required field",
+                      "is missing (required field)",
                       field.location,
                       [field.from_as_str]
                     )

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/mapper_strategy.rb

@@ -68,6 +68,8 @@ class ReeMapper::MapperStrategy
       ReeMapper::HashOutput.new(dto)
     elsif dto == Struct
       ReeMapper::StructOutput.new
+    elsif dto.include?(ReeDto::DSL)
+      ReeMapper::ReeDtoOutput.new(dto)
     else
       ReeMapper::ObjectOutput.new(dto)
     end

data/lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/ree_dto_output.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ReeMapper::ReeDtoOutput < ReeMapper::StrategyOutput
+  contract(None => Any)
+  def build_object
+    dto.new
+  end
+
+  contract(Object, ReeMapper::Field, Any => nil)
+  def assign_value(object, field, value)
+    object.set_attr(field.name, value)
+    nil
+  end
+end

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

@@ -6,6 +6,7 @@ module ReeMapper
   package do
     depends_on :ree_string
     depends_on :ree_datetime
+    depends_on :ree_dto
   end
 
   package_require('ree_string/functions/underscore')
@@ -40,6 +41,7 @@ module ReeMapper
 
   require_relative 'ree_mapper/strategy_outputs/strategy_output'
   require_relative 'ree_mapper/strategy_outputs/object_output'
+  require_relative 'ree_mapper/strategy_outputs/ree_dto_output'
   require_relative 'ree_mapper/strategy_outputs/hash_output'
   require_relative 'ree_mapper/strategy_outputs/struct_output'
 

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

@@ -57,6 +57,34 @@ RSpec.describe ReeMapper::Mapper do
     }
   end
 
+  describe 'ree_dto dto' do
+    class ReeMapper::TestDto
+      include ReeDto::DSL
+
+      build_dto do
+        field :my_field, Integer
+      end
+    end
+
+    let(:mapper) {
+      build_mapper_factory(
+        strategies: [
+          build_mapper_strategy(method: :cast, dto: ReeMapper::TestDto),
+        ]
+      ).call.use(:cast) do
+        integer :my_field
+      end
+    }
+
+    it {
+      expect(mapper.cast({ my_field: 1 }).my_field).to eq(1)
+    }
+
+    it {
+      expect(mapper.cast({ my_field: 1 })).to be_a(ReeMapper::TestDto)
+    }
+  end
+
   describe 'ostruct dto' do
     let(:mapper) {
       build_mapper_factory(

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, /`point\[x\]` is missing required field/)
+      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

@@ -174,7 +174,7 @@ RSpec.describe 'ReeMapper::MapperFactory type options' do
     }
 
     it {
-      expect { mapper.cast({}) }.to raise_error(ReeMapper::TypeError, /`number` is missing required field/)
+      expect { mapper.cast({}) }.to raise_error(ReeMapper::TypeError, /`number` is missing \(required field\)/)
     }
 
     it {

data/lib/ree_lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ree_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.105
+  version: 1.0.106
 platform: ruby
 authors:
 - Ruslan Gatiyatov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ree
@@ -651,8 +651,19 @@ files:
 - lib/ree_lib/packages/ree_dto/Package.schema.json
 - lib/ree_lib/packages/ree_dto/bin/console
 - lib/ree_lib/packages/ree_dto/package/ree_dto.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dsl.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/collection_filter.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/collection_meta.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_builder.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_class_methods.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_collection.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/dto_instance_methods.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/dto/field_meta.rb
 - lib/ree_lib/packages/ree_dto/package/ree_dto/entity_dsl.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto.rb
+- lib/ree_lib/packages/ree_dto/package/ree_dto/functions/build_dto_collection_class.rb
 - lib/ree_lib/packages/ree_dto/spec/package_schema_spec.rb
+- lib/ree_lib/packages/ree_dto/spec/ree_dto/dsl_spec.rb
 - lib/ree_lib/packages/ree_dto/spec/ree_dto/entity_dsl_spec.rb
 - lib/ree_lib/packages/ree_dto/spec/spec_helper.rb
 - lib/ree_lib/packages/ree_enum/.gitignore
@@ -828,6 +839,7 @@ files:
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/mapper_strategy.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/hash_output.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/object_output.rb
+- lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/ree_dto_output.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/strategy_output.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/strategy_outputs/struct_output.rb
 - lib/ree_lib/packages/ree_mapper/package/ree_mapper/types/abstract_type.rb