state_machines-activerecord 0.102.0 → 0.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 710df8aa712f81e7a44c6646930c1c9f4507eb5423ca752d4359fe09f27ebb2e
-  data.tar.gz: c881a6d3b25aa45df35c0d62473f3b8a1dfed4cf7298d1657bebdba8fa086468
+  metadata.gz: 571fa09486dd051901ae113941b3ae04e9867da62da325c609f97f44f1272f66
+  data.tar.gz: 22513e4df2238588d70dcff91f79fb00dfc18dac3a7b36a8a971765355939f8a
 SHA512:
-  metadata.gz: 866e2c089a9b52d214f37094021a7a1b0d10b775ce844c21eb42df7827c05fcd023b811a41cb1994215231806271825cf5b150b896de8d1d3756576525266c9e
-  data.tar.gz: 6aa52b30f96174a033db1a9f189fe233327baf8b195ded225baad3f687952d0d210fa16430e629b22f031e42359f769dab3d2aebb3addae8ddec39fdf98dc6bb
+  metadata.gz: a15cf9abb68277ce52ab35e139b15fa8ce6b28fb68424bcbcf840de0216267f7f58b62483c01b2cbd62df9694ba117dfee3b090e2b64692cfe9114396d64c0f2
+  data.tar.gz: 97cb794b7e45222503e682641e80da05282f3593453979650431f35fa687831e9349dabe46ea7f2969dc2f95e9b3bc181cfc5860af17e3d57aefb72a8144a485

data/lib/state_machines/integrations/active_record/version.rb

@@ -3,7 +3,7 @@
 module StateMachines
   module Integrations
     module ActiveRecord
-      VERSION = '0.102.0'
+      VERSION = '0.103.0'
     end
   end
 end

data/lib/state_machines/integrations/active_record.rb

@@ -447,8 +447,39 @@ module StateMachines
           enum_integration[:state_machine_methods] || []
         end
 
+        def integer_type_registered?
+          !!@integer_type_registered
+        end
+
+        # Machine internals (state matching, validations) call read() to get the
+        # current state value and compare it against state.value.  Only override
+        # when states have explicit integer values (e.g. state :pending, value: 0).
+        # In that case the custom type returns a state name string but machine
+        # internals need the raw integer for value-based lookup.
+        #
+        # For auto-indexed states (no explicit value), state.value is the string
+        # name so super() returns the right thing already.
+        def read(object, attr_sym, ivar = false)
+          return super unless integer_type_registered? && attr_sym == :state
+          return super unless states_with_explicit_integer_values?
+
+          raw = object.read_attribute_before_type_cast(attribute.to_s)
+          if raw.is_a?(::String) || raw.is_a?(::Symbol)
+            matched = states.detect { |s| s.name && s.name.to_s == raw.to_s }
+            return matched ? matched.value : raw
+          end
+          raw
+        end
+
         private
 
+        # Returns true when at least one named state has an explicit integer value.
+        # Used to decide whether read() needs to return raw integers for machine
+        # internals rather than relying on the custom type's string representation.
+        def states_with_explicit_integer_values?
+          states.any? { |s| s.name && s.value.is_a?(::Integer) }
+        end
+
         # Returns true when the state machine attribute is backed by an integer column
         def integer_column?
           return false unless owner_class.respond_to?(:type_for_attribute)
@@ -465,6 +496,7 @@ module StateMachines
         # (which fires later, during initial_state=) still compares raw integers.
         def register_integer_type
           @raw_integer_column_default = owner_class.column_defaults[attribute.to_s]
+          @integer_type_registered = true
           owner_class.attribute(attribute.to_s, StateMachines::Type::Integer.new(states))
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: state_machines-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.102.0
+  version: 0.103.0
 platform: ruby
 authors:
 - Abdelkader Boudih