strum-service 0.0.1 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23dfc7b648bc76174a823745ed28d035fa85de556dff129309c9f55e83066a81
-  data.tar.gz: 6561b68e156b33c3d2d4d391e6a838586c8036dd32bce7bd77ba702fb54de56a
+  metadata.gz: f205a707f1b5fe69e7c7939c806739a54550639cb60b99be68991387574999a6
+  data.tar.gz: 1027394e5b3f37086596e7835d8658f62e42a48439fdf4747b2426064f8eaf70
 SHA512:
-  metadata.gz: 02e2d61a36385cf3e76fcccbaba442681505461c082fb7b4d6821afad7a69815badbef25f4bafd6aba45f47ccc98260b6caf82037b12e3d8194286bd0f741f47
-  data.tar.gz: d1667dfc277014273ca400abd4b1834b83c75c91d4423862ec457aa8db269ea0b4525cef9f6bc71d66b843cd60e013f6d9fdd40022c563c2f741010052ca9bb1
+  metadata.gz: 06632a862034f79eaca80df73925ff73e7e93c5d292942a11f735a2fa97d00422736b807ba9e6578b48a4b4613ce3e218dd243d33e493238178eb04ce4c19b01
+  data.tar.gz: 484ab260dd2cbc83889fc7fddc9f39ab197a52f882df3ea6ba71aea03834c889e6619b22f46821b3ea546d4e28475497d0af80800e0f634a2d26239bb61de7fe

data/.gitlab-ci.yml

@@ -0,0 +1,3 @@
+include:
+  - project: 'strum-rb/ci-cd'
+    file: '/strum-rb/.gitlab-ci.yml'

data/.rubocop.yml

@@ -12,18 +12,15 @@ Layout/IndentationConsistency:
   Enabled: true
   EnforcedStyle: indented_internal_methods
 
-# Two spaces, no tabs (for indentation).
-Layout/IndentationWidth:
-  Enabled: true
-
 # Check quotes usage according to lint rule below.
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
 
-Metrics/LineLength:
-  Max: 120
+Layout/LineLength:
   IgnoredPatterns: ['\A#']
 
 Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
+    IgnoredMethods:
+      - describe
+      - context

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    strum-service (0.0.1)
+    strum-service (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/strum/service.rb

@@ -3,7 +3,8 @@
 require "strum/service/version"
 
 module Strum
-  module Service
+  # Strum service
+  module Service # rubocop:disable Metrics/ModuleLength
     class Failure < StandardError; end
 
     def self.included(base)
@@ -12,26 +13,40 @@ module Strum
       end
     end
 
+    # Define coercive methods
+    COERCIVE_METHODS = %i[add_error add_errors any required sliced sliced_list].freeze
+
+    COERCIVE_METHODS.each do |m|
+      define_method("#{m}!") do |*args, **kwargs, &block|
+        send(m, *args, **kwargs, &block)
+        throw :exit unless valid?
+      end
+    end
+
     # Internal: Interactor class methods.
     module ClassMethods
-      def call(_input, **args, &block)
-        new(_input, args).execute(&block)
+      def call(main_input, **args, &block)
+        new(main_input, **args).execute(&block)
       end
     end
 
     # Instance methods
-    def initialize(_input, **args)
+    def initialize(main_input, **args)
       self.strum_errors = {}
       self.service_handlers = { on: {}, success: {}, failure: {} }
       self.outputs = {}
-      self.inputs = args.merge(default: _input)
+      self.inputs = args.merge(default: main_input)
       self._inputs = inputs.dup.freeze
+      setup_default_proc
+      setup_input_default_proc
     end
 
-    def execute
-      audit
-      yield(self) if block_given?
-      call if valid?
+    def execute(&block)
+      catch(:exit) do
+        audit
+        instance_exec(self, &block) if block_given?
+        call if valid?
+      end
       valid? ? valid_result : invalid_result
     end
 
@@ -60,9 +75,10 @@ module Strum
     end
 
     def method_missing(method_name, *args, &_block)
-      super unless input.is_a?(Hash) && input[method_name.to_sym]
-
-      args.count.positive? ? public_send(input[method_name.to_sym], args) : input[method_name.to_sym]
+      (args.count.zero? &&
+        (input.is_a?(Hash) && input[method_name.to_sym]) ||
+        inputs[method_name.to_sym]) ||
+        super
     end
 
     def respond_to_missing?(method_name, include_private = false)
@@ -105,16 +121,21 @@ module Strum
       end
       # rubocop: enable Style/OptionalArguments
 
+      # def add_error(field, value)
+      #   if field.is_a?(Array)
+      #     field.each do |key|
+      #       value.is_a?(Array) ? value.each { |v| add_error(key, v) } : add_error(key, value)
+      #       add_error(key, value.is_a?(Array) ? value.first : value)
+      #     end
+      #   else
+      #     strum_errors[field] ||= []
+      #     strum_errors[field] = strum_errors[field] + Array(value)
+      #   end
+      # end
+
       def add_error(field, value)
-        if field.is_a?(Array)
-          field.each do |key|
-            value.is_a?(Array) ? value.each { |v| add_error(key, v) } : add_error(key, value)
-            add_error(key, value.is_a?(Array) ? value.first : value)
-          end
-        else
-          strum_errors[field] ||= []
-          strum_errors[field] = strum_errors[field] + Array(value)
-        end
+        strum_errors[field] ||= []
+        strum_errors[field] += Array(value)
       end
 
       def add_errors(errors)
@@ -146,16 +167,14 @@ module Strum
       end
 
       def sliced_list(*keys)
-        if input.is_a?(Array)
-          self.input = input.map do |item|
-            if item.is_a?(Hash)
-              item = item.slice(*keys)
-            else
-              add_error(:input_subitem, :must_be_hash)
-            end
+        add_error(:input, :must_be_array) && retuen unless input.is_a?(Array)
+
+        self.input = input.map do |item|
+          if item.is_a?(Hash)
+            item.slice(*keys)
+          else
+            add_error(:input_subitem, :must_be_hash)
           end
-        else
-          add_error(:input, :must_be_array)
         end
       end
 
@@ -165,16 +184,34 @@ module Strum
 
     private
 
+      def setup_default_proc
+        inputs.default_proc = proc { |h, k| h.key?(k.to_s) ? h[k.to_s] : nil }
+      end
+
+      def setup_input_default_proc
+        input.default_proc = proc { |h, k| h.key?(k.to_s) ? h[k.to_s] : nil } if input.is_a?(Hash)
+      end
+
       def key_to_sym(key)
         key.to_sym
       rescue StandardError
         key
       end
 
+      def handler_key
+        ((outputs.keys << nil) & service_handlers[:success].keys).first
+      end
+
+      def handler
+        service_handlers[:success][handler_key]
+      end
+
       def valid_result
-        handler_key = ((outputs.keys << nil) & service_handlers[:success].keys).first
-        handler = service_handlers[:success][handler_key]
-        handler.is_a?(Proc) ? handler.call(outputs[handler_key] || outputs[:default]) : outputs[handler_key] || outputs[:default]
+        if handler.is_a?(Proc)
+          handler.call(outputs[handler_key] || outputs[:default])
+        else
+          outputs[handler_key] || outputs[:default]
+        end
       end
 
       def invalid_result

data/lib/strum/service/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Service
-    VERSION = "0.0.1"
+    VERSION = "0.1.1"
   end
 end

data/strum-service.gemspec

@@ -10,15 +10,16 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Light ruby framework"
   spec.description   = "Strum Service"
-  spec.homepage      = "https://code.qpard.com/strum/strum-service"
+  spec.homepage      = "https://gitlab.com/strum-rb/strum-service"
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://code.qpard.com/strum/strum-service"
-  spec.metadata["changelog_uri"] = "https://code.qpard.com/strum/strum-service/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://gitlab.com/strum-rb/strum-service"
+  spec.metadata["changelog_uri"] = "https://gitlab.com/strum-rb/strum-service/-/blob/master/CHANGELOG.md"
+  spec.metadata["bug_tracker_uri"] = "https://gitlab.com/strum-rb/strum-service/issues"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-service
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2021-05-11 00:00:00.000000000 Z
 dependencies: []
 description: Strum Service
 email:
@@ -18,6 +18,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
@@ -32,14 +33,15 @@ files:
 - lib/strum/service.rb
 - lib/strum/service/version.rb
 - strum-service.gemspec
-homepage: https://code.qpard.com/strum/strum-service
+homepage: https://gitlab.com/strum-rb/strum-service
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  homepage_uri: https://code.qpard.com/strum/strum-service
-  source_code_uri: https://code.qpard.com/strum/strum-service
-  changelog_uri: https://code.qpard.com/strum/strum-service/CHANGELOG.md
+  homepage_uri: https://gitlab.com/strum-rb/strum-service
+  source_code_uri: https://gitlab.com/strum-rb/strum-service
+  changelog_uri: https://gitlab.com/strum-rb/strum-service/-/blob/master/CHANGELOG.md
+  bug_tracker_uri: https://gitlab.com/strum-rb/strum-service/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -55,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Light ruby framework