servactory 1.6.6 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8df03a33262af045766ff179c047c3260b85f182aa0541137597e13d7d50bbe
-  data.tar.gz: 813454694dafd13757259a9c45ad455e30e4fd73013a8d51b5022624d3bd194a
+  metadata.gz: 66de0357d02ad9ef590de1d516d1e6d0ea2f9d19d52479cb93e4e4922d6967e5
+  data.tar.gz: 83f630ec6486102357ef9d4b629dbc4e4f618e55325d97592b16b7530722299f
 SHA512:
-  metadata.gz: b61bf7ef77779b5f8c697c514a2af1baac91095c553a31ff60c9e6080233f6153eae13b24a818e527a3f887755e35c3643ffd81c47fbbabdb5c64f8dc1a98054
-  data.tar.gz: 9722ed5fff0d2390a11636e2dc28e313cb338c726e8a9c630c4eee75ac1046a8684cb7dc7385691aaab7393bf1b9568a61b500c5a2334ca2d157d2eb239988d5
+  metadata.gz: 292293afa0bfc8fba8d35605cfc80b6daa75865b3c1ad9d2d1807338c5e784bab0aa94d852b2be54d9157ca8ae44e0c0b2cf9141e92b26256d11d2c08d6ad1e2
+  data.tar.gz: 93ca03e6db127e20eb04a244e1c48c8596cf910328ab9148543c68da8068ba0cc12be24ed366996e1d72896c88ea474a9fa61f16e2c5d1c87bbbe6ccabc95fa6

data/lib/servactory/configuration/factory.rb

@@ -19,6 +19,10 @@ module Servactory
         Servactory.configuration.failure_class = failure_class
       end
 
+      def input_option_helpers(input_option_helpers)
+        Servactory.configuration.input_option_helpers.merge(input_option_helpers)
+      end
+
       def method_shortcuts(method_shortcuts)
         Servactory.configuration.method_shortcuts.merge(method_shortcuts)
       end

data/lib/servactory/configuration/setup.rb

@@ -7,6 +7,7 @@ module Servactory
                     :internal_error_class,
                     :output_error_class,
                     :failure_class,
+                    :input_option_helpers,
                     :method_shortcuts
 
       def initialize
@@ -16,8 +17,20 @@ module Servactory
 
         @failure_class = Servactory::Errors::Failure
 
+        @input_option_helpers = Servactory::Inputs::OptionHelpersCollection.new(default_input_option_helpers)
+
         @method_shortcuts = Servactory::Methods::Shortcuts::Collection.new
       end
+
+      private
+
+      def default_input_option_helpers
+        Set[
+          Servactory::Inputs::OptionHelper.new(name: :optional, equivalent: { required: false }),
+          Servactory::Inputs::OptionHelper.new(name: :internal, equivalent: { internal: true }),
+          Servactory::Inputs::OptionHelper.new(name: :as_array, equivalent: { array: true })
+        ]
+      end
     end
   end
 end

data/lib/servactory/context/callable.rb

@@ -6,6 +6,8 @@ module Servactory
       def call!(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @context_store = Store.new(self)
 
+        context_store.context.send(:assign_service_strict_mode, true)
+
         assign_data_with(arguments)
 
         inputs_workbench.find_unnecessary!
@@ -31,6 +33,8 @@ module Servactory
       def call(arguments = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         @context_store = Store.new(self)
 
+        context_store.context.send(:assign_service_strict_mode, false)
+
         assign_data_with(arguments)
 
         inputs_workbench.find_unnecessary!

data/lib/servactory/context/workspace.rb

@@ -29,7 +29,17 @@ module Servactory
       end
 
       def fail!(message:, meta: nil)
-        errors << Servactory.configuration.failure_class.new(message: message, meta: meta)
+        failure = Servactory.configuration.failure_class.new(message: message, meta: meta)
+
+        raise failure if @service_strict_mode
+
+        errors << failure
+      end
+
+      private
+
+      def assign_service_strict_mode(flag)
+        @service_strict_mode = flag
       end
     end
   end

data/lib/servactory/inputs/input.rb

@@ -5,13 +5,7 @@ module Servactory
     class Input # rubocop:disable Metrics/ClassLength
       ARRAY_DEFAULT_VALUE = ->(is: false, message: nil) { { is: is, message: message } }
 
-      HELPER_LIBRARY = {
-        optional: { required: false },
-        internal: { internal: true },
-        as_array: { array: true }
-      }.freeze
-
-      private_constant :ARRAY_DEFAULT_VALUE, :HELPER_LIBRARY
+      private_constant :ARRAY_DEFAULT_VALUE
 
       attr_reader :name,
                   :internal_name
@@ -43,11 +37,11 @@ module Servactory
         prepared_options = {}
 
         helpers.each do |helper|
-          next unless HELPER_LIBRARY.key?(helper)
+          found_helper = Servactory.configuration.input_option_helpers.find_by(name: helper)
 
-          found_helper = HELPER_LIBRARY[helper]
+          next if found_helper.blank?
 
-          prepared_options.merge!(found_helper)
+          prepared_options.merge!(found_helper.equivalent)
         end
 
         options.merge(prepared_options)

data/lib/servactory/inputs/option_helper.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    class OptionHelper
+      attr_reader :name,
+                  :equivalent
+
+      def initialize(name:, equivalent:)
+        @name = name
+        @equivalent = equivalent
+      end
+    end
+  end
+end

data/lib/servactory/inputs/option_helpers_collection.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Inputs
+    class OptionHelpersCollection
+      # NOTE: http://words.steveklabnik.com/beware-subclassing-ruby-core-classes
+      extend Forwardable
+      def_delegators :@collection, :<<, :find, :merge
+
+      def initialize(collection)
+        @collection = collection
+      end
+
+      def find_by(name:)
+        find { |helper| helper.name == name }
+      end
+    end
+  end
+end

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

@@ -94,7 +94,7 @@ module Servactory
         end
 
         def prepared_value
-          @prepared_value ||= @input.optional? && !@input.default.nil? ? @input.default : @value
+          @prepared_value ||= @input.optional? && !@input.default.nil? && @value.blank? ? @input.default : @value
         end
       end
     end

data/lib/servactory/test/fake_type.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Test
+    class FakeType; end
+  end
+end

data/lib/servactory/test/result.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Servactory
+  module Test
+    class Result
+      def initialize(**attributes)
+        attributes.each_pair do |method_name, method_return|
+          define_singleton_method(method_name) { method_return }
+        end
+      end
+    end
+  end
+end

data/lib/servactory/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servactory
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.8
 platform: ruby
 authors:
 - Anton Sokolov
@@ -211,6 +211,8 @@ files:
 - lib/servactory/inputs/dsl.rb
 - lib/servactory/inputs/input.rb
 - lib/servactory/inputs/option.rb
+- lib/servactory/inputs/option_helper.rb
+- lib/servactory/inputs/option_helpers_collection.rb
 - lib/servactory/inputs/options_collection.rb
 - lib/servactory/inputs/tools/check_errors.rb
 - lib/servactory/inputs/tools/find_unnecessary.rb
@@ -247,6 +249,8 @@ files:
 - lib/servactory/outputs/validations/type.rb
 - lib/servactory/outputs/workbench.rb
 - lib/servactory/result.rb
+- lib/servactory/test/fake_type.rb
+- lib/servactory/test/result.rb
 - lib/servactory/utils.rb
 - lib/servactory/version.rb
 homepage: https://github.com/afuno/servactory