libis-workflow-mongoid 2.0.beta.11 → 2.0.beta.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb77b9360af577f7b0b7f8067b0b43339a562512
-  data.tar.gz: 40868911a55787816c6cbd9e8e2730da9e26b1f4
+  metadata.gz: 2142a37ef9b2515d6f174ba669096ad0e7a069f4
+  data.tar.gz: da025b55d4239d74c0dfb93ff98c37f8965e6068
 SHA512:
-  metadata.gz: 64a7f3c741675179200da3beaa66d02265611afabe19dc18e3f6f293e71b8bac1c9b077b021a26e4cb76c68f403fad2c45c8d4036ab4898654783d7553e9d7ef
-  data.tar.gz: ef4c92bc1aba840e0b7b609624203759557cea6fcbf65681a60ffae6c8131410d37d9d5ced04e988360715ead97cfb5aa3dff6517aa4813445e3f57734eb1d39
+  metadata.gz: b101d3e133a0db6e106cf16c0a84a4312a31975331d193e770748230f271ae87e714596556a2e750974a47037f6fefe7273f861adde360ef593dfb997de885bf
+  data.tar.gz: 6cf53db7edd79bd3a018e6d5b77655bff52c22ce4b0755fb3da7e26d18a3d785468fba4ce22bfb9f21974fffe747b89508cdcaef0dba38b6262c9d00a75c18dd

data/.travis.yml

@@ -25,6 +25,8 @@ matrix:
       jdk: oraclejdk7
     - rvm: ruby-head
       jdk: oraclejdk8
+  allow_failures:
+    - rvm: ruby-head
 branches:
   only:
       - master

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

@@ -4,6 +4,8 @@ require 'mongoid/document'
 require 'mongoid_indifferent_access'
 require_relative 'sequence'
 
+require 'active_support/core_ext/object/deep_dup'
+
 module Libis
   module Workflow
     module Mongoid
@@ -27,6 +29,17 @@ module Libis
           new_obj.copy_attributes(self)
         end
 
+        def info
+          self.attributes.deep_dup.reject { |k,v| v.blank? || volatile_attributes.include?(k) }.to_hash
+        end
+
+        protected
+
+        def volatile_attributes
+          %w'_id c_at'
+        end
+        private
+
         def copy_attributes(other)
           self.set(
               other.attributes.reject do |k, _|

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

@@ -21,11 +21,9 @@ module Libis
             field :start_date, type: Time, default: -> { Time.now }
 
             set_callback(:destroy, :before) do |document|
-              document.items.each { |item| item.destroy! }
+              document.items.each { |item| item.destroy }
               wd = document.work_dir
               FileUtils.rmtree wd if wd && !wd.blank? && Dir.exist?(wd)
-              id = document.properties[:ingest_dir]
-              FileUtils.rmtree id if id && !id.blank? && Dir.exist?(id)
             end
 
             index start_date: 1

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

@@ -3,7 +3,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.beta.11' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.beta.12' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
     end
   end
 end

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

@@ -3,6 +3,7 @@
 require 'libis/workflow/base/workflow'
 require 'libis/workflow/mongoid/base'
 require 'libis/tools/config_file'
+require 'libis/tools/extend/hash'
 
 module Libis
   module Workflow
@@ -33,7 +34,7 @@ module Libis
               config << file_or_hash
               return nil if config.empty?
               workflow = self.new
-              workflow.configure(config.to_h)
+              workflow.configure(config.to_hash.key_strings_to_symbols(recursive: true))
               workflow
             end
 

data/spec/workflow_spec.rb

@@ -88,7 +88,7 @@ describe 'TestWorkflow' do
 
   it 'should camelize the workitem name' do
 
-    expect(run.options[:dirname]).to eq dirname
+    expect(run.options['CollectFiles'][:location]).to eq dirname
     expect(run.items.count).to eq 1
     expect(run.items.first.class).to eq TestDirItem
     expect(run.items.first.count).to eq 4

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.11
+  version: 2.0.beta.12
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow