dynflow 0.8.11 → 0.8.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93710eb28bcde8ae7c912b0a93330f4dfa2c6cab
-  data.tar.gz: 6a31996ff86af3a4ce6080d1410fc9a63b79b033
+  metadata.gz: 74ac597ce9af73467ae1ecbf398a2929f1595b14
+  data.tar.gz: 22cb74c9aef05391f93d8652888c9806fd9edde5
 SHA512:
-  metadata.gz: 77d32bc910ab7fce6d73b968b9a96915577825803634e69023109d2ad9510a0fd9d9e9e7123200a47035dcf275514b0d7db50fb2fffc11ef316959fd1609177d
-  data.tar.gz: c257770350812b06aa98462fec4c902a3c25215c7ebe31ec4c86cd1a0c3048d86dde7155435d78c24c4fe91b7544daaf73539dce5d1f617abc5f09b472ba6d81
+  metadata.gz: aec52cb41798f0730ef950e88195a3973b3d879f584b0e3341e8900147d66ff1b5642d394683894c4a0c33a1eb1d119296c08840dbbb8fb9a90d1b760d8fe0ef
+  data.tar.gz: 5e5908f5ad7938c036c948a1d925c23d714ea2384f3ef6ac0e1a40aa12c97ee71c044c598898e00e2942e04d4473738f975ceaa3b35ce0294b2a00ea0a969ede

data/Gemfile

@@ -17,3 +17,7 @@ end
 group :mysql do
   gem "mysql2"
 end
+
+if RUBY_VERSION < "2.2.2"
+  gem 'activesupport', '~> 4.2'
+end

data/dynflow.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency "concurrent-ruby-edge", '~> 0.2'
   s.add_dependency "sequel"
 
+  s.add_development_dependency "rake"
   s.add_development_dependency "rack-test"
   s.add_development_dependency "minitest"
   s.add_development_dependency "minitest-reporters"

data/lib/dynflow/action.rb

@@ -92,8 +92,8 @@ module Dynflow
 
       @phase             = Type! attributes.fetch(:phase), Phase
       @world             = Type! world, World
-      @step              = Type!(attributes.fetch(:step),
-                                 ExecutionPlan::Steps::Abstract) if phase? Executable
+      @step              = Type! attributes.fetch(:step), ExecutionPlan::Steps::Abstract, NilClass
+      raise ArgumentError, 'Step reference missing' if phase?(Executable) && @step.nil?
       @execution_plan_id = Type! attributes.fetch(:execution_plan_id), String
       @id                = Type! attributes.fetch(:id), Integer
       @plan_step_id      = Type! attributes.fetch(:plan_step_id), Integer
@@ -240,7 +240,7 @@ module Dynflow
     end
 
     def state
-      phase! Executable
+      raise "state data not available" if @step.nil?
       @step.state
     end
 
@@ -251,7 +251,7 @@ module Dynflow
     end
 
     def error
-      phase! Executable
+      raise "error data not available" if @step.nil?
       @step.error
     end
 

data/lib/dynflow/coordinator.rb

@@ -146,6 +146,14 @@ module Dynflow
         @data.merge!(owner_id: "world:#{world.id}",  world_id: world.id)
       end
 
+      def self.lock_id(*args)
+        raise NoMethodError
+      end
+
+      def self.unique_filter(*args)
+        { :class => self.name, :id => lock_id(*args) }
+      end
+
       def validate!
         super
         raise Errors::InactiveWorldError.new(@world) if @world.terminating?
@@ -171,33 +179,49 @@ module Dynflow
     class DelayedExecutorLock < LockByWorld
       def initialize(world)
         super
-        @data[:id] = "delayed-executor"
+        @data[:id] = self.class.lock_id
+      end
+
+      def self.lock_id
+        "delayed-executor"
       end
     end
 
     class WorldInvalidationLock < LockByWorld
       def initialize(world, invalidated_world)
         super(world)
-        @data[:id] = "world-invalidation:#{invalidated_world.id}"
+        @data[:id] = self.class.lock_id(invalidated_world.id)
+      end
+
+      def self.lock_id(invalidated_world_id)
+        "world-invalidation:#{invalidated_world_id}"
       end
     end
 
     class AutoExecuteLock < LockByWorld
       def initialize(*args)
         super
-        @data[:id] = "auto-execute"
+        @data[:id] = self.class.lock_id
+      end
+
+      def self.lock_id
+        "auto-execute"
       end
     end
 
     class ExecutionLock < LockByWorld
       def initialize(world, execution_plan_id, client_world_id, request_id)
         super(world)
-        @data.merge!(id: "execution-plan:#{execution_plan_id}",
+        @data.merge!(id: self.class.lock_id(execution_plan_id),
                      execution_plan_id: execution_plan_id,
                      client_world_id: client_world_id,
                      request_id: request_id)
       end
 
+      def self.lock_id(execution_plan_id)
+        "execution-plan:#{execution_plan_id}"
+      end
+
       # we need to store the following data in case of
       # invalidation of the lock from outside (after
       # the owner world terminated unexpectedly)

data/lib/dynflow/middleware.rb

@@ -46,5 +46,8 @@ module Dynflow
       pass(*args)
     end
 
+    def present
+      pass
+    end
   end
 end

data/lib/dynflow/middleware/stack.rb

@@ -14,7 +14,7 @@ module Dynflow
       @middleware_class = Child! middleware_class, Middleware
       @middleware       = middleware_class.new self
       @action           = Type! action, Dynflow::Action, NilClass
-      @method           = Match! method, :delay, :plan, :run, :finalize, :plan_phase, :finalize_phase
+      @method           = Match! method, :delay, :plan, :run, :finalize, :plan_phase, :finalize_phase, :present
       @next_stack       = Type! next_stack, Middleware::Stack, Proc
     end
 

data/lib/dynflow/middleware/world.rb

@@ -14,7 +14,7 @@ module Dynflow
     end
 
     def execute(method, action_or_class, *args, &block)
-      Match! method, :delay, :plan, :run, :finalize, :plan_phase, :finalize_phase
+      Match! method, :delay, :plan, :run, :finalize, :plan_phase, :finalize_phase, :present
       if Child? action_or_class, Dynflow::Action
         action = nil
         action_class = action_or_class

data/lib/dynflow/persistence.rb

@@ -21,9 +21,11 @@ module Dynflow
       return Action.from_hash(attributes, step.world)
     end
 
-    def load_action_for_presentation(execution_plan, action_id)
+    def load_action_for_presentation(execution_plan, action_id, step = nil)
       attributes = adapter.load_action(execution_plan.id, action_id)
-      Action.from_hash(attributes.update(phase: Action::Present, execution_plan: execution_plan), @world)
+      Action.from_hash(attributes.update(phase: Action::Present, execution_plan: execution_plan, step: step), @world).tap do |present_action|
+        @world.middleware.execute(:present, present_action) {}
+      end
     end
 
     def save_action(execution_plan_id, action)

data/lib/dynflow/version.rb

@@ -1,3 +1,3 @@
 module Dynflow
-  VERSION = '0.8.11'
+  VERSION = '0.8.12'
 end

data/lib/dynflow/web/console_helpers.rb

@@ -45,7 +45,7 @@ module Dynflow
       end
 
       def load_action(step)
-        world.persistence.load_action(step)
+        world.persistence.load_action_for_presentation(@plan, step.action_id, step)
       end
 
       def step_error(step)

data/lib/dynflow/world.rb

@@ -354,7 +354,11 @@ module Dynflow
       coordinator.acquire(Coordinator::AutoExecuteLock.new(self)) do
         planned_execution_plans =
             self.persistence.find_execution_plans filters: { 'state' => %w(planned paused), 'result' => (ExecutionPlan.results - [:error]).map(&:to_s) }
-        planned_execution_plans.map { |ep| execute ep.id }
+        planned_execution_plans.map do |ep|
+          if coordinator.find_locks(Dynflow::Coordinator::ExecutionLock.unique_filter(ep.id)).empty?
+            execute(ep.id)
+          end
+        end.compact
       end
     end
 

data/test/coordinator_test.rb

@@ -32,6 +32,12 @@ module Dynflow
           tester.finish
         end
 
+        it 'supports checking about locks' do
+          world.coordinator.acquire(Coordinator::AutoExecuteLock.new(world))
+          locks = world.coordinator.find_locks(Coordinator::AutoExecuteLock.unique_filter)
+          locks.map(&:world_id).must_equal([world.id])
+        end
+
         it 'deserializes the data from the adapter when searching for locks' do
           lock = Coordinator::AutoExecuteLock.new(world)
           world.coordinator.acquire(lock)

data/test/middleware_test.rb

@@ -132,6 +132,57 @@ module Dynflow
                         'run',
                         'output#message:finished']
       end
+
+      describe 'Presnet middleware' do
+        let(:world_with_middleware) do
+          WorldFactory.create_world.tap do |world|
+            world.middleware.use(Support::MiddlewareExample::FilterSensitiveData)
+          end
+        end
+
+        let :execution_plan do
+          result = world.trigger(Support::CodeWorkflowExample::IncomingIssue, issue_data)
+          result.must_be :planned?
+          result.finished.value
+        end
+
+        let :execution_plan_2 do
+          result = world.trigger(Support::MiddlewareExample::SecretAction)
+          result.must_be :planned?
+          result.finished.value
+        end
+
+        let :filtered_execution_plan do
+          world_with_middleware.persistence.load_execution_plan(execution_plan.id)
+        end
+
+        let :issue_data do
+          { 'author' => 'Harry Potter', 'text' => 'Lord Voldemort is comming' }
+        end
+
+        let :presenter do
+          filtered_execution_plan.root_plan_step.action filtered_execution_plan
+        end
+
+        let :presenter_2 do
+          execution_plan_2.root_plan_step.action execution_plan_2
+        end
+
+        let :presenter_without_middleware do
+          execution_plan.root_plan_step.action execution_plan
+        end
+
+        it 'filters the data ===' do
+          presenter.input['text'].must_equal('You-Know-Who is comming')
+          presenter_2.output['spell'].must_equal('***')
+        end
+
+        it "doesn't affect stored data" do
+          presenter.input['text'].must_equal('You-Know-Who is comming')
+          presenter_without_middleware.input['text'].must_equal('Lord Voldemort is comming')
+        end
+      end
+
     end
   end
 end

data/test/support/middleware_example.rb

@@ -70,6 +70,39 @@ module Support
     class AnotherLogRunMiddleware < LogRunMiddleware
     end
 
+    class FilterSensitiveData < Dynflow::Middleware
+      def present
+        if action.respond_to?(:filter_sensitive_data)
+          action.filter_sensitive_data
+        end
+        filter_sensitive_data(action.input)
+        filter_sensitive_data(action.output)
+      end
+
+      def filter_sensitive_data(data)
+        case data
+        when Hash
+          data.values.each { |value| filter_sensitive_data(value) }
+        when Array
+          data.each { |value| filter_sensitive_data(value) }
+        when String
+          data.gsub!('Lord Voldemort', 'You-Know-Who')
+        end
+      end
+    end
+
+    class SecretAction < Dynflow::Action
+      middleware.use(FilterSensitiveData)
+
+      def run
+        output[:spell] = 'Wingardium Leviosa'
+      end
+
+      def filter_sensitive_data
+        output[:spell] = '***'
+      end
+    end
+
     class LoggingAction < Dynflow::Action
 
       middleware.use LogMiddleware

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynflow
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.12
 platform: ruby
 authors:
 - Ivan Necas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -528,7 +542,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: DYNamic workFLOW engine
@@ -557,3 +571,4 @@ test_files:
 - test/testing_test.rb
 - test/web_console_test.rb
 - test/world_test.rb
+has_rdoc: