rails_workflow 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1455c2f7649e01639b50094825468cefca4117f1
-  data.tar.gz: fedbbf71998fa72e3ea6f91ff814b769a01646bc
+  metadata.gz: bdceaf61577d25aa9f96f6ecb137b324b4285e9f
+  data.tar.gz: c8d565433000b1e4865c779ed916dc2d55b29bc2
 SHA512:
-  metadata.gz: 3510938b11d1eeab1d7ed7b11e2f6758870b5c93c7ce6213d93a836c389f2b4d2ca38b82c7e19e044dcf60ef54a47898ea95c63310248f1b57a2b5990701b4b4
-  data.tar.gz: cd6e8b87b0cac21bc89810ae42b13939042fab86599d153277d334d60ab732ae554f46c434e4388b3ceebb506d85a12575be3f44731bb5be1003c9d93792ecbd
+  metadata.gz: 88dd3bf227a6548932d3c0fd623e987739bea36070a04ff95361e7763e274e24ed12c0cab520b3986df45a5c220eb0c821c39e178754a3104b230f58f26b7ddf
+  data.tar.gz: fac3080b6f6d846f8d48a8bd2cd4f6ab514352c87469b7d1423c2646378d013b79341e6ed7f18a6edf01799bba1904fecc894c8349804461dff44e375769a8eb

data/app/concerns/rails_workflow/operation_templates/assignments.rb

@@ -7,7 +7,7 @@ module RailsWorkflow
       extend ActiveSupport::Concern
 
       included do
-        belongs_to :assignment, polymorphic: true
+        belongs_to :assignment, polymorphic: true, required: false
         scope :for_user, ->(user) {
           keys = RailsWorkflow.config.assignment_by.select { |k| user.respond_to? k }
 

data/app/concerns/rails_workflow/operations/assignments.rb

@@ -6,7 +6,7 @@ module RailsWorkflow
       extend ActiveSupport::Concern
 
       included do
-        belongs_to :assignment, polymorphic: true
+        belongs_to :assignment, polymorphic: true, required: false
 
         scope :by_role, ->(role) { joins(:template).where(rails_workflow_operation_templates: { role: role }) }
         scope :by_group, ->(group) { joins(:template).where(rails_workflow_operation_templates: { group: group }) }

data/app/decorators/rails_workflow/operation_template_decorator.rb

@@ -38,14 +38,19 @@ module RailsWorkflow
     end
 
     def form
-      '_form'.prepend(object.kind)
+      '_form'.dup.prepend(object.kind)
     end
 
     def assignment
-      [
-        ::User.role_text(object.role),
-        ::User.group_text(object.group)
-      ].compact.join(', ')
+      [assignment_by_role, assignemt_by_group].compact.join(', ')
+    end
+
+    def assignment_by_role
+      User.role_text(object.role) if object.role
+    end
+
+    def assignemt_by_group
+      User.group_text(object.group) if object.group
     end
 
     def show_dependencies

data/app/models/rails_workflow/error.rb

@@ -3,7 +3,7 @@
 module RailsWorkflow
   # Stores error information
   class Error < ActiveRecord::Base
-    belongs_to :parent, polymorphic: true
+    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') }
 

data/app/models/rails_workflow/operation.rb

@@ -12,7 +12,7 @@ module RailsWorkflow
     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'
+    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
 

data/app/models/rails_workflow/operation_template.rb

@@ -8,7 +8,7 @@ module RailsWorkflow
     include OperationTemplates::Assignments
 
     belongs_to :process_template, class_name: 'RailsWorkflow::ProcessTemplate'
-    belongs_to :child_process, class_name: 'RailsWorkflow::ProcessTemplate'
+    belongs_to :child_process, class_name: 'RailsWorkflow::ProcessTemplate', required: false
 
     scope :other_operations, ->(process_template_id, operation_template_id) {
       where(process_template_id: process_template_id)

data/lib/rails_workflow/version.rb

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

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rails_workflow
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Maxim Madzhuga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.1.0