libis-workflow-mongoid 2.0.beta.19 → 2.0.beta.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4007c2617d40f21ef002c8fb826fdd591cd13678
-  data.tar.gz: 36e3a6f296770d5c025cd02965ab65b4baa2193f
+  metadata.gz: 674a0925bea93cd6af396d621e1d2a73a29e2ffb
+  data.tar.gz: 8b8037e88db86b2d0c5a43b81418ac146c7f663b
 SHA512:
-  metadata.gz: 265c9ee3d043ae9ea96f024098ebb2edfaec73440c19c73225420efa2f403626a377e969760e7bd9049b038689d88711fd3b4e29ed9246f05a02d99b8131664a
-  data.tar.gz: 2cbc5c0042c75712a9b36bbcb3c8fb69b762f24eaea2011ded5c818dbe24f05637d2d90fd54ba9ac3fd2e888f63411ccb20d4499d61d007a7921c23328401c1a
+  metadata.gz: dd4ea904e7d5b87f731b6cb531b0d1a39446fdcba03df3078850f92f768e7925628f8b35e0d5570c3cb33dc46267307e47424ac31771ce55770a5eb4d84f0d29
+  data.tar.gz: cfae7c656ae1f5e52a146a8148a7c3b14a7c80de083917affe9bbce848af40cf640dce6115638037d8683b8d58ec261de60e7788acaddcb65dd5479effb5e317

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

@@ -3,7 +3,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.beta.19' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.beta.20' 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_base.rb

@@ -8,21 +8,6 @@ module Libis
 
       module WorkItemBase
 
-        class Options
-          include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
-        end
-
-        class Properties
-          include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
-        end
-
-        class Summary
-          include Libis::Workflow::Mongoid::Dynamic
-          embedded_in :work_item, class_name: 'Libis::Workflow::Mongoid::WorkItem'
-        end
-
         def self.included(klass)
           klass.class_eval do
             include Libis::Workflow::Base::WorkItem
@@ -30,9 +15,9 @@ module Libis
 
             store_in collection: 'workflow_items'
 
-            embeds_one :options, class_name: Libis::Workflow::Mongoid::WorkItemBase::Options.to_s
-            embeds_one :properties, class_name: Libis::Workflow::Mongoid::WorkItemBase::Properties.to_s
-            embeds_one :summary, class_name: Libis::Workflow::Mongoid::WorkItemBase::Summary.to_s
+            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
@@ -55,12 +40,6 @@ module Libis
               document.logs.each { |log| log.destroy! }
             end
 
-            set_callback(:initialize, :after) do |document|
-              document.options = {}
-              document.properties = {}
-              document.summary = {}
-            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

@@ -88,7 +88,8 @@ describe 'TestWorkflow' do
 
   it 'should camelize the workitem name' do
 
-    expect(run.options['CollectFiles'][:location]).to eq dirname
+    puts run.options
+    expect(run.options['CollectFiles']['location']).to eq dirname
 
     expect(run.items.size).to eq 1
     expect(run.items.count).to eq 1
@@ -110,13 +111,13 @@ describe 'TestWorkflow' do
 
   it 'should return expected debug output' do
 
-    expect(run.summary[:DEBUG]).to eq 23
+    expect(run.summary['DEBUG']).to eq 23
     expect(run.log_history.count).to eq 8
     expect(run.status_log.count).to eq 8
     item = run.items.first
     expect(item.log_history.count).to eq 15
     expect(item.status_log.count).to eq 6
-    expect(item.summary[:DEBUG]).to eq 15
+    expect(item.summary['DEBUG']).to eq 15
 
     sample_out = <<STR
 DEBUG -- CollectFiles - TestRun : Processing subitem (1/1): items
@@ -188,8 +189,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.beta.19
+  version: 2.0.beta.20
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow