treaty 0.17.0 → 0.19.0

data/lib/treaty/entity/base.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+module Treaty
+  module Entity
+    # Base class for defining reusable entity classes in Treaty.
+    #
+    # ## Purpose
+    #
+    # Treaty::Entity::Base provides a base class for creating reusable entity classes
+    # that can be used in both request and response definitions. This allows
+    # for better code organization and reusability of common data structures.
+    #
+    # ## Usage
+    #
+    # Create an entity class by inheriting from Treaty::Entity::Base:
+    #
+    # ```ruby
+    # module Posts
+    #   module Create
+    #     class ResponseEntity < Treaty::Entity::Base
+    #       string :id
+    #       string :title
+    #       string :content
+    #       datetime :created_at
+    #     end
+    #   end
+    # end
+    # ```
+    #
+    # Then use it in your treaty definitions:
+    #
+    # ```ruby
+    # class Posts::CreateTreaty < ApplicationTreaty
+    #   version 1 do
+    #     request Posts::Create::RequestEntity
+    #     response 201, Posts::Create::ResponseEntity
+    #   end
+    # end
+    # ```
+    #
+    # ## Attribute Defaults
+    #
+    # Unlike request/response blocks, Entity attributes are required by default:
+    # - All attributes have `required: true` unless explicitly marked as `:optional`
+    # - Use `:optional` helper to make attributes optional:
+    #   ```ruby
+    #   string :title           # required by default
+    #   string :summary, :optional  # optional
+    #   ```
+    #
+    # ## Features
+    #
+    # - **Type Safety** - Enforce strict type checking for all attributes
+    # - **Nested Structures** - Support for nested objects and arrays
+    # - **Validation** - Built-in validation for all attribute types
+    # - **Reusability** - Define once, use in multiple treaties
+    # - **Options** - Full support for attribute options (required, default, as, etc.)
+    #
+    # ## Supported Types
+    #
+    # - `string` - String values
+    # - `integer` - Integer values
+    # - `boolean` - Boolean values (true/false)
+    # - `datetime` - DateTime values
+    # - `array` - Array values (with nested type definition)
+    # - `object` - Object values (with nested attributes)
+    class Base
+      include Info::DSL
+      include Attribute::DSL
+
+      class << self
+        private
+
+        # Creates an Entity::Attribute for this Entity class
+        #
+        # @return [Entity::Attribute::Attribute] Created attribute instance
+        def create_attribute(name, type, *helpers, nesting_level:, **options, &block)
+          Attribute::Attribute.new(
+            name,
+            type,
+            *helpers,
+            nesting_level:,
+            **options,
+            &block
+          )
+        end
+      end
+    end
+  end
+end

data/lib/treaty/entity/builder.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Treaty
+  module Entity
+    # Entity-specific attribute builder
+    class Builder < Treaty::Entity::Attribute::Builder::Base
+      private
+
+      def create_attribute(name, type, *helpers, nesting_level:, **options, &block)
+        Treaty::Entity::Attribute::Attribute.new(
+          name,
+          type,
+          *helpers,
+          nesting_level:,
+          **options,
+          &block
+        )
+      end
+
+      # Deep copies an attribute with adjusted nesting level for Entity context.
+      #
+      # @param source_attribute [Treaty::Entity::Attribute::Base] Attribute to copy
+      # @param new_nesting_level [Integer] New nesting level
+      # @return [Treaty::Entity::Attribute::Attribute] Copied attribute
+      def deep_copy_attribute(source_attribute, new_nesting_level) # rubocop:disable Metrics/MethodLength
+        copied = Treaty::Entity::Attribute::Attribute.new(
+          source_attribute.name,
+          source_attribute.type,
+          nesting_level: new_nesting_level,
+          **deep_copy_options(source_attribute.options)
+        )
+
+        return copied unless source_attribute.nested?
+
+        source_attribute.collection_of_attributes.each do |nested_source|
+          nested_copied = deep_copy_attribute(nested_source, new_nesting_level + 1)
+          copied.collection_of_attributes << nested_copied
+        end
+
+        copied
+      end
+    end
+  end
+end

data/lib/treaty/{info/entity → entity/info}/builder.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Treaty
-  module Info
-    module Entity
+  module Entity
+    module Info
       class Builder
         attr_reader :attributes
 
@@ -26,6 +26,12 @@ module Treaty
 
         ##########################################################################
 
+        def build_nested_attributes(attribute, current_level)
+          return {} unless attribute.nested?
+
+          build_versions_with(attribute.collection_of_attributes, current_level + 1)
+        end
+
         def build_versions_with(collection, current_level = 0)
           collection.to_h do |attribute|
             [
@@ -38,12 +44,6 @@ module Treaty
             ]
           end
         end
-
-        def build_nested_attributes(attribute, current_level)
-          return {} unless attribute.nested?
-
-          build_versions_with(attribute.collection_of_attributes, current_level + 1)
-        end
       end
     end
   end

data/lib/treaty/{info/entity → entity/info}/dsl.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Treaty
-  module Info
-    module Entity
+  module Entity
+    module Info
       module DSL
         def self.included(base)
           base.extend(ClassMethods)

data/lib/treaty/{info/entity → entity/info}/result.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module Treaty
-  module Info
-    module Entity
+  module Entity
+    module Info
       class Result
         attr_reader :attributes
 

data/lib/treaty/entity.rb

@@ -1,84 +1,16 @@
 # frozen_string_literal: true
 
 module Treaty
-  # Base class for defining DTO (Data Transfer Object) entities in Treaty.
+  # Entity namespace containing the base class and attribute system.
   #
-  # ## Purpose
+  # Users should inherit from Treaty::Entity::Base:
   #
-  # Treaty::Entity provides a base class for creating reusable DTO classes
-  # that can be used in both request and response definitions. This allows
-  # for better code organization and reusability of common data structures.
-  #
-  # ## Usage
-  #
-  # Create a DTO class by inheriting from Treaty::Entity:
-  #
-  # ```ruby
-  # class PostEntity < Treaty::Entity
-  #   string :id
-  #   string :title
-  #   string :content
-  #   datetime :created_at
-  # end
-  # ```
-  #
-  # Then use it in your treaty definitions:
-  #
-  # ```ruby
-  # class CreateTreaty < ApplicationTreaty
-  #   version 1 do
-  #     request PostEntity
-  #     response 201, PostEntity
+  #   class MyEntity < Treaty::Entity::Base
+  #     string :name
+  #     integer :age
   #   end
-  # end
-  # ```
-  #
-  # ## Attribute Defaults
   #
-  # Unlike request/response blocks, Entity attributes are required by default:
-  # - All attributes have `required: true` unless explicitly marked as `:optional`
-  # - Use `:optional` helper to make attributes optional:
-  #   ```ruby
-  #   string :title           # required by default
-  #   string :summary, :optional  # optional
-  #   ```
-  #
-  # ## Features
-  #
-  # - **Type Safety** - Enforce strict type checking for all attributes
-  # - **Nested Structures** - Support for nested objects and arrays
-  # - **Validation** - Built-in validation for all attribute types
-  # - **Reusability** - Define once, use in multiple treaties
-  # - **Options** - Full support for attribute options (required, default, as, etc.)
-  #
-  # ## Supported Types
-  #
-  # - `string` - String values
-  # - `integer` - Integer values
-  # - `boolean` - Boolean values (true/false)
-  # - `datetime` - DateTime values
-  # - `array` - Array values (with nested type definition)
-  # - `object` - Object values (with nested attributes)
-  class Entity
-    include Info::Entity::DSL
-    include Attribute::DSL
-
-    class << self
-      private
-
-      # Creates an Attribute::Entity::Attribute for this Entity class
-      #
-      # @return [Attribute::Entity::Attribute] Created attribute instance
-      def create_attribute(name, type, *helpers, nesting_level:, **options, &block)
-        Attribute::Entity::Attribute.new(
-          name,
-          type,
-          *helpers,
-          nesting_level:,
-          **options,
-          &block
-        )
-      end
-    end
+  # @see Treaty::Entity::Base for full documentation and examples
+  module Entity
   end
 end

data/lib/treaty/request/attribute/attribute.rb

@@ -4,7 +4,7 @@ module Treaty
   module Request
     module Attribute
       # Request-specific attribute that defaults to required: true
-      class Attribute < Treaty::Attribute::Base
+      class Attribute < Treaty::Entity::Attribute::Base
         private
 
         def apply_defaults!

data/lib/treaty/request/attribute/builder.rb

@@ -4,7 +4,7 @@ module Treaty
   module Request
     module Attribute
       # Request-specific attribute builder
-      class Builder < Treaty::Attribute::Builder::Base
+      class Builder < Treaty::Entity::Attribute::Builder::Base
         private
 
         def create_attribute(name, type, *helpers, nesting_level:, **options, &block)
@@ -17,6 +17,29 @@ module Treaty
             &block
           )
         end
+
+        # Deep copies an attribute with adjusted nesting level for Request context.
+        #
+        # @param source_attribute [Treaty::Entity::Attribute::Base] Attribute to copy
+        # @param new_nesting_level [Integer] New nesting level
+        # @return [Request::Attribute::Attribute] Copied attribute
+        def deep_copy_attribute(source_attribute, new_nesting_level) # rubocop:disable Metrics/MethodLength
+          copied = Attribute.new(
+            source_attribute.name,
+            source_attribute.type,
+            nesting_level: new_nesting_level,
+            **deep_copy_options(source_attribute.options)
+          )
+
+          return copied unless source_attribute.nested?
+
+          source_attribute.collection_of_attributes.each do |nested_source|
+            nested_copied = deep_copy_attribute(nested_source, new_nesting_level + 1)
+            copied.collection_of_attributes << nested_copied
+          end
+
+          copied
+        end
       end
     end
   end

data/lib/treaty/request/entity.rb

@@ -9,7 +9,7 @@ module Treaty
     # When you write a request block, Treaty creates an anonymous
     # class based on Request::Entity.
     class Entity
-      include Treaty::Attribute::DSL
+      include Treaty::Entity::Attribute::DSL
 
       class << self
         private

data/lib/treaty/request/factory.rb

@@ -21,14 +21,14 @@ module Treaty
     # ## Entity Mode
     #
     # ```ruby
-    # request PostRequestEntity
+    # request Posts::Create::RequestEntity
     # ```
     class Factory
       # Uses a provided Entity class
       #
       # @param entity_class [Class] Entity class to use
       # @return [void]
-      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity::Base subclass
       def use_entity(entity_class)
         validate_entity_class!(entity_class)
         @entity_class = entity_class
@@ -38,7 +38,7 @@ module Treaty
       #
       # @return [Collection] Collection of attributes
       def collection_of_attributes
-        return Treaty::Attribute::Collection.new if @entity_class.nil?
+        return Treaty::Entity::Attribute::Collection.new if @entity_class.nil?
 
         @entity_class.collection_of_attributes
       end
@@ -62,12 +62,12 @@ module Treaty
 
       private
 
-      # Validates that the provided entity_class is a valid Treaty::Entity subclass
+      # Validates that the provided entity_class is a valid Treaty::Entity::Base subclass
       #
       # @param entity_class [Class] Entity class to validate
-      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity::Base subclass
       def validate_entity_class!(entity_class)
-        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity
+        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity::Base
 
         raise Treaty::Exceptions::Validation,
               I18n.t(

data/lib/treaty/request/validator.rb

@@ -38,7 +38,7 @@ module Treaty
         return request_data unless request_attributes_exist?
 
         # Validate request attributes with orchestrator:
-        orchestrator_class = Class.new(Treaty::Attribute::Validation::Orchestrator::Base) do
+        orchestrator_class = Class.new(Treaty::Entity::Attribute::Validation::Orchestrator::Base) do
           define_method(:collection_of_attributes) do
             @version_factory.request_factory.collection_of_attributes
           end

data/lib/treaty/response/attribute/attribute.rb

@@ -4,7 +4,7 @@ module Treaty
   module Response
     module Attribute
       # Response-specific attribute that defaults to required: false
-      class Attribute < Treaty::Attribute::Base
+      class Attribute < Treaty::Entity::Attribute::Base
         private
 
         def apply_defaults!

data/lib/treaty/response/attribute/builder.rb

@@ -4,7 +4,7 @@ module Treaty
   module Response
     module Attribute
       # Response-specific attribute builder
-      class Builder < Treaty::Attribute::Builder::Base
+      class Builder < Treaty::Entity::Attribute::Builder::Base
         private
 
         def create_attribute(name, type, *helpers, nesting_level:, **options, &block)
@@ -17,6 +17,29 @@ module Treaty
             &block
           )
         end
+
+        # Deep copies an attribute with adjusted nesting level for Response context.
+        #
+        # @param source_attribute [Treaty::Entity::Attribute::Base] Attribute to copy
+        # @param new_nesting_level [Integer] New nesting level
+        # @return [Response::Attribute::Attribute] Copied attribute
+        def deep_copy_attribute(source_attribute, new_nesting_level) # rubocop:disable Metrics/MethodLength
+          copied = Attribute.new(
+            source_attribute.name,
+            source_attribute.type,
+            nesting_level: new_nesting_level,
+            **deep_copy_options(source_attribute.options)
+          )
+
+          return copied unless source_attribute.nested?
+
+          source_attribute.collection_of_attributes.each do |nested_source|
+            nested_copied = deep_copy_attribute(nested_source, new_nesting_level + 1)
+            copied.collection_of_attributes << nested_copied
+          end
+
+          copied
+        end
       end
     end
   end

data/lib/treaty/response/entity.rb

@@ -9,7 +9,7 @@ module Treaty
     # When you write a response block, Treaty creates an anonymous
     # class based on Response::Entity.
     class Entity
-      include Treaty::Attribute::DSL
+      include Treaty::Entity::Attribute::DSL
 
       class << self
         private

data/lib/treaty/response/factory.rb

@@ -21,7 +21,7 @@ module Treaty
     # ## Entity Mode
     #
     # ```ruby
-    # response 200, PostResponseEntity
+    # response 200, Posts::Create::ResponseEntity
     # ```
     class Factory
       attr_reader :status
@@ -34,7 +34,7 @@ module Treaty
       #
       # @param entity_class [Class] Entity class to use
       # @return [void]
-      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity::Base subclass
       def use_entity(entity_class)
         validate_entity_class!(entity_class)
         @entity_class = entity_class
@@ -44,7 +44,7 @@ module Treaty
       #
       # @return [Collection] Collection of attributes
       def collection_of_attributes
-        return Treaty::Attribute::Collection.new if @entity_class.nil?
+        return Treaty::Entity::Attribute::Collection.new if @entity_class.nil?
 
         @entity_class.collection_of_attributes
       end
@@ -68,12 +68,12 @@ module Treaty
 
       private
 
-      # Validates that the provided entity_class is a valid Treaty::Entity subclass
+      # Validates that the provided entity_class is a valid Treaty::Entity::Base subclass
       #
       # @param entity_class [Class] Entity class to validate
-      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity::Base subclass
       def validate_entity_class!(entity_class)
-        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity
+        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity::Base
 
         raise Treaty::Exceptions::Validation,
               I18n.t(

data/lib/treaty/response/validator.rb

@@ -31,7 +31,7 @@ module Treaty
 
         # Create orchestrator for response validation
         # Orchestrator filters data by attributes and performs transformation
-        orchestrator_class = Class.new(Treaty::Attribute::Validation::Orchestrator::Base) do
+        orchestrator_class = Class.new(Treaty::Entity::Attribute::Validation::Orchestrator::Base) do
           define_method(:collection_of_attributes) do
             @version_factory.response_factory.collection_of_attributes
           end

data/lib/treaty/version.rb

@@ -3,7 +3,7 @@
 module Treaty
   module VERSION
     MAJOR = 0
-    MINOR = 17
+    MINOR = 19
     PATCH = 0
     PRE = nil
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treaty
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Anton Sokolov
@@ -147,36 +147,6 @@ files:
 - Rakefile
 - config/locales/en.yml
 - lib/treaty.rb
-- lib/treaty/attribute/base.rb
-- lib/treaty/attribute/builder/base.rb
-- lib/treaty/attribute/collection.rb
-- lib/treaty/attribute/dsl.rb
-- lib/treaty/attribute/entity/attribute.rb
-- lib/treaty/attribute/entity/builder.rb
-- lib/treaty/attribute/helper_mapper.rb
-- lib/treaty/attribute/option/base.rb
-- lib/treaty/attribute/option/conditionals/base.rb
-- lib/treaty/attribute/option/conditionals/if_conditional.rb
-- lib/treaty/attribute/option/conditionals/unless_conditional.rb
-- lib/treaty/attribute/option/modifiers/as_modifier.rb
-- lib/treaty/attribute/option/modifiers/cast_modifier.rb
-- lib/treaty/attribute/option/modifiers/computed_modifier.rb
-- lib/treaty/attribute/option/modifiers/default_modifier.rb
-- lib/treaty/attribute/option/modifiers/transform_modifier.rb
-- lib/treaty/attribute/option/registry.rb
-- lib/treaty/attribute/option/registry_initializer.rb
-- lib/treaty/attribute/option/validators/format_validator.rb
-- lib/treaty/attribute/option/validators/inclusion_validator.rb
-- lib/treaty/attribute/option/validators/required_validator.rb
-- lib/treaty/attribute/option/validators/type_validator.rb
-- lib/treaty/attribute/option_normalizer.rb
-- lib/treaty/attribute/option_orchestrator.rb
-- lib/treaty/attribute/validation/attribute_validator.rb
-- lib/treaty/attribute/validation/base.rb
-- lib/treaty/attribute/validation/nested_array_validator.rb
-- lib/treaty/attribute/validation/nested_object_validator.rb
-- lib/treaty/attribute/validation/nested_transformer.rb
-- lib/treaty/attribute/validation/orchestrator/base.rb
 - lib/treaty/base.rb
 - lib/treaty/configuration.rb
 - lib/treaty/context/callable.rb
@@ -185,6 +155,40 @@ files:
 - lib/treaty/controller/dsl.rb
 - lib/treaty/engine.rb
 - lib/treaty/entity.rb
+- lib/treaty/entity/attribute/attribute.rb
+- lib/treaty/entity/attribute/base.rb
+- lib/treaty/entity/attribute/builder/base.rb
+- lib/treaty/entity/attribute/collection.rb
+- lib/treaty/entity/attribute/dsl.rb
+- lib/treaty/entity/attribute/helper_mapper.rb
+- lib/treaty/entity/attribute/option/base.rb
+- lib/treaty/entity/attribute/option/conditionals/base.rb
+- lib/treaty/entity/attribute/option/conditionals/if_conditional.rb
+- lib/treaty/entity/attribute/option/conditionals/unless_conditional.rb
+- lib/treaty/entity/attribute/option/modifiers/as_modifier.rb
+- lib/treaty/entity/attribute/option/modifiers/cast_modifier.rb
+- lib/treaty/entity/attribute/option/modifiers/computed_modifier.rb
+- lib/treaty/entity/attribute/option/modifiers/default_modifier.rb
+- lib/treaty/entity/attribute/option/modifiers/transform_modifier.rb
+- lib/treaty/entity/attribute/option/registry.rb
+- lib/treaty/entity/attribute/option/registry_initializer.rb
+- lib/treaty/entity/attribute/option/validators/format_validator.rb
+- lib/treaty/entity/attribute/option/validators/inclusion_validator.rb
+- lib/treaty/entity/attribute/option/validators/required_validator.rb
+- lib/treaty/entity/attribute/option/validators/type_validator.rb
+- lib/treaty/entity/attribute/option_normalizer.rb
+- lib/treaty/entity/attribute/option_orchestrator.rb
+- lib/treaty/entity/attribute/validation/attribute_validator.rb
+- lib/treaty/entity/attribute/validation/base.rb
+- lib/treaty/entity/attribute/validation/nested_array_validator.rb
+- lib/treaty/entity/attribute/validation/nested_object_validator.rb
+- lib/treaty/entity/attribute/validation/nested_transformer.rb
+- lib/treaty/entity/attribute/validation/orchestrator/base.rb
+- lib/treaty/entity/base.rb
+- lib/treaty/entity/builder.rb
+- lib/treaty/entity/info/builder.rb
+- lib/treaty/entity/info/dsl.rb
+- lib/treaty/entity/info/result.rb
 - lib/treaty/exceptions/base.rb
 - lib/treaty/exceptions/class_name.rb
 - lib/treaty/exceptions/deprecated.rb
@@ -200,9 +204,6 @@ files:
 - lib/treaty/exceptions/version_multiple_defaults.rb
 - lib/treaty/exceptions/version_not_found.rb
 - lib/treaty/executor/inventory.rb
-- lib/treaty/info/entity/builder.rb
-- lib/treaty/info/entity/dsl.rb
-- lib/treaty/info/entity/result.rb
 - lib/treaty/info/rest/builder.rb
 - lib/treaty/info/rest/dsl.rb
 - lib/treaty/info/rest/result.rb