rails_workflow 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d85d2776fc4b5bc25da7f7555318ad088641307
-  data.tar.gz: 3f7d947d513ec8f4431829329432ca38ec97296d
+  metadata.gz: dea54167aac6920c8627f69c61a216dcc2e537e7
+  data.tar.gz: 1d2ae941198813cf7b96cc09b6b52f89723c41bd
 SHA512:
-  metadata.gz: c8c2b93714080e1ccdf5d687aa4fde94b42d0cca08eac931217d44971439793c421b5d52787a81b46aed66b60e672400be7993aa987ec74d47acbf82494237ef
-  data.tar.gz: 2871b11611017711cfefba38526fefb1dee5bfe06eaa4a269aa333b8bab6824ed9196d8760b71d90c8808ab71a6bf6331e5d3c5c96284287c23f3c347c7617cd
+  metadata.gz: eb6704ad409c7f714988401587bbc392d3fe93d3bbcf804a9d25d2fa7b8f8f45ebe9f2e3b941d65a3ea48740f5a47f4bca288d3b5321523b97d52a919348c3aa
+  data.tar.gz: 73afc4682184789ade697bcfc02fbf8365af632e07e5b4f0b60dc6b6a11f457bde92b222d1d384cda247bdf963015fcb77e802a35d16cda6f94795b5e915a04f

data/app/concerns/rails_workflow/has_context.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'active_support/concern'
+
+module RailsWorkflow
+  module HasContext
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :context, class_name: 'RailsWorkflow::Context', as: :parent
+      
+      after_save :save_context
+      def save_context
+        context&.save
+      end
+    end
+  end
+end

data/app/models/rails_workflow/error.rb

@@ -3,8 +3,8 @@
 module RailsWorkflow
   # Stores error information
   class Error < ActiveRecord::Base
+    include HasContext
     belongs_to :parent, polymorphic: true, required: false
-    has_one :context, class_name: 'RailsWorkflow::Context', as: :parent
     scope :unresolved, -> { where('resolved is null or resolved = false') }
 
     delegate :data, to: :context

data/app/models/rails_workflow/operation.rb

@@ -8,12 +8,12 @@ module RailsWorkflow
     include OperationStatus
     include Operations::Dependencies
     include Operations::Assignments
+    include HasContext
 
     belongs_to :process, class_name: 'RailsWorkflow::Process'
     alias parent process
     belongs_to :template, class_name: 'RailsWorkflow::OperationTemplate'
     belongs_to :child_process, class_name: 'RailsWorkflow::Process', required: false
-    has_one :context, class_name: 'RailsWorkflow::Context', as: :parent
     has_many :workflow_errors, class_name: 'RailsWorkflow::Error', as: :parent
 
     delegate :data, to: :context

data/app/models/rails_workflow/process.rb

@@ -5,6 +5,7 @@ module RailsWorkflow
   # all operations, parent operation, context etc.
   class Process < ActiveRecord::Base
     include Status
+    include HasContext
 
     belongs_to :template, class_name: 'RailsWorkflow::ProcessTemplate'
     has_many :operations, class_name: 'RailsWorkflow::Operation'
@@ -13,7 +14,6 @@ module RailsWorkflow
             foreign_key: :child_process_id
 
     alias parent parent_operation
-    has_one :context, class_name: 'RailsWorkflow::Context', as: :parent
     has_many :workflow_errors, class_name: 'RailsWorkflow::Error', as: :parent
 
     delegate :data, to: :context

data/lib/rails_workflow/operation_builder.rb

@@ -20,16 +20,23 @@ module RailsWorkflow
     end
 
     def create_operation!
-      operation = operation_class.create(prepared_attributes) do |op|
-        op.context = build_context(op, completed_dependencies)
-        # Can add OperationTemplate#after_operation_create callback
-        template.after_operation_create(op) if template.respond_to?(:after_operation_create)
+      operation = operation_class.create(prepared_attributes) do |new_operation|
+        new_operation.context = build_context(
+          new_operation, completed_dependencies
+        )
+
+        after_operation_create(new_operation)
       end
 
       build_child_process(operation)
       operation
     end
 
+    def after_operation_create(operation)
+      return unless template.respond_to?(:after_operation_create)
+      template.after_operation_create(operation)
+    end
+
     def prepared_dependencies
       completed_dependencies.map do |dep|
         {

data/lib/rails_workflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsWorkflow
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

data/spec/factories/operation_templates.rb

@@ -4,6 +4,7 @@ FactoryGirl.define do
   factory :operation_template, class: 'RailsWorkflow::OperationTemplate' do
     title 'Operation Template'
     kind 'default'
+    type nil
     is_background true
     association :process_template, factory: :process_template
 

data/spec/lib/operation_builder_spec.rb

@@ -51,6 +51,31 @@ module RailsWorkflow
       end
     end
 
+    context 'operation context data' do
+      it { expect(operation.data).to eq(msg: 'Test message') } # from factory
+
+      context 'custom' do
+        before do
+          new_class = Class.new(RailsWorkflow::OperationTemplate) do
+            def after_operation_create(new_operation)
+              new_operation.data[:new_key] = 'abc'
+            end
+          end
+          stub_const('NewTemplateClass', new_class)
+        end
+
+        let(:operation_template) do
+          create :operation_template,
+                 type: 'NewTemplateClass',
+                 operation_class: 'RailsWorkflow::UserByGroupOperation'
+        end
+
+        let(:template) { operation_template.becomes(NewTemplateClass) }
+
+        it { expect(operation.data).to include(new_key: 'abc') }
+      end
+    end
+
     context 'should build child process' do
       let(:parent_template) { create :parent_operation_template }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_workflow
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Maxim Madzhuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -191,6 +191,7 @@ files:
 - Rakefile
 - app/assets/javascripts/rails_workflow/application.js
 - app/assets/stylesheets/rails_workflow/application.css
+- app/concerns/rails_workflow/has_context.rb
 - app/concerns/rails_workflow/operation_status.rb
 - app/concerns/rails_workflow/operation_templates/assignments.rb
 - app/concerns/rails_workflow/operation_templates/dependencies.rb