strum-service 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b710112b00697a5e9ffa85d91dd191518863157d9d1ad9c7263bbfb8ec37cf07
-  data.tar.gz: 73e87d006e34ed66f4930f12682d1a1eba0be9ec4a47e5634c76d149eda1a27f
+  metadata.gz: 5189e160a086e20e07bdcc593c18334e8a9b821bbc2f4d26567a2f5fcba08067
+  data.tar.gz: d8d80b04600eeb1b3a2d933b8811d2061b959ff385cee52f1d47d06d60a17aea
 SHA512:
-  metadata.gz: 51db6798a851873b819e433e014cc0addfc7bd45c8dab3e40c2a18d3eea8263db919f0eb82f8efd6d1d82781bf406446c4c64959cc7849a4ab95a2485f77d6f6
-  data.tar.gz: 3ebec9e9088617fb0c66702bd7f8514dbd2e399d646e37225002cd3de865ff084463f82367fda5e70f3cb525b456bdf1acc06c897eba205ce64967a54a9895e1
+  metadata.gz: 29510b09777a53d1befe59a80efdb0dca47ed44721e9c3e27c99b6035e3c2084fa6ac5e120f71822e54d9ead423c281c88d1a57f8ef4932dba62504b97e4217b
+  data.tar.gz: fae7e288048a8b8cadccd9a322b211b6a7e9ccc3d248dba6c13150d31cfb0201634f6a094862f491916783ea18dbd5ab122339053a42912f2937fc11facd54c2

data/Gemfile

@@ -7,8 +7,8 @@ gemspec
 
 gem "rake", "~> 12.0"
 
-gem "rspec", "~> 3.10"
-gem "rubocop", "~> 1.5"
-gem "rubocop-ast", "~> 1.3"
-gem "rubocop-rake", "~> 0.5.1"
-gem "rubocop-rspec", "~> 2.0.0"
+gem "rspec", "~> 3.11.0"
+gem "rubocop", "~> 1.25.1"
+gem "rubocop-ast", "~> 1.16.0"
+gem "rubocop-rake", "~> 0.6.0"
+gem "rubocop-rspec", "~> 2.9.0"

data/Gemfile.lock

@@ -1,63 +1,62 @@
 PATH
   remote: .
   specs:
-    strum-service (0.2.1)
+    strum-service (0.2.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    diff-lcs (1.4.4)
-    parallel (1.20.1)
-    parser (3.0.2.0)
+    diff-lcs (1.5.0)
+    parallel (1.21.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (12.3.3)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.18.4)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.25.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.8.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.8.0)
-      parser (>= 3.0.1.1)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.0.1)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
-    unicode-display_width (2.0.0)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   rake (~> 12.0)
-  rspec (~> 3.10)
-  rubocop (~> 1.5)
-  rubocop-ast (~> 1.3)
-  rubocop-rake (~> 0.5.1)
-  rubocop-rspec (~> 2.0.0)
+  rspec (~> 3.11.0)
+  rubocop (~> 1.25.1)
+  rubocop-ast (~> 1.16.0)
+  rubocop-rake (~> 0.6.0)
+  rubocop-rspec (~> 2.9.0)
   strum-service!
 
 BUNDLED WITH
-   2.2.15
+   2.3.14

data/lib/strum/service/version.rb

@@ -2,6 +2,6 @@
 
 module Strum
   module Service
-    VERSION = "0.2.1"
+    VERSION = "0.2.4"
   end
 end

data/lib/strum/service.rb

@@ -45,8 +45,8 @@ module Strum
 
     def execute
       catch(:exit) do
-        audit
         yield(self) if block_given?
+        audit
         call if valid?
       end
       valid? ? valid_result : invalid_result
@@ -85,7 +85,7 @@ module Strum
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      input.is_a?(Hash) && input[method_name.to_sym] || super
+      (input.is_a?(Hash) && input[method_name.to_sym]) || super
     end
 
     protected
@@ -147,7 +147,7 @@ module Strum
 
       def required(*keys)
         if input.is_a?(Hash)
-          (keys - input.keys).each { |key| add_error(key, :field_must_exist) }
+          (keys - service_keys).each { |key| add_error(key, :field_must_exist) }
         else
           add_error(:input, :must_be_hash)
         end
@@ -155,7 +155,7 @@ module Strum
 
       def any(*keys)
         if input.is_a?(Hash)
-          add_error(:input, :any_field_must_exist) unless (keys & input.keys).count.positive?
+          add_error(:input, :any_field_must_exist) unless (keys & service_keys).count.positive?
         else
           add_error(:input, :must_be_hash)
         end
@@ -163,14 +163,14 @@ module Strum
 
       def sliced(*keys)
         if input.is_a?(Hash)
-          self.input = input.slice(*keys)
+          self.input = input.merge(args).slice(*keys)
         else
           add_error(:input, :must_be_hash)
         end
       end
 
       def sliced_list(*keys)
-        add_error(:input, :must_be_array) && retuen unless input.is_a?(Array)
+        add_error(:input, :must_be_array) && return unless input.is_a?(Array)
 
         self.input = input.map do |item|
           if item.is_a?(Hash)
@@ -181,6 +181,10 @@ module Strum
         end
       end
 
+      def service_keys
+        input.keys | args.keys
+      end
+
       def array!
         self.input = [*input]
       end

data/strum-service.gemspec

@@ -29,4 +29,5 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.metadata["rubygems_mfa_required"] = "false"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: strum-service
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Serhiy Nazarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2022-07-19 00:00:00.000000000 Z
 dependencies: []
 description: Strum Service
 email:
@@ -42,6 +42,7 @@ metadata:
   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
+  rubygems_mfa_required: 'false'
 post_install_message: 
 rdoc_options: []
 require_paths: