servactory 2.0.0.rc6 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d337c1c09df29b2014f467f12add33fe12d19fcceb44a6307e34f554867b9312
-  data.tar.gz: 6a32967282f264550f51d82b94c50c73ad0e66c394d80041eb89b2f367199932
+  metadata.gz: a360afbf0c2646c3509ad3f37cb49e4a59453ded9f741a012965d962565285e4
+  data.tar.gz: 47a2bca86fc7622a7fa5e8a70bbb9cac4c179e3a43ee67ee050e6c5dd7b0cb21
 SHA512:
-  metadata.gz: 2d93a26fa64a8216eb590799d7535fadf85b25c2a19d30572fcb9608a8250c5c93c54de9d63525ca00319d27194946289d75fe4b11bfacd5722442c16118fceb
-  data.tar.gz: e90c2907c3b7806974f98e7b8950d6595e80cdbc0dc314c4340c70c254e6baee0fafd5c0d96685793b3aa8fb720669547dde176c6b698f109f1383733781a41f
+  metadata.gz: d6e1c489135e42759ee1bae986ed590aaf01164f8243a77b24a8a0b13d37056f4f5de3b86c1b741a94bbee8abe87656be6ad351818de32cc01a255af68d4db7e
+  data.tar.gz: 379633b8ddee7e378eafabacc9b97ced01375daa8612ce6b162c054674a6aac825093670602a92e2b03594c76f4f5dc22de9cbec25dcfa3770b0e73f102860fa

data/lib/servactory/actions/dsl.rb

@@ -68,14 +68,14 @@ module Servactory
         end
 
         def method_missing(name, *args, &block)
-          return method_missing_for_aliases_for_make(name, *args, &block) if config.action_aliases.include?(name)
+          return method_missing_for_action_aliases(name, *args, &block) if config.action_aliases.include?(name)
 
           return method_missing_for_shortcuts_for_make(name, *args, &block) if config.action_shortcuts.include?(name)
 
           super
         end
 
-        def method_missing_for_aliases_for_make(_alias_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
+        def method_missing_for_action_aliases(_alias_name, *args, &block) # rubocop:disable Lint/UnusedMethodArgument
           method_name = args.first
           method_options = args.last.is_a?(Hash) ? args.pop : {}
 

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

@@ -4,8 +4,8 @@ module Servactory
   module VERSION
     MAJOR = 2
     MINOR = 0
-    PATCH = 0
-    PRE = "rc6"
+    PATCH = 1
+    PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")
   end

data/lib/servactory.rb

@@ -2,7 +2,7 @@
 
 require "zeitwerk"
 
-require "active_support/core_ext/string"
+require "active_support/all"
 
 loader = Zeitwerk::Loader.for_gem
 loader.inflector.inflect(

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc6
+  version: 2.0.1
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-29 00:00:00.000000000 Z
+date: 2023-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.8
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.8
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -294,9 +314,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: