rails-workflow 1.4.6.4 → 1.4.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aea9261c6bf6fa5ab1c793179ef8440a67be0d6
-  data.tar.gz: aa69e4c243b24250f6880cfcfcf3efafc33b9a15
+  metadata.gz: 41958ff514ac9776a7dcdc9a4ca9bdeff19c5207
+  data.tar.gz: 7503bd6d628ea7a37576db536a7dc57342d208ea
 SHA512:
-  metadata.gz: ad8375bdbe64ae0ddadf8d9e272e22d198dfc87108327fba67d7c2852955c334334efafe24195b4f0d6ffe2d18ce726205fff343142a8c2cbe46c0e44721988e
-  data.tar.gz: ccb120fe43028613ab269556076cbee0a7113da2831d0c32308cd68a680080e99fc21e68b50142f8843bb57813fe67d82facc0bfa1d387e6eabac5ad2c40287c
+  metadata.gz: 9037c414fa9d537ec00bd97d22b18330531bb5cd6af225bd62c45df00fe62249ffce6acdd39ca194d135e83dc949089f9882dceba4f78a73ef059f93779251a9
+  data.tar.gz: ba52069e35a1637a99f4631492bd9dfe816f93a81aa42d751dfb9739c2295ce4e7183524b9c35a2afc051d422f19b11a2705878ed804c39560c0a8bef4abdba2

data/lib/workflow/event.rb

@@ -7,16 +7,23 @@ module Workflow
     #   @return [Array] Array of {Workflow::Event::Transition}s defined for this event.
     # @!attribute [r] meta
     #   @return [Hash] Extra information defined for this event.
-    attr_reader :name, :transitions, :meta
+    # @!attribute [r] tags
+    #   @return [Array] Tags for this event.
+    attr_reader :name, :transitions, :meta, :tags
 
     # @api private
     # See {Workflow::State#on} for creating objects of this class.
     # @param [Symbol] name The name of the event to create.
     # @param [Hash] meta Optional Metadata for this object.
-    def initialize(name, meta: {})
+    # @param [Array] tags Tags for this event.
+    def initialize(name, tags: [], meta: {})
       @name = name.to_sym
       @transitions = []
       @meta = meta || {}
+      @tags = [tags].flatten.uniq
+      unless @tags.reject { |t| t.is_a? Symbol }
+        raise WorkflowDefinitionError, "Tags can only include symbols, event: [#{name}]"
+      end
     end
 
     def valid?

data/lib/workflow/specification.rb

@@ -41,6 +41,7 @@ module Workflow
     end
 
     set_callback(:spec_definition, :after, :define_tag_methods)
+    set_callback(:spec_definition, :after, :define_event_tag_methods)
 
     # Find the state with the given name.
     #
@@ -126,7 +127,7 @@ module Workflow
 
     private
 
-    module TagHelpers
+    module StateTagHelpers
       def initial?
         sequence.zero?
       end
@@ -138,15 +139,24 @@ module Workflow
 
     def define_tag_methods
       tags = states.map(&:tags).flatten.uniq
-      tag_method_module = build_tag_method_module(tags)
+      tag_method_module = build_tag_method_module(tags, true)
       states.each do |state|
         state.send :extend, tag_method_module
       end
     end
 
-    def build_tag_method_module(tags)
+    def define_event_tag_methods
+      events = states.map(&:events).flatten
+      tags   = events.map(&:tags).flatten
+      tag_method_module = build_tag_method_module(tags, false)
+      events.each do |event|
+        event.send :extend, tag_method_module
+      end
+    end
+
+    def build_tag_method_module(tags, include_state_helpers)
       tag_method_module = Module.new
-      tag_method_module.send :include, TagHelpers
+      tag_method_module.send :include, StateTagHelpers if include_state_helpers
       tag_method_module.class_eval do
         tags.each do |tag|
           define_method "#{tag}?" do

data/lib/workflow/state.rb

@@ -26,9 +26,9 @@ module Workflow
       @sequence = sequence
       @events = []
       @meta = meta
-      @tags = [tags].flatten
+      @tags = [tags].flatten.uniq
       unless @tags.reject { |t| t.is_a? Symbol }
-        raise WorkflowDefinitionError, "Tags can only include symbols, state: #{name}"
+        raise WorkflowDefinitionError, "Tags can only include symbols, state: [#{name}]"
       end
     end
 
@@ -71,9 +71,9 @@ module Workflow
     #  state :the_diner
     # end
     # ```
-    def on(name, to: nil, meta: {}, &transitions)
+    def on(name, to: nil, tags: [], meta: {}, &transitions)
       check_can_add_transition!(name, to: to, &transitions)
-      event = Workflow::Event.new(name, meta: meta)
+      event = Workflow::Event.new(name, tags: tags, meta: meta)
 
       if to
         event.to to

data/lib/workflow/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Workflow
-  VERSION = '1.4.6.4'
+  VERSION = '1.4.8.4'
 end

metadata

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