sequel-state-machine 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0c0bd5c716d726e9e8ba679d545038637a3ed7da8a569918e24725d0558021
-  data.tar.gz: dcba20e8cb5eb3fbcbad3e70e5e5d0662d3515c44ebb6fa033efc5ae4f1e7a02
+  metadata.gz: 7ecbd578f38b3444f3e5174d6bee1fbceb3421eec1d2435a1d3435ec20904ed0
+  data.tar.gz: c336baa29efda7c18885264aae288e6fc15f975da155e87be320976be7ccb93d
 SHA512:
-  metadata.gz: 78367e0296561bc60d3474dad00650cf1865bd50ee8c96eef1e430c24da24b47ab9f2a70c21f2560a1417ec014b0437e4cbc374c276ab8f18a1f162f4e1dfe5c
-  data.tar.gz: 48c59a255b6d6c4736ceed4e75ab8f0bfe59363cab146ae989c2928d9560f829ea62da3cae3452a1006a6e19a7c8600ced96847ab9f453f74cc854cf51c39841
+  metadata.gz: e9718320cbc2646fd5e3dfdae80e98fda4c6ccd230643ac3301893cee210206400199359297c3e6cac5707b590cdcc065c225d93980ebce4cf3f5ae1b5b493fc
+  data.tar.gz: 666800f88b63defc4a2f336315c147eef1338f37574eacdcb2130c930784cbd63ba66cc6cd10df7ff2bbc3260d06315f3bc4686e855100ce577eb21ed2c4154a

data/lib/state_machines/sequel/spec_helpers.rb

@@ -2,54 +2,60 @@
 
 require "rspec"
 
-RSpec::Matchers.define :transition_on do |event|
-  match do |receiver|
-    raise ArgumentError, "must use :to to provide a target state" if (@to || "").to_s.empty?
-    raise ArgumentError, "must use :of_machine for use with multiple state machines" if
-      @machine.nil? && receiver.class.state_machines.length > 1
-    receiver.send(event, *@args)
-    @to == receiver.send(@machine || :sequel_state_machine_status)
-  end
+module StateMachines
+  module Sequel
+    module SpecHelpers
+      module_function def find_state_machine(receiver, event)
+        state_machine = receiver.class.state_machines.values.find { |sm| sm.events[event] }
+        raise ArgumentError, "receiver #{receiver.class} has no state machine for event #{event}" unless state_machine
+        return state_machine
+      end
 
-  chain :of_machine do |col|
-    @machine = col
-  end
+      RSpec::Matchers.define :transition_on do |event|
+        match do |receiver|
+          raise ArgumentError, "must use :to to provide a target state" if (@to || "").to_s.empty?
+          machine = StateMachines::Sequel::SpecHelpers.find_state_machine(receiver, event)
+          receiver.send(event, *@args)
+          current_status = receiver.send(machine.attribute)
+          @to == current_status
+        end
 
-  chain :to do |to_state|
-    @to = to_state
-  end
+        chain :to do |to_state|
+          @to = to_state
+        end
 
-  chain :with do |*args|
-    @args = args
-  end
+        chain :with do |*args|
+          @args = args
+        end
 
-  chain :audit do
-    @audit = true
-  end
+        chain :audit do
+          @audit = true
+        end
 
-  failure_message do |receiver|
-    msg =
-      if @to == receiver.state_machine_status
-        "expected that event #{event} would transition, but did not"
-      else
-        "expected that event #{event} would transition to #{@to} but is #{receiver.state_machine_status}"
+        failure_message do |receiver|
+          status = receiver.send(StateMachines::Sequel::SpecHelpers.find_state_machine(receiver, event).attribute)
+          msg =
+            "expected that event #{event} would transition to #{@to} but is #{status}"
+          (msg += "\n#{receiver.audit_logs.map(&:inspect).join("\n")}") if @audit
+          msg
+        end
       end
-    (msg += "\n#{receiver.audit_logs.map(&:inspect).join("\n")}") if @audit
-    msg
-  end
-end
 
-RSpec::Matchers.define :not_transition_on do |event|
-  match do |receiver|
-    !receiver.send(event, *@args)
-  end
+      RSpec::Matchers.define :not_transition_on do |event|
+        match do |receiver|
+          !receiver.send(event, *@args)
+        end
 
-  chain :with do |*args|
-    @args = args
-  end
+        chain :with do |*args|
+          @args = args
+        end
 
-  failure_message do |receiver|
-    "expected that event #{event} would not transition, but did and is now #{receiver.state_machine_status}"
+        failure_message do |receiver|
+          status = receiver.send(StateMachines::Sequel::SpecHelpers.find_state_machine(receiver, event).attribute)
+          "expected that event #{event} would not transition, but did and is now #{status}"
+        end
+      end
+    end
   end
 end
 

data/lib/state_machines/sequel/version.rb

@@ -2,6 +2,6 @@
 
 module StateMachines
   module Sequel
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sequel-state-machine
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Lithic Tech
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec