conflow 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4e50a7f447dad66d1522e881c5253e3478a806a38a08478660fc0a831d59a5d
-  data.tar.gz: ae859355013408d204a12532dc480efdef8933dd70bc37ab87e60a06e17f0612
+  metadata.gz: 172b50e6e55599152b9db5caa41bf3c2c12a3ea50211cba7abee58a4087caa78
+  data.tar.gz: 73dbbd9b138d9e5dd97e3827f595f80274b51a62aa1da59b39e443c4b190ad54
 SHA512:
-  metadata.gz: 6b004258305c37c987b6edee1482ba0e00e2f9e02ca3ef6d5354288de59f7e6f7d8f2c75235cc1a51faf678e8a639459d6cb925f03276a10fc307b86b877a964
-  data.tar.gz: b9b87d6d3579b7301e19b1e74ff7ff292e06e2df16f1810c4e0a2de6ab537597fb2aa42b9c1da780248161f1e3b8e667cb97be88a80fcfd7268a2afe23ab21f8
+  metadata.gz: 67ce640beb104c23a542f3ba8439922a7582c5a4debf7ce444e39137ae6c019b901e529ab1fb8722826a1a554d2d973c791d16aff02883493691d5297cf4b97c
+  data.tar.gz: 991a119e2a9bcc11fafe10ce53b53f121e1b5103773a8471ad9c52cbc734c60dc32cade6473564088fdf87e1ab354bb7bd237c61683855da840cf20186824943

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.1
+
+- Prevent enqueing jobs and finishing flow during flow configuration
+
 ## 0.4.0
 
 - Removed hooks, added promises. If you were looking only on Changelog, you never even knew about hooks - it can stay that way :)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    conflow (0.4.0)
+    conflow (0.4.1)
       redis (~> 4.0)
 
 GEM

data/lib/conflow/flow.rb

@@ -41,6 +41,7 @@ module Conflow
     has_many :jobs, Conflow::Job
     field :queued_jobs, :set
     field :indegree,    :sorted_set
+    field :lock,        :value
 
     # Create new flow with given parameters
     # @param args [Array<Object>] any parameters that will be passed to {#configure} method
@@ -56,13 +57,17 @@ module Conflow
     #   MyFlow.create(id: 320, strict: false)
     #   MyFlow.create(id: 15, strict: true)
     def self.create(*args)
-      new.tap { |flow| flow.configure(*args) }
+      new.tap do |flow|
+        flow.with_lock do
+          flow.configure(*args)
+        end
+      end
     end
 
     # Returns whether or not the flow is finished (all jobs were processed)
     # @return [Boolean] true if no pending jobs
     def finished?
-      queued_jobs.size.zero? && indegree.size.zero?
+      lock.value != 1 && queued_jobs.size.zero? && indegree.size.zero?
     end
 
     # @abstract
@@ -71,5 +76,15 @@ module Conflow
     # @param args [Array<Object>] any arguments needed to start a flow
     # @see create
     def configure(*args); end
+
+    # Lock prevents flow from enqueuing jobs during configuration - it could happen that first job is finished
+    # before second is enqueued, therefore "finishing" the flow.
+    # @api private
+    def with_lock
+      self.lock = 1
+      yield
+      self.lock = 0
+      queue_available_jobs
+    end
   end
 end

data/lib/conflow/flow/job_handler.rb

@@ -41,6 +41,8 @@ module Conflow
       private
 
       def queue_available_jobs
+        return unless lock.value != 1
+
         call_script(Conflow::Redis::QueueJobsScript)&.each do |job_id|
           queue Conflow::Job.new(job_id)
         end

data/lib/conflow/version.rb

@@ -2,5 +2,5 @@
 
 module Conflow
   # Current version of the gem
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conflow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Michał Begejowicz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis