treaty 0.6.0 → 0.8.0

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.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Anton Sokolov
@@ -150,6 +150,9 @@ 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
@@ -174,6 +177,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,23 +188,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/scope/collection.rb
-- lib/treaty/request/scope/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/scope/collection.rb
-- lib/treaty/response/scope/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,122 +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)
-        {
-          scopes: build_scopes_with(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
-      end
-
-      ##########################################################################
-
-      def build_attributes_with(collection, current_level = 0)
-        # validate_nesting_level!(current_level)
-
-        {
-          attributes: build_attributes_hash(collection, current_level)
-        }
-      end
-
-      def build_attributes_hash(collection, 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

data/lib/treaty/info/dsl.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Info
-    module DSL
-      def self.included(base)
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods
-        def info
-          builder = Builder.build(
-            collection_of_versions:
-          )
-
-          Result.new(builder)
-        end
-
-        # API: Treaty Web
-        def treaty?
-          true
-        end
-      end
-    end
-  end
-end

data/lib/treaty/info/result.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Info
-    class Result
-      attr_reader :versions
-
-      def initialize(builder)
-        @versions = builder.versions
-      end
-    end
-  end
-end

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

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Request
-    module Attribute
-      module Validation
-        class Orchestrator < Treaty::Attribute::Validation::Orchestrator::Base
-          private
-
-          def collection_of_scopes
-            return Treaty::Request::Scope::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, {})
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,50 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Request
-    module Attribute
-      class Validator < Treaty::Attribute::Validation::Base
-        def self.validate!(...)
-          new(...).validate!
-        end
-
-        def initialize(params:, version_factory:)
-          super(version_factory:)
-
-          @params = params
-        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!
-          return request_data unless adapter_strategy?
-          return request_data unless request_attributes_exist?
-
-          # For adapter strategy:
-          Validation::Orchestrator.validate!(
-            version_factory: @version_factory,
-            data: request_data
-          )
-        end
-
-        def request_attributes_exist?
-          return false if @version_factory.request_factory&.collection_of_scopes&.empty?
-
-          @version_factory.request_factory.collection_of_scopes.exists?
-        end
-      end
-    end
-  end
-end

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/attribute/validation/orchestrator.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Response
-    module Attribute
-      module Validation
-        class Orchestrator < Treaty::Attribute::Validation::Orchestrator::Base
-          private
-
-          def collection_of_scopes
-            return Treaty::Response::Scope::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, {})
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Treaty
-  module Response
-    module Attribute
-      class Validator < Treaty::Attribute::Validation::Base
-        def self.validate!(version_factory:, response_data: {})
-          new(
-            version_factory:,
-            response_data:
-          ).validate!
-        end
-
-        def initialize(version_factory:, response_data: {})
-          super(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?
-
-          # For adapter strategy:
-          Validation::Orchestrator.validate!(
-            version_factory: @version_factory,
-            data: @response_data
-          )
-        end
-
-        def response_attributes_exist?
-          return false if @version_factory.response_factory&.collection_of_scopes&.empty?
-
-          @version_factory.response_factory.collection_of_scopes.exists?
-        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