rails-workflow 1.4.10 → 1.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 191eec593e88c80dc6841a12868e152969c1a7d9
-  data.tar.gz: 6d3286dc5b0e76ee27f828eacc331ce564614c61
+  metadata.gz: b8bdc4bd121ea33bf5c173251fbad21009ddeb72
+  data.tar.gz: f593969d04cbb64b74cb551da7e7b06ca7e3fcd6
 SHA512:
-  metadata.gz: bc0a5badfa16114e179459339dae2c6878b459c6994b622ceef89470d452fae7b8f16e85b82a2923a356af39c748a6478181753df7acd38a40a96fe9cc61238b
-  data.tar.gz: 5de00112a75831b3de4b1c2aa34ff2e310dbb1616d7bb63075d152855f20adcd070aebc4c9abb1b3f26170d3e971f0bd68d5b1c62a3a87744c0b820d1ba1de2f
+  metadata.gz: a09a67020266baa7489303f5713e0fb346b8d8b6db32257332d4c96ec599cd7314888d4cb854479f76834c7d8f17f2d6e3249f16c262706162f7f44f9f97e98a
+  data.tar.gz: 4161bb384a19eef51d640ff64e0aefb6c3ff373b92259890b0f47428d81f1a21494c5e39b9a35f2126f2e5dd3df8b6da37347a9bc7e7704079bff86b1a8ff3e6

data/lib/workflow/adapters/active_record.rb

@@ -63,6 +63,18 @@ module Workflow
           workflow_spec.states.each { |state| define_scopes(state) }
         end
 
+        def state_tagged_with(*tags)
+          states = workflow_spec.states.tagged_with(tags)
+          states.map! { |state| state.name.to_s }
+          where(workflow_state: states)
+        end
+
+        def state_not_tagged_with(*tags)
+          states = workflow_spec.states.tagged_with(tags)
+          states.map! { |state| state.name.to_s }
+          where.not(workflow_state: states)
+        end
+
         private
 
         def superclass_workflow

data/lib/workflow/specification.rb

@@ -8,10 +8,14 @@ module Workflow
   class Specification
     include ActiveSupport::Callbacks
 
-    # The state objects defined for this specification, keyed by name
-    # @return [Hash]
+    # The state objects defined for this specification
+    # @return [Array]
     attr_reader :states
 
+    # The event objects defined for this specification
+    # @return [Array]
+    attr_reader :events
+
     # State object to be given to newly created objects under this workflow.
     # @return [State]
     attr_reader :initial_state
@@ -40,8 +44,10 @@ module Workflow
       end
     end
 
+    set_callback(:spec_definition, :after, :add_tagged_with_to_states_and_events)
     set_callback(:spec_definition, :after, :define_tag_methods)
     set_callback(:spec_definition, :after, :define_event_tag_methods)
+    set_callback(:spec_definition, :after, :collect_events)
 
     # Find the state with the given name.
     #
@@ -137,6 +143,18 @@ module Workflow
       end
     end
 
+    module TaggedWith
+      def tagged_with(*tags)
+        tags = [tags].flatten
+        select { |item| (item.tags & tags).any? }
+      end
+
+      def not_tagged_with(*tags)
+        tags = [tags].flatten
+        reject { |item| (item.tags & tags).any? }
+      end
+    end
+
     def define_tag_methods
       tags = states.map(&:tags).flatten.uniq
       tag_method_module = build_tag_method_module(tags, true)
@@ -145,15 +163,23 @@ module Workflow
       end
     end
 
+    def collect_events
+      @events = states.map(&:events).flatten
+    end
+
     def define_event_tag_methods
-      events = states.map(&:events).flatten
-      tags   = events.map(&:tags).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 add_tagged_with_to_states_and_events
+      states.send :extend, TaggedWith
+      events.send :extend, TaggedWith
+    end
+
     def build_tag_method_module(tags, include_state_helpers)
       tag_method_module = Module.new
       tag_method_module.send :include, StateTagHelpers if include_state_helpers

data/lib/workflow/version.rb

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

metadata

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