workflow-archiver 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32c9418414ffb16cf6a2fbc5023624cad5ff8eb9
-  data.tar.gz: c6591215bdfd57fa70bf923d18fc3e1f6a9f44ee
+  metadata.gz: bfb0bdfe2166b60e965269c08e3e3974acc57fcc
+  data.tar.gz: 48643eb6e09e11edc36562a76a7a58dbd3058db0
 SHA512:
-  metadata.gz: b4a8f4f7a62ea751aadf48b0e6c32998cbb90aed4298ca577e69e1503fd471dca8f518be1d01fcb273099d4d2c873761d685c5c6e03e2a08fdcee6be97414575
-  data.tar.gz: 1347883e472fe0d14e124d33c326e64e31f5be58240b8fb1e91b0752cac00e635fbf34387650c28be6670cd1e4f3b999aeacb7854ca1ba28fbdac84943cdaf10
+  metadata.gz: 56a8bcad387c55e927386038257654188640136e0093081a1d697401641a8a3dede603c8af0f53ce9d0d97afc7a5198d0bbf362d4c580adef02bd2cdddd21989
+  data.tar.gz: f12a9553415f97617aa6d7c2e5a0ae5994a55c7483c5dbcb8a77ee3c3ff6bfd40b141948ffd8509d7390a031fdeeabc0fb6cb424ccc1ffb18352d26e68625682

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/lib/dor/workflow_archiver.rb

@@ -7,11 +7,11 @@ module Dor
   # Holds the paramaters about the workflow rows that need to be deleted
   ArchiveCriteria = Struct.new(:repository, :druid, :datastream, :version) do
     # @param [Array<Hash>] List of objects returned from {WorkflowArchiver#find_completed_objects}.  It expects the following keys in the hash
-    def setup_from_query(row_hash)
+    def setup_from_query(row_hash, dor_conn)
       self.repository = row_hash[:repository]
       self.druid = row_hash[:druid]
       self.datastream = row_hash[:datastream]
-      set_current_version
+      set_current_version(dor_conn)
       self
     end
 
@@ -25,8 +25,9 @@ module Dor
       h
     end
 
-    def set_current_version
-      self.version = Faraday.get WorkflowArchiver.config.dor_service_uri + "/dor/v1/objects/#{druid}/versions/current"
+    def set_current_version(dor_conn)
+      response = dor_conn.get "/dor/v1/objects/#{druid}/versions/current"
+      self.version = response.body
     rescue Faraday::Error::ClientError => ise
       raise unless ise.inspect =~ /Unable to find.*in fedora/
       LyberCore::Log.warn ise.inspect.to_s
@@ -67,6 +68,10 @@ module Dor
       @conn ||= Sequel.connect(@db_uri)
     end
 
+    def dor_conn
+      @dor_conn ||= Faraday.new(:url => WorkflowArchiver.config.dor_service_uri)
+    end
+
     # @return [String] The columns appended with comma and newline
     def wf_column_string
       WF_COLUMNS.join(",\n")
@@ -135,6 +140,9 @@ module Dor
 
       delete_sql = "delete from #{@workflow_table} where druid = :druid and datastream = :datastream "
 
+      LyberCore::Log.debug "copy_sql is #{copy_sql}"
+      LyberCore::Log.debug "delete_sql is #{delete_sql}"
+
       if(workflow_info.repository)
         copy_sql += "and #{@workflow_table}.repository = :repository"
         delete_sql += 'and repository = :repository'
@@ -183,7 +191,7 @@ module Dor
     def map_result_to_criteria(rows)
       rows.lazy.map do |r|
         begin
-          ArchiveCriteria.new.setup_from_query(r)
+          ArchiveCriteria.new.setup_from_query(r, dor_conn)
         rescue => e
           LyberCore::Log.error("Skipping archiving of #{r['DRUID']}")
           LyberCore::Log.error("#{e.inspect}\n" + e.backtrace.join("\n"))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workflow-archiver
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Willy Mene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lyber-core
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Enables archiving of DOR workflows