rails_workflow 0.2.1 → 0.2.2

data/app/views/rails_workflow/operation_templates/new.html.slim

@@ -3,32 +3,32 @@ ol.breadcrumb.alert-warning
   li
     = link_to "Configuration", process_templates_path
   li
-    = link_to "Template: #{parent.title}", process_template_path(parent)
+    = link_to "Template: #{@process_template.title}", process_template_path(@process_template)
   li.active
-    = "Add #{resource.type_title}"
+    = "Add #{@operation_template.type_title}"
 
-= render partial: "flash", locals: {notice: notice}
+= render partial: "application/flash", locals: {notice: notice}
 
 .row
   .col-md-10
     .panel
       .panel-heading
         h1.panel-title
-          = "Add #{resource.type_title}"
+          = "Add #{@operation_template.type_title}"
       .panel-body
 
-        = form_for [parent, resource], html: {class: "form-horizontal clearfix"} do |f|
-          = render partial: resource.form, locals: {f: f}
+        = form_for [@process_template, @operation_template], html: {class: "form-horizontal clearfix"} do |f|
+          = render partial: @operation_template.form, locals: {f: f}
           .form-group
             = f.label :dependencies, class: "control-label col-sm-2"
             .col-sm-10
-              - if resource.other_operations.blank?
+              - if @operation_template.other_operations.blank?
                 .checkbox
                   label
                     | There is no other operations in this process template.
 
-              - resource.other_operations.each_with_index do |depends_on, index|
-                - matched_dependency = resource.dependencies.detect { |d| d['id'] == depends_on.id }
+              - @operation_template.other_operations.each_with_index do |depends_on, index|
+                - matched_dependency = @operation_template.dependencies.detect { |d| d['id'] == depends_on.id }
                 .panel.panel-warning
                   .panel-heading
                     .checkbox
@@ -45,7 +45,7 @@ ol.breadcrumb.alert-warning
                           = check_box "operation_template[dependencies][#{index}]", "statuses", {multiple: true, checked: status_matched}, status[0].to_s, nil
                           = status[1]
           .btn-toolbar.pull-right
-            = link_to 'Back', process_template_operation_templates_path(parent), class: "btn btn-default"
+            = link_to 'Back', process_template_operation_templates_path(@process_template), class: "btn btn-default"
             = f.submit value: 'Save', class: "btn btn-success"
 
 

data/app/views/rails_workflow/operation_templates/show.html.slim

@@ -2,39 +2,39 @@ ol.breadcrumb.alert-warning
   li
     = link_to "Configuration", process_templates_path
   li
-    = link_to "Template: #{parent.title}", process_template_path(parent)
+    = link_to "Template: #{@process_template.title}", process_template_path(@process_template)
   li.active
-    = "Operation Template: #{resource.title}"
-= render partial: "flash", locals: { notice: notice }
+    = "Operation Template: #{@operation_template.title}"
+= render partial: "application/flash", locals: { notice: notice }
 
 .row
   .col-md-10
     .panel
       .panel-heading
         h1.panel-title
-          = "Operation: #{resource.title}"
+          = "Operation: #{@operation_template.title}"
       .panel-body
         table.table.table-striped.table-hover
           tr
             td Operation Class
-            td = resource.operation_class
+            td = @operation_template.operation_class
           tr
             td Operation Template Class
-            td = resource.type
+            td = @operation_template.type
 
-          - if resource.assignment.present?
+          - if @operation_template.assignment.present?
             tr
               td Assigned To
-              td = resource.assignment
+              td = @operation_template.assignment
 
 
           tr
             td Asynchronous
-            td = resource.async_text
+            td = @operation_template.async_text
 
           tr
             td Background:
-            td = resource.is_background_text
+            td = @operation_template.is_background_text
 
 
     .panel
@@ -42,7 +42,7 @@ ol.breadcrumb.alert-warning
         h1.panel-title Dependencies
       .panel-body
         table.table.table-striped.table-hover
-          - resource.show_dependencies.each do |dependency|
+          - @operation_template.show_dependencies.each do |dependency|
             tr
               td
                 = dependency.shift
@@ -51,5 +51,5 @@ ol.breadcrumb.alert-warning
                   span.label.label-default< = dependency_status
   .col-md-2
     .btn-toolbar
-      = link_to 'Edit', edit_process_template_operation_template_path(parent, resource), class: "btn btn-primary"
+      = link_to 'Edit', edit_process_template_operation_template_path(@process_template, @operation_template), class: "btn btn-primary"
 

data/app/views/rails_workflow/operations/index.html.slim

@@ -17,7 +17,7 @@ ol.breadcrumb.alert-warning
               th Created At
 
           tbody
-            - collection.each do |operation|
+            - @operations.each do |operation|
               tr
                 td = link_to operation.title, process_operation_path(operation.process, operation)
                 td

data/app/views/rails_workflow/operations/show.html.slim

@@ -1,24 +1,24 @@
 ruby:
-  child_process = resource.child_process
+  child_process = @operation.child_process
 
 ol.breadcrumb.alert-warning
   li
     = link_to "Processes", processes_path
   li
-    = link_to "Process: #{parent.title}", parent
+    = link_to "Process: #{@operation.process.title}", @operation.process
   li.active
-    = "Operation: #{resource.title} "
+    = "Operation: #{@operation.title} "
 
-= render partial: "flash", locals: { notice: notice }
+= render partial: "application/flash", locals: { notice: notice }
 
 .row
   .col-md-10
     .panel
       .panel-heading
         h1.panel-title
-          = "Operation: #{resource.title} "
-          span.label.more-info-label class=(resource.status[:class])
-            = resource.status[:text]
+          = "Operation: #{@operation.title} "
+          span.label.more-info-label class=(@operation.status[:class])
+            = @operation.status[:text]
       .panel-body
         .col-md-6
           table.table.table-striped.table-hover
@@ -26,21 +26,21 @@ ol.breadcrumb.alert-warning
 
               tr
                 td Created At
-                td = resource.created_at
+                td = @operation.created_at
 
               tr
                 td Completed At
-                td = resource.completed_at
+                td = @operation.completed_at
 
-              - if resource.assigned_to.present?
+              - if @operation.assigned_to.present?
                 tr
                   td Assigned To
-                  td = resource.assigned_to
+                  td = @operation.assigned_to
               tr
                 td Operation Template
-                td = link_to resource.template.title,
-                             process_template_operation_template_path(resource.template.process_template,
-                                                                      resource.template)
+                td = link_to @operation.template.title,
+                             process_template_operation_template_path(@operation.template.process_template,
+                                                                      @operation.template)
 
               - if child_process.present?
                 tr
@@ -52,16 +52,16 @@ ol.breadcrumb.alert-warning
                       = child_process.status[:text]
               tr
                 td Asynchronous
-                td = resource.async
+                td = @operation.async
 
               tr
                 td Background
-                td = resource.is_background
+                td = @operation.is_background
 
 
         .col-md-6
 
-          - if resource.show_dependencies.empty?
+          - if @operation.show_dependencies.empty?
             .col-md-12
               strong
                 | No dependencies
@@ -71,7 +71,7 @@ ol.breadcrumb.alert-warning
                 tr
                   td
                     strong Satisfied Dependencies
-                - resource.show_dependencies.each do |dependency|
+                - @operation.show_dependencies.each do |dependency|
                   tr
                     td
                       = link_to process_operation_path(dependency.process, dependency)
@@ -83,7 +83,7 @@ ol.breadcrumb.alert-warning
                 tr
                   td
                     strong Template Dependencies
-                - resource.show_template_dependencies.each do |dependency|
+                - @operation.show_template_dependencies.each do |dependency|
                   tr
                     td
                       = dependency.shift
@@ -96,7 +96,7 @@ ol.breadcrumb.alert-warning
       .btn-toolbar
         ul.nav.nav-pills
           li role="presentation" class="active"
-            = link_to "Back to Process", process_path(resource.process)
+            = link_to "Back to Process", process_path(@operation.process)
 
 
 .row
@@ -105,19 +105,10 @@ ol.breadcrumb.alert-warning
       .panel-heading
         h1.panel-title Operation Context
       .panel-body
-        table.table.table-striped.table-hover
-          thead
-            tr
-              th Key
-              th Value
-          tbody
-            - resource.context.each_pair do |key, value|
-              tr
-                td = key
-                td = value
+        = render @operation.context.partial_name, { context: @operation.context }
 
-- if resource.workflow_errors.unresolved.present?
-  - resource.workflow_errors.unresolved.each do |error|
+- if @operation.workflow_errors.unresolved.present?
+  - @operation.workflow_errors.unresolved.each do |error|
     .row
       .col-md-10
         .panel
@@ -131,7 +122,7 @@ ol.breadcrumb.alert-warning
                     strong Created at
                   td
                     .pull-right
-                      = button_to "Retry", retry_process_operation_error_path(resource.process, resource, error), class: "btn btn-warning", method: :put
+                      = button_to "Retry", retry_process_operation_error_path(@operation.process, @operation, error), class: "btn btn-warning", method: :put
                     = error.created_at
                 tr
                   td

data/app/views/rails_workflow/process_templates/_form.html.slim

@@ -1,8 +1,8 @@
-- if resource.errors.any?
+- if @process_template.errors.any?
   #error_explanation
-    h2 = "#{pluralize(resource.errors.count, "error")} prohibited this process template from being saved:"
+    h2 = "#{pluralize(@process_template.errors.count, "error")} prohibited this process template from being saved:"
     ul
-      - resource.errors.full_messages.each do |message|
+      - @process_template.errors.full_messages.each do |message|
         li = message
 
 .form-group

data/app/views/rails_workflow/process_templates/edit.html.slim

@@ -1,21 +1,21 @@
-= render partial: "flash", locals: {notice: notice}
+= render partial: "application/flash", locals: {notice: notice}
 
 ol.breadcrumb.alert-warning
   li
     = link_to "Configuration", process_templates_path
   li.active
-    = "Template: #{resource.title}"
+    = "Template: #{@process_template.title}"
 
 .row
   .col-md-10
     .panel
       .panel-heading
         h1.panel-title
-          = "Template: #{resource.title}"
+          = "Template: #{@process_template.title}"
       .panel-body
-        = form_for resource, html: { class: "form-horizontal clearfix" } do |f|
+        = form_for @process_template, html: { class: "form-horizontal clearfix" } do |f|
           = render partial: 'form', locals: {f: f}
           .btn-toolbar.pull-right
-            = link_to 'Show', resource, class: "btn btn-default"
+            = link_to 'Show', @process_template, class: "btn btn-default"
             = link_to 'Back', process_templates_path, class: "btn btn-default"
             = f.submit value: 'Save', class: "btn btn-success"

data/app/views/rails_workflow/process_templates/index.html.slim

@@ -1,7 +1,7 @@
 ol.breadcrumb.alert-warning
   li.active Configuration
 
-= render partial: "flash", locals: {notice: notice}
+= render partial: "application/flash", locals: {notice: notice}
 
 .row
   .col-sm-10
@@ -21,7 +21,7 @@ ol.breadcrumb.alert-warning
               th
 
           tbody
-            - collection.each do |process_template|
+            - @process_templates.each do |process_template|
               tr
                 td = link_to process_template.title, process_template_operation_templates_path(process_template)
                 td = process_template.manager_class

data/app/views/rails_workflow/process_templates/new.html.slim

@@ -5,8 +5,8 @@
         h1.panel-title
           = "New Process Template"
       .panel-body
-        = form_for resource, html: {class: "form-horizontal clearfix"} do |f|
-          = render partial: resource.form, locals: {f: f}
+        = form_for @process_template, html: {class: "form-horizontal clearfix"} do |f|
+          = render partial: @process_template.form, locals: {f: f}
           .btn-toolbar.pull-right
             = link_to 'Back', process_templates_path, class: "btn btn-default"
             = f.submit value: 'Save', class: "btn btn-success"

data/app/views/rails_workflow/process_templates/show.html.slim

@@ -1,16 +1,16 @@
 
 ruby:
   new_template_path = -> (type) do
-    new_process_template_operation_template_path(resource.id, operation_template: {kind: type} )
+    new_process_template_operation_template_path(@process_template.id, operation_template: {kind: type} )
   end
 
 ol.breadcrumb.alert-warning
   li
     = link_to "Configuration", process_templates_path
   li.active
-    = "Template: #{resource.title}"
+    = "Template: #{@process_template.title}"
 
-= render partial: "flash", locals: { notice: notice }
+= render partial: "application/flash", locals: { notice: notice }
 
 .row
   .col-sm-10
@@ -25,22 +25,22 @@ ol.breadcrumb.alert-warning
             tr
               td
                 strong Process manager
-              td = resource.manager_class
+              td = @process_template.manager_class
 
             tr
               td
                 strong Process class
-              td = resource.process_class
+              td = @process_template.process_class
 
             tr
               td
                 strong Process Template class
-              td = resource.type
+              td = @process_template.type
 
   .col-sm-2
     .row
       .btn-group
-        = button_to "Create Process", {controller: "processes", action: "create", process: {template_id: resource.id}}, method: :post, class: "btn btn-lg btn-success"
+        = button_to "Create Process", {controller: "processes", action: "create", process: {template_id: @process_template.id}}, method: :post, class: "btn btn-lg btn-success"
       br
       br
       .btn-group
@@ -55,9 +55,9 @@ ol.breadcrumb.alert-warning
       br
       br
       .btn-group
-        = link_to 'Edit', edit_process_template_path(resource), class: "btn btn-primary"
+        = link_to 'Edit', edit_process_template_path(@process_template), class: "btn btn-primary"
       br
       br
       .btn-group
-        = link_to 'Operations', process_template_operation_templates_path(resource), class: "btn btn-primary"
+        = link_to 'Operations', process_template_operation_templates_path(@process_template), class: "btn btn-primary"
 

data/app/views/rails_workflow/processes/index.html.slim

@@ -36,7 +36,7 @@ ol.breadcrumb.alert-warning
               th Created At
               th Parent/Child
           tbody
-            - collection.each do |process|
+            - @processes.each do |process|
               tr
                 td = link_to process.title, process
                 td
@@ -56,7 +56,7 @@ ol.breadcrumb.alert-warning
                     = link_to child.title, child
                     span.label<> class=(child.status[:class])
                       = child.status[:text]
-        = will_paginate collection
+        = will_paginate @processes
 
   .col-sm-4
 

data/app/views/rails_workflow/processes/show.html.slim

@@ -1,23 +1,23 @@
 ruby:
-  parent_operation = resource.parent_operation
+  parent_operation = @process.parent_operation
   parent_process = parent_operation.process if parent_operation.present?
 
 ol.breadcrumb.alert-warning
   li
     = link_to "Processes", processes_path
   li.active
-    = "Process: #{resource.title}"
+    = "Process: #{@process.title}"
 
-= render partial: "flash", locals: { notice: notice }
+= render partial: "application/flash", locals: { notice: notice }
 
 .row
   .col-sm-8
     .panel
       .panel-heading
         h1.panel-title
-          = "Process: #{resource.title} "
-          span.label class=(resource.status[:class])
-            = resource.status[:text]
+          = "Process: #{@process.title} "
+          span.label class=(@process.status[:class])
+            = @process.status[:text]
       .panel-body
         table.table.table-striped.table-hover
           thead
@@ -30,9 +30,9 @@ ol.breadcrumb.alert-warning
 
 
           tbody
-            - resource.operations.each do |operation|
+            - @process.operations.each do |operation|
               tr
-                td = link_to operation.title, process_operation_path(resource, operation)
+                td = link_to operation.title, process_operation_path(@process, operation)
                 td
                   span.label class=(operation.status[:class])
                     = operation.status[:text]
@@ -52,9 +52,9 @@ ol.breadcrumb.alert-warning
               th Operation Assignment
               th Sub process
           tbody
-            - resource.future_operations.each do |operation|
+            - @process.future_operations.each do |operation|
               tr
-                td = link_to operation.title, process_template_operation_template_path(resource.template, operation)
+                td = link_to operation.title, process_template_operation_template_path(@process.template, operation)
                 td
                   ul.list-unstyled
                     - operation.show_dependencies.each do |dependency|
@@ -69,8 +69,8 @@ ol.breadcrumb.alert-warning
                     = operation.child_process.title
                     span.label.label-default<> = (operation.async || false) ? "async" : "sync"
 
-    - if resource.workflow_errors.unresolved.present?
-      - resource.workflow_errors.unresolved.each do |error|
+    - if @process.workflow_errors.unresolved.present?
+      - @process.workflow_errors.unresolved.each do |error|
         .panel
           .panel-heading
             h1.panel-title Error
@@ -82,7 +82,7 @@ ol.breadcrumb.alert-warning
                     strong Created at
                   td
                     .pull-right
-                      = button_to "Retry", retry_process_error_path(resource, error), class: "btn btn-warning", method: :put
+                      = button_to "Retry", retry_process_error_path(@process, error), class: "btn btn-warning", method: :put
 
                     = error.created_at
                 tr
@@ -102,12 +102,12 @@ ol.breadcrumb.alert-warning
               td
                 strong Created at
               td
-                = resource.created_at
+                = @process.created_at
             tr
               td
                 strong Process Template
               td
-                = link_to resource.template.title, process_template_path(resource.template)
+                = link_to @process.template.title, process_template_path(@process.template)
 
             - if parent_operation.present?
               tr
@@ -122,13 +122,4 @@ ol.breadcrumb.alert-warning
       .panel-heading
         h1.panel-title Process Context
       .panel-body
-        table.table.table-striped.table-hover
-          thead
-            tr
-              th Key
-              th Value
-          tbody
-            - resource.context.data.each_pair do |key, value|
-              tr
-                td = key
-                td = value
+        = render @process.context.partial_name, { context: @process.context }

data/app/workers/rails_workflow/error_worker.rb

@@ -4,14 +4,7 @@ module RailsWorkflow
 
     def perform(parent_id, parent_class)
       parent = parent_class.constantize.find(parent_id)
-
-      if parent.is_a? RailsWorkflow::Operation
-        parent.status = RailsWorkflow::Operation::ERROR
-      end
-      if parent.is_a? RailsWorkflow::Process
-        parent.status = RailsWorkflow::Process::ERROR
-      end
-
+      parent.status = parent.class::ERROR
       parent.save
 
       if parent.respond_to?(:parent_operation) &&

data/db/migrate/20150215164401_add_partial_name_to_context.rb

@@ -0,0 +1,6 @@
+class AddPartialNameToContext < ActiveRecord::Migration
+  def change
+    add_column :rails_workflow_operation_templates, :partial_name, :string
+    add_column :rails_workflow_process_templates, :partial_name, :string
+  end
+end

data/db/migrate/20150217161051_change_dependencies_to_json.rb

@@ -0,0 +1,6 @@
+class ChangeDependenciesToJson < ActiveRecord::Migration
+  def change
+    change_column :rails_workflow_operation_templates, :dependencies, 'JSON USING dependencies::JSON'
+    change_column :rails_workflow_operations, :dependencies, 'JSON USING dependencies::JSON'
+  end
+end