libis-workflow-activerecord 0.9.2 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 379a7d33367283bc65ca129d9824af1e486e335e308481b702451f4c0dd2dec5
-  data.tar.gz: cf40df8e08387af400220bb24ac5f107540e5a00a3cf650a6f538c7260e8d6ef
+  metadata.gz: 8d41bc5ce60d5ec9f3368d4970f1659c1a524119616d3065e1167c60cc17e796
+  data.tar.gz: 33e6a53ad2260ca97924417196d4da388614430e6ce850d7d0b0229055c480ed
 SHA512:
-  metadata.gz: e31730b7390994d48673e1cbf358f62d4b2d05df8b7cf18c4d020cf25f94ba8f16c2a9ee41dea80db338457dfa8e63eb5d70237ae3694ca067c2f6d54f553380
-  data.tar.gz: a257bdf9e2bbe84a97e3114880307f2f38bb63217484443771cec173343cbd9465d57aedd76d29a3dc83c41df0e6796aa67b70b4b5c84b80f3dc0ccf73434546
+  metadata.gz: f5cceda837e1f187863dec902a1f7012a23aa6f97ec269261c31257ddd0b4290be778005a91c18f6a102b0824154ca4a01aaf0c50ec01edc9d07b8e91d551ef4
+  data.tar.gz: 5f091dc88445c9892827db5d7db3d3fe471395e59abc5307031725379ac8d775ffc970d85c6875105aa70d428e50834fb61ea676a8aeb0037e9b9fa34b67d811

data/Rakefile

@@ -12,10 +12,11 @@ require 'yaml'
 # noinspection RubyResolve
 require 'logger'
 require 'active_record'
+require 'database_cleaner'
 
-namespace :db do
+namespace(:db) do
   def create_database(config)
-    options = {:charset => 'utf8', :collation => 'utf8_unicode_ci'}
+    options = {:charset => 'utf8', :collation => 'en_US.UTF-8'}
 
     create_db = lambda do |cfg|
       ActiveRecord::Base.establish_connection cfg.merge('database' => nil)
@@ -69,10 +70,16 @@ namespace :db do
     ActiveRecord::Base.connection.drop_database @config['database']
   end
 
+  desc 'Clears the database and reloads the default setup'
+  task :clear => :configure_connection do
+    DatabaseCleaner.strategy = :truncation
+
+  end
+
   desc 'Migrate the database (options: VERSION=x, VERBOSE=false).'
   task :migrate => :configure_connection do
     ActiveRecord::Migration.verbose = true
-    ActiveRecord::Migrator.migrate MIGRATIONS_DIR, ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+    ActiveRecord::MigrationContext.new(MIGRATIONS_DIR).migrate(ENV['VERSION'] ? ENV['VERSION'].to_i : nil)
   end
 
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'

data/db/config.yml

@@ -1,17 +1,18 @@
 default: &default
   adapter: postgresql
   encoding: utf-8
-  database: upload
+  database: workflow
   host: localhost
   port: 5432
-  username: upload
-  password: upload
+  username: workflow
+  password: workflow
   # For details on connection pooling, see Rails configuration guide
   # http://guides.rubyonrails.org/configuring.html#database-pooling
   pool: 20
 
 development:
   <<: *default
+  database: workflow_dev
 
   # The specified database role being used to connect to postgres.
   # To create additional roles in postgres see `$ createuser --help`.
@@ -45,6 +46,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   <<: *default
+  database: workflow_test
   min_messages: warning
 
 # As with config/secrets.yml, you never want to store sensitive information,

data/db/migrate/004_create_statuses_table.rb

@@ -10,10 +10,11 @@ class CreateStatusesTable < ActiveRecord::Migration[5.0]
       t.string :status, limit: 12
       t.integer :progress
       t.integer :max
+      t.datetime :created, null: false
+      t.datetime :updated, null: false
 
       t.references :work_item, foreign_key: {to_table: :work_items, on_delete: :cascade}
 
-      t.timestamps
     end
 
     add_index :statuses, [:task, :id]

data/lib/libis/workflow/activerecord.rb

@@ -12,7 +12,6 @@ module Libis
       autoload :WorkItem, 'libis/workflow/activerecord/work_item'
       autoload :Run, 'libis/workflow/activerecord/run'
       autoload :Job, 'libis/workflow/activerecord/job'
-      autoload :Worker, 'libis/workflow/activerecord/worker'
       autoload :Workflow, 'libis/workflow/activerecord/workflow'
       autoload :Status, 'libis/workflow/activerecord/status'
 

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

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

data/libis-workflow-activerecord.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'libis-workflow', '~> 2.0'
-  spec.add_runtime_dependency 'activerecord', '~> 5'
+  spec.add_runtime_dependency 'activerecord', '~> 5.2'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake'

data/spec/job_spec.rb

@@ -6,5 +6,4 @@ require_relative 'test_job'
 
 describe 'TestJob' do
 
-  context
 end

data/spec/spec_helper.rb

@@ -14,6 +14,8 @@ require 'stringio'
 
 RSpec.configure do |cfg|
 
+  ActiveRecord::Migration.maintain_test_schema!
+
   cfg.before :suite do
     ::Libis::Workflow::ActiveRecord.configure do |config|
       config.logger.appenders =

data/spec/tasks/camelize_name.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require 'backports/rails/string'
+require 'libis/tools/extend/string'
 require 'libis-workflow'
 
 class CamelizeName < ::Libis::Workflow::Task

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.5
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -183,11 +183,8 @@ files:
 - 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
 - lib/libis/workflow/activerecord/workflow.rb
 - libis-workflow-activerecord.gemspec
-- spec/db_env.sh
-- spec/db_start.sh
 - spec/items.rb
 - spec/items/test_dir_item.rb
 - spec/items/test_file_item.rb
@@ -224,13 +221,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: ActiveRecord persistence for the LIBIS Workflow framework.
 test_files:
-- spec/db_env.sh
-- spec/db_start.sh
 - spec/items.rb
 - spec/items/test_dir_item.rb
 - spec/items/test_file_item.rb

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

@@ -1,20 +0,0 @@
-require 'libis/workflow/worker'
-require 'sidekiq'
-
-module Libis
-  module Workflow
-    module ActiveRecord
-
-      class Worker < Libis::Workflow::Worker
-
-        def get_job(job_config)
-          job_name = job_config.delete(:name)
-          job = ::Libis::Workflow::ActiveRecord::Job.find(name: job_name).first
-          raise RuntimeError.new "Workflow #{job_name} not found" unless job.is_a? ::Libis::Workflow::ActiveRecord::Job
-          job
-        end
-
-      end
-    end
-  end
-end

data/spec/db_env.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-export DB_HOST="kahana.mongohq.com:10053"
-export DB_HOST="localhost:27017"
-export DB_USER="test"
-export DB_PASS="abc123"

data/spec/db_start.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-cd `dirname $0`
-mkdir -p ./data/db
-/opt/mongodb/bin/mongod --dbpath ./data/db
-