treaty 0.7.0 → 0.9.0

data/lib/treaty/request/factory.rb

@@ -2,33 +2,80 @@
 
 module Treaty
   module Request
+    # Factory for creating request definitions.
+    #
+    # Supports two modes:
+    # 1. Block mode: Creates an anonymous Request::Entity class with the block
+    # 2. Entity mode: Uses a provided Entity class directly
+    #
+    # ## Block Mode
+    #
+    # ```ruby
+    # request do
+    #   object :post do
+    #     string :title
+    #   end
+    # end
+    # ```
+    #
+    # ## Entity Mode
+    #
+    # ```ruby
+    # request PostRequestEntity
+    # ```
     class Factory
-      def attribute(name, type, *helpers, **options, &block)
-        collection_of_attributes << Attribute::Attribute.new(
-          name,
-          type,
-          *helpers,
-          nesting_level: 0,
-          **options,
-          &block
-        )
+      # 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
+      def use_entity(entity_class)
+        validate_entity_class!(entity_class)
+        @entity_class = entity_class
       end
 
+      # Returns collection of attributes from the entity class
+      #
+      # @return [Collection] Collection of attributes
       def collection_of_attributes
-        @collection_of_attributes ||= Treaty::Attribute::Collection.new
-      end
+        return Treaty::Attribute::Collection.new if @entity_class.nil?
 
-      ##########################################################################
+        @entity_class.collection_of_attributes
+      end
 
+      # Handles DSL methods for defining attributes
+      #
+      # This allows the factory to be used with method_missing
+      # for backwards compatibility with direct method calls.
+      # Creates an anonymous Request::Entity class on first use.
       def method_missing(type, *helpers, **options, &block)
-        name = helpers.shift
+        # If no entity class yet, create one
+        @entity_class ||= Class.new(Entity)
 
-        attribute(name, type, *helpers, **options, &block)
+        # Call the method on the entity class
+        @entity_class.public_send(type, *helpers, **options, &block)
       end
 
       def respond_to_missing?(name, *)
         super
       end
+
+      private
+
+      # Validates that the provided entity_class is a valid Treaty::Entity subclass
+      #
+      # @param entity_class [Class] Entity class to validate
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      def validate_entity_class!(entity_class)
+        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity
+
+        raise Treaty::Exceptions::Validation,
+              I18n.t(
+                "treaty.request.factory.invalid_entity_class",
+                type: entity_class.class,
+                value: entity_class
+              )
+      end
     end
   end
 end

data/lib/treaty/request/validator.rb

@@ -0,0 +1,65 @@
+# frozen_string_literal: true
+
+module Treaty
+  module Request
+    # Validator for request data
+    class Validator
+      class << self
+        # Validates request parameters against the request definition
+        #
+        # @param params [Hash] Request parameters to validate
+        # @param version_factory [Versions::Factory] Version factory with request definition
+        # @return [Hash] Validated and transformed parameters
+        def validate!(params:, version_factory:)
+          new(params:, version_factory:).validate!
+        end
+      end
+
+      def initialize(params:, version_factory:)
+        @params = params
+        @version_factory = version_factory
+      end
+
+      def validate!
+        validate_request_attributes!
+      end
+
+      private
+
+      def request_data
+        @request_data ||= begin
+          @params.to_unsafe_h
+        rescue NoMethodError
+          @params
+        end
+      end
+
+      def validate_request_attributes! # rubocop:disable Metrics/MethodLength
+        return request_data unless adapter_strategy?
+        return request_data unless request_attributes_exist?
+
+        # For adapter strategy with attributes defined:
+        orchestrator_class = Class.new(Treaty::Attribute::Validation::Orchestrator::Base) do
+          define_method(:collection_of_attributes) do
+            @version_factory.request_factory.collection_of_attributes
+          end
+        end
+
+        orchestrator_class.validate!(
+          version_factory: @version_factory,
+          data: request_data
+        )
+      end
+
+      def adapter_strategy?
+        !@version_factory.strategy_instance.direct?
+      end
+
+      def request_attributes_exist?
+        return false if @version_factory.request_factory&.collection_of_attributes&.empty?
+
+        @version_factory.request_factory.collection_of_attributes.exists?
+      end
+    end
+  end
+end

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

@@ -3,6 +3,7 @@
 module Treaty
   module Response
     module Attribute
+      # Response-specific attribute that defaults to required: false
       class Attribute < Treaty::Attribute::Base
         private
 

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

@@ -3,6 +3,7 @@
 module Treaty
   module Response
     module Attribute
+      # Response-specific attribute builder
       class Builder < Treaty::Attribute::Builder::Base
         private
 

data/lib/treaty/response/entity.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Treaty
+  module Response
+    # Entity class for response definitions.
+    # Attributes are optional by default.
+    #
+    # This class is used internally when defining response blocks.
+    # When you write a response block, Treaty creates an anonymous
+    # class based on Response::Entity.
+    class Entity
+      include Treaty::Attribute::DSL
+
+      class << self
+        private
+
+        # Creates a Response::Attribute::Attribute for this Response::Entity class
+        #
+        # @return [Response::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/response/factory.rb

@@ -2,6 +2,27 @@
 
 module Treaty
   module Response
+    # Factory for creating response definitions.
+    #
+    # Supports two modes:
+    # 1. Block mode: Creates an anonymous Response::Entity class with the block
+    # 2. Entity mode: Uses a provided Entity class directly
+    #
+    # ## Block Mode
+    #
+    # ```ruby
+    # response 200 do
+    #   object :post do
+    #     string :id
+    #   end
+    # end
+    # ```
+    #
+    # ## Entity Mode
+    #
+    # ```ruby
+    # response 200, PostResponseEntity
+    # ```
     class Factory
       attr_reader :status
 
@@ -9,32 +30,58 @@ module Treaty
         @status = status
       end
 
-      def attribute(name, type, *helpers, **options, &block)
-        collection_of_attributes << Attribute::Attribute.new(
-          name,
-          type,
-          *helpers,
-          nesting_level: 0,
-          **options,
-          &block
-        )
+      # 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
+      def use_entity(entity_class)
+        validate_entity_class!(entity_class)
+        @entity_class = entity_class
       end
 
+      # Returns collection of attributes from the entity class
+      #
+      # @return [Collection] Collection of attributes
       def collection_of_attributes
-        @collection_of_attributes ||= Treaty::Attribute::Collection.new
-      end
+        return Treaty::Attribute::Collection.new if @entity_class.nil?
 
-      ##########################################################################
+        @entity_class.collection_of_attributes
+      end
 
+      # Handles DSL methods for defining attributes
+      #
+      # This allows the factory to be used with method_missing
+      # for backwards compatibility with direct method calls.
+      # Creates an anonymous Response::Entity class on first use.
       def method_missing(type, *helpers, **options, &block)
-        name = helpers.shift
+        # If no entity class yet, create one
+        @entity_class ||= Class.new(Entity)
 
-        attribute(name, type, *helpers, **options, &block)
+        # Call the method on the entity class
+        @entity_class.public_send(type, *helpers, **options, &block)
       end
 
       def respond_to_missing?(name, *)
         super
       end
+
+      private
+
+      # Validates that the provided entity_class is a valid Treaty::Entity subclass
+      #
+      # @param entity_class [Class] Entity class to validate
+      # @raise [Treaty::Exceptions::Validation] if entity_class is not a valid Treaty::Entity subclass
+      def validate_entity_class!(entity_class)
+        return if entity_class.is_a?(Class) && entity_class < Treaty::Entity
+
+        raise Treaty::Exceptions::Validation,
+              I18n.t(
+                "treaty.response.factory.invalid_entity_class",
+                type: entity_class.class,
+                value: entity_class
+              )
+      end
     end
   end
 end

