ex_machina 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8cb9dc7e92353478947c8c9a88c166b5c02061
-  data.tar.gz: b612897d0b21304de584ea98a3801d6e7a76ea35
+  metadata.gz: 57083b19aff05a44248885c7590c6a7de5cfa621
+  data.tar.gz: c9508b343566892827858014891be2bb855e4231
 SHA512:
-  metadata.gz: 25b5ef8875fb3de5cf84bc7d1ae856c1345cae080deef13a3d04442be5106154aaf915b3682846876323b5fd229ecbe81002d5653637be037d98a198f10dc057
-  data.tar.gz: e60ebe4a9de753d450a408b00302771c333e044df90d76c6305ced6d9a8b46a9303ede4086456a55afc5a3ba91c0d907d923bcc241df986f487e0ba8b13cc31d
+  metadata.gz: 948506f91923b06f1a64fd9840b6ca5789cc710ab39c48d0642930605aacb351991532cee120aed72a6983cb7ebac7ec7de5baf139fa3fd609a39192396f763a
+  data.tar.gz: 0661def7d1be979008dddd435fc2cd3b489329473d28ee92497d4588e1d622f84471e3c94b731f952f57d93f9b627a8666fb65428f530fef49a53ce56b17dc39

data/.ruby-version

@@ -0,0 +1 @@
+2.3.0

data/lib/ex_machina/event.rb

@@ -73,8 +73,8 @@ module ExMachina
             runner = Execution.new(self, transition)
             runner.run
 
-            result = runner.success?
-            break result unless runner.skipped?
+            result = runner.current
+            break if runner.success?
           end
         end
         result

data/lib/ex_machina/event/execution.rb

@@ -28,7 +28,7 @@ module ExMachina
         @running  = true
         @result   = nil
         @previous = event.status
-        @current  = nil
+        @current  = event.status
       end
 
       def finish!(value)
@@ -44,7 +44,7 @@ module ExMachina
         elsif value == :skipped
           skipped!
         elsif value == :error
-          error!
+          error!(@exception)
         else
           @result = value
         end
@@ -65,7 +65,7 @@ module ExMachina
         result == :failure
       end
       def failure!
-        @current = @previous
+        @current = previous
         finish!(@result = :failure)
       end
 
@@ -77,7 +77,7 @@ module ExMachina
       end
 
       def error!(exception)
-        # TODO handle exception
+        @exception = exception
         finish!(@result = :error)
       end
       def error?
@@ -98,32 +98,48 @@ module ExMachina
 
       def run
         start!
-
         return skipped! unless eligible?
 
-        invoke(transition.do_before)
         begin
-          call = invoke(:perform)
-          invoke(transition.do_after)
-          finish!(call)
+          invoke(callback(:before), true)
+          if (performed = invoke(:perform, true))
+            success!
+          else
+            failure!
+          end
+          invoke(:transit)
+          invoke(callback(:after))
+
         rescue StandardError => ex
           error!(ex)
         end
 
         if success?
-          invoke(:transit)
-          invoke(transition.do_success)
+          invoke(callback(:success))
         elsif failure?
-          invoke(transition.do_failure)
+          invoke(callback(:failure))
+        elsif error?
+          invoke(callback(:error))
+        elsif skipped?
+          invoke(callback(:skip))
+        else
+          # do what?
         end
 
-        call
+        performed
       end
 
       protected
 
-      def invoke(meth, arg = self)
-        Util.invoke_method(event, meth, arg)
+      # return the transition 'do_callback' or default '(before|after)_transition method
+      def callback(name)
+        transition.send("do_#{name}") || "#{name}_#{previous}_to_#{current}"
+      end
+
+      def invoke(meth, default = nil)
+        result = Util.invoke_method(event, meth, self)
+        return default if result.nil?
+        result
       end
     end
   end

data/lib/ex_machina/event/transition.rb

@@ -3,9 +3,9 @@ module ExMachina
     class Transition
 
       attr_reader :from, :to
-      attr_reader :do_if, :do_unless, :do_before, :do_after, :do_success, :do_failure
+      attr_reader :do_if, :do_unless, :do_before, :do_after, :do_success, :do_failure, :do_error
 
-      def initialize(options)
+      def initialize(**options)
         @from    = Array(options.fetch(:from)).map { |status| normalize(status) }
         @to      = normalize(options.fetch(:to))
 
@@ -16,6 +16,7 @@ module ExMachina
         @do_after   = options[:after]
         @do_success = options[:success]
         @do_failure = options[:failure]
+        @do_error   = options[:error]
       end
 
       def from?(status)

data/lib/ex_machina/version.rb

@@ -1,3 +1,3 @@
 module ExMachina
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ex_machina
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Rodrigo Panachi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-06 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - Gemfile
 - LICENSE.txt
 - README.md