closed_loop 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ff1ecd4ed9a2bf4145dd0a74174f17323cce5aa80f23aaf4291de4870c74a61
-  data.tar.gz: '07286939fcee7c4a1519ae88dc862706eca84b27bf508e313af9253c34e89b12'
+  metadata.gz: 215c8d6c36a00683966575960ce1ae019d418308ef9589b5acad9032eebc9b65
+  data.tar.gz: e0ada82086f7f9893b5439e4d2dcca9362a0042566a406dcf7d4a83c4a718cd7
 SHA512:
-  metadata.gz: 6631a4bcdcc0a30e531e54d0ec843f09ea0b67f215a90c8447468770fdfab6ec19a333321c29f565e573d40d87e9fbfa22f360d3fcc834819674a41fceb3814c
-  data.tar.gz: 76290f04f6f710986fdc50120c3817fb7196168cf1dc79bd2bc767157bf53671ad05f146ccba071e0b8820b91e43e1abfb5be7861dd3ae7b09f223075d08502c
+  metadata.gz: d128e66f02f90e054623afe177a02b42c021d63d61f78099f62e82901f9d3d9ba0eac8daedd4e632ce5646bf9eb1980ba0ffbf94520a07d527e8c7ee279bfb4e
+  data.tar.gz: bb0e34235ed7b41e1e4ecf650385fc93921b0a3100aca253845db35c12983d66bb196b485263630e817c15d1cad53158fc23a239aebc3e38e500c391e205fe91

data/lib/closed_loop/machine/instance.rb

@@ -20,25 +20,22 @@ module ClosedLoop
       end
 
       def transit!(target, user, to:, &block)
-        available_transition = available_transitions(target, user).find do |transition|
-          transition.from == target.status.to_sym && transition.to == to.to_sym
-        end
+        transition = find_transition(target, user, to:)
 
-        if available_transition&.available?(target, user)
-          available_transition.perform!(target, user, &block)
-        else
+        unless transition
           raise("Transition #{self.class} #{target.status}->#{to} for #{target.id} by #{user} not available!")
         end
+
+        transition.perform!(target, user, &block)
       end
 
       def transit(target, user, to:, attributes: {}, &block)
-        available_transition = available_transitions(target, user).find do |transition|
-          transition.from == target.status.to_sym && transition.to == to.to_sym
-        end
+        transition = find_transition(target, user, to:)
+        transition&.perform(target, user, attributes, &block)
+      end
 
-        if available_transition&.available?(target, user)
-          available_transition.perform(target, user, attributes, &block)
-        end
+      def find_transition(target, user, to:)
+        available_transitions(target, user).find { |transition| transition.to == to.to_sym }
       end
 
       def resolve_role(*args)

data/lib/closed_loop/machine/transition.rb

@@ -6,8 +6,8 @@ module ClosedLoop
       end
 
       def available?(target, user)
-        role == machine.resolve_role(target, user) &&
-          target.status.to_sym == from &&
+        Array(role).include?(machine.resolve_role(target, user)) &&
+          Array(from).include?(target.status.to_sym) &&
           none_constraints?(target, user)
       end
 

data/lib/closed_loop/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ClosedLoop
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closed_loop
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Vilius Luneckas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler