dor-services 5.4.1 → 5.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 35cb1a44d9afd35558a54871f7af46dc84ae6edc
-  data.tar.gz: b3164b45e0cf6715f59658de8b49eb85e1563d47
+  metadata.gz: f647df9fcf225b255d735ada30da8bc2341fec8d
+  data.tar.gz: f658e61c9dee49e0d9393fa458f48dd3f9079577
 SHA512:
-  metadata.gz: f9be737b2a4309a040db2ec25d6fe63938212de57275914a78e29e8672fc24f2a1e3bff9432032e2a6b6ee1cd60cd66a24ecad5a029f19a75255a2fece62538f
-  data.tar.gz: 347762c2217189fe6db553f1f140eee4800405aad4dc73a45465ffa696bbf16468fb432081419c019fc636ad94de36359199df2ade3a855ff7564489bec67aba
+  metadata.gz: f973016488d017947ceb2009c2695e63faf856197169d4488c84a32c34142d0d52aa8a83be6f4ef3b6fed75d4f1c16f6ef0608bf3325337f86ee6f23ed96cbb1
+  data.tar.gz: f6df2fce0ada1ed23bf924d3ee234e88b5fca0ebc16d6dd79746de7121fc79fc7fc8256bb425552dfb1cb23cb5d37a03ef572b59cac8b0bb2d8306a6e590103d

data/lib/dor/datastreams/workflow_ds.rb

@@ -35,7 +35,7 @@ module Dor
     def content(refresh = false)
       @content = nil if refresh
       @content ||= Dor::WorkflowService.get_workflow_xml 'dor', pid, nil
-    rescue RestClient::ResourceNotFound
+    rescue Dor::WorkflowException => e
       xml = Nokogiri::XML(%(<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{pid}"/>))
       digital_object.datastreams.keys.each do |dsid|
         next unless dsid =~ /WF$/

data/lib/dor/models/workflow_object.rb

@@ -45,10 +45,7 @@ module Dor
 
     def to_solr(solr_doc = {}, *args)
       super solr_doc, *args
-      client = Dor::WorkflowService.workflow_resource
-      xml = client["workflow_archive?repository=#{definition.repo}&workflow=#{definition.name}&count-only=true"].get
-      count = Nokogiri::XML(xml).at_xpath('/objects/@count').value
-      solr_doc["#{definition.name}_archived_isi"] = count
+      solr_doc["#{definition.name}_archived_isi"] = Dor::WorkflowService.count_archived_for_workflow(definition.name)
       solr_doc
     end
 

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.4.1'
+  VERSION = '5.4.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.4.1
+  version: 5.4.2
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -98,28 +98,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.2
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -162,20 +148,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.21'
 - !ruby/object:Gem::Dependency
   name: rdf
   requirement: !ruby/object:Gem::Requirement
@@ -302,20 +274,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.4
-- !ruby/object:Gem::Dependency
-  name: osullivan
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: retries
   requirement: !ruby/object:Gem::Requirement
@@ -336,14 +294,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -468,20 +426,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jhove-service
   requirement: !ruby/object:Gem::Requirement