rails_workflow 0.2.1 → 0.2.2

data/lib/generators/rails_workflow/install/templates/create_workflow_processes.rb

@@ -1,116 +1,149 @@
 class CreateWorkflowProcesses < ActiveRecord::Migration
   def change
-    unless table_exists?(:rails_workflow_processes) || table_exists?(:workflow_processes)
-      create_table :workflow_processes do |t|
-        t.integer :status
-        t.boolean :async
-        t.string :title
-
-        t.timestamps
-      end
-
-      create_table :workflow_operations do |t|
-        t.integer :status
-        t.boolean :async
-        t.string :title
-
-        t.timestamps
-      end
-
-      create_table :workflow_process_templates do |t|
-        t.string :title
-        t.text :source
-        t.string :manager_class
-        t.string :process_class
-
-        t.timestamps
-      end
-
-      create_table :workflow_operation_templates do |t|
-        t.string :title
-        t.text :source
-        t.text :dependencies
-        t.string :operation_class
-        t.integer :process_template_id
-        t.timestamps
-      end
-
-
-      add_column :workflow_processes, :template_id, :integer
-      add_column :workflow_processes, :type, :string
-      add_column :workflow_operations, :process_id, :integer
-      add_column :workflow_operations, :template_id, :integer
-      add_column :workflow_operation_templates, :async, :boolean
-      add_column :workflow_operations, :dependencies, :text
-      add_column :workflow_operation_templates, :child_process_id, :integer
-      add_column :workflow_operations, :child_process_id, :integer
-
-      add_column :workflow_operation_templates, :assignment_id, :integer
-      add_column :workflow_operation_templates, :assignment_type, :string
-
-      add_column :workflow_operations, :assignment_id, :integer
-      add_column :workflow_operations, :assignment_type, :string
-      add_column :workflow_operations, :assigned_at, :datetime
-
-      add_column :workflow_operation_templates, :kind, :string
-
-      add_column :workflow_operation_templates, :role, :string
-      add_column :workflow_operation_templates, :group, :string
-
-      add_column :workflow_operations, :type, :string
-      add_column :workflow_operations, :is_active, :boolean
-      add_column :workflow_operation_templates, :instruction, :text
-
-      create_table :workflow_contexts do |t|
-        t.integer :parent_id
-        t.string :parent_type
-        t.json :body
-
-        t.timestamps
-      end
-
-      add_index :workflow_contexts, [:parent_id, :parent_type]
-
-      create_table :workflow_errors do |t|
-        t.string :message
-        t.text :stack_trace
-        t.integer :parent_id
-        t.string :parent_type
+    create_tables
+    create_columns
+    check_json_columns
+    create_indexes
+  end
 
-        t.timestamps
+  def create_tables
+    [
+        [:workflow_processes, :rails_workflow_processes],
+        [:workflow_operations, :rails_workflow_operations],
+        [:workflow_process_templates, :rails_workflow_process_templates],
+        [:workflow_operation_templates, :rails_workflow_operation_templates],
+        [:workflow_contexts, :rails_workflow_contexts],
+        [:workflow_errors, :rails_workflow_errors]
+    ].map do |names|
+      if table_exists? names[0]
+        rename_table names[0], names[1]
       end
 
-      add_column :workflow_operations, :completed_at, :datetime
-      add_column :workflow_operation_templates, :is_background, :boolean, default: true
-      add_column :workflow_operations, :is_background, :boolean
-
-      unless column_exists? :workflow_operation_templates, :type
-        add_column :workflow_operation_templates, :type, :string
-      end
+      create_table names[1] unless table_exists? names[1]
+    end
 
-      unless column_exists? :workflow_errors, :resolved
-        add_column :workflow_errors, :resolved, :boolean
-      end
+  end
 
-      unless column_exists? :workflow_process_templates, :type
-        add_column :workflow_process_templates, :type, :string
+  def create_indexes
+    [
+        [:rails_workflow_contexts, [:parent_id, :parent_type]],
+        [:rails_workflow_errors, [:parent_id, :parent_type]],
+        [:rails_workflow_operation_templates, :process_template_id],
+        [:rails_workflow_operations, :process_id],
+        [:rails_workflow_operations, :template_id]
+    ].each do |idx|
+      unless index_exists? idx[0], idx[1]
+        add_index idx[0], idx[1]
       end
+    end
+  end
 
-      unless column_exists? :workflow_errors, :resolved, :boolean
-        add_column :workflow_errors, :resolved, :boolean
+  def create_columns
+    {
+      :rails_workflow_contexts => [
+        [:integer,  :parent_id],
+        [:string,   :parent_type],
+        [:json,     :body],
+        [:datetime, :created_at],
+        [:datetime, :updated_at],
+      ],
+
+      :rails_workflow_errors => [
+        [:string,   :message],
+        [:text,    :stack_trace],
+        [:integer,  :parent_id],
+        [:string,   :parent_type],
+        [:datetime, :created_at],
+        [:datetime, :updated_at],
+        [:boolean,  :resolved]
+      ],
+
+      :rails_workflow_operation_templates => [
+          [:string,   :title],
+          [:string,   :version],
+          [:text,     :source],
+          [:json,     :dependencies],
+          [:string,   :operation_class],
+          [:integer,  :process_template_id],
+          [:datetime, :created_at],
+          [:datetime, :updated_at],
+          [:boolean,  :async],
+          [:integer,  :child_process_id],
+          [:integer,  :assignment_id],
+          [:string,   :assignment_type],
+          [:string,   :kind],
+          [:string,   :role],
+          [:string,   :group],
+          [:text,     :instruction],
+          [:boolean,  :is_background],
+          [:string,   :type],
+          [:string,   :partial_name],
+      ],
+
+      :rails_workflow_operations => [
+          [:integer,  :status],
+          [:boolean,  :async],
+          [:string,   :version],
+          [:string,   :tag],
+          [:string,   :title],
+          [:datetime, :created_at],
+          [:datetime, :updated_at],
+          [:integer,  :process_id],
+          [:integer,  :template_id],
+          [:json,     :dependencies],
+          [:integer,  :child_process_id],
+          [:integer,  :assignment_id],
+          [:string,   :assignment_type],
+          [:datetime, :assigned_at],
+          [:string,   :type],
+          [:boolean,  :is_active],
+          [:datetime, :completed_at],
+          [:boolean,  :is_background]
+      ],
+
+      :rails_workflow_process_templates => [
+          [:string,   :title],
+          [:text,     :source],
+          [:string,   :version],
+          [:string,   :manager_class],
+          [:string,   :process_class],
+          [:datetime, :created_at],
+          [:datetime, :updated_at],
+          [:string,   :type],
+          [:string,   :partial_name]
+      ],
+
+      :rails_workflow_processes => [
+          [:integer,  :status],
+          [:string,   :version],
+          [:string,   :tag],
+          [:boolean,  :async],
+          [:string,   :title],
+          [:datetime, :created_at],
+          [:datetime, :updated_at],
+          [:integer,  :template_id],
+          [:string,   :type]
+      ]
+    }.each do |table, columns|
+      columns.map do |column|
+        unless column_exists? table, column[1]
+          add_column table, column[1], column[0]
+        end
       end
 
     end
 
+  end
 
-    unless table_exists? :rails_workflow_processes
-      rename_table :workflow_processes, :rails_workflow_processes
-      rename_table :workflow_operations, :rails_workflow_operations
-      rename_table :workflow_process_templates, :rails_workflow_process_templates
-      rename_table :workflow_operation_templates, :rails_workflow_operation_templates
-      rename_table :workflow_contexts, :rails_workflow_contexts
-      rename_table :workflow_errors, :rails_workflow_errors
+  def check_json_columns
+    [
+        [RailsWorkflow::Operation, :dependencies],
+        [RailsWorkflow::OperationTemplate, :dependencies],
+        [RailsWorkflow::Context, :body]
+    ].map do |check|
+      if check[0].columns_hash[check[1].to_s].sql_type != "json"
+        change_column check[0].table_name, check[1], "JSON USING #{check[1]}::JSON"
+      end
     end
-
   end
 end

data/lib/rails_workflow/version.rb

@@ -1,3 +1,3 @@
 module RailsWorkflow
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/rails_workflow.rb

@@ -1,7 +1,5 @@
 require "rails_workflow/engine"
 require 'singleton'
-require 'inherited_resources'
-require 'devise'
 require 'draper'
 
 
@@ -54,23 +52,37 @@ module RailsWorkflow
       @default_operation_types.merge(@operation_types || {})
     end
 
+    def operation_template_klass=(value)
+      @operation_template_type = value
+    end
+
     def default_operation_template_type
-      @default_operation_template_type
+      @operation_template_type || @default_operation_template_type
+    end
+
+    def manager_class=(value)
+      @process_manager = value
     end
 
     def manager_class
-      @default_process_manager
+      @process_manager || @default_process_manager
     end
 
-    def process_class
-      @default_process_class
+    def process_class=(value)
+      @process_class = value
     end
 
-    def process_template_type
-      @default_process_template_type
+    def process_template_klass=(value)
+      @process_template_type = value
     end
 
+    def process_class
+      @process_class || @default_process_class
+    end
 
+    def process_template_type
+      @process_template_type || @default_process_template_type
+    end
 
   end
 

data/spec/controllers/rails_workflow/operation_templates_controller_spec.rb

@@ -3,7 +3,6 @@ require 'rails_helper'
 module RailsWorkflow
   RSpec.describe OperationTemplatesController, :type => :controller do
     routes { RailsWorkflow::Engine.routes }
-    login_user
 
     before :each do
       @template = create :process_template
@@ -28,7 +27,7 @@ module RailsWorkflow
         operation_template = OperationTemplate.create! valid_attributes
 
         get :index, { process_template_id: @template.id }, valid_session, use_route: :workflow
-        expect(assigns(:operations)).to eq([operation_template])
+        expect(assigns(:operation_templates)).to eq([operation_template])
       end
     end
 

data/spec/controllers/rails_workflow/operations_controller_spec.rb

@@ -21,7 +21,6 @@ require 'rails_helper'
 module RailsWorkflow
   RSpec.describe OperationsController, :type => :controller do
     routes { RailsWorkflow::Engine.routes }
-    login_user
 
     let(:valid_attributes) {
       skip("Add a hash of attributes valid for your model")

data/spec/controllers/rails_workflow/process_templates_controller_spec.rb

@@ -3,7 +3,6 @@ require 'rails_helper'
 module RailsWorkflow
   RSpec.describe ProcessTemplatesController, :type => :controller do
     routes { RailsWorkflow::Engine.routes }
-    login_user
 
     let(:valid_attributes) {
        {title: 'First Test project'}

data/spec/controllers/rails_workflow/processes_controller_spec.rb

@@ -3,7 +3,6 @@ require 'rails_helper'
 module RailsWorkflow
   RSpec.describe ProcessesController, :type => :controller do
     routes { RailsWorkflow::Engine.routes }
-    login_user
 
     before :each do
       @template = create :process_template

data/spec/core/rails_workflow/process_manager_spec.rb

@@ -10,7 +10,7 @@ module RailsWorkflow
       dependencies = [
           {
               "id" => operation.id,
-              "statuses" => [RailsWorkflow::OperationStatus::DONE]
+              "statuses" => [RailsWorkflow::Operation::DONE]
           }
       ]
 
@@ -96,6 +96,22 @@ module RailsWorkflow
         process.reload
         expect(process.status).to eq Process::DONE
       end
+
+      it 'should complete process if last operation skipped' do
+        manager.start_process
+        process.operations.first.complete
+        process.operations.last.skip
+        process.reload
+        expect(process.status).to eq Process::DONE
+      end
+
+      it 'should complete process if last operation canceled' do
+        manager.start_process
+        process.operations.first.complete
+        process.operations.last.cancel
+        process.reload
+        expect(process.status).to eq Process::DONE
+      end
     end
   end
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,6 +1,12 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 
-  before_action :authenticate_user!
+  before_action :development_authenticate_user!
+
+  def development_authenticate_user!
+    if Rails.env.development?
+      authenticate_user!
+    end
+  end
 
 end

data/spec/dummy/app/models/user.rb

@@ -14,11 +14,11 @@ class User < ActiveRecord::Base
 
   def self.get_group_values
     [
-        ['Sales Team', 'sales_team'],
-        ['Admin', 'admin'],
-        ['Customer Support Team', 'support_team'],
-        ['Stock team', 'stock_team'],
-        ['Provisioning Team', 'provisioning_team']
+        ['Sales Team', :sales_team],
+        ['Admin', :admin],
+        ['Customer Support Team', :support_team],
+        ['Stock team', :stock_team],
+        ['Provisioning Team', :provisioning_team]
     ]
   end
 

data/spec/dummy/config/application.rb

@@ -6,6 +6,7 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
+require "devise"
 # require "rails/test_unit/railtie"
 
 Bundler.require(*Rails.groups)

data/spec/dummy/config/database.yml.semaphore

@@ -0,0 +1,16 @@
+defaults: &defaults
+  adapter: postgresql
+  encoding: unicode
+  username: username
+  host: localhost
+  port: 5432
+  pool: 14
+  reaping_frequency: 10
+
+development:
+  <<: *defaults
+  database: wf_def
+
+test: &test
+  <<: *defaults
+  database: wf_test

data/spec/dummy/config/routes.rb

@@ -9,5 +9,4 @@ Rails.application.routes.draw do
 
   devise_for :users
   mount RailsWorkflow::Engine => "/workflow", as: "workflow"
-  root to: 'workflow/operations#index'
 end

data/spec/dummy/db/schema.rb

@@ -11,12 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20150210070051) do
+ActiveRecord::Schema.define(version: 20150217161051) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
-  create_table "leads", force: true do |t|
+  create_table "leads", force: :cascade do |t|
     t.integer  "sales_contact_id"
     t.text     "offer"
     t.string   "name"
@@ -24,7 +24,7 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.datetime "updated_at"
   end
 
-  create_table "rails_workflow_contexts", force: true do |t|
+  create_table "rails_workflow_contexts", force: :cascade do |t|
     t.integer  "parent_id"
     t.string   "parent_type"
     t.json     "body"
@@ -34,7 +34,7 @@ ActiveRecord::Schema.define(version: 20150210070051) do
 
   add_index "rails_workflow_contexts", ["parent_id", "parent_type"], name: "index_rails_workflow_contexts_on_parent_id_and_parent_type", using: :btree
 
-  create_table "rails_workflow_errors", force: true do |t|
+  create_table "rails_workflow_errors", force: :cascade do |t|
     t.string   "message"
     t.text     "stack_trace"
     t.integer  "parent_id"
@@ -44,10 +44,10 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.boolean  "resolved"
   end
 
-  create_table "rails_workflow_operation_templates", force: true do |t|
+  create_table "rails_workflow_operation_templates", force: :cascade do |t|
     t.string   "title"
     t.text     "source"
-    t.text     "dependencies"
+    t.json     "dependencies"
     t.string   "operation_class"
     t.integer  "process_template_id"
     t.datetime "created_at"
@@ -62,9 +62,10 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.text     "instruction"
     t.boolean  "is_background",       default: true
     t.string   "type"
+    t.string   "partial_name"
   end
 
-  create_table "rails_workflow_operations", force: true do |t|
+  create_table "rails_workflow_operations", force: :cascade do |t|
     t.integer  "status"
     t.boolean  "async"
     t.string   "title"
@@ -72,7 +73,7 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.datetime "updated_at"
     t.integer  "process_id"
     t.integer  "template_id"
-    t.text     "dependencies"
+    t.json     "dependencies"
     t.integer  "child_process_id"
     t.integer  "assignment_id"
     t.string   "assignment_type"
@@ -83,7 +84,7 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.boolean  "is_background"
   end
 
-  create_table "rails_workflow_process_templates", force: true do |t|
+  create_table "rails_workflow_process_templates", force: :cascade do |t|
     t.string   "title"
     t.text     "source"
     t.string   "manager_class"
@@ -91,9 +92,10 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "type"
+    t.string   "partial_name"
   end
 
-  create_table "rails_workflow_processes", force: true do |t|
+  create_table "rails_workflow_processes", force: :cascade do |t|
     t.integer  "status"
     t.boolean  "async"
     t.string   "title"
@@ -103,14 +105,14 @@ ActiveRecord::Schema.define(version: 20150210070051) do
     t.string   "type"
   end
 
-  create_table "sales_contacts", force: true do |t|
+  create_table "sales_contacts", force: :cascade do |t|
     t.text     "message"
     t.string   "email"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
-  create_table "users", force: true do |t|
+  create_table "users", force: :cascade do |t|
     t.string   "email",                  default: "", null: false
     t.string   "encrypted_password",     default: "", null: false
     t.string   "reset_password_token"