simple_states 1.1.0.rc3 → 1.1.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62484e71bb773d12d26c48145326a69c9417eaa
-  data.tar.gz: 43a29c2623c7b5494db9ec06be67539d9dcd1023
+  metadata.gz: 08cd20b4c3fb3a7f24851e71a511e0ceec335e80
+  data.tar.gz: 22d653ec211a6507ee79ad774bcc604096dfced6
 SHA512:
-  metadata.gz: 99d1f7413bfc08f2c22dc8ea2ab56844373a6ee6c0cb7ee54eb283728f2b796608342fe2dcb8b5ded1a037f1b8354dc3138a69709fdfe00e80493c37a69f4d0d
-  data.tar.gz: b76d5167d1035b790a346052fab1c898742b61f556b3557997db6aa030b2f3d32efbd7ca6f19737d875ad4e9ca80b5e828aa5ab54ff626bed096d480fd64bfdb
+  metadata.gz: 2de3393af9bf9bc2c78a96efc52c77022d4feeda20e093fb40a6a6542105b13471f2e5c4c1bfb39efc38949a7786531cb1ccf80773fee149bd0d66103451bb13
+  data.tar.gz: ef5b76be5af7dca69d302ac4bf0005153b3087c9c31d452c2dd7b963d831c749d58c7310d1ca6bc9ecc37750b8dad7ad8f21e22a4e1fb1de4893152df7e452ec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_states (1.1.0.pre)
+    simple_states (1.1.0.rc4)
       activesupport
       hashr (~> 0.0.10)
 

data/lib/simple_states.rb

@@ -73,8 +73,7 @@ module SimpleStates
 
   def reset_state
     self.state = self.class.initial_state
-    states = self.class.state_names - [self.class.initial_state]
-    states.each { |state| self.send(:"#{state}_at=", nil) if respond_to?(:"#{state}_at=") }
+    self.class.events.map { |*args| Event.new(*args).reset(self) }
   end
 
   def past_states

data/lib/simple_states/event.rb

@@ -28,6 +28,10 @@ module SimpleStates
       end
     end
 
+    def reset(object)
+      set_timestamp(object, nil)
+    end
+
     protected
 
       def save?
@@ -51,10 +55,17 @@ module SimpleStates
       end
 
       def set_state(object, args)
-        state = target_state(args)
+        data  = args.last.is_a?(Hash) ? args.last : {}
+        state = data[:state].try(:to_sym) || target_state
         object.past_states << object.state.to_sym if object.state
         object.state = state.to_sym if set_state?(object, state)
-        object.send(:"#{state}_at=", now) if object.respond_to?(:"#{state}_at=") && object.respond_to?(:"#{state}_at") && object.send(:"#{state}_at").nil?
+        set_timestamp(object, data[:"#{target_state}_at"] || now)
+      end
+
+      def set_timestamp(object, time)
+        reader, writer = :"#{target_state}_at", :"#{target_state}_at="
+        return unless object.respond_to?(writer) && object.respond_to?(reader) && object.send(reader).nil?
+        object.send(writer, time)
       end
 
       def set_state?(object, state)
@@ -64,9 +75,8 @@ module SimpleStates
         lft && rgt && lft < rgt
       end
 
-      def target_state(args)
-        state = args.last[:state].try(:to_sym) if args.last.is_a?(Hash)
-        state || options.to || "#{name}ed".sub(/eed$/, 'ed').to_sym
+      def target_state
+        options.to || "#{name}ed".sub(/eed$/, 'ed').to_sym
       end
 
       def send_methods(object, methods, args)

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '1.1.0.rc3'
+  VERSION = '1.1.0.rc5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc3
+  version: 1.1.0.rc5
 platform: ruby
 authors:
 - Sven Fuchs