libis-workflow-mongoid 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017f82dc01ac32a1e83b84d9fc5df11ffaf0615c
-  data.tar.gz: d92861630b1adebd7230af71e6d51b0285107308
+  metadata.gz: a97ed4107bf80afa5dc836eda58f8476c3d863b5
+  data.tar.gz: 3ba0b9532f2a929e626fe6e2a8cbd4d90e5abb7e
 SHA512:
-  metadata.gz: 82f885ebe58ec52be066d8aefd8859612569e5ba6556d905852c80062fe0c9b51265563763b845caa2a4bded2924c9ce708c5dca71bcfcd94b60b0ef3478e107
-  data.tar.gz: 97bf3b6bc08f98149cbe887e855c2fcc9d776aa1b951fc85910cdaabff6b2dc2294368735a540e761069f23d4bfd2663813f8a1a4f96afa53aab2c857acf9483
+  metadata.gz: e9763f51354b51451354dd54849c8e4b7a44cc96f91ee6c0a7c7286e22e02f933c4653e553fb149692c375f5d518c00914e23f0b3da905bdab3537d304b62304
+  data.tar.gz: 9513f8c35aaf0a7c3d28b5534c18c385cee0b767fdb787871b79e6278cb45ab65231978921aaf6b5289759b69ed2f3500b227a702a64bd2d3764ae78a580f57f

data/lib/libis/workflow/mongoid/base.rb

@@ -2,7 +2,6 @@ require 'mongoid'
 require 'mongoid/document'
 require 'yaml'
 require 'libis/tools/extend/hash'
-require 'map_with_indifferent_access'
 
 require_relative 'sequence'
 
@@ -34,8 +33,8 @@ module Libis
           end
 
           def create_from_hash(hash, id_tags, &block)
-            hash = hash.key_strings_to_symbols
-            id_tags = id_tags.map(&:to_sym)
+            hash = hash.key_symbols_to_strings(recursive: true)
+            id_tags = id_tags.map(&:to_s)
             return nil unless id_tags.empty? || id_tags.any? { |k| hash.include?(k) }
             tags = id_tags.inject({}) do |h, k|
               v = hash.delete(k)
@@ -51,17 +50,6 @@ module Libis
             item
           end
 
-          def indifferent_hash(field_name, method_name)
-            define_method method_name do
-              MapWithIndifferentAccess::Map.new(self.read_attribute(field_name))
-            end
-
-            define_method "#{method_name}=" do |value|
-              self.write_attribute(field_name, value)
-              self.send(method_name)
-            end
-          end
-
         end
 
         def dup

data/lib/libis/workflow/mongoid/job.rb

@@ -1,4 +1,3 @@
-require 'map_with_indifferent_access'
 require 'libis/workflow/base/job'
 require 'libis/workflow/mongoid/base'
 
@@ -15,7 +14,7 @@ module Libis
 
         field :name, type: String
         field :description, type: String
-        field :_input, type: Hash, default: -> { Hash.new }
+        field :input, type: Hash, default: -> { Hash.new }
         field :run_object, type: String
         field :log_to_file, type: Boolean, default: false
         field :log_each_run, type: Boolean, default: false
@@ -31,27 +30,10 @@ module Libis
 
         def self.from_hash(hash)
           self.create_from_hash(hash, [:name]) do |item, cfg|
-            item.workflow = Libis::Workflow::Mongoid.from_hash(name: cfg.delete(:workflow))
+            item.workflow = Libis::Workflow::Mongoid.from_hash(name: cfg.delete('workflow'))
           end
         end
 
-        # def input
-        #   MapWithIndifferentAccess::Map.new(self.read_attribute(:_input))
-        # end
-        #
-        # def input=(hash)
-        #   self.write_attribute(:_input, hash)
-        #   self.input
-        # end
-
-        indifferent_hash :_input, :input
-
-        def to_hash
-          result = super
-          result[:input] = result.delete(:_input)
-          result
-        end
-
         def logger
           return ::Libis::Workflow::Mongoid::Config.logger unless self.log_to_file
           logger = ::Logging::Repository[self.name]
@@ -76,7 +58,7 @@ module Libis
         # noinspection RubyStringKeysInHashInspection
         def execute(opts = {})
           if self.log_each_run
-            opts[:run_config] = {
+            opts['run_config'] = {
                 'log_to_file=' => true,
                 'log_level=' => self.log_level
             }

data/lib/libis/workflow/mongoid/log_entry.rb

@@ -19,6 +19,11 @@ module Libis
         field :status, type: String
         field :run_id
 
+        index({logger_type: 1, logger_id: 1, c_at: 1}, {background: true, name: 'by_logger'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, task: 1}, {background: true, name: 'by_logger_task'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, }, {background: true, name: 'by_logger'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, status: 1}, {background: true, sparse: true, name: 'status_by_logger'})
+
         belongs_to :logger, polymorphic: true
 
       end

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

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

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

@@ -11,12 +11,12 @@ module Libis
 
         store_in collection: 'workflow_items'
 
-        field :_options, type: Hash, default: -> { Hash.new }
-        field :_properties, type: Hash, default: -> { Hash.new }
-        field :_summary, type: Hash, default: -> { Hash.new }
+        field :options, type: Hash, default: -> { Hash.new }
+        field :properties, type: Hash, default: -> { Hash.new }
+        field :summary, type: Hash, default: -> { Hash.new }
 
         has_many :logs, as: :logger, class_name: Libis::Workflow::Mongoid::LogEntry.to_s,
-                 dependent: :destroy, autosave: true, order: :_id.asc do
+                 dependent: :destroy, autosave: true, order: :c_at.asc do
           def log_history
             where(:status.exists => false)
           end
@@ -36,18 +36,6 @@ module Libis
           document.logs.each { |log| log.destroy! }
         end
 
-        indifferent_hash :_options, :options
-        indifferent_hash :_properties, :properties
-        indifferent_hash :_summary, :summary
-
-        def to_hash
-          result = super
-          result[:options] = result.delete(:_options)
-          result[:properties] = result.delete(:_properties)
-          result[:summary] = result.delete(:_summary)
-          result
-        end
-
         def log_history
           # noinspection RubyResolve
           self.logs.log_history.all || []

data/lib/libis/workflow/mongoid/workflow.rb

@@ -1,4 +1,3 @@
-require 'map_with_indifferent_access'
 require 'libis/workflow/base/workflow'
 require 'libis/workflow/mongoid/base'
 require 'libis/tools/config_file'
@@ -17,7 +16,7 @@ module Libis
 
         field :name, type: String
         field :description, type: String
-        field :_config, type: Hash, default: -> { Hash.new }
+        field :config, type: Hash, default: -> { Hash.new }
 
         index({name: 1}, {unique: 1})
 
@@ -25,11 +24,7 @@ module Libis
 
         def self.from_hash(hash)
           self.create_from_hash(hash, [:name]) do |item, cfg|
-            if (value = item.read_attribute(:config))
-              item.write_attribute(:_config, value)
-              item.remove_attribute(:config)
-            end
-            item.configure(cfg.key_strings_to_symbols(recursive: true).merge(name: item.name))
+            item.configure(cfg.merge('name' => item.name))
             cfg.clear
           end
         end
@@ -39,22 +34,10 @@ module Libis
           config << file_or_hash
           return nil if config.empty?
           workflow = self.new
-          workflow.configure(config.to_hash.key_strings_to_symbols(recursive: true))
+          workflow.configure(config.to_hash.key_symbols_to_strings(recursive: true))
           workflow
         end
 
-        indifferent_hash :_config, :config
-
-        def to_hash
-          result = super
-          result[:config] = result.delete(:_config)
-          result
-        end
-
-        def input
-          Libis::Tools::DeepStruct.new(super)
-        end
-
       end
     end
   end

data/spec/items/test_dir_item.rb

@@ -12,7 +12,7 @@ class TestDirItem < TestItem
   end
 
   def name
-    self.properties[:name] || super
+    self.properties['name'] || super
   end
 
 end

data/spec/items/test_file_item.rb

@@ -15,15 +15,15 @@ class TestFileItem < TestItem
   end
 
   def name
-    self.properties[:name] || super
+    self.properties['name'] || super
   end
 
   def filesize
-    properties[:size]
+    properties['size']
   end
 
   def fixity_check(checksum)
-    properties[:checksum] == checksum
+    properties['checksum'] == checksum
   end
 
 end

data/spec/tasks/camelize_name.rb

@@ -6,7 +6,7 @@ class CamelizeName < ::Libis::Workflow::Task
 
   def process(item)
     return unless (item.is_a?(TestFileItem) || item.is_a?(TestDirItem))
-    item.properties[:name] = item.name.camelize
+    item.properties['name'] = item.name.camelize
     item.save!
   end
 

data/spec/workflow_spec.rb

@@ -38,40 +38,40 @@ describe 'TestWorkflow' do
   let(:workflow) {
     wf = TestWorkflow.find_or_initialize_by(name: 'TestWorkflow')
     wf.configure(
-        name: 'TestWorkflow',
-        description: 'Workflow for testing',
-        tasks: [
-            {class: 'CollectFiles', recursive: true},
+        'name' => 'TestWorkflow',
+        'description' => 'Workflow for testing',
+        'tasks' => [
+            {'class' => 'CollectFiles', 'recursive' => true},
             {
-                name: 'ProcessFiles',
-                subitems: true,
-                tasks: [
-                    {class: 'ChecksumTester', recursive: true},
-                    {class: 'CamelizeName', recursive: true}
+                'name' => 'ProcessFiles',
+                'subitems' => true,
+                'tasks' => [
+                    {'class' => 'ChecksumTester', 'recursive' => true},
+                    {'class' => 'CamelizeName', 'recursive' => true}
                 ]
             }
         ],
-        input: {
-            dirname: {default: '.', propagate_to: 'CollectFiles#location'},
-            checksum_type: {default: 'SHA1', propagate_to: 'ProcessFiles/ChecksumTester'}
+        'input' => {
+            'dirname' => {'default' => '.', 'propagate_to' => 'CollectFiles#location'},
+            'checksum_type' => {'default' => 'SHA1', 'propagate_to' => 'ProcessFiles/ChecksumTester'}
         }
     )
-    wf.save
+    wf.save!
     wf
   }
   let(:job) {
     job = TestJob.find_or_initialize_by(name: 'TestJob')
     job.configure(
-        name: 'TestJob',
-        description: 'Job for testing',
-        workflow: workflow,
-        run_object: 'TestRun',
-        input: {dirname: dirname, checksum_type: 'SHA256'},
+        'name' => 'TestJob',
+        'description' => 'Job for testing',
+        'workflow' => workflow,
+        'run_object' => 'TestRun',
+        'input' => {'dirname' => dirname, 'checksum_type' => 'SHA256'},
     )
 
     # noinspection RubyResolve
     job.runs.each { |run| run.destroy! }
-    job.save
+    job.save!
     job
   }
 
@@ -81,9 +81,9 @@ describe 'TestWorkflow' do
 
   it 'should contain three tasks' do
 
-    expect(workflow.config[:tasks].size).to eq 3
-    expect(workflow.config[:tasks].first[:class]).to eq 'CollectFiles'
-    expect(workflow.config[:tasks].last[:class]).to eq '::Libis::Workflow::Tasks::Analyzer'
+    expect(workflow.config['tasks'].size).to eq 3
+    expect(workflow.config['tasks'].first['class']).to eq 'CollectFiles'
+    expect(workflow.config['tasks'].last['class']).to eq '::Libis::Workflow::Tasks::Analyzer'
 
   end
 
@@ -162,17 +162,17 @@ STR
     expect(wf.description).to eq 'Workflow for testing'
     expect(wf.input.count).to eq 2
     expect(wf.input[:dirname][:default]).to eq '.'
-    expect(wf.config[:tasks].count).to eq 3
-    expect(wf.config[:tasks][0][:class]).to eq 'CollectFiles'
-    expect(wf.config[:tasks][0][:recursive]).to eq true
-    expect(wf.config[:tasks][1][:name]).to eq 'ProcessFiles'
-    expect(wf.config[:tasks][1][:subitems]).to eq true
-    expect(wf.config[:tasks][1][:tasks].count).to eq 2
-    expect(wf.config[:tasks][1][:tasks][0][:class]).to eq 'ChecksumTester'
-    expect(wf.config[:tasks][1][:tasks][0][:recursive]).to eq true
-    expect(wf.config[:tasks][1][:tasks][1][:class]).to eq 'CamelizeName'
-    expect(wf.config[:tasks][1][:tasks][1][:recursive]).to eq true
-    expect(wf.config[:tasks][2][:class]).to eq '::Libis::Workflow::Tasks::Analyzer'
+    expect(wf.config['tasks'].count).to eq 3
+    expect(wf.config['tasks'][0]['class']).to eq 'CollectFiles'
+    expect(wf.config['tasks'][0]['recursive']).to eq true
+    expect(wf.config['tasks'][1]['name']).to eq 'ProcessFiles'
+    expect(wf.config['tasks'][1]['subitems']).to eq true
+    expect(wf.config['tasks'][1]['tasks'].count).to eq 2
+    expect(wf.config['tasks'][1]['tasks'][0]['class']).to eq 'ChecksumTester'
+    expect(wf.config['tasks'][1]['tasks'][0]['recursive']).to eq true
+    expect(wf.config['tasks'][1]['tasks'][1]['class']).to eq 'CamelizeName'
+    expect(wf.config['tasks'][1]['tasks'][1]['recursive']).to eq true
+    expect(wf.config['tasks'][2]['class']).to eq '::Libis::Workflow::Tasks::Analyzer'
   end
 
   # noinspection RubyResolve
@@ -190,8 +190,8 @@ STR
     item = run.items.first
     expect(item.nil?).to eq false
     expect(item.is_a? TestDirItem).to eq true
-    expect(item.properties[:name]).to eq 'Items'
-    expect(item.properties[:ingest_failed]).to eq false
+    expect(item.properties['name']).to eq 'Items'
+    expect(item.properties['ingest_failed']).to eq false
   end
 
   it 'move item in relation' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-11 00:00:00.000000000 Z
+date: 2016-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow
@@ -122,14 +122,6 @@ files:
 - lib/libis/workflow/mongoid/work_item.rb
 - lib/libis/workflow/mongoid/worker.rb
 - lib/libis/workflow/mongoid/workflow.rb
-- lib/map_with_indifferent_access.rb
-- lib/map_with_indifferent_access/list.rb
-- lib/map_with_indifferent_access/map.rb
-- lib/map_with_indifferent_access/normalization.rb
-- lib/map_with_indifferent_access/normalization/deep_normalizer.rb
-- lib/map_with_indifferent_access/values.rb
-- lib/map_with_indifferent_access/version.rb
-- lib/map_with_indifferent_access/wraps_collection.rb
 - libis-workflow-mongoid.gemspec
 - mongoid.yml
 - spec/db_env.sh