data/lib/treaty/response/validator.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Treaty
+  module Response
+    # Validator for response data
+    class Validator
+      class << self
+        # Validates response data against the response definition
+        #
+        # @param response_data [Hash] Response data to validate
+        # @param version_factory [Versions::Factory] Version factory with response definition
+        # @return [Hash] Validated and transformed response data
+        def validate!(version_factory:, response_data: {})
+          new(version_factory:, response_data:).validate!
+        end
+      end
+
+      def initialize(version_factory:, response_data: {})
+        @version_factory = version_factory
+        @response_data = response_data
+      end
+
+      def validate!
+        validate_response_attributes!
+      end
+
+      private
+
+      def validate_response_attributes!
+        return @response_data unless response_attributes_exist?
+
+        # Create orchestrator for both DIRECT and ADAPTER strategies
+        # Orchestrator filters data by attributes and performs transformation
+        orchestrator_class = Class.new(Treaty::Attribute::Validation::Orchestrator::Base) do
+          define_method(:collection_of_attributes) do
+            @version_factory.response_factory.collection_of_attributes
+          end
+        end
+
+        orchestrator_class.validate!(
+          version_factory: @version_factory,
+          data: @response_data
+        )
+      end
+
+      def adapter_strategy?
+        !@version_factory.strategy_instance.direct?
+      end
+
+      def response_attributes_exist?
+        return false if @version_factory.response_factory&.collection_of_attributes&.empty?
+
+        @version_factory.response_factory.collection_of_attributes.exists?
+      end
+    end
+  end
+end

data/lib/treaty/version.rb

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

data/lib/treaty/versions/execution/request.rb

@@ -3,7 +3,7 @@
 module Treaty
   module Versions
     module Execution
-      class Request
+      class Request # rubocop:disable Metrics/ClassLength
         def self.execute!(...)
           new(...).execute!
         end
@@ -117,9 +117,11 @@ module Treaty
 
           unless executor.respond_to?(method_name)
             raise Treaty::Exceptions::Execution,
-                  I18n.t("treaty.execution.method_not_found",
-                         method: method_name,
-                         class_name: executor)
+                  I18n.t(
+                    "treaty.execution.method_not_found",
+                    method: method_name,
+                    class_name: executor
+                  )
           end
 
           executor.public_send(method_name, params: @validated_params)
@@ -134,7 +136,10 @@ module Treaty
 
         def raise_executor_missing_error!
           raise Treaty::Exceptions::Execution,
-                I18n.t("treaty.execution.executor_missing", version: @version_factory.version)
+                I18n.t(
+                  "treaty.execution.executor_missing",
+                  version: @version_factory.version
+                )
         end
 
         def servactory_service?

data/lib/treaty/versions/factory.rb

@@ -48,16 +48,24 @@ module Treaty
         @deprecated_result = result
       end
 
-      def request(&block)
+      def request(entity_class = nil, &block)
         @request_factory ||= Request::Factory.new
 
-        @request_factory.instance_eval(&block) if block_given?
+        if entity_class.present?
+          @request_factory.use_entity(entity_class)
+        elsif block_given?
+          @request_factory.instance_eval(&block)
+        end
       end
 
-      def response(status, &block)
+      def response(status, entity_class = nil, &block)
         @response_factory ||= Response::Factory.new(status)
 
-        @response_factory.instance_eval(&block) if block_given?
+        if entity_class.present?
+          @response_factory.use_entity(entity_class)
+        elsif block_given?
+          @response_factory.instance_eval(&block)
+        end
       end
 
       def delegate_to(executor, method = :call)
@@ -74,7 +82,10 @@ module Treaty
         end
 
         raise Treaty::Exceptions::Validation,
-              I18n.t("treaty.versioning.factory.invalid_default_option", type: @default_result.class)
+              I18n.t(
+                "treaty.versioning.factory.invalid_default_option",
+                type: @default_result.class
+              )
       end
 
       ##########################################################################

data/lib/treaty/versions/resolver.rb

@@ -52,12 +52,18 @@ module Treaty
 
       def raise_version_not_found!
         raise Treaty::Exceptions::Validation,
-              I18n.t("treaty.versioning.resolver.version_not_found", version: @current_version)
+              I18n.t(
+                "treaty.versioning.resolver.version_not_found",
+                version: @current_version
+              )
       end
 
       def raise_version_deprecated!
         raise Treaty::Exceptions::Deprecated,
-              I18n.t("treaty.versioning.resolver.version_deprecated", version: @current_version)
+              I18n.t(
+                "treaty.versioning.resolver.version_deprecated",
+                version: @current_version
+              )
       end
     end
   end

data/lib/treaty/versions/workspace.rb

@@ -13,7 +13,7 @@ module Treaty
           collection_of_versions: @collection_of_versions
         )
 
-        validated_params = Request::Attribute::Validator.validate!(
+        validated_params = Request::Validator.validate!(
           params:,
           version_factory:
         )
@@ -23,7 +23,7 @@ module Treaty
           validated_params:
         )
 
-        validated_response = Response::Attribute::Validator.validate!(
+        validated_response = Response::Validator.validate!(
           version_factory:,
           response_data: executor_result
         )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: treaty
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Anton Sokolov
@@ -150,12 +150,16 @@ files:
 - 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/modifiers/as_modifier.rb
 - lib/treaty/attribute/option/modifiers/default_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
@@ -174,6 +178,7 @@ files:
 - lib/treaty/context/workspace.rb
 - lib/treaty/controller/dsl.rb
 - lib/treaty/engine.rb
+- lib/treaty/entity.rb
 - lib/treaty/exceptions/base.rb
 - lib/treaty/exceptions/class_name.rb
 - lib/treaty/exceptions/deprecated.rb
@@ -184,19 +189,22 @@ files:
 - lib/treaty/exceptions/strategy.rb
 - lib/treaty/exceptions/unexpected.rb
 - lib/treaty/exceptions/validation.rb
-- lib/treaty/info/builder.rb
-- lib/treaty/info/dsl.rb
-- lib/treaty/info/result.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
 - lib/treaty/request/attribute/attribute.rb
 - lib/treaty/request/attribute/builder.rb
-- lib/treaty/request/attribute/validation/orchestrator.rb
-- lib/treaty/request/attribute/validator.rb
+- lib/treaty/request/entity.rb
 - lib/treaty/request/factory.rb
+- lib/treaty/request/validator.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/entity.rb
 - lib/treaty/response/factory.rb
+- lib/treaty/response/validator.rb
 - lib/treaty/result.rb
 - lib/treaty/strategy.rb
 - lib/treaty/support/loader.rb

data/lib/treaty/info/builder.rb

@@ -1,108 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Info
-    class Builder
-      attr_reader :versions
-
-      def self.build(...)
-        new.build(...)
-      end
-
-      def build(collection_of_versions:)
-        build_all(
-          versions: collection_of_versions
-        )
-
-        self
-      end
-
-      private
-
-      def build_all(versions:)
-        build_versions_with(
-          collection: versions
-        )
-      end
-
-      ##########################################################################
-
-      def build_versions_with(collection:) # rubocop:disable Metrics/MethodLength
-        @versions = collection.map do |version|
-          gem_version = version.version.version
-          {
-            version: gem_version.version,
-            segments: gem_version.segments,
-            default: version.default_result,
-            summary: version.summary_text,
-            strategy: version.strategy_instance.code,
-            deprecated: version.deprecated_result,
-            executor: build_executor_with(version),
-            request: build_request_with(version),
-            response: build_response_with(version)
-          }
-        end
-      end
-
-      ##########################################################################
-
-      def build_executor_with(version)
-        {
-          executor: version.executor.executor,
-          method: version.executor.method
-        }
-      end
-
-      ##########################################################################
-
-      def build_request_with(version)
-        build_attributes_structure(version.request_factory)
-      end
-
-      def build_response_with(version)
-        response_factory = version.response_factory
-        {
-          status: response_factory.status
-        }.merge(build_attributes_structure(response_factory))
-      end
-
-      ##########################################################################
-
-      def build_attributes_structure(factory)
-        {
-          attributes: build_attributes_hash(factory.collection_of_attributes)
-        }
-      end
-
-      def build_attributes_hash(collection, current_level = 0)
-        # validate_nesting_level!(current_level)
-
-        collection.to_h do |attribute|
-          [
-            attribute.name,
-            {
-              type: attribute.type,
-              options: attribute.options,
-              attributes: build_nested_attributes(attribute, current_level)
-            }
-          ]
-        end
-      end
-
-      def build_nested_attributes(attribute, current_level)
-        return {} unless attribute.nested?
-
-        build_attributes_hash(attribute.collection_of_attributes, current_level + 1)
-      end
-
-      # def validate_nesting_level!(level)
-      #   return unless level > Treaty::Engine.config.treaty.attribute_nesting_level
-      #
-      #   raise Treaty::Exceptions::NestedAttributes,
-      #         I18n.t("treaty.attributes.errors.nesting_level_exceeded",
-      #                level:,
-      #                max_level: Treaty::Engine.config.treaty.attribute_nesting_level)
-      # end
-    end
-  end
-end