simple_states 1.1.0.rc8 → 1.1.0.rc9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cbfef0efaf93d1c51a1598450fecc545aa1f553
-  data.tar.gz: f0587d5e61c30fa30ca244dffe59468a38c66843
+  metadata.gz: 6cb0cd4174f43de4ce090284993ccb0aa8d281c8
+  data.tar.gz: e4e602930a604f01e96b0c2cb0c40141b712c58a
 SHA512:
-  metadata.gz: 3afe817b596759582d3c044a9aaecd0be85ccb147fe3e74ac128538027fccac06ec12fd8c6316ab2db08589902711923f9c77017df3db8bd7358ca9ed9b26f8a
-  data.tar.gz: a7e809db0bcadb50a8f87049170894de4e9edcac90b09f6204c054220a039d082e25a4631adc3ce8044ede719723061960a9172f13f896f5b6967de9b1117585
+  metadata.gz: 92f4f66f9cbd3850146ef9b623fec993ae0f311d052fd74ad3683cf55dc059e86cbf699b8698fea88cd5517e46b5e53b2088119ae9a13127b6711faa1d36d296
+  data.tar.gz: 271c62daefe82dbd858d7b4d6b07071ea325af9575bb03447b266e02b44f27bc2e320fb259b03df913e8206e3e940a14c7abab92959ba38c3d677ddf8fbf51c5

data/Gemfile.lock

@@ -1,9 +1,8 @@
 PATH
   remote: .
   specs:
-    simple_states (1.1.0.rc7)
+    simple_states (1.1.0.rc8)
       activesupport
-      hashr (~> 0.0.10)
 
 GEM
   remote: https://rubygems.org/
@@ -14,7 +13,6 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    hashr (0.0.22)
     i18n (0.7.0)
     json (1.8.3)
     metaclass (0.0.1)

data/lib/simple_states/event.rb

@@ -54,13 +54,16 @@ module SimpleStates
         state = data[:state].try(:to_sym) || target_state
         object.past_states << object.state.to_sym if object.state
         object.state = state.to_sym
-        set_timestamp(object, data[:"#{target_state}_at"] || now)
+        write_attrs(object, data)
       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)
+      def write_attrs(object, data)
+        data = { :"#{target_state}_at" => Time.now.utc }.merge(data)
+        data.each { |key, value| write_attr(object, key, value) }
+      end
+
+      def write_attr(object, key, value)
+        object.send(:"#{key}=", value) if object.respond_to?(:"#{key}=") && object.respond_to?(key) && object.send(key).nil?
       end
 
       def set_state?(object, args)
@@ -69,7 +72,7 @@ module SimpleStates
         return true unless object.class.state_options[:ordered]
         states = object.class.state_names
         lft, rgt = states.index(object.state.try(:to_sym)), states.index(state)
-        lft.nil? || rgt.nil? || lft < rgt
+        lft.nil? || rgt.nil? || lft <= rgt
       end
 
       def target_state

data/lib/simple_states/version.rb

@@ -1,3 +1,3 @@
 module SimpleStates
-  VERSION = '1.1.0.rc8'
+  VERSION = '1.1.0.rc9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_states
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc8
+  version: 1.1.0.rc9
 platform: ruby
 authors:
 - Sven Fuchs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-04 00:00:00.000000000 Z
+date: 2015-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport