servactory 2.13.2 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d303c7927860fbde7534d718fd64104cce4caad49304636767ef6b0da8f9d3a
-  data.tar.gz: d8065166611e2da7a40e6529df84e12002e72e8533cd2015bf5ee867f65f3ca8
+  metadata.gz: 0f6718e3b5e71152099847ec1713940116c44a7641dbc3c63d7a4ef60478ef3c
+  data.tar.gz: 9ecd3809f2792504bb5f2694b4ceb9969e5bd4ad386dccfbdb5af6e0a8e55a9a
 SHA512:
-  metadata.gz: f28e93b9cb1932770e44ce8e17d726edef59be66608dd9d68a063d3389db4e71f2cbda685cdbc5081164aa3cb1ff0d6719431078238d0f5053d8f7df97d16e2c
-  data.tar.gz: f454f6d653fe7f31e039c5f5b5816863edb7399f433beb4b78f5dc31895d7d86200e0bac374528a85e8855bd0370bb53515c643a55e9ce412571dd2222ce11fe
+  metadata.gz: 1810233557cfb71509fcf04e618295cde0ab190511b8bb50569cd098cf359c606730de1299d89eaaeec8e6c55d65b901fc7bbea895e46532a1a3f825d5bfcc6f
+  data.tar.gz: 4011679f170547c0ee3b4e1c527dfadccb961185446d4386c3a9ff6da81da9a6da683d7d5102ca339a5609c644d61ded644321115cc1697368451301c53a8078

data/lib/generators/servactory/templates/services/application_service/base.rb

@@ -52,7 +52,15 @@ module ApplicationService
 
       # hash_mode_class_names [CustomHash]
 
-      # action_shortcuts %i[assign build create save]
+      # action_shortcuts(
+      #   %i[assign build create save],
+      #   {
+      #     restrict: {
+      #       prefix: :create,
+      #       suffix: :restriction
+      #     }
+      #   }
+      # )
 
       # action_aliases %i[do_it!]
 

data/lib/servactory/actions/dsl.rb

@@ -87,14 +87,16 @@ module Servactory
         end
 
         def method_missing(name, ...)
-          return method_missing_for_action_aliases(name, ...) if config.action_aliases.include?(name)
+          return method_missing_for_action_aliases(...) if config.action_aliases.include?(name)
 
-          return method_missing_for_shortcuts_for_make(name, ...) if config.action_shortcuts.include?(name)
+          if (action_shortcut = config.action_shortcuts.find_by(name:)).present?
+            return method_missing_for_shortcuts_for_make(action_shortcut, ...)
+          end
 
           super
         end
 
-        def method_missing_for_action_aliases(_alias_name, *args)
+        def method_missing_for_action_aliases(*args)
           method_name = args.first
           method_options = args.last.is_a?(Hash) ? args.pop : {}
 
@@ -103,16 +105,37 @@ module Servactory
           make(method_name, **method_options)
         end
 
-        def method_missing_for_shortcuts_for_make(shortcut_name, *args)
+        def method_missing_for_shortcuts_for_make(action_shortcut, *args)
           method_options = args.last.is_a?(Hash) ? args.pop : {}
 
           args.each do |method_name|
-            make(:"#{shortcut_name}_#{method_name}", **method_options)
+            full_method_name = build_method_name_for_shortcuts_for_make_with(
+              method_name.to_s,
+              action_shortcut
+            )
+
+            make(full_method_name, **method_options)
           end
         end
 
+        def build_method_name_for_shortcuts_for_make_with(method_name, action_shortcut)
+          prefix = action_shortcut.fetch(:prefix)
+          suffix = action_shortcut.fetch(:suffix)
+
+          method_body, special_char =
+            Servactory::Utils.extract_special_character_from(method_name.to_s)
+
+          parts = []
+          parts << "#{prefix}_" if prefix.present?
+          parts << method_body
+          parts << "_#{suffix}" if suffix.present?
+          parts << special_char if special_char
+
+          parts.join.to_sym
+        end
+
         def respond_to_missing?(name, *)
-          config.action_aliases.include?(name) || config.action_shortcuts.include?(name) || super
+          config.action_aliases.include?(name) || config.action_shortcuts.shortcuts.include?(name) || super
         end
 
         def next_position

data/lib/servactory/configuration/actions/shortcuts/collection.rb

@@ -6,10 +6,20 @@ module Servactory
       module Shortcuts
         class Collection
           extend Forwardable
-          def_delegators :@collection, :<<, :each, :merge, :include?
+          def_delegators :@collection, :merge!, :fetch, :keys
 
           def initialize(*)
-            @collection = Set.new
+            @collection = {}
+          end
+
+          alias merge merge!
+
+          def shortcuts
+            keys
+          end
+
+          def find_by(name:)
+            fetch(name, nil)
           end
         end
       end

data/lib/servactory/configuration/collection_mode/class_names_collection.rb

@@ -5,7 +5,7 @@ module Servactory
     module CollectionMode
       class ClassNamesCollection
         extend Forwardable
-        def_delegators :@collection, :merge, :intersection
+        def_delegators :@collection, :merge, :intersect?
 
         def initialize(collection)
           @collection = collection

data/lib/servactory/configuration/factory.rb

@@ -2,7 +2,7 @@
 
 module Servactory
   module Configuration
-    class Factory
+    class Factory # rubocop:disable Metrics/ClassLength
       def initialize(config)
         @config = config
       end
@@ -63,8 +63,20 @@ module Servactory
         @config.action_aliases.merge(action_aliases)
       end
 
-      def action_shortcuts(action_shortcuts)
-        @config.action_shortcuts.merge(action_shortcuts)
+      def action_shortcuts(array, hash = {}) # rubocop:disable Metrics/MethodLength
+        prepared = array.to_h do |action_shortcut|
+          [
+            action_shortcut,
+            {
+              prefix: action_shortcut,
+              suffix: nil
+            }
+          ]
+        end
+
+        prepared = prepared.merge(hash)
+
+        @config.action_shortcuts.merge(prepared)
       end
 
       def i18n_root_key(value)

data/lib/servactory/configuration/hash_mode/class_names_collection.rb

@@ -5,7 +5,7 @@ module Servactory
     module HashMode
       class ClassNamesCollection
         extend Forwardable
-        def_delegators :@collection, :include?
+        def_delegators :@collection, :include?, :intersect?
 
         def initialize(collection)
           @collection = collection

data/lib/servactory/test_kit/rspec/matchers/have_service_input_matchers/valid_with_matcher.rb

@@ -129,7 +129,7 @@ module Servactory
             end
 
             def failure_inclusion_passes? # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-              input_inclusion_in = attribute_data.fetch(:inclusion, {}).fetch(:in, nil)
+              input_inclusion_in = attribute_data.dig(:inclusion, :in)
 
               return true if input_inclusion_in.blank?
 

data/lib/servactory/tool_kit/dynamic_options/consists_of.rb

@@ -28,7 +28,7 @@ module Servactory
 
         def common_condition_with(attribute:, value:, option:)
           return true if option.value == false
-          return [false, :wrong_type] if @collection_mode_class_names.intersection(attribute.types).empty?
+          return [false, :wrong_type] unless @collection_mode_class_names.intersect?(attribute.types)
 
           values = value.respond_to?(:flatten) ? value&.flatten : value
 

data/lib/servactory/tool_kit/dynamic_options/inclusion.rb

@@ -10,14 +10,14 @@ module Servactory
         end
 
         def condition_for_input_with(input:, value:, option:)
-          if input.required? || (
-            input.optional? && !input.default.nil?
-          ) || (
-            input.optional? && !value.nil?
-          ) # do
+          if input.required? || (input.optional? && !value.nil?) # rubocop:disable Style/IfUnlessModifier
             return option.value.include?(value)
           end
 
+          if input.optional? && value.nil? && !input.default.nil? # rubocop:disable Style/IfUnlessModifier
+            return option.value.include?(input.default)
+          end
+
           true
         end
 

data/lib/servactory/tool_kit/dynamic_options/schema.rb

@@ -29,9 +29,9 @@ module Servactory
           common_condition_with(attribute: output, value:, option:)
         end
 
-        def common_condition_with(attribute:, value:, option:) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def common_condition_with(attribute:, value:, option:) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           return true if option.value == false
-          return [false, :wrong_type] if @default_hash_mode_class_names.intersection(attribute.types).empty?
+          return [false, :wrong_type] unless @default_hash_mode_class_names.intersect?(attribute.types)
 
           if value.blank? && ((attribute.input? && attribute.optional?) || attribute.internal? || attribute.output?)
             return true

data/lib/servactory/utils.rb

@@ -46,6 +46,14 @@ module Servactory
       false
     end
 
+    def extract_special_character_from(string)
+      if string.end_with?("!", "?")
+        [string.chop, string[-1]]
+      else
+        [string, nil]
+      end
+    end
+
     FALSE_VALUES = [
       false,
       nil, "",

data/lib/servactory/version.rb

@@ -3,8 +3,8 @@
 module Servactory
   module VERSION
     MAJOR = 2
-    MINOR = 13
-    PATCH = 2
+    MINOR = 14
+    PATCH = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join(".")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.14.0
 platform: ruby
 authors:
 - Anton Sokolov
 bindir: bin
 cert_chain: []
-date: 2025-03-19 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -103,14 +103,14 @@ dependencies:
   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
@@ -189,14 +189,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: steep
   requirement: !ruby/object:Gem::Requirement
@@ -347,7 +347,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="