statesman-multi_state 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bf730dc6e8c627150dccbc9d71deccb850c5d38b1df57571d8a9498bcc7ec3e
-  data.tar.gz: 7d2ee716b2e833fdce24a1cc0a1f18eeb1414fcdedc11a39bdebcce0af38965b
+  metadata.gz: 56b6d12e6735645ee756e41faf3c25a9db55ce2185555f996e0d97c20abaabc1
+  data.tar.gz: 5f3bc6ad945f8b2b15fc285a14be068da5aa8d3911ed34fdce80dcdbedd7745c
 SHA512:
-  metadata.gz: b774428fbe41859c4794c625e2adf80a0954285c376ade1cb71c2a4045cb4796fb0c9a145118c01c0d8ae6e0b3c13b1eb4744ab5dd3fe7f704588a4cc96be7c0
-  data.tar.gz: 822b889f5a7cfdde93d2602d83113588daf419bc070ab6582bf900b6fa67272e2bb9df263f6db614438b2cab136753625ca0f7e17595a8b5c931bbe911210047
+  metadata.gz: 10d154e23d0d77bebcbc88f8e9aaad0f3ba92897a1ddfe53265486ecadaca65bc79e2b6c028c2294b290528bbcbf5fa71488e059fa65b890932d8524d7fff41b
+  data.tar.gz: 9cff0f4741c416da6696728115b777809f3d45230988786fc861abee6a2e43b5b887aac20c1a3765bed3bfdf5d80f36af0c57df7d8f4ec94994b6b36f57bf07f

data/lib/statesman/adapters/custom_active_record_queries.rb

@@ -27,7 +27,15 @@ module Statesman
 
           define_in_state(base, query_builder, join_name, field_name)
           define_not_in_state(base, query_builder, join_name, field_name)
-        end
+
+          define_method(:reload) do |*a|
+            instance = super(*a)
+            if instance.respond_to?(:"#{field_name}_state_machine", true)
+              instance.send(:"#{field_name}_state_machine").reset
+            end
+            instance
+          end
+       end
 
         private
 

data/lib/statesman/multi_state/active_record_macro.rb

@@ -64,12 +64,6 @@ module Statesman
               Hash[self.class.#{field_name}_human_wrapper]
                 .invert[#{field_name}_current_state]
             end
-
-            private
-
-            def #{field_name}
-              #{field_name}_current_state
-            end
           CODE
 
           include(const_set("#{field_name}#{SecureRandom.hex(4)}_mod".classify, Module.new).tap do |mod|
@@ -90,13 +84,8 @@ module Statesman
               class_eval <<~METHOD, __FILE__, __LINE__ + 1
                 def save_with_state(**options)
                   @registered_callbacks ||= []
-                  if #{virtual_attribute_name}.to_s != #{field_name}_current_state.to_s
-                    if #{field_name}_can_transition_to?(#{virtual_attribute_name})
-                      @registered_callbacks << -> { #{field_name}_transition_to(#{virtual_attribute_name}, **options) }
-                    else
-                      errors.add(:#{field_name}, :invalid_transition, message: "cannot transition from \#{#{field_name}} to \#{#{virtual_attribute_name}}")
-                      return false
-                    end
+                  if #{virtual_attribute_name}_changed? && #{field_name}_can_transition_to?(#{virtual_attribute_name})
+                    @registered_callbacks << -> { #{field_name}_transition_to(#{virtual_attribute_name}, **options) }
                   end
 
                   if defined?(super)

data/lib/statesman/multi_state/version.rb

@@ -2,6 +2,6 @@
 
 module Statesman
   module MultiState
-    VERSION = '0.2.7'
+    VERSION = '0.2.8'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: statesman-multi_state
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Chedli Bourguiba