libis-workflow-activerecord 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3b864ebd79697b212e8e398b7c98080e22238ff38efa0d9e16f8ce2862e9904
-  data.tar.gz: 89b6d5b72c99d3fa5bebcd63e03df3f29cafb95ecf76b179bac8649f9fb1ffad
+  metadata.gz: 379a7d33367283bc65ca129d9824af1e486e335e308481b702451f4c0dd2dec5
+  data.tar.gz: cf40df8e08387af400220bb24ac5f107540e5a00a3cf650a6f538c7260e8d6ef
 SHA512:
-  metadata.gz: adffbcd7031d6d01291ee8a00e64f46b084f8a12e7b834bf232f42200d87b805be56540251fefb2c2d150d40260094776065dbee422b153b5bfeaf6f6ce4a197
-  data.tar.gz: ff0e83c3a87d4197814486bb34367215d91f8807966ed6ca5fc0273329f6fe3da33709bc7297ae5cff9330ec9bc017a10df7d051c017fb80f0ce6d3834e78a85
+  metadata.gz: e31730b7390994d48673e1cbf358f62d4b2d05df8b7cf18c4d020cf25f94ba8f16c2a9ee41dea80db338457dfa8e63eb5d70237ae3694ca067c2f6d54f553380
+  data.tar.gz: a257bdf9e2bbe84a97e3114880307f2f38bb63217484443771cec173343cbd9465d57aedd76d29a3dc83c41df0e6796aa67b70b4b5c84b80f3dc0ccf73434546

data/Gemfile

@@ -1,3 +1,4 @@
+# noinspection RubyArgCount
 source 'https://rubygems.org'
 
 gemspec name: 'libis-workflow-activerecord', development_group: :test

data/Rakefile

@@ -1,3 +1,4 @@
+# noinspection RubyResolve
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
@@ -6,7 +7,9 @@ RSpec::Core::RakeTask.new('spec')
 desc 'run tests'
 task :default => :spec
 
+# noinspection RubyResolve
 require 'yaml'
+# noinspection RubyResolve
 require 'logger'
 require 'active_record'
 

data/db/migrate/003_create_work_items_table.rb

@@ -7,13 +7,11 @@ class CreateWorkItemsTable < ActiveRecord::Migration[5.0]
     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
+        t.jsonb :properties, default: {}
+        t.jsonb :options, default: {}
       else
-        t.json :properties
-        t.json :options
-        t.json :status_log
+        t.json :properties, default: {}
+        t.json :options, default: {}
       end
       t.references :parent, foreign_key: {to_table: :work_items, on_delete: :cascade}
       t.references :job, foreign_key: {to_table: :jobs, on_delete: :cascade}
@@ -21,9 +19,5 @@ class CreateWorkItemsTable < ActiveRecord::Migration[5.0]
       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/migrate/004_create_statuses_table.rb

@@ -0,0 +1,22 @@
+require 'libis/workflow/activerecord'
+
+class CreateStatusesTable < ActiveRecord::Migration[5.0]
+
+  # noinspection RubyResolve
+  def change
+
+    create_table :statuses do |t|
+      t.string :task
+      t.string :status, limit: 12
+      t.integer :progress
+      t.integer :max
+
+      t.references :work_item, foreign_key: {to_table: :work_items, on_delete: :cascade}
+
+      t.timestamps
+    end
+
+    add_index :statuses, [:task, :id]
+
+  end
+end

data/db/schema.rb

@@ -51,13 +51,11 @@ ActiveRecord::Schema.define do
   create_table :work_items, force: :cascade do |t|
     t.string :type
     if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
-      t.jsonb :properties
-      t.jsonb :options
-      t.jsonb :status_log
+      t.jsonb :properties, default: {}
+      t.jsonb :options, default: {}
     else
-      t.json :properties
-      t.json :options
-      t.json :status_log
+      t.json :properties, default: {}
+      t.json :options, default: {}
     end
     t.references :parent, foreign_key: {to_table: :work_items, on_delete: :cascade}
     t.references :job, foreign_key: {to_table: :jobs, on_delete: :cascade}
@@ -65,8 +63,18 @@ ActiveRecord::Schema.define do
     t.timestamps
   end
 
-  if ActiveRecord::Base.connection.instance_values["config"][:adapter] == "postgresql"
-    add_index :work_items, :status_log, using: :gin
+  create_table :statuses, force: :cascade do |t|
+    t.string :task
+    t.string :status, limit: 12
+    t.integer :progress
+    t.integer :max
+    t.datetime :created
+    t.datetime :updated
+
+    t.references :work_item, foreign_key: {to_table: :work_items, on_delete: :cascade}
+
   end
 
+  add_index :statuses, [:task, :id]
+
 end

data/lib/libis/workflow/activerecord.rb

@@ -14,6 +14,7 @@ module Libis
       autoload :Job, 'libis/workflow/activerecord/job'
       autoload :Worker, 'libis/workflow/activerecord/worker'
       autoload :Workflow, 'libis/workflow/activerecord/workflow'
+      autoload :Status, 'libis/workflow/activerecord/status'
 
       def self.configure
         yield ::Libis::Workflow::ActiveRecord::Config.instance

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

@@ -25,6 +25,8 @@ module Libis
 
       Config[:log_dir] = '.'
 
+      Config[:db_dir] = File.join(File.dirname(__FILE__),'..', '..', '..', '..', 'db')
+
     end
   end
 end

data/lib/libis/workflow/activerecord/helpers/symbol_serializer.rb

@@ -0,0 +1,21 @@
+module Libis
+  module Workflow
+    module ActiveRecord
+      module Helpers
+
+        class SymbolSerializer
+
+          def self.dump(value)
+            value&.to_s rescue nil
+          end
+
+          def self.load(value)
+            value&.to_sym rescue nil
+          end
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require 'libis-workflow-activerecord'
+
+require_relative 'helpers/symbol_serializer'
+
+module Libis
+  module Workflow
+    module ActiveRecord
+
+      class Status < ::ActiveRecord::Base
+        include Libis::Workflow::ActiveRecord::Base
+
+        serialize :status, Libis::Workflow::ActiveRecord::Helpers::SymbolSerializer
+
+        # noinspection RailsParamDefResolve
+        belongs_to :work_item, class_name: Libis::Workflow::ActiveRecord::WorkItem.to_s,
+                   inverse_of: :status_log,
+                   autosave: true
+      end
+
+    end
+  end
+end

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

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

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

@@ -20,7 +20,14 @@ module Libis
         # noinspection RubyArgCount
         serialize :properties, Libis::Workflow::ActiveRecord::Helpers::HashSerializer
         # noinspection RubyArgCount
-        serialize :status_log, Libis::Workflow::ActiveRecord::Helpers::StatusSerializer
+        # serialize :status_log, Libis::Workflow::ActiveRecord::Helpers::StatusSerializer
+        #
+        # noinspection RailsParamDefResolve
+        has_many :status_log,
+                 -> {order('id')},
+                 class_name: Libis::Workflow::ActiveRecord::Status.to_s,
+                 foreign_key: :work_item_id,
+                 autosave: true
 
         # noinspection RailsParamDefResolve
         has_many :items,
@@ -45,7 +52,6 @@ module Libis
           self.properties.each {|k, v| new_item.properties[k.to_sym] = v.dup}
           new_item.options = {}.with_indifferent_access
           self.options.each {|k, v| new_item.options[k.to_sym] = v.dup}
-          new_item.status_log = []
           yield new_item if block_given?
           new_item
         end
@@ -68,19 +74,34 @@ module Libis
         end
 
         def get_items
-          self.items
+          self.items.order(:id)
         end
 
         def get_item_list
-          self.items.to_a
+          get_items.to_a
         end
 
         protected
 
+        def save_log_entry(log_entry)
+          log_entry.save!
+          self.reload
+        end
+
+        def status_entry(task = nil)
+          task = task.namepath if task.is_a?(Libis::Workflow::Task)
+          return self.status_log.order(id: :asc).last if task.blank?
+          self.status_log.where(task: task).order(id: :asc).last
+        rescue Exception
+          nil
+        end
+
         def add_status_log(info)
-          # noinspection RubyResolve
-          self.status_log << info.with_indifferent_access
+          self.status_log.build(info)
           self.status_log.last
+          # noinspection RubyResolve
+          # self.status_log << info.with_indifferent_access
+          # self.status_log.last
         end
 
       end

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

@@ -11,6 +11,8 @@ module Libis
         include ::Libis::Workflow::Base::Workflow
         include ::Libis::Workflow::ActiveRecord::Base
 
+        serialize :input, Libis::Workflow::ActiveRecord::Helpers::HashSerializer
+
         # noinspection RailsParamDefResolve
         has_many :jobs,
                  -> {order('id')},

data/libis-workflow-activerecord.gemspec

@@ -6,6 +6,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'libis/workflow/activerecord/version'
 require 'date'
 
+# noinspection RubyResolve
 Gem::Specification.new do |spec|
   spec.name = 'libis-workflow-activerecord'
   spec.version = ::Libis::Workflow::ActiveRecord::VERSION
@@ -19,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/libis/workflow-activerecord'
   spec.license = 'MIT'
 
+  # noinspection RubyResolve
   spec.platform = Gem::Platform::JAVA if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
   spec.files = `git ls-files -z`.split("\0")

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 require 'coveralls'
 Coveralls.wear!
 
+# noinspection RubyResolve
 require 'bundler/setup'
+# noinspection RubyResolve
 Bundler.setup
 
 require 'rspec'
@@ -13,14 +15,17 @@ require 'stringio'
 RSpec.configure do |cfg|
 
   cfg.before :suite do
-    # noinspection RubyResolve
-    ::Libis::Workflow::ActiveRecord.configure do |cfg|
-      cfg.logger.appenders =
+    ::Libis::Workflow::ActiveRecord.configure do |config|
+      config.logger.appenders =
           ::Logging::Appenders.string_io('StringIO', layout: ::Libis::Tools::Config.get_log_formatter)
-      cfg.itemdir = File.join(File.dirname(__FILE__), 'items')
-      cfg.taskdir = File.join(File.dirname(__FILE__), 'tasks')
-      cfg.workdir = File.join(File.dirname(__FILE__), 'work')
-      cfg.database_connect 'db/config.yml', :test
+      # noinspection RubyResolve
+      config.itemdir = File.join(File.dirname(__FILE__), 'items')
+      # noinspection RubyResolve
+      config.taskdir = File.join(File.dirname(__FILE__), 'tasks')
+      # noinspection RubyResolve
+      config.workdir = File.join(File.dirname(__FILE__), 'work')
+      # noinspection RubyResolve
+      config.database_connect 'db/config.yml', :test
     end
     DatabaseCleaner.clean_with :truncation
   end

data/spec/workflow_spec.rb

@@ -24,6 +24,7 @@ describe 'TestWorkflow' do
 
   let(:workflow) {
     wf = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
+    # noinspection RubyStringKeysInHashInspection
     wf.configure(
         'name' => 'TestWorkflow',
         'description' => 'Workflow for testing',
@@ -47,6 +48,7 @@ describe 'TestWorkflow' do
     wf
   }
   let(:job) {
+    # noinspection RubyStringKeysInHashInspection
     job = TestJob.from_hash(
         'name' => 'TestJob',
         'description' => 'Job for testing',
@@ -73,7 +75,9 @@ describe 'TestWorkflow' do
     job
   }
 
-  let(:run) { job.execute }
+  let(:run) {
+    job.execute
+  }
 
   it 'should contain three tasks' do
 

data/spec/workitem_spec.rb

@@ -164,6 +164,7 @@ describe 'TestWorkItem' do
 
     it 'updated' do
       item.set_status('abc', :DONE)
+      item.reload
       expect(item.status_log.size).to be 1
       status_entry = item.status_log[0]
       expect(status_entry[:task]).to eql 'abc'
@@ -184,6 +185,7 @@ describe 'TestWorkItem' do
 
       it 'updated' do
         item.status_progress('def', 3, 10)
+        item.reload
         expect(item.status_log.size).to be 2
         status_entry = item.status_log[1]
         expect(status_entry[:task]).to eql 'def'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-07 00:00:00.000000000 Z
+date: 2018-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -166,6 +166,7 @@ files:
 - db/migrate/001_create_workflow_table.rb
 - db/migrate/002_create_jobs_table.rb
 - db/migrate/003_create_work_items_table.rb
+- db/migrate/004_create_statuses_table.rb
 - db/schema.rb
 - db/setup_db.rb
 - db/travis.config.yml
@@ -176,8 +177,10 @@ files:
 - lib/libis/workflow/activerecord/helpers/hash_serializer.rb
 - lib/libis/workflow/activerecord/helpers/property_helper.rb
 - lib/libis/workflow/activerecord/helpers/status_serializer.rb
+- lib/libis/workflow/activerecord/helpers/symbol_serializer.rb
 - lib/libis/workflow/activerecord/job.rb
 - lib/libis/workflow/activerecord/run.rb
+- lib/libis/workflow/activerecord/status.rb
 - lib/libis/workflow/activerecord/version.rb
 - lib/libis/workflow/activerecord/work_item.rb
 - lib/libis/workflow/activerecord/worker.rb