rails-workflow 1.4.13 → 1.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ada397c29addd3b7b628691797ac590f7214d0
-  data.tar.gz: 0e7375ee4380363fb96ac04c3f7e3d62608e9ed4
+  metadata.gz: 17c522c16b567a5a0e909a8b37e46b43dcf46f96
+  data.tar.gz: b585c04ac5f95851b43d537cdf785b480e51aaec
 SHA512:
-  metadata.gz: 349149ca15104eb4a9aef2f48d3090a48434b60e0842f6be06de9bece667c8119d6f0f220e5f28f70f8898d0db70b2a85278108b73d91e9815b8fe1c69932086
-  data.tar.gz: ad54fca54b8276f34badbc4e80c6ff2e72bca982ed501b1cc5b1d9dfeafc283206db9a8eb748ef8d3663cb62d39a415774fe9d6e042323f1ccab732ef9b15ed5
+  metadata.gz: dca5ec08aaf2013e28b68e94d73b14feb136f631c9ed0e1b89cb66c904a6d8b33e0771fcfe5a5cd6b5868d12f9a848b14bb79118c8d46b4bb7b3bde9b79e07d2
+  data.tar.gz: f594cc082be1139d73a79652ff6779d74ec4ecb470e78d143e8032fe0ec7cac2e3f0d71c9917481bc2b89ba62e6abdcf534d489357c71a1180c625f630ed172f

data/lib/workflow/adapters/active_record_validations.rb

@@ -8,7 +8,7 @@ module Workflow
       extend ActiveSupport::Concern
 
       included do
-        prepend RevalidateOnlyAfterAttributesChange
+        prepend RevalidateOnlyAfterAttributesChange if self < ::ActiveRecord::Base
       end
 
       ###
@@ -21,11 +21,7 @@ module Workflow
       #
       def method_missing(method, *args, &block)
         if method.to_s =~ /^transitioning_(from|to|via_event)_([\w_-]+)\?$/
-          class_eval "
-          def #{method}
-            transitioning? direction: '#{$LAST_MATCH_INFO[1]}', state: '#{$LAST_MATCH_INFO[2]}'
-          end
-          "
+          define_transitioning_method(method, *$LAST_MATCH_INFO[1..2])
           send method
         else
           super
@@ -108,7 +104,7 @@ module Workflow
         end
 
         def write_attribute(attr_name, value)
-          @changed_since_validation = true
+          @changed_since_validation = true unless attr_name.to_sym == :workflow_state
           super
         end
       end
@@ -131,6 +127,22 @@ module Workflow
 
       private
 
+      def persist_workflow_state(new_state)
+        old_state = current_state.name
+        return_val = super
+        return return_val if valid?
+        super(old_state)
+        false
+      end
+
+      def define_transitioning_method(method, direction, state)
+        class_eval do
+          define_method method do
+            transitioning? direction: direction, state: state
+          end
+        end
+      end
+
       def transitioning?(direction:, state:)
         state = state.to_sym
         return false unless transition_context

data/lib/workflow/adapters/adapter.rb

@@ -10,6 +10,9 @@ module Workflow
         else
           if Adapters.const_defined?(:ActiveRecord) && self < ::ActiveRecord::Base
             include Adapters::ActiveRecord
+          end
+
+          if included_modules.map(&:name).include?('ActiveModel::Validations')
             include ActiveRecordValidations
           end
 

data/lib/workflow/specification.rb

@@ -89,7 +89,7 @@ module Workflow
     # @return [nil]
     def state(name, tags: [], **meta, &events)
       name = name.to_sym
-      new_state = Workflow::State.new(name, @states.length, tags: tags, **meta)
+      new_state = Workflow::State.new(name, @states, tags: tags, **meta)
       @initial_state ||= new_state
       @states << new_state
       new_state.instance_eval(&events) if block_given?
@@ -145,7 +145,7 @@ module Workflow
 
     module StateTagHelpers
       def initial?
-        sequence.zero?
+        all_states.index(self).zero?
       end
 
       def terminal?

data/lib/workflow/state.rb

@@ -17,11 +17,11 @@ module Workflow
     # @api private
     # For creating {Workflow::State} objects please see {Specification#state}
     # @param [Symbol] name Name of the state being created. Must be unique within its workflow.
-    # @param [Fixnum] sequence Sort location among states on this workflow.
+    # @param [Array] all_states All states defined for this workflow, used for sorting.
     # @param [Hash] meta Optional metadata for this state.
-    def initialize(name, sequence, tags: [], **meta)
+    def initialize(name, all_states, tags: [], **meta)
       @name = name.to_sym
-      @sequence = sequence
+      @all_states = all_states
       @events = []
       @tags = [tags].flatten.uniq
       unless @tags.reject { |t| t.is_a? Symbol }
@@ -93,6 +93,12 @@ module Workflow
       nil
     end
 
+    class << self
+      def beyond?(other)
+        -> { current_state > other }
+      end
+    end
+
     private def check_can_add_transition!(name, to: nil)
       raise Errors::DualEventDefinitionError if to && block_given?
 
@@ -111,19 +117,20 @@ module Workflow
     # Overloaded comparison operator.  Workflow states are sorted according to the order
     # in which they were defined.
     #
-    # @param [Workflow::State] other state to be compared against.
+    # @param [Workflow::State] other state or Symbol name to be compared against.
     # @return [Integer]
     def <=>(other)
-      raise Errors::StateComparisonError, other unless other.is_a?(State)
-      sequence <=> other.send(:sequence)
+      if other.is_a?(Symbol)
+        other = all_states.find { |state| state.name == other }
+      end
+      all_states.index(self) <=> all_states.index(other)
     end
 
     private
 
     # @api private
-    # @!attribute [r] sequence
-    #   @return [Fixnum] The position of this state within the
-    #                     order it was defined for in its workflow.
-    attr_reader :sequence
+    # @!attribute [r] all_states
+    #   @return [Array] All states defined on my workflow.  Used for sorting.
+    attr_reader :all_states
   end
 end

data/lib/workflow/version.rb

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

metadata

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