servactory 2.0.0.rc5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ecb994c1e8be578cb83edfa20eb4b60efc3b80a36d24439e83e6b0c6208ac3be
-  data.tar.gz: d75f094fd6d07465761b542e7997ac222fcaf1c2e397216c10c768485a5b4250
+  metadata.gz: 7f2faba7bb024470613b92cccd026889f07744afa108b02308995332850bcf87
+  data.tar.gz: c6cd5f199e95e2c104b65778125017a62347e216e97d0cf2f2337fb081fc85ba
 SHA512:
-  metadata.gz: a0213bf096871d202defff4eab2055bd91c9414c1ebd8bba279b2fda73df0345b1321bcb802a68176cc3b16abdc81c77dd2fd55294f06123a674ed74c2ae2c0f
-  data.tar.gz: 403bc708be4a3cfc9ce73c78f2f14336a8d49b9e9a488b0781b80ee2808cc2217599f3b5cc6f54396239e404e52f8d5719676b491f0adc0019bdb4f31c5b69b4
+  metadata.gz: a46461312794bbee6b5a38b164377a5fb10fd258315936b89f6118f489b4fa66b3b8e75c518a7cc1e32d2827c10844f085d7fa38123eb8c2781177fcdced77fd
+  data.tar.gz: cf285f17d88fa7034b349b0e22c3bf6649fce0d525a75d49ac22a692a75cd2048e2894065a3e4d83a2241abfafc7fc65390fc690b7d716d54e96d97dd825734e

data/lib/servactory/context/workspace/inputs.rb

@@ -48,8 +48,8 @@ module Servactory
 
           input.value = input.default if input.optional? && input.value.blank?
 
-          if input.hash_mode?
-            input.value = prepare_hash_values_inside(object: input.value, schema: input.schema.fetch(:is))
+          if input.hash_mode? && (tmp_schema = input.schema.fetch(:is)).present?
+            input.value = prepare_hash_values_inside(object: input.value, schema: tmp_schema)
           end
 
           input_prepare = input.prepare.fetch(:in, nil)

data/lib/servactory/context/workspace.rb

@@ -9,7 +9,6 @@ module Servactory
           collection_of_inputs: collection_of_inputs
         )
       end
-      alias inp inputs
 
       def internals
         @internals ||= Internals.new(
@@ -17,7 +16,6 @@ module Servactory
           collection_of_internals: collection_of_internals
         )
       end
-      alias int internals
 
       def outputs
         @outputs ||= Outputs.new(
@@ -25,7 +23,6 @@ module Servactory
           collection_of_outputs: collection_of_outputs
         )
       end
-      alias out outputs
 
       def fail_input!(input_name, message:)
         raise self.class.config.input_error_class.new(

data/lib/servactory/inputs/input.rb

@@ -16,7 +16,6 @@ module Servactory
         name,
         *helpers,
         as: nil,
-        type:,
         collection_mode_class_names:,
         hash_mode_class_names:,
         option_helpers:,
@@ -30,7 +29,7 @@ module Servactory
 
         options = apply_helpers_for_options(helpers: helpers, options: options) if helpers.present?
 
-        add_basic_options_with(type: type, options: options)
+        add_basic_options_with(options)
       end
       # rubocop:enable Style/KeywordParametersOrder
 
@@ -60,15 +59,15 @@ module Servactory
         options.merge(prepared_options)
       end
 
-      def add_basic_options_with(type:, options:)
+      def add_basic_options_with(options)
         # Check Class: Servactory::Inputs::Validations::Required
         add_required_option_with(options)
 
         # Check Class: Servactory::Inputs::Validations::Type
-        add_types_option_with(type)
+        add_types_option_with(options)
         add_default_option_with(options)
-        add_collection_option_with(type, options)
-        add_hash_option_with(type, options)
+        add_collection_option_with(options)
+        add_hash_option_with(options)
 
         # Check Class: Servactory::Inputs::Validations::Inclusion
         add_inclusion_option_with(options)
@@ -107,12 +106,12 @@ module Servactory
         )
       end
 
-      def add_types_option_with(type)
+      def add_types_option_with(options)
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :types,
           attribute: self,
           validation_class: Servactory::Inputs::Validations::Type,
-          original_value: Array(type),
+          original_value: Array(options.fetch(:type)),
           need_for_checks: true,
           body_fallback: nil,
           with_advanced_mode: false
@@ -137,7 +136,7 @@ module Servactory
         )
       end
 
-      def add_collection_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :consists_of,
           attribute: self,
@@ -145,7 +144,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(type) }
+              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           define_conflicts: [
@@ -161,7 +160,7 @@ module Servactory
         )
       end
 
-      def add_hash_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :schema,
           attribute: self,
@@ -169,7 +168,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(type) }
+              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           define_conflicts: [

data/lib/servactory/internals/internal.rb

@@ -9,7 +9,6 @@ module Servactory
 
       def initialize(
         name,
-        type:,
         collection_mode_class_names:,
         hash_mode_class_names:,
         **options
@@ -18,7 +17,7 @@ module Servactory
         @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
 
-        add_basic_options_with(type: type, options: options)
+        add_basic_options_with(options)
       end
 
       def method_missing(name, *args, &block)
@@ -33,26 +32,26 @@ module Servactory
         collection_of_options.names.include?(name) || super
       end
 
-      def add_basic_options_with(type:, options:)
+      def add_basic_options_with(options)
         # Check Class: Servactory::Internals::Validations::Type
-        add_types_option_with(type)
-        add_collection_option_with(type, options)
-        add_hash_option_with(type, options)
+        add_types_option_with(options)
+        add_collection_option_with(options)
+        add_hash_option_with(options)
       end
 
-      def add_types_option_with(type)
+      def add_types_option_with(options)
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :types,
           attribute: self,
           validation_class: Servactory::Internals::Validations::Type,
-          original_value: Array(type),
+          original_value: Array(options.fetch(:type)),
           need_for_checks: true,
           body_fallback: nil,
           with_advanced_mode: false
         )
       end
 
-      def add_collection_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :consists_of,
           attribute: self,
@@ -60,7 +59,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(type) }
+              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           need_for_checks: false,
@@ -71,7 +70,7 @@ module Servactory
         )
       end
 
-      def add_hash_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :schema,
           attribute: self,
@@ -79,7 +78,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(type) }
+              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           need_for_checks: false,

data/lib/servactory/outputs/output.rb

@@ -9,7 +9,6 @@ module Servactory
 
       def initialize(
         name,
-        type:,
         collection_mode_class_names:,
         hash_mode_class_names:,
         **options
@@ -18,7 +17,7 @@ module Servactory
         @collection_mode_class_names = collection_mode_class_names
         @hash_mode_class_names = hash_mode_class_names
 
-        add_basic_options_with(type: type, options: options)
+        add_basic_options_with(options)
       end
 
       def method_missing(name, *args, &block)
@@ -33,26 +32,26 @@ module Servactory
         collection_of_options.names.include?(name) || super
       end
 
-      def add_basic_options_with(type:, options:)
+      def add_basic_options_with(options)
         # Check Class: Servactory::Outputs::Validations::Type
-        add_types_option_with(type)
-        add_collection_option_with(type, options)
-        add_hash_option_with(type, options)
+        add_types_option_with(options)
+        add_collection_option_with(options)
+        add_hash_option_with(options)
       end
 
-      def add_types_option_with(type)
+      def add_types_option_with(options)
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :types,
           attribute: self,
           validation_class: Servactory::Internals::Validations::Type,
-          original_value: Array(type),
+          original_value: Array(options.fetch(:type)),
           need_for_checks: true,
           body_fallback: nil,
           with_advanced_mode: false
         )
       end
 
-      def add_collection_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_collection_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :consists_of,
           attribute: self,
@@ -60,7 +59,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :collection_mode?,
-              content: ->(**) { collection_mode_class_names.include?(type) }
+              content: ->(**) { collection_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           need_for_checks: false,
@@ -71,7 +70,7 @@ module Servactory
         )
       end
 
-      def add_hash_option_with(type, options) # rubocop:disable Metrics/MethodLength
+      def add_hash_option_with(options) # rubocop:disable Metrics/MethodLength
         collection_of_options << Servactory::Maintenance::Attributes::Option.new(
           name: :schema,
           attribute: self,
@@ -79,7 +78,7 @@ module Servactory
           define_methods: [
             Servactory::Maintenance::Attributes::DefineMethod.new(
               name: :hash_mode?,
-              content: ->(**) { hash_mode_class_names.include?(type) }
+              content: ->(**) { hash_mode_class_names.include?(options.fetch(:type)) }
             )
           ],
           need_for_checks: false,

data/lib/servactory/version.rb

@@ -5,7 +5,7 @@ module Servactory
     MAJOR = 2
     MINOR = 0
     PATCH = 0
-    PRE = "rc5"
+    PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc5
+  version: 2.0.0
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-28 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -294,9 +294,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.17
 signing_key: