dynflow 0.5.0 → 0.5.1

data/lib/dynflow/action.rb

@@ -395,6 +395,8 @@ module Dynflow
             end
           end
         end
+
+        check_serializable :input
       end
     end
 
@@ -422,6 +424,8 @@ module Dynflow
           if result == SUSPEND
             self.state = :suspended
           end
+
+          check_serializable :output
         end
 
       else
@@ -440,5 +444,14 @@ module Dynflow
         end
       end
     end
+
+    def check_serializable(what)
+      Match! what, :input, :output
+      value = send what
+      recursive_to_hash value # it raises when not serializable
+    rescue => e
+      value.replace not_serializable: true
+      raise e
+    end
   end
 end

data/lib/dynflow/executors/parallel/worker.rb

@@ -23,6 +23,7 @@ module Dynflow
                   sequential_manager.finalize
                 end)
           @pool << WorkerDone[work: message, worker: self]
+        ensure
           @transaction_adapter.cleanup
         end
       end

data/lib/dynflow/testing/assertions.rb

@@ -30,6 +30,16 @@ module Dynflow
         found
       end
 
+      def refute_action_planed(action, planned_action_class)
+        Match! action.phase, Action::Plan
+        Match! action.state, :success
+        found = action.execution_plan.planned_plan_steps.
+            select { |a| a.is_a?(planned_action_class) }
+
+        assert(found.empty?, "Action #{planned_action_class} was planned")
+        found
+      end
+
       # assert that +action+ has run-phase planned
       def assert_run_phase(action, input = nil, &block)
         Match! action.phase, Action::Plan

data/lib/dynflow/testing/dummy_execution_plan.rb

@@ -7,16 +7,28 @@ module Dynflow
       attr_reader :id, :planned_plan_steps, :planned_run_steps, :planned_finalize_steps
 
       def initialize
-        @id                     = Testing.get_id.to_s
-        @planned_plan_steps     = []
-        @planned_run_steps      = []
-        @planned_finalize_steps = []
+        @id                       = Testing.get_id.to_s
+        @planned_plan_steps       = []
+        @planned_run_steps        = []
+        @planned_finalize_steps   = []
+        @planned_action_stubbers  = {}
       end
 
       def world
         @world ||= DummyWorld.new
       end
 
+      # Allows modify the DummyPlannedAction returned by plan_action
+      def stub_planned_action(klass, &block)
+        @planned_action_stubbers[klass] = block
+      end
+
+      def add_plan_step(klass, _)
+        dummy_planned_action(klass).tap do |action|
+          @planned_plan_steps << action
+        end
+      end
+
       def add_run_step(action)
         @planned_run_steps << action
         action
@@ -27,9 +39,12 @@ module Dynflow
         action
       end
 
-      def add_plan_step(klass, action)
-        @planned_plan_steps << action = DummyPlannedAction.new(klass)
-        action
+      def dummy_planned_action(klass)
+        DummyPlannedAction.new(klass).tap do |action|
+          if planned_action_stubber = @planned_action_stubbers[klass]
+            planned_action_stubber.call(action)
+          end
+        end
       end
 
       def switch_flow(*args, &block)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/dynflow/web_console.rb

@@ -56,6 +56,10 @@ module Dynflow
         end
       end
 
+      def duration_to_s(duration)
+        h("%0.2fs" % duration)
+      end
+
       def load_action(step)
         world.persistence.load_action(step)
       end
@@ -74,7 +78,7 @@ module Dynflow
         if !value_html.empty?
           <<-HTML
             <p>
-              #{h(label)}
+              <b>#{h(label)}</b>
           #{value_html}
             </p>
           HTML
@@ -139,11 +143,11 @@ module Dynflow
       end
 
       def updated_url(new_params)
-        url("?" + Rack::Utils.build_query(params.merge(new_params.stringify_keys)))
+        url("?" + Rack::Utils.build_nested_query(params.merge(new_params.stringify_keys)))
       end
 
       def paginated_url(delta)
-        h(updated_url(page: [0, page + delta].max))
+        h(updated_url(page: [0, page + delta].max.to_s))
       end
 
       def pagination_options

data/test/action_test.rb

@@ -70,5 +70,26 @@ module Dynflow
         presenter.summary.must_equal(assignees: ["John Doe"])
       end
     end
+
+    describe 'serialization' do
+
+      include Testing
+
+      it 'fails when input is not serializable' do
+        klass = Class.new(Dynflow::Action)
+        -> { create_and_plan_action klass, key: Object.new }.must_raise NoMethodError
+      end
+
+      it 'fails when output is not serializable' do
+        klass  = Class.new(Dynflow::Action) do
+          def run
+            output.update key: Object.new
+          end
+        end
+        action = create_and_plan_action klass, {}
+        -> { run_action action }.must_raise NoMethodError
+      end
+    end
+
   end
 end

data/test/testing_test.rb

@@ -9,7 +9,7 @@ module Dynflow
 
     describe 'testing' do
 
-      it '#plan_action' do
+      specify '#plan_action' do
         input  = { 'input' => 'input' }
         action = create_and_plan_action CWE::DummyHeavyProgress, input
 
@@ -21,9 +21,20 @@ module Dynflow
         assert_run_phase action
         assert_finalize_phase action
         assert_action_planed action, CWE::DummySuspended
+        refute_action_planed action, CWE::DummyAnotherTrigger
       end
 
-      it '#run_action without suspend' do
+      specify 'stub_plan_action' do
+        action = create_action CWE::DummyHeavyProgress
+        action.execution_plan.stub_planned_action(CWE::DummySuspended) do |sub_action|
+          sub_action.define_singleton_method(:test) { "test" }
+        end
+        plan_action(action, {})
+        stubbed_action = action.execution_plan.planned_plan_steps.first
+        stubbed_action.test.must_equal "test"
+      end
+
+      specify '#run_action without suspend' do
         input  = { 'input' => 'input' }
         plan   = create_and_plan_action CWE::DummyHeavyProgress, input
         action = run_action plan
@@ -37,7 +48,7 @@ module Dynflow
         action.progress_done.must_equal 1
       end
 
-      it '#run_action with suspend' do
+      specify '#run_action with suspend' do
         input  = { 'input' => 'input' }
         plan   = create_and_plan_action CWE::DummySuspended, input
         action = run_action plan
@@ -59,7 +70,7 @@ module Dynflow
         action.progress_done.must_equal 1
       end
 
-      it '#finalizes' do
+      specify '#finalize_action' do
         input                 = { 'input' => 'input' }
         plan                  = create_and_plan_action CWE::DummyHeavyProgress, input
         run                   = run_action plan
@@ -122,14 +133,14 @@ module Dynflow
         let(:planned_action) { create_and_plan_action CWE::Merge, plan_input }
         let(:runned_action) { run_action planned_action }
 
-        it '#plans' do
+        it 'plans' do
           assert_run_phase planned_action
           refute_finalize_phase planned_action
 
           planned_action.execution_plan.planned_plan_steps.must_be_empty
         end
 
-        it '#runs' do
+        it 'runs' do
           runned_action.output.fetch(:passed).must_equal true
         end
 
@@ -138,7 +149,7 @@ module Dynflow
             super.update review_results: [true, false]
           end
 
-          it '#runs' do
+          it 'runs' do
             runned_action.output.fetch(:passed).must_equal false
           end
         end

data/web/views/flow_step.erb

@@ -5,17 +5,27 @@
 <% end %>
 
 <span class="step-label">
-  <%= h(step.id) %>: <%= h(step.action_class.name) %> (<%= h(step.state) %>)
+  <%= h(step.id) %>: <%= h(step.action_class.name) %>
+  (<%= h(step.state) %>)
+  <% unless step.state == :pending %>
+    [ <%= duration_to_s(step.real_time) %> / <%= duration_to_s(step.execution_time) %> ]
+  <% end %>
 </span>
 <% if @plan.state == :paused && step.state == :error %>
   <a href="<%= url("/#{@plan.id}/skip/#{step.id}") %>" class="postlink">Skip</a>
 <% end %>
 <div class="action">
+  <% unless @plan.state == :pending %>
+    <p><b>Started at:</b> <%= h(step.started_at) %></p>
+    <p><b>Ended at:</b> <%= h(step.ended_at) %></p>
+    <p><b>Real time:</b> <%= duration_to_s(step.real_time) %></p>
+    <p><b>Execution time (excluding suspended state):</b> <%= duration_to_s(step.execution_time) %></p>
+  <% end %>
   <%= show_action_data("Input:", action.input) %>
   <%= show_action_data("Output:", action.output) %>
   <% if step.error %>
     <p>
-      Error:
+      <b>Error:</b>
     </p>
     <p>
       <%= h(step.error.exception_class) %>

data/web/views/show.erb

@@ -14,6 +14,16 @@
   <%= h(@plan.result) %>
 </p>
 
+<p>
+  <b>Started at:</b>
+  <%= h(@plan.started_at) %>
+</p>
+
+<p>
+  <b>Ended at:</b>
+  <%= h(@plan.ended_at) %>
+</p>
+
 <ul class="phases nav nav-tabs" id="myTab">
   <li><a href="#plan">Plan</a></li>
   <li class="active"><a href="#run">Run</a></li>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport