servactory 1.8.5 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7493cf468717aef41460f0658f7bc3b7de1a280be66dd7408eeb14a861817e
-  data.tar.gz: e4d05dbc3d4a37ddd3c1bb6bb3c536dde9f11d03525cb53d7f3af74f4ec56030
+  metadata.gz: e1be37829a79065ae8dcecc340fbecb58a1fcd15739221b38cf57474e371f3e5
+  data.tar.gz: beed9c07d4ed8772da258084c320f0f278e5170169971abe4497a3863eb59399
 SHA512:
-  metadata.gz: c04b93e6f0a4ad53a8ba64e3ec86373bc5ae0bd151a169baddd4c3df195666c000353772cfe600a92ca1e82ad0403cc9f3abad359b6602375aa5eea59c3351e9
-  data.tar.gz: 74281796feed47017b68ba38b387fb1e20076c85131966ec967d2c0b88a76ad0996b802ea9574c02ec2bbba2a37c3cb1aca62bada4ae25ad1f66d692ecf49726
+  metadata.gz: 03a6c5da26c496b0d96a7ae51cbd85e1cc70e318222db1561add7d91fa27f0278c160129735b3e65ac9165eb440a5ec3fe33c4f2390e7e33c95997521c185203
+  data.tar.gz: 73772169c25d6d2eeb45a4032bb47ce0a6f47dad6e05102a2f2512fa33eaf9c13bdcdcc665e84f7e2660c169ba683919921f497708967b2bbd3b5b221a28a7b9

data/README.md

@@ -1,9 +1,21 @@
-# Servactory
-
-A set of tools for building reliable services of any complexity.
-
-[![Gem version](https://img.shields.io/gem/v/servactory?logo=rubygems&logoColor=fff)](https://rubygems.org/gems/servactory)
-[![Release Date](https://img.shields.io/github/release-date/afuno/servactory)](https://github.com/afuno/servactory/releases)
+<p align="center">
+  <a href="https://servactory.com" target="_blank">
+    <picture>
+      <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/servactory/servactory/main/.github/logo-dark.svg">
+      <source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/servactory/servactory/main/.github/logo-light.svg">
+      <img alt="Servactory" src="https://raw.githubusercontent.com/servactory/servactory/main/.github/logo-light.svg" width="350" height="70" style="max-width: 100%;">
+    </picture>
+  </a>
+</p>
+
+<p align="center">
+  A set of tools for building reliable services of any complexity.
+</p>
+
+<p align="center">
+    <a href="https://rubygems.org/gems/servactory"><img src="https://img.shields.io/gem/v/servactory?logo=rubygems&logoColor=fff" alt="Gem version"></a>
+    <a href="https://github.com/afuno/servactory/releases"><img src="https://img.shields.io/github/release-date/afuno/servactory" alt="Release Date"></a>
+</p>
 
 ## Documentation
 

data/config/locales/en.yml

@@ -31,3 +31,6 @@ en:
       tools:
         conflicts:
           error: "[%{service_class_name}] Conflict between internal and output attributes `%{overlapping_attributes}`"
+    methods:
+      call:
+        not_used: Nothing to perform. Use `make` or create a `call` method

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

@@ -24,7 +24,7 @@ module Servactory
 
         private
 
-        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
+        def getter_with(name:, &block) # rubocop:disable Metrics/MethodLength, Lint/UnusedMethodArgument, Metrics/AbcSize
           input_name = name.to_s.chomp("?").to_sym
           input = @collection_of_inputs.find_by(name: input_name)
 

data/lib/servactory/context/workspace.rb

@@ -75,6 +75,15 @@ module Servactory
         @collection_of_outputs = collection_of_outputs
       end
 
+      def call
+        raise Servactory.configuration.failure_class.new(
+          message: I18n.t(
+            "servactory.methods.call.not_used",
+            service_class_name: self.class.name
+          )
+        )
+      end
+
       def service_storage
         @service_storage ||= { internals: {}, outputs: {} }
       end

data/lib/servactory/inputs/input.rb

@@ -187,7 +187,7 @@ module Servactory
         )
       end
 
-      def add_prepare_option_with(options)
+      def add_prepare_option_with(options) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         collection_of_options << Option.new(
           name: :prepare,
           input: self,

data/lib/servactory/inputs/validations/inclusion.rb

@@ -17,13 +17,19 @@ module Servactory
         private_constant :DEFAULT_MESSAGE
 
         def self.check(context:, input:, value:, check_key:, **)
-          return unless should_be_checked_for?(input, check_key)
+          return unless should_be_checked_for?(input, value, check_key)
 
           new(context: context, input: input, value: value).check
         end
 
-        def self.should_be_checked_for?(input, check_key)
-          check_key == :inclusion && input.inclusion_present?
+        def self.should_be_checked_for?(input, value, check_key)
+          check_key == :inclusion && (
+            input.required? || (
+              input.optional? && !input.default.nil?
+            ) || (
+              input.optional? && !value.nil?
+            )
+          )
         end
 
         ##########################################################################

data/lib/servactory/methods/dsl.rb

@@ -42,6 +42,14 @@ module Servactory
         def only_if(condition)
           return if @current_stage.blank?
 
+          @current_stage.is_condition_opposite = false
+          @current_stage.condition = condition
+        end
+
+        def only_unless(condition)
+          return if @current_stage.blank?
+
+          @current_stage.is_condition_opposite = true
           @current_stage.condition = condition
         end
 

data/lib/servactory/methods/stage.rb

@@ -6,7 +6,8 @@ module Servactory
       attr_accessor :position,
                     :wrapper,
                     :rollback,
-                    :condition
+                    :condition,
+                    :is_condition_opposite
 
       def initialize(position:, wrapper: nil, rollback: nil, condition: nil)
         @position = position

data/lib/servactory/methods/tools/runner.rb

@@ -14,7 +14,7 @@ module Servactory
         end
 
         def run!
-          return try_to_use_call if @collection_of_stages.empty?
+          return use_call if @collection_of_stages.empty?
 
           @collection_of_stages.sorted_by_position.each do |stage|
             call_stage(stage)
@@ -23,8 +23,8 @@ module Servactory
 
         private
 
-        def try_to_use_call
-          @context.try(:send, :call)
+        def use_call
+          @context.send(:call)
         end
 
         def call_stage(stage)
@@ -57,12 +57,11 @@ module Servactory
 
         def unnecessary_for_stage?(stage)
           condition = stage.condition
-          # is_condition_opposite = stage.is_condition_opposite
+          is_condition_opposite = stage.is_condition_opposite
 
-          result = prepare_condition_for(condition) # rubocop:disable Style/RedundantAssignment
+          result = prepare_condition_for(condition)
 
-          # is_condition_opposite ? !result : result
-          result
+          is_condition_opposite ? !result : result
         end
 
         def unnecessary_for_make?(make_method)

data/lib/servactory/outputs/dsl.rb

@@ -5,7 +5,6 @@ module Servactory
     module DSL
       def self.included(base)
         base.extend(ClassMethods)
-        base.include(Workspace)
       end
 
       module ClassMethods

data/lib/servactory/test_kit/fake_type.rb

@@ -2,6 +2,6 @@
 
 module Servactory
   module TestKit
-    class FakeType; end
+    class FakeType; end # rubocop:disable Lint/EmptyClass
   end
 end

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 8
-    PATCH = 5
+    PATCH = 7
 
     STRING = [MAJOR, MINOR, PATCH].join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.7
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,10 +244,8 @@ files:
 - lib/servactory/outputs/collection.rb
 - lib/servactory/outputs/dsl.rb
 - lib/servactory/outputs/output.rb
-- lib/servactory/outputs/tools/conflicts.rb
 - lib/servactory/outputs/validations/base.rb
 - lib/servactory/outputs/validations/type.rb
-- lib/servactory/outputs/workspace.rb
 - lib/servactory/result.rb
 - lib/servactory/test_kit/fake_type.rb
 - lib/servactory/test_kit/result.rb

data/lib/servactory/outputs/tools/conflicts.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Outputs
-    module Tools
-      class Conflicts
-        def self.validate!(...)
-          new(...).validate!
-        end
-
-        def initialize(context, collection_of_outputs, collection_of_internals)
-          @context = context
-          @collection_of_outputs = collection_of_outputs
-          @collection_of_internals = collection_of_internals
-        end
-
-        def validate!
-          return if overlapping_attributes.empty?
-
-          message_text = I18n.t(
-            "servactory.outputs.tools.conflicts.error",
-            service_class_name: @context.class.name,
-            overlapping_attributes: overlapping_attributes.join(", ")
-          )
-
-          raise Servactory.configuration.output_error_class.new(message: message_text)
-        end
-
-        private
-
-        def overlapping_attributes
-          @overlapping_attributes ||=
-            @collection_of_outputs.names.intersection(@collection_of_internals.names)
-        end
-      end
-    end
-  end
-end

data/lib/servactory/outputs/workspace.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Servactory
-  module Outputs
-    module Workspace
-      def call!(collection_of_internals:, collection_of_outputs:, **)
-        super
-
-        Tools::Conflicts.validate!(self, collection_of_outputs, collection_of_internals)
-      end
-    end
-  end
-end