rails_workflow 0.2.1 → 0.2.2

data/app/controllers/rails_workflow/process_templates_controller.rb

@@ -1,39 +1,66 @@
-require 'rails_workflow/application_controller'
 module RailsWorkflow
-  class ProcessTemplatesController < ::InheritedResources::Base
+  class ProcessTemplatesController < ::ActionController::Base
+    layout 'rails_workflow/application'
+    respond_to :html
+
+    before_action :set_process_template, only: [:show, :edit, :update, :destroy]
+
     before_filter do
       @config_section_active = true
     end
 
-    layout 'rails_workflow/application'
+
+    def index
+      @process_templates = ProcessTemplateDecorator.
+          decorate_collection(process_templates_collection)
+
+      respond_with(@process_templates)
+    end
+
+
+    def new
+      @process_template = ProcessTemplate.new(permitted_params).decorate
+      respond_with @process_template
+    end
+
 
     def create
-      # create!{ process_template_url(resource) }
-      create!{ process_template_operation_templates_path(resource) }
+      @process_template = ProcessTemplate.create(permitted_params)
+      redirect_to process_template_operation_templates_path(@process_template)
     end
 
     def update
-      update! { process_template_url(resource) }
+      @process_template.update(permitted_params)
+      redirect_to process_template_url(@process_template)
     end
 
     def destroy
-      destroy! { process_templates_url}
+      @process_template.destroy
+      redirect_to process_templates_url
     end
 
     protected
     def permitted_params
-      params.permit(process_template: [:title, :source, :manager_class, :process_class, :type])
+      params.permit(
+          process_template: [
+              :title,
+              :source,
+              :manager_class,
+              :partial_name,
+              :process_class,
+              :type
+          ]
+      )[:process_template]
     end
 
-
-    def collection
-      ::RailsWorkflow::ProcessTemplateDecorator.decorate_collection(super)
+    def set_process_template
+      @process_template = ProcessTemplate.find(params[:id]).decorate
     end
 
-    def resource
-      super.decorate
+    def process_templates_collection
+      ProcessTemplate.
+          order(id: :desc)
     end
 
-
   end
 end

data/app/controllers/rails_workflow/processes_controller.rb

@@ -1,70 +1,91 @@
-require 'rails_workflow/application_controller'
 module RailsWorkflow
-  class ProcessesController < ::InheritedResources::Base
+  class ProcessesController < ::ActionController::Base
     layout 'rails_workflow/application'
+    respond_to :html
+    before_action :set_process, only: [:show, :edit, :update, :destroy]
 
     before_filter do
       @processes_section_active = true
     end
 
-    def create
-      #any process should be build by process manager
-      #using some process template.
 
-      @process = RailsWorkflow::ProcessManager.start_process params[:process][:template_id], {}
+    def index
+      @processes = ProcessDecorator.decorate_collection(undecorated_collection)
 
-      create! { process_url(resource) }
-    end
+      @errors = Error.
+          unresolved.order(id: :asc).
+          includes(:parent).limit(10)
 
-    def update
-      update! { processes_path }
+      @open_user_operations = OperationDecorator.
+          decorate_collection(
+            RailsWorkflow::Operation.incompleted.
+                unassigned.includes(:template).
+                limit(20)
+          )
+
+      @statistic = {
+          all: RailsWorkflow::Process.count,
+          statuses: RailsWorkflow::Process.count_by_statuses
+      }
     end
 
-    def destroy
-      destroy! { processes_url}
+    def new
+      @process = Process.new(permitted_params).decorate
     end
 
-    def index
 
-      @errors = RailsWorkflow::Error.unresolved.order(id: :asc).includes(:parent).limit(10)
-      @open_user_operations = RailsWorkflow::OperationDecorator.decorate_collection(
-          RailsWorkflow::Operation.incompleted.unassigned.includes(:template).limit(20)
+    def create
+      @process = RailsWorkflow::ProcessManager.start_process(
+          params[:process][:template_id], {}
       )
-      @statistic = {
-          all: RailsWorkflow::Process.count,
-          statuses: RailsWorkflow::Process.count_by_statuses
-      }
 
-      index!
+      redirect_to process_url(@process)
     end
 
 
+    def update
+      @process.update(permitted_params)
+      redirect_to processes_path
+    end
+
+    def destroy
+      @process.destroy
+      redirect_to processes_path
+    end
+
+
+
     protected
     def permitted_params
-      params.permit(processes: [:status, :async, :title, :template_id], filter: [:status])
+      params.permit(
+          process: [
+              :status,
+              :async,
+              :title,
+              :template_id
+          ],
+          filter: [:status]
+      )[:process]
     end
 
     def undecorated_collection
-      get_collection_ivar || begin
-        collection_scope = end_of_association_chain
+
+        collection_scope = Process.default_scoped
 
         if params[:filter]
-          status = ::RailsWorkflow::Process.get_status_code(params[:filter]['status'])
+          status = Process.get_status_code(params[:filter]['status'])
           collection_scope = collection_scope.by_status(status)
         end
 
-        set_collection_ivar collection_scope.paginate(page: params[:page]).order(created_at: :desc)
+        collection_scope.paginate(page: params[:page]).order(created_at: :desc)
 
-      end
     end
 
 
-    def collection
-      ProcessDecorator.decorate_collection(undecorated_collection)
-    end
 
-    def resource
-      ProcessDecorator.decorate(super)
+
+    def set_process
+      @process ||= ProcessDecorator.decorate(Process.find params[:id]).decorate
     end
 
 

data/app/decorators/rails_workflow/context_decorator.rb

@@ -1,5 +1,10 @@
 module RailsWorkflow
-  class ContextDecorator < Decorator
+  class ContextDecorator < Draper::Decorator
+
+    def partial_name
+      object.parent.template.partial_name.presence || "application/context"
+    end
+
     def data
       if object.present?
         object.prepare_data object.data

data/app/decorators/rails_workflow/operation_decorator.rb

@@ -2,6 +2,12 @@
 module RailsWorkflow
   class OperationDecorator < OperationHelperDecorator
     delegate_all
+    decorates_association :template, with: OperationTemplateDecorator
+
+
+    def context
+      ContextDecorator.decorate object.context
+    end
 
     def process
       object.process.decorate
@@ -32,23 +38,9 @@ module RailsWorkflow
 
     end
 
-    def context
-      ContextDecorator.decorate(object.context).data
-    end
 
     def show_template_dependencies
-      if object.dependencies.present?
-        object.template.dependencies.map do |dependency|
-          depends_on = OperationTemplate.where(id: dependency['id']).pluck(:title).first
-          statuses = object.
-              get_status_values.
-              select{|status| dependency['statuses'].include? status[0]}
-          [depends_on] + statuses.map(&:last)
-        end
-      else
-        []
-      end
-
+      template.show_dependencies
     end
 
   end

data/app/decorators/rails_workflow/operation_template_decorator.rb

@@ -20,7 +20,7 @@ module RailsWorkflow
 
     def other_operations
       if object.persisted?
-         object.process_template.operations.where.not(id: object.id).order(id: :asc).to_a
+         object.other_operations.order(id: :asc).to_a
       else
         #operations without current to build dependencies form part
         object.process_template.operations.to_a - [object]

data/app/decorators/rails_workflow/process_decorator.rb

@@ -1,8 +1,7 @@
 module RailsWorkflow
   class ProcessDecorator < Decorator
-    delegate_all
-
     include StatusDecorator
+    delegate_all
 
     def created_at
       object.created_at.strftime('%m/%d/%Y %H:%M')

data/app/decorators/rails_workflow/status_decorator.rb

@@ -5,31 +5,30 @@ module RailsWorkflow
     included do
       def status
         if object.status
-
-          label_class = 'label-default'
-
-          if object.status == object.class::DONE
-            label_class = 'label-success'
-          elsif [object.class::IN_PROGRESS, object.class::WAITING].include? object.status
-            label_class = 'label-primary'
-          elsif object.status == object.class::ERROR
-            label_class = 'label-danger'
-            #'warning'
-          end
-
-          text = object.get_status_values.
-              detect { |status| object.status == status[0] }[1]
-
           {
-              class: label_class,
-              text: text
+              class: get_label_class(object),
+              text: object.get_status_values.assoc(object.status)[1]
           }
         else
           {
               class: nil,
-              text: nil,
+              text: nil
           }
         end
+
+      end
+
+      def get_label_class object
+        case object.status
+          when object.class::DONE
+            'label-success'
+          when object.class::IN_PROGRESS..object.class::WAITING
+            'label-primary'
+          when object.class::ERROR
+            'label-danger'
+          else
+            'label-default'
+        end
       end
 
     end

data/app/models/rails_workflow/error.rb

@@ -4,12 +4,14 @@ module RailsWorkflow
     has_one :context, class_name: "RailsWorkflow::Context", as: :parent
     scope :unresolved, -> { where("resolved is null or resolved = false")}
 
+    delegate :data, to: :context
+
     def retry
       update_attribute(:resolved, true)
 
-      target = context.data[:target]
-      method = context.data[:method]
-      args = context.data[:args]
+      target = data[:target]
+      method = data[:method]
+      args = data[:args]
 
       target.send(method, *args)
 

data/app/models/rails_workflow/operation_template.rb

@@ -8,24 +8,21 @@ module RailsWorkflow
     belongs_to :process_template, class_name: "RailsWorkflow::ProcessTemplate"
     belongs_to :child_process, class_name: "RailsWorkflow::ProcessTemplate"
 
-    class << self
+    scope :other_operations, ->(process_template_id, operation_template_id) {
+      where(process_template_id: process_template_id).
+          where.not(id: operation_template_id)
+    }
 
-      def types
-        RailsWorkflow.config.operation_types
-      end
 
-      # by default system using context data of first dependnecy
-      # the one that triggered current operation build
-      def build_context dependencies
-        dependencies.first.try(:context).try(:data)
-      end
+    def other_operations
+      OperationTemplate.other_operations(self.process_template_id, self.id)
+    end
 
-      def build_context! operation, dependencies
-        RailsWorkflow::Context.new(
-            parent: operation,
-            data: build_context(dependencies) || operation.process.data)
-      end
 
+    class << self
+      def types
+        RailsWorkflow.config.operation_types
+      end
     end
 
 
@@ -38,14 +35,6 @@ module RailsWorkflow
       RailsWorkflow.config.default_operation_template_type
     end
 
-    def resolve_dependency operation
-      true
-    end
-
-    def resolve_dependency! operation
-      resolve_dependency operation
-    end
-
     private
     def default_class kind
       RailsWorkflow.config.operation_types[kind][:class]

data/app/models/rails_workflow/process.rb

@@ -1,6 +1,6 @@
 module RailsWorkflow
   class Process < ActiveRecord::Base
-    include ProcessStatus
+    include Status
     include Processes::DependencyResolver
     include Processes::DefaultRunner
 

data/app/views/application/_context.html.slim

@@ -0,0 +1,11 @@
+table.table.table-striped.table-hover
+  thead
+    tr
+      th Key
+      th Value
+  tbody
+    - context.data.each_pair do |key, value|
+      tr
+        td = key
+        td = value
+

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

@@ -1,11 +1,11 @@
-- if resource.errors.any?
+- if @operation_template.errors.any?
   #error_explanation
-    h2 = "#{pluralize(resource.errors.count, "error")} prohibited this wf_operation_template from being saved:"
+    h2 = "#{pluralize(@operation_template.errors.count, "error")} prohibited this wf_operation_template from being saved:"
     ul
-      - resource.errors.full_messages.each do |message|
+      - @operation_template.errors.full_messages.each do |message|
         li = message
 
-= hidden_field_tag 'operation_template[kind]', resource.kind
+= hidden_field_tag 'operation_template[kind]', @operation_template.kind
 
 .form-group
   = f.label :title, class: "control-label col-sm-2"
@@ -19,14 +19,20 @@
     = f.text_field :operation_class, class: "form-control", placeholder: f.object.default_class
 
 .form-group
-  = f.label :type, "Operation Template Class", class: "control-label col-sm-2"
+  = f.label :type, "Template Class", class: "control-label col-sm-2"
   .col-sm-10
     = f.text_field :type, class: "form-control", placeholder: f.object.default_type
 
+.form-group
+  = f.label :partial_name, "Context Partial", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :partial_name, class: "form-control", placeholder: "Default"
+
+
 .form-group
   = f.label :child_process, class: "control-label col-sm-2"
   .col-sm-10
-    = f.collection_select(:child_process_id, parent.other_processes, :id, :title, {include_blank: true}, { class: "form-control" })
+    = f.collection_select(:child_process_id, @process_template.other_processes, :id, :title, {include_blank: true}, { class: "form-control" })
 
 .checkbox
   .col-sm-2

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

@@ -1,11 +1,11 @@
-- if resource.errors.any?
+- if @operation_template.errors.any?
   #error_explanation
-    h2 = "#{pluralize(resource.errors.count, "error")} prohibited this wf_operation_template from being saved:"
+    h2 = "#{pluralize(@operation_template.errors.count, "error")} prohibited this wf_operation_template from being saved:"
     ul
-      - resource.errors.full_messages.each do |message|
+      - @operation_template.errors.full_messages.each do |message|
         li = message
 
-= hidden_field_tag 'operation_template[kind]', resource.kind
+= hidden_field_tag 'operation_template[kind]', @operation_template.kind
 
 .form-group
   = f.label :group, class: "control-label col-sm-2"
@@ -24,10 +24,15 @@
     = f.text_field :operation_class, class: "form-control", placeholder: f.object.default_class
 
 .form-group
-  = f.label :type, "Operation Template Class", class: "control-label col-sm-2"
+  = f.label :type, "Template Class", class: "control-label col-sm-2"
   .col-sm-10
     = f.text_field :type, class: "form-control", placeholder: f.object.default_type
 
+.form-group
+  = f.label :partial_name, "Context Partial", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :partial_name, class: "form-control", placeholder: "Default"
+
 .form-group
   .col-sm-2
   .col-sm-10

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

@@ -1,11 +1,11 @@
-- if resource.errors.any?
+- if @operation_template.errors.any?
   #error_explanation
-    h2 = "#{pluralize(resource.errors.count, "error")} prohibited this wf_operation_template from being saved:"
+    h2 = "#{pluralize(@operation_template.errors.count, "error")} prohibited this wf_operation_template from being saved:"
     ul
-      - resource.errors.full_messages.each do |message|
+      - @operation_template.errors.full_messages.each do |message|
         li = message
 
-= hidden_field_tag 'operation_template[kind]', resource.kind
+= hidden_field_tag 'operation_template[kind]', @operation_template.kind
 
 .form-group
   = f.label :role, class: "control-label col-sm-2"
@@ -24,10 +24,15 @@
     = f.text_field :operation_class, class: "form-control", placeholder: f.object.default_class
 
 .form-group
-  = f.label :type, "Operation Template Class", class: "control-label col-sm-2"
+  = f.label :type, "Template Class", class: "control-label col-sm-2"
   .col-sm-10
     = f.text_field :type, class: "form-control", placeholder: f.object.default_type
 
+.form-group
+  = f.label :partial_name, "Context Partial", class: "control-label col-sm-2"
+  .col-sm-10
+    = f.text_field :partial_name, class: "form-control", placeholder: "Default"
+
 .form-group
   .col-sm-2
   .col-sm-10

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

@@ -3,31 +3,31 @@ 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}"
+    = "Operation Template: #{@operation_template.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}"
+          = "Operation: #{@operation_template.title}"
       .panel-body
 
-        = form_for [parent, resource], url: process_template_operation_template_path,  html: {class: "form-horizontal clearfix"} do |f|
-          = render partial: resource.form, locals: {f: f}
+        = form_for [@process_template, @operation_template], url: process_template_operation_template_path,  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
@@ -44,5 +44,5 @@ 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/index.html.slim

@@ -8,11 +8,11 @@ ol.breadcrumb.alert-warning
   li
     = link_to "Configuration", process_templates_path
   li.active
-    = "Template: #{parent.title}"
+    = "Template: #{@process_template.title}"
 
 
 
-= render partial: "flash", locals: {notice: notice}
+= render partial: "application/flash", locals: {notice: notice}
 
 
 .row
@@ -20,7 +20,7 @@ ol.breadcrumb.alert-warning
     .panel
       .panel-heading
         h1.panel-title
-          = "Template: #{parent.title}"
+          = "Template: #{@process_template.title}"
       .panel-body
 
         table.table.table-striped.table-hover
@@ -36,9 +36,9 @@ ol.breadcrumb.alert-warning
 
 
           tbody
-            - collection.each do |operation|
+            - @operation_templates.each do |operation|
               tr
-                td = link_to operation.title, process_template_operation_template_path(parent, operation)
+                td = link_to operation.title, process_template_operation_template_path(@process_template, operation)
                 td = operation.assignment
                 td
                   ul.list-unstyled
@@ -51,13 +51,13 @@ ol.breadcrumb.alert-warning
                   - if operation.child_process.present?
                     = operation.child_process.title
                     span.label.label-default<> = (operation.async || false) ? "async" : "sync"
-                td = link_to 'Edit', edit_process_template_operation_template_path(parent, operation)
-                td = link_to 'Destroy', process_template_operation_template_path(parent, operation), data: {:confirm => 'Are you sure?'}, :method => :delete
+                td = link_to 'Edit', edit_process_template_operation_template_path(@process_template, operation)
+                td = link_to 'Destroy', process_template_operation_template_path(@process_template, operation), data: {:confirm => 'Are you sure?'}, :method => :delete
 
   .col-md-2
     .row
       .btn-group
-        = button_to "Create Process", {  controller: "processes", action: "create", process: { template_id: parent.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
@@ -72,6 +72,6 @@ ol.breadcrumb.alert-warning
       br
       br
       .btn-group
-        = link_to 'Edit', edit_process_template_path(parent), class: "btn btn-primary"
+        = link_to 'Edit', edit_process_template_path(@process_template), class: "btn btn-primary"