servactory 1.8.4 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca0fa5827beb874848039178b4711da493272bc8d1005ba5f0d7d3a566aa099
-  data.tar.gz: 62e0eb9d9a955aaf04848f7612ac7f91a88cd583e5ead545d25df9ec99a02e06
+  metadata.gz: 63d469613e34fcd13e27dc8fb62fa6c36fc25cf9b9e35f5b21af30013ac75993
+  data.tar.gz: e3edd5a0bfbd2b889e81be1aeeaa836f80c6e9925c65e5f4ed09ce2a35d44673
 SHA512:
-  metadata.gz: a0720019832d9e0e5b8ca4ed63641ab2f21457b85dbe645bdbe9d1c771b13e261b60318368ec1f3dc98a1a0108761e67b9225c3da678bb9e4f29de5df47dd407
-  data.tar.gz: 8b4471a08a037994f8b8e79aac11fb5d0bdaec365ea48a1843323a09518d5a679586656f11ef6c8f1805e18f1236e76ee00f2fd4646f4084e28b6a6d6939b90f
+  metadata.gz: 774bb94eb10a8695cde168e8cd7bc224ebc65804e2092c617dacf471612d1b3980dbc2f6d80b0418f9885a4697587c9d2d12c4172b176d79de4d6114f5198aed
+  data.tar.gz: 2987a6379e4404e1757e4cef6749ae3e5fd8b98712d23e630b1b0a5bde5cdac8232046089d59cc1e642b7a540a9def431dfc6708e3696a14b517ce22cd1025f7

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

@@ -24,8 +24,9 @@ module Servactory
 
         private
 
-        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          input = @collection_of_inputs.find_by(name: name)
+        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)
 
           return yield if input.nil?
 
@@ -35,7 +36,11 @@ module Servactory
           input_prepare = input.prepare.fetch(:in, nil)
           input_value = input_prepare.call(value: input_value) if input_prepare.present?
 
-          input_value
+          if name.to_s.end_with?("?")
+            Servactory::Utils.query_attribute(input_value)
+          else
+            input_value
+          end
         end
       end
     end

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

@@ -42,11 +42,18 @@ module Servactory
         end
 
         def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          internal = @collection_of_internals.find_by(name: name)
+          internal_name = name.to_s.chomp("?").to_sym
+          internal = @collection_of_internals.find_by(name: internal_name)
 
           return yield if internal.nil?
 
-          @context.send(:fetch_internal, internal.name)
+          internal_value = @context.send(:fetch_internal, internal.name)
+
+          if name.to_s.end_with?("?")
+            Servactory::Utils.query_attribute(internal_value)
+          else
+            internal_value
+          end
         end
       end
     end

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

@@ -42,11 +42,18 @@ module Servactory
         end
 
         def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          output = @collection_of_outputs.find_by(name: name)
+          output_name = name.to_s.chomp("?").to_sym
+          output = @collection_of_outputs.find_by(name: output_name)
 
           return yield if output.nil?
 
-          @context.send(:fetch_output, output.name)
+          output_value = @context.send(:fetch_output, output.name)
+
+          if name.to_s.end_with?("?")
+            Servactory::Utils.query_attribute(output_value)
+          else
+            output_value
+          end
         end
       end
     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/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

@@ -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/result.rb

@@ -26,6 +26,7 @@ module Servactory
       define_singleton_method(:failure?) { false }
 
       @context.send(:service_storage).fetch(:outputs).each_pair do |key, value|
+        define_singleton_method(:"#{key}?") { Servactory::Utils.query_attribute(value) }
         define_singleton_method(key) { value }
       end
 

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/utils.rb

@@ -4,16 +4,51 @@ module Servactory
   module Utils
     module_function
 
+    FALSE_VALUES = [
+      false,
+      nil, "",
+      "0", :"0", 0,
+      "f", :f,
+      "F", :F,
+      "false", :false, # rubocop:disable Lint/BooleanSymbol
+      "FALSE", :FALSE,
+      "off", :off,
+      "OFF", :OFF
+    ].to_set.freeze
+
+    private_constant :FALSE_VALUES
+
     # @param value [#to_s]
     # @return [Boolean]
     def true?(value)
-      value.to_s.casecmp("true").to_i.zero?
+      !FALSE_VALUES.include?(value)
     end
 
+    # @param value [#to_s]
+    # @return [Boolean]
     def value_present?(value)
       !value.nil? && (
         value.respond_to?(:empty?) ? !value.empty? : true
       )
     end
+
+    # NOTE: Based on `query_cast_attribute` from ActiveRecord:
+    #       https://github.com/rails/rails/blob/main/activerecord/lib/active_record/attribute_methods/query.rb
+    # @param value [#to_s]
+    # @return [Boolean]
+    def query_attribute(value) # rubocop:disable Metrics/MethodLength
+      case value
+      when true        then true
+      when false, nil  then false
+      else
+        if value.is_a?(Numeric) || (value.respond_to?(:match?) && !value.match?(/[^0-9]/))
+          !value.to_i.zero?
+        else
+          return false if FALSE_VALUES.include?(value)
+
+          !value.blank?
+        end
+      end
+    end
   end
 end

data/lib/servactory/version.rb

@@ -4,7 +4,7 @@ module Servactory
   module VERSION
     MAJOR = 1
     MINOR = 8
-    PATCH = 4
+    PATCH = 6
 
     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.4
+  version: 1.8.6
 platform: ruby
 authors:
 - Anton Sokolov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-29 00:00:00.000000000 Z
+date: 2023-07-04 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