stator 0.8.0 → 0.9.0.beta

data/gemfiles/activerecord_6.1.gemfile.lock

@@ -1,62 +1,61 @@
 PATH
   remote: ..
   specs:
-    stator (0.8.0)
-      activerecord (>= 6.0)
-      base64
-      benchmark
-      bigdecimal
-      logger
-      mutex_m
+    stator (0.9.0.beta)
+      activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activerecord (6.1.7.10)
-      activemodel (= 6.1.7.10)
-      activesupport (= 6.1.7.10)
-    activerecord-nulldb-adapter (1.1.1)
-      activerecord (>= 6.0, < 8.1)
-    activesupport (6.1.7.10)
+    activemodel (6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord (6.1.6.1)
+      activemodel (= 6.1.6.1)
+      activesupport (= 6.1.6.1)
+    activerecord-nulldb-adapter (0.8.0)
+      activerecord (>= 5.2.0, < 7.1)
+    activesupport (6.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appraisal (2.5.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    concurrent-ruby (1.3.4)
-    diff-lcs (1.6.1)
-    i18n (1.14.7)
+    concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    minitest (5.25.5)
-    mutex_m (0.3.0)
-    rake (13.2.1)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    minitest (5.16.2)
+    rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    thor (1.3.2)
-    tzinfo (2.0.6)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    thor (1.2.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.7.2)
+    zeitwerk (2.6.0)
 
 PLATFORMS
   ruby
@@ -65,36 +64,10 @@ DEPENDENCIES
   activerecord (~> 6.1.0)
   activerecord-nulldb-adapter
   appraisal
-  concurrent-ruby (= 1.3.4)
+  debug
   rake
   rspec
   stator!
 
-CHECKSUMS
-  activemodel (6.1.7.10) sha256=562d9b1d0597f450437ec7cd6540b13f3e074cce5c7b237ac76e7435a15d4b8c
-  activerecord (6.1.7.10) sha256=db1719ef443a5437badcaa1d0fb5da7db985988fb69cc37085ca6bcc569fb31a
-  activerecord-nulldb-adapter (1.1.1) sha256=034c91106183b954b072fba14c2786adf1a2b9e852ce04f85f823afaf03e9820
-  activesupport (6.1.7.10) sha256=3f8e1f787a7bfbf765959ba509ef70af8293b35cb864078919365a12bf33d470
-  appraisal (2.5.0) sha256=36989221be127913b0dba8d114da2001e6b2dceea7bd4951200eaba764eed3ce
-  base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
-  benchmark (0.4.0) sha256=0f12f8c495545e3710c3e4f0480f63f06b4c842cc94cec7f33a956f5180e874a
-  bigdecimal (3.1.9) sha256=2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc
-  concurrent-ruby (1.3.4) sha256=d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32
-  diff-lcs (1.6.1) sha256=12a5a83f3e37a8e2f4427268e305914d5f1879f22b4e73bb1a09f76a3dd86cd4
-  i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
-  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
-  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
-  mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
-  rake (13.2.1) sha256=46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d
-  rspec (3.13.0) sha256=d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993
-  rspec-core (3.13.3) sha256=25136507f4f9cf2e8977a2851e64e438b4331646054e345998714108745cdfe4
-  rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58
-  rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
-  rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
-  stator (0.8.0)
-  thor (1.3.2) sha256=eef0293b9e24158ccad7ab383ae83534b7ad4ed99c09f96f1a6b036550abbeda
-  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
-  zeitwerk (2.7.2) sha256=842e067cb11eb923d747249badfb5fcdc9652d6f20a1f06453317920fdcd4673
-
 BUNDLED WITH
-   2.6.7
+   2.3.16

data/gemfiles/activerecord_7.0.gemfile

@@ -2,11 +2,11 @@
 
 source "https://rubygems.org"
 
+gem "activerecord", "~> 7.0.0"
 gem "appraisal"
+gem "debug"
 gem "activerecord-nulldb-adapter"
 gem "rake"
 gem "rspec"
-gem "activerecord", "~> 7.0.0"
-gem "concurrent-ruby", "1.3.4"
 
 gemspec path: "../"

data/gemfiles/activerecord_7.0.gemfile.lock

@@ -1,59 +1,58 @@
 PATH
   remote: ..
   specs:
-    stator (0.8.0)
-      activerecord (>= 6.0)
-      base64
-      benchmark
-      bigdecimal
-      logger
-      mutex_m
+    stator (0.9.0.beta)
+      activerecord
+      activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activerecord (7.0.8.7)
-      activemodel (= 7.0.8.7)
-      activesupport (= 7.0.8.7)
-    activerecord-nulldb-adapter (1.1.1)
-      activerecord (>= 6.0, < 8.1)
-    activesupport (7.0.8.7)
+    activemodel (7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord (7.0.3.1)
+      activemodel (= 7.0.3.1)
+      activesupport (= 7.0.3.1)
+    activerecord-nulldb-adapter (0.8.0)
+      activerecord (>= 5.2.0, < 7.1)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-    appraisal (2.5.0)
+    appraisal (2.4.1)
       bundler
       rake
       thor (>= 0.14.0)
-    base64 (0.2.0)
-    benchmark (0.4.0)
-    bigdecimal (3.1.9)
-    concurrent-ruby (1.3.4)
-    diff-lcs (1.6.1)
-    i18n (1.14.7)
+    concurrent-ruby (1.1.10)
+    debug (1.6.1)
+      irb (>= 1.3.6)
+      reline (>= 0.3.1)
+    diff-lcs (1.5.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    logger (1.7.0)
-    minitest (5.25.5)
-    mutex_m (0.3.0)
-    rake (13.2.1)
-    rspec (3.13.0)
-      rspec-core (~> 3.13.0)
-      rspec-expectations (~> 3.13.0)
-      rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.3)
-      rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    io-console (0.5.11)
+    irb (1.4.1)
+      reline (>= 0.3.0)
+    minitest (5.16.2)
+    rake (13.0.6)
+    reline (0.3.1)
+      io-console (~> 0.5)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.13.0)
-    rspec-support (3.13.2)
-    thor (1.3.2)
-    tzinfo (2.0.6)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    thor (1.2.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
 
 PLATFORMS
@@ -63,35 +62,10 @@ DEPENDENCIES
   activerecord (~> 7.0.0)
   activerecord-nulldb-adapter
   appraisal
-  concurrent-ruby (= 1.3.4)
+  debug
   rake
   rspec
   stator!
 
-CHECKSUMS
-  activemodel (7.0.8.7) sha256=f13b04bb055c1e85b965ce40b0a2e671b8d97835083597bc7fbc04cde0f40a83
-  activerecord (7.0.8.7) sha256=f94fc8510e58a18e462c5ee8862c9be75e2bfad0688e8d022b86a6e05df2a45a
-  activerecord-nulldb-adapter (1.1.1) sha256=034c91106183b954b072fba14c2786adf1a2b9e852ce04f85f823afaf03e9820
-  activesupport (7.0.8.7) sha256=df4702375de924aae81709c831605317c5417f0bd9e502a0373ff84a067204ff
-  appraisal (2.5.0) sha256=36989221be127913b0dba8d114da2001e6b2dceea7bd4951200eaba764eed3ce
-  base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
-  benchmark (0.4.0) sha256=0f12f8c495545e3710c3e4f0480f63f06b4c842cc94cec7f33a956f5180e874a
-  bigdecimal (3.1.9) sha256=2ffc742031521ad69c2dfc815a98e426a230a3d22aeac1995826a75dabfad8cc
-  concurrent-ruby (1.3.4) sha256=d4aa926339b0a86b5b5054a0a8c580163e6f5dcbdfd0f4bb916b1a2570731c32
-  diff-lcs (1.6.1) sha256=12a5a83f3e37a8e2f4427268e305914d5f1879f22b4e73bb1a09f76a3dd86cd4
-  i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
-  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
-  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
-  mutex_m (0.3.0) sha256=cfcb04ac16b69c4813777022fdceda24e9f798e48092a2b817eb4c0a782b0751
-  rake (13.2.1) sha256=46cb38dae65d7d74b6020a4ac9d48afed8eb8149c040eccf0523bec91907059d
-  rspec (3.13.0) sha256=d490914ac1d5a5a64a0e1400c1d54ddd2a501324d703b8cfe83f458337bab993
-  rspec-core (3.13.3) sha256=25136507f4f9cf2e8977a2851e64e438b4331646054e345998714108745cdfe4
-  rspec-expectations (3.13.3) sha256=0e6b5af59b900147698ea0ff80456c4f2e69cac4394fbd392fbd1ca561f66c58
-  rspec-mocks (3.13.2) sha256=2327335def0e1665325a9b617e3af9ae20272741d80ac550336309a7c59abdef
-  rspec-support (3.13.2) sha256=cea3a2463fd9b84b9dcc9685efd80ea701aa8f7b3decb3b3ce795ed67737dbec
-  stator (0.8.0)
-  thor (1.3.2) sha256=eef0293b9e24158ccad7ab383ae83534b7ad4ed99c09f96f1a6b036550abbeda
-  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
-
 BUNDLED WITH
-   2.6.7
+   2.3.16

data/lib/stator/alias.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 module Stator
   class Alias
+    attr_reader :machine, :name, :namespace, :attr_name, :states, :not, :opposite_args, :constant, :scope
 
     def initialize(machine, name, options = {})
       @machine    = machine
       @name       = name
-      @namespace  = @machine.namespace
-      @full_name  = [@namespace, @name].compact.join('_')
+      @namespace  = machine.namespace
       @states     = []
       @not        = false
       @opposite   = nil
@@ -13,8 +15,12 @@ module Stator
       @scope      = options[:scope]
     end
 
+    def attr_name
+      @attr_name ||= generate_attr_name
+    end
+
     def is(*args)
-      @states |= args.map(&:to_s)
+      @states |= args.map(&:to_sym)
     end
 
     def is_not(*args)
@@ -22,60 +28,75 @@ module Stator
       is(*args)
     end
 
+    alias not? not
+
     def opposite(*args)
-      @opposite = args
+      # set the incoming args for opposite as opposite
+      @opposite_args = args
     end
 
     def evaluate
       generate_methods
 
-      if @opposite
-        op = @machine.state_alias(*@opposite)
+      return if opposite_args.blank?
 
-        op.is(*@states)     if @not
-        op.is_not(*@states) if !@not
-      end
+      # this will generate the alias for the opposite
+      op = machine.state_alias(*opposite_args)
+
+      op.is(*states)     if not?
+      op.is_not(*states) unless not?
     end
 
-    protected
+    private
+
+    def inverse_states
+      (machine.states - states).map(&:to_sym)
+    end
 
     def inferred_constant_name
-      [@full_name.upcase, @machine.field.to_s.pluralize.upcase].join('_')
+      [attr_name.upcase, machine.field.to_s.pluralize.upcase].join('_')
+    end
+
+    def generate_attr_name
+      if namespace == Stator.default_namespace
+        name
+      else
+        [namespace, name].compact.join('_').to_sym
+      end
     end
 
     def generate_methods
+      expected_states = (not? ? inverse_states : states)
 
-      not_states = (@machine.states - @states)
+      if scope
+        name = (scope == true ? attr_name : scope)
 
-      if @scope
-        name = @scope == true ? @full_name : @scope
-        @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-          scope #{name.inspect}, lambda {
-            where(_stator(#{@namespace.inspect}).field => #{(@not ? not_states : @states).inspect})
-          }
+        machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+          scope :#{name}, -> { where(_stator(#{namespace.inspect}).field => #{expected_states}) }
         EV
       end
 
-      if @constant
-        name = @constant == true ? inferred_constant_name : @constant.to_s.upcase
-        if @not
-          @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-            #{name} = #{not_states.inspect}.freeze
+      if constant
+        name = (constant == true ? inferred_constant_name : constant.to_s.upcase)
+
+        if not?
+          machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+            #{name} = #{inverse_states}.freeze
           EV
         else
-          @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-            #{name} = #{@states.inspect}.freeze
+          machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+            #{name} = #{states}.freeze
           EV
         end
       end
 
-      @machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
-        def #{@full_name}?
-          integration = _stator(#{@namespace.inspect}).integration(self)
-          #{(@not ? not_states : @states).inspect}.include?(integration.state)
+      machine.klass.class_eval <<-EV, __FILE__, __LINE__ + 1
+        def #{attr_name}?
+          integration = _stator_integration(:#{namespace})
+
+          #{expected_states}.include?(integration.state.to_sym)
         end
       EV
     end
-
   end
 end

data/lib/stator/integration.rb

@@ -2,48 +2,48 @@
 
 module Stator
   class Integration
+    delegate :states,       to: :machine
+    delegate :transitions,  to: :machine
+    delegate :namespace,    to: :machine
 
-    delegate :states,       to: :@machine
-    delegate :transitions,  to: :@machine
-    delegate :namespace,    to: :@machine
-
-    attr_reader :skip_validations
-    attr_reader :skip_transition_tracking
+    attr_reader :skip_validations, :skip_transition_tracking, :record, :machine
 
     def initialize(machine, record)
       @machine = machine
       @record  = record
+      @skip_transition_tracking = false
     end
 
     def state=(new_value)
-      @record.send("#{@machine.field}=", new_value)
+      record.send("#{machine.field}=", new_value)
     end
 
     def state
-      @record.send(@machine.field)
+      record.send(machine.field)&.to_sym
     end
 
     def state_was(use_previous = false)
       if use_previous
-        @record.attribute_before_last_save(@machine.field)
+        record.previous_changes[machine.field].try(:[], 0).to_sym
       else
-        @record.attribute_in_database(@machine.field)
+        record.send("#{@machine.field}_was")
       end
     end
 
     def state_by?(state, time)
-      field_name = "#{state}_#{@machine.field}_at"
-      return false unless @record.respond_to?(field_name)
-      return false if @record.send(field_name).nil?
+      field_name = "#{state}_#{machine.field}_at"
+      return false unless record.respond_to?(field_name)
+      return false if record.send(field_name).nil?
       return true if time.nil?
-      @record.send(field_name) <= time
+
+      record.send(field_name) <= time
     end
 
     def state_changed?(use_previous = false)
       if use_previous
-        @record.saved_change_to_attribute?(@machine.field)
+        !!record.previous_changes[machine.field.to_s]
       else
-        @record.will_save_change_to_attribute?(@machine.field)
+        record.send("#{machine.field}_changed?")
       end
     end
 
@@ -51,23 +51,20 @@ module Stator
       return unless state_changed?
       return if skip_validations
 
-      was = state_was
-      is  = state
-
-      if @record.new_record?
-        invalid_state! unless @machine.matching_transition(::Stator::Transition::ANY, is)
+      if record.new_record?
+        invalid_state! unless machine.matching_transition(Stator::ANY, state)
       else
-        invalid_transition!(was, is) unless @machine.matching_transition(was, is)
+        invalid_transition!(state_was, state) unless machine.matching_transition(state_was, state)
       end
     end
 
     # TODO: i18n
     def invalid_state!
-      @record.errors.add(@machine.field, "is not a valid state")
+      record.errors.add(machine.field, 'is not a valid state')
     end
 
     def invalid_transition!(was, is)
-      @record.errors.add(@machine.field, "cannot transition to #{is.inspect} from #{was.inspect}")
+      record.errors.add(machine.field, "cannot transition to #{is} from #{was}")
     end
 
     def track_transition
@@ -83,7 +80,7 @@ module Stator
       state = state.to_s
       t = t.to_time
 
-      state_at = @record.send("#{state}_#{@machine.field}_at")
+      state_at = record.send("#{state}_#{machine.field}_at")
 
       # if we've never been in the state, the answer is no
       return false if state_at.nil?
@@ -91,20 +88,18 @@ module Stator
       # if we came into this state later in life, the answer is no
       return false if state_at > t
 
-      all_states = @machine.states.reverse
+      all_states = machine.states.reverse
 
       # grab all the states and their timestamps that occur on or after state_at and on or before the time in question
-      later_states = all_states.map do |s|
+      later_states = all_states.filter_map do |s|
         next if state == s
 
-        at = @record.send("#{s}_#{@machine.field}_at")
+        at = record.send("#{s}_#{machine.field}_at")
 
-        next if at.nil?
-        next if at < state_at
-        next if at > t
+        next if at.nil? || at < state_at || at > t
 
         { state: s, at: at }
-      end.compact
+      end
 
       # if there were no states on or after the state_at, the answer is yes
       return true if later_states.empty?
@@ -115,53 +110,51 @@ module Stator
       later_states = later_groups[later_group_key]
 
       # if the lowest timestamp is the same as the state's timestamp, evaluate based on state index
-      if later_states[0][:at] == state_at
-        return all_states.index(state) < all_states.index(later_states[0][:state])
-      end
+      return all_states.index(state) < all_states.index(later_states[0][:state]) if later_states[0][:at] == state_at
 
       false
     end
 
     def likely_state_at(t)
-      @machine.states.reverse.detect { |s| in_state_at?(s, t) }
+      machine.states.reverse.detect { |s| in_state_at?(s, t) }
     end
 
     def without_validation
-      was = @skip_validations
+      was = skip_validations
       @skip_validations = true
-      yield @record
+      yield record
     ensure
       @skip_validations = was
     end
 
     def without_transition_tracking
-      was = @skip_transition_tracking
+      was = skip_transition_tracking
       @skip_transition_tracking = true
-      yield @record
+      yield record
     ensure
       @skip_transition_tracking = was
     end
 
-    protected
+    private
 
     def attempt_to_track_state(state_to_track)
       return unless state_to_track
 
-      _attempt_to_track_change("#{state_to_track}_#{@machine.field}_at")
+      _attempt_to_track_change("#{state_to_track}_#{machine.field}_at")
     end
 
     def attempt_to_track_state_changed_timestamp
-      _attempt_to_track_change("#{@machine.field}_changed_at")
+      _attempt_to_track_change("#{machine.field}_changed_at")
     end
 
     def _attempt_to_track_change(field_name)
-      return unless @record.respond_to?(field_name)
-      return unless @record.respond_to?("#{field_name}=")
-      return unless @record.send(field_name.to_s).nil? || state_changed?
-      return if @record.will_save_change_to_attribute?(field_name)
+      return unless record.respond_to?(field_name)
+      return unless record.respond_to?("#{field_name}=")
+      return unless record.send(field_name.to_s).nil? || state_changed?
 
-      @record.send("#{field_name}=", (Time.zone || Time).now)
-    end
+      return if record.send("#{field_name}_changed?")
 
+      record.send("#{field_name}=", (Time.zone || Time).now)
+    end
   end
 end