servactory 2.5.0.rc4 → 2.5.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03950ff6fd385cfe8ba4506f2eb4dc7c2dc94dcf838d2a10b783e25e6b290af6'
-  data.tar.gz: 64182d91fa7a9042cefb99ec422d3710761f8ab412a8b00184c324bae23debfb
+  metadata.gz: fe966e4418033cec85b4d0f335a4cbfaefc5fe65e2c510bfec9a755601a088c7
+  data.tar.gz: b6bf04ea33fc1e3f5307406ea848fb2fb65117ec697339c99b581796ff4f568e
 SHA512:
-  metadata.gz: f85e47114458349c416a1a64d69098d29a67b8d837025acff53acc91885225c9ecab6036422fcd269793f5cdd22a90fe6ba0b8899074dde10837a6e0989b0cc3
-  data.tar.gz: 96bfba7a9fdc2c763ed8ab4b355a966053fa2a1f0e7bd365bbaa7f51dda089edc30ed00a61566e25252fa12df07eac7e327fb814d5dcb6b77d474f5e3718e1e7
+  metadata.gz: '0847386548d522669a7faf2ad1fc86a41a10cec8d19b1f7c1263b8b842210b236f0c84f1fc9e1bedbd196594031b0e79e20cbaece5e5b5b2bde6efcd458ae14c'
+  data.tar.gz: d8bf8ebff755faebe4d7ccdefe9ab412a79e33b6b9ab888537d1a0cae7b19e78fa57b36d4e387cccdc451c37f1a2443ef5d09b6eb79118526145a8b1491581f8

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

@@ -55,6 +55,8 @@ module ApplicationService
       # action_shortcuts %i[assign build create save]
 
       # action_aliases %i[do_it!]
+
+      # predicate_methods_enabled false
     end
   end
 end

data/lib/servactory/configuration/dsl.rb

@@ -29,6 +29,8 @@ module Servactory
           child.config.action_aliases = config.action_aliases
           child.config.action_shortcuts = config.action_shortcuts
           child.config.action_rescue_handlers = config.action_rescue_handlers
+
+          child.config.predicate_methods_enabled = config.predicate_methods_enabled
         end
 
         def config

data/lib/servactory/configuration/factory.rb

@@ -97,6 +97,12 @@ module Servactory
         @config.action_shortcuts.merge(action_shortcuts)
       end
 
+      def predicate_methods_enabled(flag)
+        return @config.predicate_methods_enabled = flag if boolean?(flag)
+
+        raise_error_about_wrong_predicate_methods_enabled_with(:predicate_methods_enabled, flag)
+      end
+
       private
 
       # def action_rescue_handlers(action_rescue_handlers)
@@ -111,6 +117,10 @@ module Servactory
         value.is_a?(Class) && value <= Servactory::Result
       end
 
+      def boolean?(value)
+        value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      end
+
       ##########################################################################
 
       def raise_error_about_wrong_exception_class_with(config_name, value)
@@ -126,6 +136,13 @@ module Servactory
               "The `#{value}` value must be a subclass of `Servactory::Result`. " \
               "See configuration example here: https://servactory.com/guide/configuration"
       end
+
+      def raise_error_about_wrong_predicate_methods_enabled_with(config_name, value)
+        raise ArgumentError,
+              "Error in `#{config_name}` configuration. " \
+              "The `#{value}` value must be `TrueClass` or `FalseClass`. " \
+              "See configuration example here: https://servactory.com/guide/configuration"
+      end
     end
   end
 end

data/lib/servactory/configuration/setup.rb

@@ -16,7 +16,8 @@ module Servactory
                     :output_option_helpers,
                     :action_aliases,
                     :action_shortcuts,
-                    :action_rescue_handlers
+                    :action_rescue_handlers,
+                    :predicate_methods_enabled
 
       def initialize # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @input_exception_class = Servactory::Exceptions::Input
@@ -46,6 +47,12 @@ module Servactory
         @action_aliases = Servactory::Actions::Aliases::Collection.new
         @action_shortcuts = Servactory::Actions::Shortcuts::Collection.new
         @action_rescue_handlers = Servactory::Actions::RescueHandlers::Collection.new
+
+        @predicate_methods_enabled = true
+      end
+
+      def predicate_methods_enabled?
+        @predicate_methods_enabled
       end
 
       private

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

@@ -43,7 +43,8 @@ module Servactory
 
         # rubocop:disable Metrics/MethodLength, Metrics/AbcSize,  Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Lint/UnusedMethodArgument
         def getter_with(name:, &block)
-          input_name = name.to_s.chomp("?").to_sym
+          input_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
+
           input = @collection_of_inputs.find_by(name: input_name)
 
           return yield if input.nil?
@@ -58,7 +59,7 @@ module Servactory
           input_prepare = input.prepare.fetch(:in, nil)
           input_value = input_prepare.call(value: input_value) if input_prepare.present?
 
-          if name.to_s.end_with?("?")
+          if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
             Servactory::Utils.query_attribute(input_value)
           else
             input_value

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

@@ -53,15 +53,15 @@ module Servactory
           @context.send(:servactory_service_store).assign_internal(internal.name, value)
         end
 
-        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          internal_name = name.to_s.chomp("?").to_sym
+        def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
+          internal_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
           internal = @collection_of_internals.find_by(name: internal_name)
 
           return yield if internal.nil?
 
           internal_value = @context.send(:servactory_service_store).fetch_internal(internal.name)
 
-          if name.to_s.end_with?("?")
+          if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
             Servactory::Utils.query_attribute(internal_value)
           else
             internal_value

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

@@ -53,15 +53,15 @@ module Servactory
           @context.send(:servactory_service_store).assign_output(output.name, value)
         end
 
-        def getter_with(name:, &block) # rubocop:disable Lint/UnusedMethodArgument
-          output_name = name.to_s.chomp("?").to_sym
+        def getter_with(name:, &block) # rubocop:disable Metrics/AbcSize, Lint/UnusedMethodArgument
+          output_name = @context.class.config.predicate_methods_enabled? ? name.to_s.chomp("?").to_sym : name
           output = @collection_of_outputs.find_by(name: output_name)
 
           return yield if output.nil?
 
           output_value = @context.send(:servactory_service_store).fetch_output(output.name)
 
-          if name.to_s.end_with?("?")
+          if name.to_s.end_with?("?") && @context.class.config.predicate_methods_enabled?
             Servactory::Utils.query_attribute(output_value)
           else
             output_value

data/lib/servactory/maintenance/attributes/options/registrar.rb

@@ -227,9 +227,6 @@ module Servactory
               define_conflicts: [
                 Servactory::Maintenance::Attributes::DefineConflict.new(
                   content: -> { :prepare_vs_inclusion if @attribute.prepare_present? && @attribute.inclusion_present? }
-                ),
-                Servactory::Maintenance::Attributes::DefineConflict.new(
-                  content: -> { :prepare_vs_must if @attribute.prepare_present? && @attribute.must_present? }
                 )
               ],
               need_for_checks: false,

data/lib/servactory/result.rb

@@ -3,9 +3,9 @@
 module Servactory
   class Result
     class Outputs
-      def initialize(outputs)
+      def initialize(outputs:, predicate_methods_enabled:)
         outputs.each_pair do |key, value|
-          define_singleton_method(:"#{key}?") { Servactory::Utils.query_attribute(value) }
+          define_singleton_method(:"#{key}?") { Servactory::Utils.query_attribute(value) } if predicate_methods_enabled
           define_singleton_method(key) { value }
         end
       end
@@ -104,7 +104,14 @@ module Servactory
     end
 
     def outputs
-      @outputs ||= Outputs.new(@context.send(:servactory_service_store).outputs)
+      @outputs ||= Outputs.new(
+        outputs: @context.send(:servactory_service_store).outputs,
+        predicate_methods_enabled: if @context.is_a?(Servactory::TestKit::Result)
+                                     true
+                                   else
+                                     @context.class.config.predicate_methods_enabled?
+                                   end
+      )
     end
 
     ########################################################################

data/lib/servactory/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 2.5.0.rc4
+  version: 2.5.0.rc6
 platform: ruby
 authors:
 - Anton Sokolov