steppy 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b004c99544ed8e124ccdf1e699a421a0a70c1515ef2c095f26c2d50b0f76b97a
-  data.tar.gz: 40ff04003443747d336ff6cab8771849ceff5f97282160e4581674d75ea0baf6
+  metadata.gz: 06bbbf8061978cb442a6dbd96a98c07bf4c856866674b7bd8719b76f3593ccef
+  data.tar.gz: 64c95196b0f8217622cf027d25b036987dbf0f82b86da162f94043bf36235aeb
 SHA512:
-  metadata.gz: 5d8cda58c821abafe498dedb044e849c5cfb4e25a2e4d81e9113dee0c2bdb9927533421ac2046e32af84bc0f4092559d9b3996d6254f76f7afca78162fc71a9b
-  data.tar.gz: 42c3c4587b6aa2fba5848a0e67617000603f0729eaefd11826b45d138532f5bab604649518f0b078b9f80be8c5c206910353c790250f2ee7a6b49aafb3d854e0
+  metadata.gz: db545b9c0870ada505a73f5b4420e534f702ebfc4f950c158e64f7bf55d32b51e526fcef3c428dda9e7d2818998431bb7d0fd7fd6c7ba1898d355bd9e8b8461c
+  data.tar.gz: d8505d24ce6978a85043fa27a4ba2149ac86be5061819aff27377cb067a9cfb6edc2388a35c7015092603e4b4b0ff784c990807a729829137e8d3922b1627fcd

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    steppy (1.0.2)
+    steppy (1.0.3)
 
 GEM
   remote: https://rubygems.org/

data/lib/steppy/class_methods.rb

@@ -12,7 +12,7 @@ module Steppy
     end
 
     def step(method = nil, args = {}, &block)
-      steps.push(
+      steps_cache.push(
         Steppy.parse_step(method: method, args: args, block: block)
       )
       self
@@ -21,12 +21,12 @@ module Steppy
     alias step_return step
 
     def step_if(condition, &block)
-      steps.push(condition: condition, block: block)
+      steps_cache.push(condition: condition, block: block)
       self
     end
 
     def step_unless(condition, &block)
-      steps.push(condition: -> { !steppy_run_condition(condition) }, block: block)
+      steps_cache.push(condition: -> { !steppy_run_condition(condition) }, block: block)
       self
     end
 
@@ -38,14 +38,14 @@ module Steppy
     def step_if_else(condition_block, step_steps, args = {})
       if_step, else_step = step_steps
 
-      steps.push Steppy.parse_step(
+      steps_cache.push Steppy.parse_step(
         method: if_step,
         args: {
           if: condition_block,
         }.merge(args)
       )
 
-      steps.push Steppy.parse_step(
+      steps_cache.push Steppy.parse_step(
         method: else_step,
         args: {
           unless: condition_block,
@@ -57,17 +57,25 @@ module Steppy
       step_add_callback(:after, block, key)
     end
 
+    def step_after_all(&block)
+      step_add_callback(:after, block, :all)
+    end
+
     def step_before(key = nil, &block)
       step_add_callback(:before, block, key)
     end
 
+    def step_before_all(&block)
+      step_add_callback(:before, block, :all)
+    end
+
     def step_add_callback(type, block, key)
-      callback_key = key ? key.to_sym : :global
+      callback_key = key ? key.to_sym : :each
       callbacks = step_callbacks[type][callback_key] ||= []
       callbacks.push(block)
     end
 
-    def steps
+    def steps_cache
       steppy_cache[:steps]
     end
 
@@ -82,10 +90,12 @@ module Steppy
         rescues: [],
         callbacks: {
           before: {
-            global: [],
+            all: [],
+            each: [],
           },
           after: {
-            global: [],
+            all: [],
+            each: [],
           },
         }
       )

data/lib/steppy/instance_methods.rb

@@ -8,11 +8,17 @@ module Steppy
     def steppy(attributes = {}, cache = {})
       steppy_initialize_cache({ attributes: attributes, prefix: :step }.merge(cache))
 
-      if steppy_cache.key?(:block)
+      step_run_callbacks(:before, :all, attributes)
+
+      result = if steppy_cache.key?(:block)
         instance_exec(&steppy_cache[:block])
       else
         steppy_run(steppy_cache)
       end
+
+      step_run_callbacks(:after, :all, attributes)
+
+      result
     rescue StandardError => exception
       steppy_rescue exception, steppy_cache[:rescues]
     end
@@ -135,12 +141,14 @@ module Steppy
       result
     end
 
-    def step_run_callbacks(type, method, result, args)
+    def step_run_callbacks(type, method, result, args = result)
       callbacks = step_callbacks[type]
       method_callbacks = callbacks[method] || []
 
-      callbacks[:global].each do |callback|
-        instance_exec(result, args, &callback)
+      if method != :all
+        callbacks[:each].each do |callback|
+          instance_exec(result, args, &callback)
+        end
       end
 
       method_callbacks.each do |callback|

data/lib/steppy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Steppy
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: steppy
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler