simple_states 1.1.0.rc5 → 1.1.0.rc7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08cd20b4c3fb3a7f24851e71a511e0ceec335e80
-  data.tar.gz: 22d653ec211a6507ee79ad774bcc604096dfced6
+  metadata.gz: 2b4846151d903961bc29e2a5004515bead3d5064
+  data.tar.gz: efbcb59bdcf552e31492117d6b779253e1505a67
 SHA512:
-  metadata.gz: 2de3393af9bf9bc2c78a96efc52c77022d4feeda20e093fb40a6a6542105b13471f2e5c4c1bfb39efc38949a7786531cb1ccf80773fee149bd0d66103451bb13
-  data.tar.gz: ef5b76be5af7dca69d302ac4bf0005153b3087c9c31d452c2dd7b963d831c749d58c7310d1ca6bc9ecc37750b8dad7ad8f21e22a4e1fb1de4893152df7e452ec
+  metadata.gz: 940486943b52ef093d0ac0c6204b0b2aec31b3b2831022344173f757d7bd7da5a17885335ac946b7045a43e71d13d8c4b2e25c71ac97412fc0b751b0f74ed00f
+  data.tar.gz: 89a8bcf7b64d517112def866dd41babfd5f9400ae15100f39837bccbc21a600e17f894fbc1476cacb153d12551448758af6b91bc2158147a4b85fa300c8e32cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_states (1.1.0.rc4)
+    simple_states (1.1.0.rc6)
       activesupport
       hashr (~> 0.0.10)
 
@@ -37,6 +37,3 @@ DEPENDENCIES
   rake (~> 0.9.2)
   simple_states!
   test_declarative
-
-BUNDLED WITH
-   1.10.6

data/lib/simple_states/event.rb

@@ -15,7 +15,7 @@ module SimpleStates
     end
 
     def call(object, *args)
-      return if skip?(object, args)
+      return false if skip?(object, args) || !set_state?(object, args)
 
       raise_invalid_transition(object) unless can_transition?(object)
       run_callbacks(object, :before, args)
@@ -58,7 +58,7 @@ module SimpleStates
         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.state = state.to_sym
         set_timestamp(object, data[:"#{target_state}_at"] || now)
       end
 
@@ -68,11 +68,13 @@ module SimpleStates
         object.send(writer, time)
       end
 
-      def set_state?(object, state)
+      def set_state?(object, args)
+        data  = args.last.is_a?(Hash) ? args.last : {}
+        state = data[:state].try(:to_sym) || target_state
         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 && rgt && lft < rgt
+        lft.nil? || rgt.nil? || lft < rgt
       end
 
       def target_state

data/lib/simple_states/states.rb

@@ -30,7 +30,7 @@ module SimpleStates
       def define_event(const, (name, options))
         const.send(:define_method, name) do |*args|
           event = args.first.is_a?(Event) ? args.shift : Event.new(name, options)
-          event.call(self, *args) { super(*args) if defined?(super) }
+          event.call(self, *args) { defined?(super) ? super(*args) : true }
         end
 
         const.send(:define_method, :"#{name}!") do |*args|

data/lib/simple_states/version.rb

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

metadata

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