libis-workflow-activerecord 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5e5ca19333207c2454878483bec80747d8af6717
-  data.tar.gz: 4006386a833854575803812cb7f379f43baafb21
+SHA256:
+  metadata.gz: e3b864ebd79697b212e8e398b7c98080e22238ff38efa0d9e16f8ce2862e9904
+  data.tar.gz: 89b6d5b72c99d3fa5bebcd63e03df3f29cafb95ecf76b179bac8649f9fb1ffad
 SHA512:
-  metadata.gz: f90d6c9a59ccbaec455a9ece2bf6759d60ba2bddafbecf3f37470117eb2b2ec7738c2f942c80fdf81825a57abd641343ac4acb75817a7d0861f5de26495ba69e
-  data.tar.gz: 4fc925d21262f45aa265658ac39cbc558401dd40057bdfc7be801429a8b5522309ec299d978ed9f624360b6c3483b01352e340570159a692fc552614760a4fba
+  metadata.gz: adffbcd7031d6d01291ee8a00e64f46b084f8a12e7b834bf232f42200d87b805be56540251fefb2c2d150d40260094776065dbee422b153b5bfeaf6f6ce4a197
+  data.tar.gz: ff0e83c3a87d4197814486bb34367215d91f8807966ed6ca5fc0273329f6fe3da33709bc7297ae5cff9330ec9bc017a10df7d051c017fb80f0ce6d3834e78a85

data/db/config.yml

@@ -1,6 +1,6 @@
 default: &default
   adapter: postgresql
-  encoding: unicode
+  encoding: utf-8
   database: upload
   host: localhost
   port: 5432
@@ -38,7 +38,7 @@ development:
   #   debug5, debug4, debug3, debug2, debug1,
   #   log, notice, warning, error, fatal, and panic
   # Defaults to warning.
-  min_messages: debug5
+  min_messages: log
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

data/db/migrate/001_create_workflow_table.rb

@@ -0,0 +1,25 @@
+require 'libis/workflow/activerecord'
+
+class CreateWorkflowTable < ActiveRecord::Migration[5.0]
+
+  def change
+
+    create_table :workflows do |t|
+      t.string :type
+      t.string :name
+      t.text :description
+      if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+        t.jsonb :config, default: {}
+      else
+        t.json :config, default: {}
+      end
+
+      t.timestamps
+    end
+
+    if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+      add_index :workflows, :config, using: :gin
+    end
+
+  end
+end

data/db/migrate/002_create_jobs_table.rb

@@ -1,13 +1,18 @@
 require 'libis/workflow/activerecord'
 
-class CreateWorkflowItemsTable < ActiveRecord::Migration[5.0]
+class CreateJobsTable < ActiveRecord::Migration[5.0]
 
   def change
+
     create_table :jobs do |t|
       t.string :type
       t.string :name
-      t.string :description
-      t.jsonb :input
+      t.text :description
+      if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+        t.jsonb :input, default: {}
+      else
+        t.json :input, default: {}
+      end
       t.string :run_object
       t.boolean :log_to_file, default: true
       t.boolean :log_each_run, default: true
@@ -16,12 +21,14 @@ class CreateWorkflowItemsTable < ActiveRecord::Migration[5.0]
       # noinspection RubyResolve
       t.integer :log_keep, default: 5
 
+      t.references :workflow, foreign_key: {to_table: :workflows, on_delete: :cascade}
+
       t.timestamps
+    end
 
-      t.integer :run_id
-      t.integer :workflow_id
+    if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+      add_index :jobs, :input, using: :gin
     end
 
-    add_index :jobs, :workflow_id
   end
 end

data/db/migrate/003_create_work_items_table.rb

@@ -0,0 +1,29 @@
+require 'libis/workflow/activerecord'
+
+class CreateWorkItemsTable < ActiveRecord::Migration[5.0]
+
+  def change
+
+    create_table :work_items do |t|
+      t.string :type
+      if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+        t.jsonb :properties
+        t.jsonb :options
+        t.jsonb :status_log
+      else
+        t.json :properties
+        t.json :options
+        t.json :status_log
+      end
+      t.references :parent, foreign_key: {to_table: :work_items, on_delete: :cascade}
+      t.references :job, foreign_key: {to_table: :jobs, on_delete: :cascade}
+
+      t.timestamps
+    end
+
+    if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
+      add_index :work_items, :status_log, using: :gin
+    end
+
+  end
+end

data/db/schema.rb

@@ -39,10 +39,9 @@ ActiveRecord::Schema.define do
     # noinspection RubyResolve
     t.integer :log_keep, default: 5
 
-    t.timestamps
-
     t.references :workflow, foreign_key: {to_table: :workflows, on_delete: :cascade}
-    t.integer :workflow_id
+
+    t.timestamps
   end
 
   if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
@@ -62,6 +61,7 @@ ActiveRecord::Schema.define do
     end
     t.references :parent, foreign_key: {to_table: :work_items, on_delete: :cascade}
     t.references :job, foreign_key: {to_table: :jobs, on_delete: :cascade}
+
     t.timestamps
   end
 

data/lib/libis/workflow/activerecord/version.rb

@@ -1,7 +1,7 @@
 module Libis
   module Workflow
     module ActiveRecord
-      VERSION = '0.9.0' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '0.9.1' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -163,8 +163,9 @@ files:
 - README.md
 - Rakefile
 - db/config.yml
-- db/migrate/001_create_work_items_table.rb
+- db/migrate/001_create_workflow_table.rb
 - db/migrate/002_create_jobs_table.rb
+- db/migrate/003_create_work_items_table.rb
 - db/schema.rb
 - db/setup_db.rb
 - db/travis.config.yml
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord persistence for the LIBIS Workflow framework.

data/db/migrate/001_create_work_items_table.rb

@@ -1,18 +0,0 @@
-require 'libis/workflow/activerecord'
-
-class CreateWorkflowItemsTable < ActiveRecord::Migration[5.0]
-
-  def change
-    create_table :work_items do |t|
-      t.string :type
-      t.jsonb :properties
-      t.jsonb :options
-      t.jsonb :status_log
-      t.references :parent, foreign_key: {to_table: :work_items, on_delete: :cascade}
-
-      t.timestamps
-    end
-
-    add_index :work_items, :status_log, using: :gin
-  end
-end