strum 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c8a20f6179dc0c1358fae87f00c2f6fb0be85c42cddd9f545e854431dba4217
-  data.tar.gz: 17531b732f1aff37adea4e64fa5ac7960704f2e283a4677d0bbaba99f22623ad
+  metadata.gz: 669c2365f0c1acb88593f40bf72fa07d578d50f45002ff050bcec003f6ef5b88
+  data.tar.gz: 01c3a81de20d453c75c331668967bcc43513839293477b30179d770908cfeaac
 SHA512:
-  metadata.gz: 87ffae962e4b0873239afc21e32768221071db8d5fc74fa03eba275c0f12b1f230e9db26d3b2e79d29daea92fe5fc54ce030475c3569ef2f334d54a79f665f93
-  data.tar.gz: 06af32c6691ebbea36a646cb0e5b6311f426fee26ffd1ee2e2a07c11c7fa52d89d19f1c9109a09925242d93184a317c3717b78b8523ad407e2bb74d9aa08ea38
+  metadata.gz: 310fa01411570abe606bcdaf6dbfcd69c0952d50fd2ff3dd788d8142cec9e28aedcba8b5bf8c80f7cde172d726faba41d2909e2e6fdccf0c768c91852eaeeb6c
+  data.tar.gz: ce8f1eff59478e10650f902c974538de4e3c312a313d7ba0424feed717d5866865c0bfe628bc6f8dad1cb923738177b90e50496ae56553fa90b079465a5d3694

data/Gemfile.lock

@@ -1,23 +1,17 @@
 PATH
   remote: .
   specs:
-    strum (0.0.37)
+    strum (0.0.40)
       dry-inflector (~> 0.2.0)
-      dry-matcher (~> 0.8.2)
       thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
-    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
     dry-inflector (0.2.0)
-    dry-matcher (0.8.3)
-      dry-core (>= 0.4.8)
-    io-console (0.5.4)
+    io-console (0.5.5)
     irb (1.2.1)
       reline (>= 0.0.1)
     jaro_winkler (1.5.4)
@@ -49,11 +43,11 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    sequel (5.28.0)
+    sequel (5.29.0)
     sequel-annotate (1.4.0)
       sequel (>= 4)
     thor (0.20.3)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/lib/strum/service.rb

@@ -1,27 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/matcher"
-
 module Strum
   # Module
   module Service
     class Failure < StandardError; end
 
-    StrumMatcher = Dry::Matcher.new(
-      success: Dry::Matcher::Case.new(
-        match: lambda do |value, *pattern|
-          value[0] && (pattern.any? ? pattern.include?(value[1]) : true)
-        end,
-        resolve: ->(value) { value.last }
-      ),
-      failure: Dry::Matcher::Case.new(
-        match: lambda do |value, *pattern|
-          !value[0] && (pattern.any? ? pattern.include?(value[1]) : true)
-        end,
-        resolve: ->(value) { value.last }
-      )
-    )
-
     def self.included(base)
       base.class_eval do
         extend ClassMethods
@@ -38,16 +21,24 @@ module Strum
     # Instance methods
     def initialize(_input)
       self.strum_errors = {}
+      self.service_handlers = { on: {}, success: {}, failure: {} }
       self.outputs = {}
       self._input = _input
       self._input.freeze
       self.input = self._input.dup
     end
 
-    def execute(&block)
+    def execute
       audit
-      call if valid?
-      valid? ? valid_result(&block) : invalid_result(&block)
+      if valid?
+        yield(self) if block_given?
+        call
+      end
+      valid? ? valid_result : invalid_result
+    end
+
+    def hook(name, data = self)
+      service_handlers[:on][name].is_a?(Proc) && service_handlers[:on][name].call(data)
     end
 
     def valid?
@@ -58,6 +49,18 @@ module Strum
       strum_errors
     end
 
+    def on(arg, &block)
+      service_handlers[:on][arg] = block
+    end
+
+    def success(arg = nil, &block)
+      service_handlers[:success][arg] = block
+    end
+
+    def failure(arg = nil, &block)
+      service_handlers[:failure][arg] = block
+    end
+
     def method_missing(method_name, *args, &_block)
       super unless input.is_a?(Hash) && input[method_name.to_sym]
 
@@ -70,7 +73,7 @@ module Strum
 
     protected
 
-      attr_accessor :_input, :input, :strum_errors, :outputs
+      attr_accessor :_input, :input, :strum_errors, :outputs, :service_handlers
 
       def call
         raise Failure, "call method must be implemented"
@@ -130,17 +133,14 @@ module Strum
         key
       end
 
-      def valid_result(&block)
-        return outputs[:default] || outputs unless block_given?
-        return StrumMatcher.call([true, outputs[:default]], &block) if outputs[:default]
-
-        StrumMatcher.call([true, *outputs.keys, outputs], &block)
+      def valid_result
+        handler = service_handlers[:success][((outputs.keys << nil) & service_handlers[:success].keys).first]
+        handler.is_a?(Proc) ? handler.call(outputs[:default] || outputs) : outputs[:default] || outputs
       end
 
-      def invalid_result(&block)
-        return nil unless block_given?
-
-        StrumMatcher.call([false, *errors.values, errors], &block)
+      def invalid_result
+        handler = service_handlers[:failure][((errors.keys << nil) & service_handlers[:failure].keys).first]
+        handler.is_a?(Proc) ? handler.call(errors) : errors
       end
   end
 end

data/lib/strum/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Strum
-  VERSION = "0.0.38"
+  VERSION = "0.0.40"
 end

data/strum.gemspec

@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "dry-inflector", "~> 0.2.0"
-  spec.add_dependency "dry-matcher", "~> 0.8.2"
   spec.add_dependency "thor", "~> 0.20"
   spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "irb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-30 00:00:00.000000000 Z
+date: 2020-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: dry-matcher
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement