rails_workflow 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3af317d30d995b99af8a9725cc68b0b906fe30a0
-  data.tar.gz: 5d8aca320659cb5eb308ec9e10b05e9205f940ce
+  metadata.gz: 13578e628767e17f817b949ec491a1a8250aebf4
+  data.tar.gz: b645cb6885642e653d733e7abba06a9b212b2eea
 SHA512:
-  metadata.gz: 1dc1b0d349aaf8df2c8a36c95c3849a35a028a03d31bc180625b73d21f373b76d776758140b10bef994564bef013f1fe54cb23cd0c4055c6aad4720b07887879
-  data.tar.gz: ec3e7d110289b87d44de85a6bcb8edbbb6b1469b159e2f3fc260f44c26cd41db16c7a5c7ea5c9bc272ea545ab8bfb6039a15edaa0b1ea4de01cd6f0ffcafee03
+  metadata.gz: bbc6cd94c1709f3ccd551ec2dae71a0f3ffc0083ff21ae5ba602debbeb664b9b32c4190e6f41ce29d3443a65b8d629dcb01b2de930bdd581a605ff59e9e913fd
+  data.tar.gz: eb2b961eae1310f9d06080c9ab163a6b0eb3000d20f431c12c5cb5ac9c47e63707db3361efb003fea4f69ffd854ede0ce1ea22a85a94665c6dcf214240887220

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

@@ -16,10 +16,11 @@ module RailsWorkflow
       extend ActiveSupport::Concern
 
       included do
-        scope :independent_only, -> { where(dependencies: nil.to_json) }
-
         serialize :dependencies, JSON
 
+        # dependeing on serialize / rails version it may save null value or 'null' value
+        scope :independent_only, -> { where("dependencies is null or dependencies = 'null' or dependencies='[]'") }
+
         def resolve_dependency operation
           true
         end

data/app/concerns/rails_workflow/process_templates/default_builder.rb

@@ -13,8 +13,6 @@ module RailsWorkflow
         extend ActiveSupport::Concern
 
         included do
-
-
           def build_process! context
             process = process_class.create template: self
 
@@ -23,10 +21,7 @@ module RailsWorkflow
               process.create_context(data: context, parent: process)
 
               build_independent_operations process
-              process.reload
-              build_process(process) if respond_to? :build_process
               process
-
             end
 
           end

data/app/concerns/rails_workflow/processes/default_runner.rb

@@ -18,8 +18,6 @@ module RailsWorkflow
             update_attribute(:status, self.class::IN_PROGRESS)
             self.operations.where(status: RailsWorkflow::Operation::NOT_STARTED).map(&:start)
           end
-
-
         end
 
         def operation_exception

data/app/controllers/rails_workflow/application_controller.rb

@@ -1,10 +1,11 @@
 module RailsWorkflow
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     before_filter only: [:index, :show, :edit] do
       RailsWorkflow::OperationTemplate.inheritance_column = nil
       RailsWorkflow::Operation.inheritance_column = nil
       RailsWorkflow::ProcessTemplate.inheritance_column = nil
     end
 
+    # before_action :authenticate_user!
   end
 end

data/app/controllers/rails_workflow/errors_controller.rb

@@ -1,5 +1,5 @@
 module RailsWorkflow
-  class ErrorsController < ActionController::Base
+  class ErrorsController < ApplicationController
 
     def retry
       process = RailsWorkflow::Process.find(permitted_params[:process_id])

data/app/controllers/rails_workflow/operation_templates_controller.rb

@@ -1,5 +1,5 @@
 module RailsWorkflow
-  class OperationTemplatesController < ::ActionController::Base
+  class OperationTemplatesController < ApplicationController
     layout 'rails_workflow/application'
     before_action :set_operation_template, only: [:show, :edit, :update, :destroy]
     before_action :set_process_template

data/app/controllers/rails_workflow/operations_controller.rb

@@ -1,5 +1,5 @@
 module RailsWorkflow
-  class OperationsController < ::ActionController::Base
+  class OperationsController < ApplicationController
     layout 'rails_workflow/application'
     respond_to :html
 

data/app/controllers/rails_workflow/process_templates_controller.rb

@@ -1,5 +1,5 @@
 module RailsWorkflow
-  class ProcessTemplatesController < ::ActionController::Base
+  class ProcessTemplatesController < ApplicationController
     layout 'rails_workflow/application'
     respond_to :html, :json
 

data/app/controllers/rails_workflow/processes_controller.rb

@@ -1,5 +1,5 @@
 module RailsWorkflow
-  class ProcessesController < ::ActionController::Base
+  class ProcessesController < ApplicationController
     layout 'rails_workflow/application'
     respond_to :html
     before_action :set_process, only: [:show, :edit, :update, :destroy]
@@ -69,16 +69,14 @@ module RailsWorkflow
     end
 
     def undecorated_collection
+      collection_scope = Process.default_scoped
 
-        collection_scope = Process.default_scoped
-
-        if params[:filter]
-          status = Process.get_status_code(params[:filter]['status'])
-          collection_scope = collection_scope.by_status(status)
-        end
-
-        collection_scope.paginate(page: params[:page]).order(created_at: :desc)
+      if params[:filter]
+        status = Process.get_status_code(params[:filter]['status'])
+        collection_scope = collection_scope.by_status(status)
+      end
 
+      collection_scope.paginate(page: params[:page]).order(id: :asc)
     end
 
 

data/app/decorators/rails_workflow/process_decorator.rb

@@ -32,7 +32,7 @@ module RailsWorkflow
     end
 
     def operations
-      OperationDecorator.decorate_collection(object.operations)
+      OperationDecorator.decorate_collection(object.operations.order(:id))
     end
 
 

data/app/serializers/rails_workflow/operation_template_serializer.rb

@@ -4,7 +4,8 @@ module RailsWorkflow
                :async, :assignment_id, :assignment_type, :kind, :role, :group, :instruction,
                :is_background, :type, :partial_name, :version, :tag
 
-    has_one :child_process, serializer: RailsWorkflow::OperationTemplateSerializer
+    # todo add child_process search by guid
+    # has_one :child_process, serializer: RailsWorkflow::ProcessTemplateSerializer
 
     def dependencies
       object.dependencies.each do |d|

data/lib/rails_workflow/version.rb

@@ -1,3 +1,3 @@
 module RailsWorkflow
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/spec/controllers/rails_workflow/operation_templates_controller_spec.rb

@@ -86,10 +86,7 @@ module RailsWorkflow
                             process_template_id: @template.id,
                             operation_template: valid_attributes
                         }, valid_session, use_route: :workflow
-          }.to change(OperationTemplate, :count).by(1)
-
-          last_operation = OperationTemplate.last
-          expect(last_operation).to be_instance_of(RailsWorkflow::CustomOperationTemplate)
+          }.to change(RailsWorkflow::CustomOperationTemplate, :count).by(1)
         end
 
         it "assigns a newly created operation_template as @operation_template" do