dynflow 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '085cf607bfa2da0da617fa6d5b02b44db8ffc038'
-  data.tar.gz: d212611e59f46a686277f7318795239d5f36c109
+SHA256:
+  metadata.gz: e36392c5ebe5f3a20b879eca68d46ff0ee715985d7107af64f69b4ef256bf19e
+  data.tar.gz: 3177acf84d594013c47f5a6413fc56f47dbb121727c5549948ef2f30ec2099de
 SHA512:
-  metadata.gz: bd10ae9a1ccc68899f6723f646c7f32c9bb0d7ad5b463d94cdceed56a61ab42c83412206bd6e73f6983d627b4b2c58bcaf504676b9a3a4dce69781d4f90e2637
-  data.tar.gz: e08f5bac717d9898ebcbbbe12d79eedc2cc5175cbe911e57a79db65f24c9889b5a018e9220c3361baa4c1c23178c72684171fefb8d925729f980745218a5df03
+  metadata.gz: 41e469d615fb041a1323b6d512f31b57aafe55de76b35212b1d615e249822214aeda51f5710221932d4d7e78aae9515f500f80278b7d056f42403c24a28cdd31
+  data.tar.gz: b7a202cf192a9d7af21e556971876867f180eb2a6319cd624075af854bb2a64ed0cd12435076261dc71aad4439ff01ebc3c2216799f85d0dbff30e0d495658d7

data/lib/dynflow/active_job/queue_adapter.rb

@@ -3,11 +3,15 @@ module Dynflow
     module QueueAdapters
       module QueueMethods
         def enqueue(job)
-          ::Rails.application.dynflow.world.trigger(JobWrapper, job.serialize)
+          ::Rails.application.dynflow.world.trigger(JobWrapper, job.serialize).tap do |plan|
+            job.provider_job_id = plan.id
+          end
         end
 
         def enqueue_at(job, timestamp)
-          ::Rails.application.dynflow.world.delay(JobWrapper, { :start_at => Time.at(timestamp) }, job.serialize)
+          ::Rails.application.dynflow.world.delay(JobWrapper, { :start_at => Time.at(timestamp) }, job.serialize).tap do |plan|
+            job.provider_job_id = plan.id
+          end
         end
       end
 

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '1.0.4'.freeze
+  VERSION = '1.0.5'.freeze
 end

data/test/activejob_adapter_test.rb

@@ -12,8 +12,11 @@ module Dynflow
   end
 
   describe 'running jobs' do
+    let :world do
+      WorldFactory.create_world
+    end
+
     before(:all) do
-      world = WorldFactory.create_world
       ::ActiveJob::QueueAdapters.send(:include, ::Dynflow::ActiveJob::QueueAdapters)
       ::ActiveJob::Base.queue_adapter = :dynflow
       dynflow_mock = Minitest::Mock.new
@@ -42,16 +45,20 @@ module Dynflow
     end
 
     it 'enqueues the job' do
+      job = nil
       out, = capture_subprocess_io do
-        SampleJob.perform_later 'hello'
+        job = SampleJob.perform_later 'hello'
       end
+      assert world.persistence.load_execution_plan(job.provider_job_id)
       assert_match(/Enqueued Dynflow::SampleJob/, out)
     end
 
     it 'schedules job in the future' do
+      job = nil
       out, = capture_subprocess_io do
-        SampleJob.set(:wait => 1.seconds).perform_later 'hello'
+        job = SampleJob.set(:wait => 1.seconds).perform_later 'hello'
       end
+      assert world.persistence.load_execution_plan(job.provider_job_id)
       assert_match(/Enqueued Dynflow::SampleJob.*at.*UTC/, out)
     end
   end

data/web/views/index.erb

@@ -20,7 +20,7 @@
 <% @plans.each do |plan| %>
   <tr>
     <td><%= h(plan.id) %></td>
-    <td><%= h(plan.label || plan.root_plan_step.action_class.name) %></td>
+    <td><%= h(plan.label || (plan.root_plan_step && plan.root_plan_step.action_class.name)) %></td>
     <th><%= h(plan.state) %></th>
     <th><%= h(plan.result) %></th>
     <th><%= h(plan.started_at) %></th>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-08 00:00:00.000000000 Z
+date: 2018-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -602,7 +602,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine