steppy 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06bbbf8061978cb442a6dbd96a98c07bf4c856866674b7bd8719b76f3593ccef
-  data.tar.gz: 64c95196b0f8217622cf027d25b036987dbf0f82b86da162f94043bf36235aeb
+  metadata.gz: f7cfb710dfbb840665b8980fbec49ec54e57b365b9ae2d57362921e08bc6d469
+  data.tar.gz: 2db3a03835c9e31a9b7027e539bb1b9da3578af5adb0fdfce8b95016f2191654
 SHA512:
-  metadata.gz: db545b9c0870ada505a73f5b4420e534f702ebfc4f950c158e64f7bf55d32b51e526fcef3c428dda9e7d2818998431bb7d0fd7fd6c7ba1898d355bd9e8b8461c
-  data.tar.gz: d8505d24ce6978a85043fa27a4ba2149ac86be5061819aff27377cb067a9cfb6edc2388a35c7015092603e4b4b0ff784c990807a729829137e8d3922b1627fcd
+  metadata.gz: 074f8fb7ce46be4b67ca8ffb1f0c0fe6e3d2e671469bbdbed66669da880aa1b22363a6bc66c7fa4210b1135a9d856b739d9585840fc28c1cf63d03f041f3f3ec
+  data.tar.gz: d83b0a8fdd0806d5a43a64a4be6e722661157380a3477c610d83323a016762acd425cb694bb5488beec60d98cfcf577034c967508d985d70417a79a01179f2a5

data/Gemfile.lock

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

data/lib/steppy/class_methods.rb

@@ -54,22 +54,22 @@ module Steppy
     end
 
     def step_after(key = nil, &block)
-      step_add_callback(:after, block, key)
+      step_add_callback(:after, key, block)
     end
 
     def step_after_all(&block)
-      step_add_callback(:after, block, :all)
+      step_add_callback(:after, :all, block)
     end
 
     def step_before(key = nil, &block)
-      step_add_callback(:before, block, key)
+      step_add_callback(:before, key, block)
     end
 
     def step_before_all(&block)
-      step_add_callback(:before, block, :all)
+      step_add_callback(:before, :all, block)
     end
 
-    def step_add_callback(type, block, key)
+    def step_add_callback(type, key, block)
       callback_key = key ? key.to_sym : :each
       callbacks = step_callbacks[type][callback_key] ||= []
       callbacks.push(block)

data/lib/steppy/instance_methods.rb

@@ -16,7 +16,7 @@ module Steppy
         steppy_run(steppy_cache)
       end
 
-      step_run_callbacks(:after, :all, attributes)
+      step_run_callbacks(:after, :all, attributes, result)
 
       result
     rescue StandardError => exception
@@ -126,7 +126,7 @@ module Steppy
         return steppy_result
       end
 
-      step_run_callbacks(:before, method, args, args)
+      step_run_callbacks(:before, method, args)
 
       result = if block
         instance_exec(steppy_attributes, &block)
@@ -134,25 +134,25 @@ module Steppy
         steppy_run_method(method, steppy_attributes)
       end
 
-      step_run_callbacks(:after, method, result, args)
+      step_run_callbacks(:after, method, args, result)
 
       steppy_set(args[:set], result)
 
       result
     end
 
-    def step_run_callbacks(type, method, result, args = result)
+    def step_run_callbacks(type, method, args, result = nil)
       callbacks = step_callbacks[type]
       method_callbacks = callbacks[method] || []
 
       if method != :all
         callbacks[:each].each do |callback|
-          instance_exec(result, args, &callback)
+          instance_exec(args, result, &callback)
         end
       end
 
       method_callbacks.each do |callback|
-        instance_exec(result, args, &callback)
+        instance_exec(args, result, &callback)
       end
     end
 

data/lib/steppy/version.rb

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

metadata

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