treaty 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1917cdb2d494999973e0791ff341457fc4721dd08c5e02f08fb26c1918c1fb0
-  data.tar.gz: 1e3ec37bf3bcd81e29c10afa5e8229b2ce80e920baad407f8b32ca17fb14e987
+  metadata.gz: e12062cde9c855fa59706b03143fc63760837b8b7ea2eacec1c78694212ec2c1
+  data.tar.gz: 8fddef7c5bb06a1e592ff45873556eab88ef46fa2c578a7425a915803210db50
 SHA512:
-  metadata.gz: 14f558348b67d7ebbe64f19daaa952eabf127b21b466f45ca52da0ca66ff4ac83e7a370df14238ecbce3da0535216d41a3033f6d8c7359985129dc713e93152c
-  data.tar.gz: 7190e87b3c29912d51f77bc1765e44fcadb738eb807275bf8e84a54a0398ff259db94b15ad77bec8fbf0810e67d25ee864d96d2c2c0fdd3c93092add43e0489c
+  metadata.gz: '0684be39d9831977a7afefaf06d9ad5dc683b619b598c68e7d6afd0f751d834caaaa998cadffc921aa2d024939fa40778cdaedb7a2264f6582d43bcdbfc06405'
+  data.tar.gz: 64b70b809d8729b9fd2b9b7cf2e5c30404c6e1e84c51cdaf85596a6b38538dd3cd3c85679b0f5d183d948ca81de15f85acf204ace86972cd47f35c8d884ed3a9

data/README.md

@@ -62,15 +62,15 @@ module Posts
       strategy Treaty::Strategy::ADAPTER
 
       request do
-        scope :post do
-          string :title, :required
-          string :content, :required
+        object :post do
+          string :title
+          string :content
           string :summary, :optional
         end
       end
 
       response 201 do
-        scope :post do
+        object :post do
           string :id
           string :title
           string :content

data/config/locales/en.yml

@@ -27,8 +27,7 @@ en:
         nested:
           # Orchestrator errors
           orchestrator:
-            collection_not_implemented: "Subclass must implement the collection_of_scopes method"
-            scope_data_not_implemented: "Subclass must implement the scope_data_for method"
+            collection_not_implemented: "Subclass must implement the collection_of_attributes method"
 
           # Array validation errors
           array:
@@ -61,7 +60,7 @@ en:
     request:
       # Request factory DSL
       factory:
-        unknown_method: "Unknown method '%{method}' in request definition. Use 'scope :name do ... end' to define request structure"
+        unknown_method: "Unknown method '%{method}' in request definition. Use 'object :name do ... end' to define request structure"
 
     # ============================================================================
     # Response: Response definition and structure
@@ -69,7 +68,7 @@ en:
     response:
       # Response factory DSL
       factory:
-        unknown_method: "Unknown method '%{method}' in response definition. Use 'scope :name do ... end' to define response structure"
+        unknown_method: "Unknown method '%{method}' in response definition. Use 'object :name do ... end' to define response structure"
 
     # ============================================================================
     # Versioning: API version management and resolution

data/lib/treaty/attribute/base.rb

@@ -6,7 +6,7 @@ module Treaty
     #
     # ## Purpose
     #
-    # Represents a single attribute defined in request/response scopes.
+    # Represents a single attribute defined in request/response definitions.
     # Handles:
     # - Attribute metadata (name, type, nesting level)
     # - Helper mode to simple mode conversion
@@ -37,7 +37,7 @@ module Treaty
     # - `object` - nested attributes as direct children
     # - `array` - nested attributes define array element structure
     #
-    # Special scope `:_self` is used for simple arrays:
+    # Special attribute name `:_self` is used for simple arrays:
     #   array :tags do
     #     string :_self  # Array of strings
     #   end

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

@@ -3,11 +3,11 @@
 module Treaty
   module Attribute
     module Builder
-      # Base DSL builder for defining attributes in request/response scopes.
+      # Base DSL builder for defining attributes in request/response definitions.
       #
       # ## Purpose
       #
-      # Provides the DSL interface for defining attributes within scopes.
+      # Provides the DSL interface for defining attributes within objects.
       # Handles method_missing magic to support type-based method calls.
       #
       # ## Responsibilities
@@ -23,8 +23,8 @@ module Treaty
       #
       # ```ruby
       # request do
-      #   scope :user do
-      #     string :name, :required
+      #   object :user do
+      #     string :name
       #     integer :age, default: 18
       #     object :profile do
       #       string :bio

data/lib/treaty/attribute/collection.rb

@@ -14,7 +14,7 @@ module Treaty
     # ## Usage
     #
     # Used internally by:
-    # - Scope factories (to store attributes in a scope)
+    # - Request/Response factories (to store attributes)
     # - Attribute::Base (to store nested attributes)
     #
     # ## Methods

data/lib/treaty/attribute/option/modifiers/default_modifier.rb

@@ -25,7 +25,7 @@ module Treaty
         # 1. **Response defaults** (most common):
         #    ```ruby
         #    response 200 do
-        #      scope :meta do
+        #      object :meta do
         #        integer :limit, default: 12
         #        integer :page, default: 1
         #      end

data/lib/treaty/attribute/option/registry.rb

@@ -99,16 +99,16 @@ module Treaty
           #
           # @return [Hash] Hash of option_name => processor_class for validators
           def validators
-            registry.select { |_, info| info[:category] == :validator }
-                    .transform_values { |info| info[:processor_class] }
+            registry.select { |_, info| info.fetch(:category) == :validator }
+                    .transform_values { |info| info.fetch(:processor_class) }
           end
 
           # Get all modifiers
           #
           # @return [Hash] Hash of option_name => processor_class for modifiers
           def modifiers
-            registry.select { |_, info| info[:category] == :modifier }
-                    .transform_values { |info| info[:processor_class] }
+            registry.select { |_, info| info.fetch(:category) == :modifier }
+                    .transform_values { |info| info.fetch(:processor_class) }
           end
 
           # Reset registry (mainly for testing)

data/lib/treaty/attribute/option_orchestrator.rb

@@ -131,7 +131,7 @@ module Treaty
       # @param option_name [Symbol] The option name (:required, :type, etc.)
       # @return [Option::Base, nil] The processor instance or nil if not found
       def processor_for(option_name)
-        @processors[option_name]
+        @processors.fetch(option_name)
       end
 
       private

data/lib/treaty/attribute/validation/nested_array_validator.rb

@@ -8,7 +8,7 @@ module Treaty
       # ## Purpose
       #
       # Performs validation for nested array attributes during the validation phase.
-      # Handles both simple arrays (with :_self scope) and complex arrays (objects).
+      # Handles both simple arrays (with :_self attribute) and complex arrays (objects).
       #
       # ## Responsibilities
       #
@@ -19,7 +19,7 @@ module Treaty
       #
       # ## Array Types
       #
-      # ### Simple Array (`:_self` scope)
+      # ### Simple Array (`:_self` attribute)
       # Array containing primitive values (strings, integers, etc.)
       #
       # ```ruby
@@ -93,7 +93,7 @@ module Treaty
 
         private
 
-        # Validates array item for simple arrays (with :_self scope)
+        # Validates array item for simple arrays (with :_self attribute)
         # Simple array contains primitive values: strings, integers, datetimes, etc.
         # Example: ["ruby", "rails", "api"] where each item is a String
         #

data/lib/treaty/attribute/validation/nested_transformer.rb

@@ -6,8 +6,8 @@ module Treaty
       # Handles transformation of nested attributes (objects and arrays).
       # Extracted from Orchestrator::Base to reduce complexity.
       class NestedTransformer
-        SELF_SCOPE = :_self
-        private_constant :SELF_SCOPE
+        SELF_OBJECT = :_self
+        private_constant :SELF_OBJECT
 
         attr_reader :attribute
 
@@ -118,8 +118,8 @@ module Treaty
 
         # Transforms array with nested attributes
         class ArrayTransformer
-          SELF_SCOPE = :_self
-          private_constant :SELF_SCOPE
+          SELF_OBJECT = :_self
+          private_constant :SELF_OBJECT
 
           attr_reader :attribute
 
@@ -150,10 +150,10 @@ module Treaty
 
           # Checks if this is a simple array (primitive values)
           #
-          # @return [Boolean] True if array contains primitive values with :_self scope
+          # @return [Boolean] True if array contains primitive values with :_self attribute
           def simple_array?
             attribute.collection_of_attributes.size == 1 &&
-              attribute.collection_of_attributes.first.name == SELF_SCOPE
+              attribute.collection_of_attributes.first.name == SELF_OBJECT
           end
 
           # Validates a simple array element (primitive value)

data/lib/treaty/attribute/validation/orchestrator/base.rb

@@ -9,12 +9,12 @@ module Treaty
         # ## Purpose
         #
         # Coordinates the validation and transformation of request/response data for a specific
-        # API version. Processes all scopes and their attributes, applying validations and
-        # transformations defined in the treaty DSL.
+        # API version. Processes all attributes, applying validations and transformations
+        # defined in the treaty DSL.
         #
         # ## Responsibilities
         #
-        # 1. **Scope Processing** - Iterates through all defined scopes
+        # 1. **Attribute Processing** - Iterates through all defined attributes
         # 2. **Attribute Validation** - Validates each attribute's value
         # 3. **Data Transformation** - Transforms values (defaults, renaming)
         # 4. **Nested Handling** - Delegates nested structures to NestedTransformer
@@ -23,17 +23,16 @@ module Treaty
         # ## Usage
         #
         # Subclasses must implement:
-        # - `collection_of_scopes` - Returns scopes for this context (request/response)
-        # - `scope_data_for(name)` - Extracts data for a specific scope
+        # - `collection_of_attributes` - Returns attributes for this context (request/response)
         #
         # Example:
         #   orchestrator = Request::Orchestrator.new(version_factory: factory, data: params)
         #   validated_data = orchestrator.validate!
         #
-        # ## Special Scopes
+        # ## Special Case: object :_self
         #
-        # - Normal scope: `{ scope_name: { ... } }`
-        # - Self scope (`:_self`): Attributes merged directly into parent
+        # - Normal object: `{ object_name: { ... } }`
+        # - Self object (`:_self`): Attributes merged directly into parent
         #
         # ## Architecture
         #
@@ -41,13 +40,13 @@ module Treaty
         # - `AttributeValidator` - Validates individual attributes
         # - `NestedTransformer` - Handles nested objects and arrays
         #
-        # The refactored design separates concerns:
-        # - Orchestrator: High-level flow and scope iteration
+        # The design separates concerns:
+        # - Orchestrator: High-level flow and attribute iteration
         # - Validator: Individual attribute validation
         # - Transformer: Nested structure transformation
         class Base
-          SELF_SCOPE = :_self
-          private_constant :SELF_SCOPE
+          SELF_OBJECT = :_self
+          private_constant :SELF_OBJECT
 
           attr_reader :version_factory, :data
 
@@ -69,17 +68,22 @@ module Treaty
             @data = data
           end
 
-          # Validates and transforms all scopes
-          # Iterates through scopes, processes attributes, handles :_self scope
+          # Validates and transforms all attributes
+          # Iterates through attributes, processes them, handles :_self objects
           #
-          # @return [Hash] Transformed data with all scopes processed
+          # @return [Hash] Transformed data with all attributes processed
           def validate!
             transformed_data = {}
 
-            collection_of_scopes.each do |scope_factory|
-              transformed_scope_data = validate_and_transform_scope!(scope_factory)
-              transformed_data[scope_factory.name] = transformed_scope_data if scope_factory.name != SELF_SCOPE
-              transformed_data.merge!(transformed_scope_data) if scope_factory.name == SELF_SCOPE
+            collection_of_attributes.each do |attribute|
+              transformed_value = validate_and_transform_attribute!(attribute)
+
+              if attribute.name == SELF_OBJECT && attribute.type == :object
+                # For object :_self, merge nested attributes to root
+                transformed_data.merge!(transformed_value)
+              else
+                transformed_data[attribute.name] = transformed_value
+              end
             end
 
             transformed_data
@@ -87,103 +91,83 @@ module Treaty
 
           private
 
-          # Returns collection of scopes for this context
+          # Returns collection of attributes for this context
           # Must be implemented in subclasses
           #
           # @raise [Treaty::Exceptions::Validation] If not implemented
-          # @return [Array<ScopeFactory>] Collection of scope factories
-          def collection_of_scopes
+          # @return [Treaty::Attribute::Collection] Collection of attributes
+          def collection_of_attributes
             raise Treaty::Exceptions::Validation,
                   I18n.t("treaty.attributes.validators.nested.orchestrator.collection_not_implemented")
           end
 
-          # Validates all attributes in a scope (deprecated, not used)
-          #
-          # @param scope_factory [ScopeFactory] The scope to validate
-          # @return [void]
-          def validate_scope!(scope_factory)
-            scope_data = scope_data_for(scope_factory.name)
-
-            validators_for_scope(scope_factory).each do |attribute, validator|
-              value = scope_data.fetch(attribute.name, nil)
-              validator.validate_value!(value)
-            end
-          end
-
-          # Gets cached validators for scope or builds them
+          # Gets cached validators for attributes or builds them
           #
-          # @param scope_factory [ScopeFactory] The scope factory
           # @return [Hash] Hash of attribute => validator
-          def validators_for_scope(scope_factory)
-            @validators_cache ||= {}
-            @validators_cache[scope_factory] ||= build_validators_for_scope(scope_factory)
+          def validators_for_attributes
+            @validators_for_attributes ||= build_validators_for_attributes
           end
 
-          # Builds validators for all attributes in a scope
+          # Builds validators for all attributes
           #
-          # @param scope_factory [ScopeFactory] The scope factory
           # @return [Hash] Hash of attribute => validator
-          def build_validators_for_scope(scope_factory)
-            scope_factory.collection_of_attributes.each_with_object({}) do |attribute, cache|
+          def build_validators_for_attributes
+            collection_of_attributes.each_with_object({}) do |attribute, cache|
               validator = AttributeValidator.new(attribute)
               validator.validate_schema!
               cache[attribute] = validator
             end
           end
 
-          # Extracts data for a specific scope
-          # Must be implemented in subclasses
-          #
-          # @param _name [Symbol] The scope name
-          # @raise [Treaty::Exceptions::Validation] If not implemented
-          # @return [Hash] Scope data
-          def scope_data_for(_name)
-            raise Treaty::Exceptions::Validation,
-                  I18n.t("treaty.attributes.validators.nested.orchestrator.scope_data_not_implemented")
-          end
-
-          # Validates and transforms all attributes in a scope
+          # Validates and transforms a single attribute
           # Handles both nested and regular attributes
           #
-          # @param scope_factory [ScopeFactory] The scope to process
-          # @return [Hash] Transformed scope data
-          def validate_and_transform_scope!(scope_factory) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-            scope_data = scope_data_for(scope_factory.name)
-
-            return scope_data if scope_factory.collection_of_attributes.empty?
-
-            transformed_scope_data = {}
-
-            validators_for_scope(scope_factory).each do |attribute, validator|
-              source_name = attribute.name
-              value = scope_data.fetch(source_name, nil)
-
-              if attribute.nested?
-                transformed_value = validate_and_transform_nested(attribute, value, validator)
-              else
-                validator.validate_value!(value)
-                transformed_value = validator.transform_value(value)
-              end
-
-              target_name = validator.target_name
-
-              transformed_scope_data[target_name] = transformed_value
+          # @param attribute [Attribute] The attribute to process
+          # @return [Object] Transformed attribute value
+          def validate_and_transform_attribute!(attribute) # rubocop:disable Metrics/MethodLength
+            validator = validators_for_attributes.fetch(attribute)
+
+            # For :_self object, get data from root; otherwise from attribute key
+            value = if attribute.name == SELF_OBJECT && attribute.type == :object
+                      data
+                    else
+                      data.fetch(attribute.name, nil)
+                    end
+
+            if attribute.nested?
+              validate_and_transform_nested(attribute, value, validator)
+            else
+              validator.validate_value!(value)
+              validator.transform_value(value)
             end
-
-            transformed_scope_data
           end
 
           # Validates and transforms nested attribute (object/array)
           # Delegates transformation to NestedTransformer
           #
           # @param attribute [Attribute::Base] The nested attribute
-          # @param value [Object] The value to validate and transform
+          # @param value [Object, nil] The value to validate and transform
           # @param validator [AttributeValidator] The validator instance
-          # @return [Object] Transformed nested value
+          # @return [Object, nil] Transformed nested value or nil
+          #
+          # @note Flow control:
+          #   - If value is nil and attribute is required → validate_required! raises exception
+          #   - If value is nil and attribute is optional → validate_required! does nothing, returns nil
+          #   - If value is not nil → proceeds to transformation (value guaranteed non-nil)
           def validate_and_transform_nested(attribute, value, validator)
+            # Step 1: Validate type if value is present
             validator.validate_type!(value) unless value.nil?
+
+            # Step 2: Validate required constraint
+            # This will raise an exception if attribute is required and value is nil
             validator.validate_required!(value)
 
+            # Step 3: Early return for nil values
+            # Only reaches here if attribute is optional and value is nil
+            return nil if value.nil?
+
+            # Step 4: Transform non-nil value
+            # At this point, value is guaranteed to be non-nil
             transformer = NestedTransformer.new(attribute)
             transformer.transform(value)
           end

data/lib/treaty/exceptions/nested_attributes.rb

@@ -18,7 +18,7 @@ module Treaty
     #
     # ```ruby
     # request do
-    #   scope :user do
+    #   object :user do
     #     object :profile do
     #       object :settings do
     #         object :preferences do
@@ -57,7 +57,7 @@ module Treaty
     #
     # - Keep nesting shallow (2-3 levels maximum)
     # - Consider flattening deeply nested structures
-    # - Use separate scopes instead of deep nesting
+    # - Use separate objects instead of deep nesting
     # - Refactor complex structures into simpler ones
     class NestedAttributes < Base
     end

data/lib/treaty/info/builder.rb

@@ -56,41 +56,27 @@ module Treaty
       ##########################################################################
 
       def build_request_with(version)
-        {
-          scopes: build_scopes_with(version.request_factory)
-        }
+        build_attributes_structure(version.request_factory)
       end
 
       def build_response_with(version)
         response_factory = version.response_factory
         {
-          status: response_factory.status,
-          scopes: build_scopes_with(response_factory)
-        }
-      end
-
-      ##########################################################################
-
-      def build_scopes_with(request_factory)
-        request_factory.collection_of_scopes.to_h do |scope|
-          [
-            scope.name,
-            build_attributes_with(scope.collection_of_attributes)
-          ]
-        end
+          status: response_factory.status
+        }.merge(build_attributes_structure(response_factory))
       end
 
       ##########################################################################
 
-      def build_attributes_with(collection, current_level = 0)
-        # validate_nesting_level!(current_level)
-
+      def build_attributes_structure(factory)
         {
-          attributes: build_attributes_hash(collection, current_level)
+          attributes: build_attributes_hash(factory.collection_of_attributes)
         }
       end
 
-      def build_attributes_hash(collection, current_level)
+      def build_attributes_hash(collection, current_level = 0)
+        # validate_nesting_level!(current_level)
+
         collection.to_h do |attribute|
           [
             attribute.name,

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

@@ -7,18 +7,10 @@ module Treaty
         class Orchestrator < Treaty::Attribute::Validation::Orchestrator::Base
           private
 
-          def collection_of_scopes
-            return Treaty::Request::Scope::Collection.new if version_factory.request_factory.nil?
+          def collection_of_attributes
+            return Treaty::Attribute::Collection.new if version_factory.request_factory.nil?
 
-            version_factory.request_factory.collection_of_scopes
-          end
-
-          def scope_data_for(name)
-            # If the scope is :_self, it's the root level.
-            return data if name == :_self
-
-            # Otherwise, fetch data from the named scope.
-            data.fetch(name, {})
+            version_factory.request_factory.collection_of_attributes
           end
         end
       end

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

@@ -40,9 +40,9 @@ module Treaty
         end
 
         def request_attributes_exist?
-          return false if @version_factory.request_factory&.collection_of_scopes&.empty?
+          return false if @version_factory.request_factory&.collection_of_attributes&.empty?
 
-          @version_factory.request_factory.collection_of_scopes.exists?
+          @version_factory.request_factory.collection_of_attributes.exists?
         end
       end
     end

data/lib/treaty/request/factory.rb

@@ -3,25 +3,27 @@
 module Treaty
   module Request
     class Factory
-      def scope(name, &block)
-        @scope_factory = Scope::Factory.new(name)
-
-        @scope_factory.instance_eval(&block) if block_given?
-
-        collection_of_scopes << @scope_factory
-
-        @scope_factory = nil
+      def attribute(name, type, *helpers, **options, &block)
+        collection_of_attributes << Attribute::Attribute.new(
+          name,
+          type,
+          *helpers,
+          nesting_level: 0,
+          **options,
+          &block
+        )
       end
 
-      def collection_of_scopes
-        @collection_of_scopes ||= Scope::Collection.new
+      def collection_of_attributes
+        @collection_of_attributes ||= Treaty::Attribute::Collection.new
       end
 
       ##########################################################################
 
-      def method_missing(name, *, &_block)
-        raise Treaty::Exceptions::MethodName,
-              I18n.t("treaty.request.factory.unknown_method", method: name)
+      def method_missing(type, *helpers, **options, &block)
+        name = helpers.shift
+
+        attribute(name, type, *helpers, **options, &block)
       end
 
       def respond_to_missing?(name, *)

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

@@ -7,18 +7,10 @@ module Treaty
         class Orchestrator < Treaty::Attribute::Validation::Orchestrator::Base
           private
 
-          def collection_of_scopes
-            return Treaty::Response::Scope::Collection.new if version_factory.response_factory.nil?
+          def collection_of_attributes
+            return Treaty::Attribute::Collection.new if version_factory.response_factory.nil?
 
-            version_factory.response_factory.collection_of_scopes
-          end
-
-          def scope_data_for(name)
-            # If the scope is :_self, it's the root level.
-            return data if name == :_self
-
-            # Otherwise, fetch data from the named scope.
-            data.fetch(name, {})
+            version_factory.response_factory.collection_of_attributes
           end
         end
       end

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

@@ -34,9 +34,9 @@ module Treaty
         end
 
         def response_attributes_exist?
-          return false if @version_factory.response_factory&.collection_of_scopes&.empty?
+          return false if @version_factory.response_factory&.collection_of_attributes&.empty?
 
-          @version_factory.response_factory.collection_of_scopes.exists?
+          @version_factory.response_factory.collection_of_attributes.exists?
         end
       end
     end

data/lib/treaty/response/factory.rb

@@ -9,25 +9,27 @@ module Treaty
         @status = status
       end
 
-      def scope(name, &block)
-        @scope_factory = Scope::Factory.new(name)
-
-        @scope_factory.instance_eval(&block) if block_given?
-
-        collection_of_scopes << @scope_factory
-
-        @scope_factory = nil
+      def attribute(name, type, *helpers, **options, &block)
+        collection_of_attributes << Attribute::Attribute.new(
+          name,
+          type,
+          *helpers,
+          nesting_level: 0,
+          **options,
+          &block
+        )
       end
 
-      def collection_of_scopes
-        @collection_of_scopes ||= Scope::Collection.new
+      def collection_of_attributes
+        @collection_of_attributes ||= Treaty::Attribute::Collection.new
       end
 
       ##########################################################################
 
-      def method_missing(name, *, &_block)
-        raise Treaty::Exceptions::MethodName,
-              I18n.t("treaty.response.factory.unknown_method", method: name)
+      def method_missing(type, *helpers, **options, &block)
+        name = helpers.shift
+
+        attribute(name, type, *helpers, **options, &block)
       end
 
       def respond_to_missing?(name, *)

data/lib/treaty/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treaty
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Anton Sokolov
@@ -192,15 +192,11 @@ files:
 - lib/treaty/request/attribute/validation/orchestrator.rb
 - lib/treaty/request/attribute/validator.rb
 - lib/treaty/request/factory.rb
-- lib/treaty/request/scope/collection.rb
-- lib/treaty/request/scope/factory.rb
 - lib/treaty/response/attribute/attribute.rb
 - lib/treaty/response/attribute/builder.rb
 - lib/treaty/response/attribute/validation/orchestrator.rb
 - lib/treaty/response/attribute/validator.rb
 - lib/treaty/response/factory.rb
-- lib/treaty/response/scope/collection.rb
-- lib/treaty/response/scope/factory.rb
 - lib/treaty/result.rb
 - lib/treaty/strategy.rb
 - lib/treaty/support/loader.rb

data/lib/treaty/request/scope/collection.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Request
-    module Scope
-      class Collection
-        extend Forwardable
-
-        def_delegators :@collection, :<<, :to_h, :each, :find, :empty?
-
-        def initialize(collection = Set.new)
-          @collection = collection
-        end
-
-        def exists?
-          !empty?
-        end
-      end
-    end
-  end
-end

data/lib/treaty/request/scope/factory.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Request
-    module Scope
-      class Factory
-        attr_reader :name
-
-        def initialize(name)
-          @name = name
-        end
-
-        def attribute(name, type, *helpers, **options, &block)
-          collection_of_attributes << Attribute::Attribute.new(
-            name,
-            type,
-            *helpers,
-            nesting_level: 0,
-            **options,
-            &block
-          )
-        end
-
-        def collection_of_attributes
-          @collection_of_attributes ||= Treaty::Attribute::Collection.new
-        end
-
-        ########################################################################
-
-        def method_missing(type, *helpers, **options, &block)
-          name = helpers.shift
-
-          attribute(name, type, *helpers, **options, &block)
-        end
-
-        def respond_to_missing?(name, *)
-          super
-        end
-      end
-    end
-  end
-end

data/lib/treaty/response/scope/collection.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Response
-    module Scope
-      class Collection
-        extend Forwardable
-
-        def_delegators :@collection, :<<, :to_h, :each, :find, :empty?
-
-        def initialize(collection = Set.new)
-          @collection = collection
-        end
-
-        def exists?
-          !empty?
-        end
-      end
-    end
-  end
-end

data/lib/treaty/response/scope/factory.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Response
-    module Scope
-      class Factory
-        attr_reader :name
-
-        def initialize(name)
-          @name = name
-        end
-
-        def attribute(name, type, *helpers, **options, &block)
-          collection_of_attributes << Attribute::Attribute.new(
-            name,
-            type,
-            *helpers,
-            nesting_level: 0,
-            **options,
-            &block
-          )
-        end
-
-        def collection_of_attributes
-          @collection_of_attributes ||= Treaty::Attribute::Collection.new
-        end
-
-        ########################################################################
-
-        def method_missing(type, *helpers, **options, &block)
-          name = helpers.shift
-
-          attribute(name, type, *helpers, **options, &block)
-        end
-
-        def respond_to_missing?(name, *)
-          super
-        end
-      end
-    end
-  end
-end