stator 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6975d1e52854c059916ff592dfa6aa0b6b1ca38e
-  data.tar.gz: 46770289d79b6b2f4632189aa2cf8e9d8b1cbb58
+  metadata.gz: 813eb5f387c3f467935894391e29ec246d9591cf
+  data.tar.gz: 0c345b053ec9402ee9466225894411b7baf3d205
 SHA512:
-  metadata.gz: 538e813262272898e14939b345f5764905289dc58a56bd881a7566b2d595ea00d979febeb439243a544d647612866e9973ddbec013903419a6c318fa48712c53
-  data.tar.gz: fd4b003fe8dd0347e2309803b600c12630f164462f003d643fe06d32bbf15a8c327c650e261f098607924c056fc973f29dc88e1bfb8f21821303661feb070005
+  metadata.gz: c0f5a3887ea6ec9ccbb5085d5bacd216cb0af88c56fae7dfdccfddd6d96d97cc2b1b25ee3187c1a8dcdd8d61dd9bdf647425103041e0f8d8ecd7801f80c9bb61
+  data.tar.gz: 7c5c5b3995d047c798cf9f52d7dec00205a2798e4cdd5a3ae227e14448fba752d06c026c808ecff66e8b747de9de4fc2b9bba9897ede59f3b75290fd2525846e

data/lib/stator/integration.rb

@@ -77,20 +77,48 @@ module Stator
 
       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?
+
+      # if we came into this state later in life, the answer is no
       return false if state_at > t
 
-      min_next = @machine.states.map do |s|
+      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|
+
         next if state == s
+
         at = @record.send("#{s}_#{@machine.field}_at")
-        at && at >= state_at ? at : nil
-      end.compact.sort[0]
 
-      return true if min_next.nil?
-      return true if min_next >= t
+        next if at.nil?
+        next if at < state_at
+        next if at > t
+
+        { state: s, at: at }
+      end.compact
+
+      # if there were no states on or after the state_at, the answer is yes
+      return true if later_states.empty?
+
+      # grab the states that were present at the lowest timestamp
+      later_groups = later_states.group_by{|s| s[:at] }
+      later_group_key = later_groups.keys.sort[0]
+      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
+
       false
     end
 
+    def likely_state_at(t)
+      @machine.states.reverse.detect{|s| in_state_at?(s,t) }
+    end
+
 
     protected
 

data/lib/stator/model.rb

@@ -44,6 +44,11 @@ module Stator
         machine.integration(self).in_state_at?(state, t)
       end
 
+      def likely_state_at(t, namespace = '')
+        machine = self._stator(namespace)
+        machine.integration(self).likely_state_at(t)
+      end
+
       protected
 
 

data/lib/stator/version.rb

@@ -1,7 +1,7 @@
 module Stator
   MAJOR       = 0
   MINOR       = 1
-  PATCH       = 4
+  PATCH       = 5
   PRERELEASE  = nil
 
   VERSION = [MAJOR, MINOR, PATCH, PRERELEASE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: stator
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord