rails-workflow 1.4.1.3 → 1.4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8270a626780c254a58897c2cef2e0b162b5fbcae
-  data.tar.gz: 1a9e4480f3306fc8b10136d2dce4c92d3570b529
+  metadata.gz: ebaf58ab065f71da4435f23776e611a91a3db506
+  data.tar.gz: 7c2852bd1e597559436ab141a3a66c8840425589
 SHA512:
-  metadata.gz: 70c376c21353280fbff28bac40ba2509581c681e2591788793d1031bf40923f21665c2e5285609e899e65a3b74acb4390d511cd14108beeb8b438ab861e82085
-  data.tar.gz: b79da68fd8e266ff0d1a55623a60db87c1499dfeb0ccfc0e551dd4ee77186b4ee57b5e5f8f26fdc6665db07c8caf0fac71419926b3b0fef9b1bcc42f37e5de1b
+  metadata.gz: dd9d5cdca15811c52c65974a329e810bf8712a3caa16e159a9661393126ff0fecf18c052294d4896b40e0f555de7429acc2217595a21a6f61801ecfbbfbfa0bd
+  data.tar.gz: adb0500c94fef7a0b0f8d7b01bb724dd7d6feb5161c3ee254e38d6e3e5ad5cafa7bcc7eac33ec5725f76e291d9a24366c516af7a9df823b6098a98f4e4157374

data/bin/console

@@ -2,7 +2,6 @@
 
 require "bundler/setup"
 require "workflow"
-
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
 

data/lib/workflow/callbacks/transition_callback_wrapper.rb

@@ -1,17 +1,17 @@
 module Workflow
   module Callbacks
     class TransitionCallbackWrapper
-      attr_reader :callback_type, :raw_proc
-      def initialize(callback_type, raw_proc)
+      attr_reader :callback_type, :inner_procedure
+      def initialize(callback_type, inner_procedure)
         @callback_type = callback_type
-        @raw_proc      = raw_proc
+        @inner_procedure      = inner_procedure
       end
 
-      def self.build_wrapper(callback_type, raw_proc)
-        if raw_proc.kind_of? ::Proc
-          new(callback_type, raw_proc).wrapper
+      def self.build_wrapper(callback_type, inner_procedure)
+        if inner_procedure.kind_of? ::Proc
+          new(callback_type, inner_procedure).wrapper
         else
-          raw_proc
+          inner_procedure
         end
       end
 
@@ -23,13 +23,16 @@ module Workflow
           keyrest_string,
           procedure_string].compact.join(', ')
 
-        raw_proc = self.raw_proc
+        inner_procedure = self.inner_procedure
         str = <<-EOF
           Proc.new do |target#{', callbacks' if around_callback?}|
             attributes = transition_context.attributes.dup
+            event_args = transition_context.event_args.dup
+            name_arg = -> (name) { attributes.delete(name) || event_args.shift }
             target.instance_exec(#{arguments})
           end
         EOF
+        # puts str
         eval(str)
       end
 
@@ -44,7 +47,7 @@ module Workflow
         names  = []
         names << 'target'   if params.shift
         (names << 'callbacks') && params.shift if around_callback?
-        names += params.map{|t| "transition_context.#{t}"}
+        names += params.map{|name| "name_arg.call(:#{name})"}
         return names.join(', ') if names.any?
       end
 
@@ -60,11 +63,11 @@ module Workflow
       end
 
       def rest_param_string
-        '*transition_context.event_args' if rest_param
+        '*event_args' if rest_param
       end
 
       def procedure_string
-        '&raw_proc'
+        '&inner_procedure'
       end
 
       def name_params
@@ -90,10 +93,10 @@ module Workflow
       end
 
       def parameters
-        raw_proc.parameters
+        inner_procedure.parameters
       end
       def arity
-        raw_proc.arity
+        inner_procedure.arity
       end
     end
   end

data/lib/workflow/transition_context.rb

@@ -43,6 +43,10 @@ module Workflow
       [from, to, event, event_args]
     end
 
+    def respond_to?(method)
+      named_arguments.key?(method) || super
+    end
+
     def method_missing(method, *args)
       if named_arguments.key?(method)
         named_arguments[method]

data/lib/workflow/version.rb

@@ -1,3 +1,3 @@
 module Workflow
-  VERSION = "1.4.1.3"
+  VERSION = "1.4.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-workflow
 version: !ruby/object:Gem::Version
-  version: 1.4.1.3
+  version: 1.4.1.4
 platform: ruby
 authors:
 - Tyler Gannon