dor-services 4.22.1 → 4.22.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTgxNmYwMjFmNWQwZGZjZDViMmVmYWJmNDEwMTVjMWE0ODQ4OWI4ZA==
+    NDYxZTA5OWZlY2Y4ZGE5ZjM2NzY5NTgwYjk2YzRmZTNkYjYwNGY5Ng==
   data.tar.gz: !binary |-
-    MzY1YmM5ZWI5ZTBmN2M3YzhiN2Y0NDBhZTQ1YzI0MzdlMzIyNmEwZQ==
+    MWNiNTFmZTMzYjJjOTExNDhiNTJkODI4OTg3NDNmZDAzMDMwYzUxZQ==
 SHA512:
   metadata.gz: !binary |-
-    ODMyMjRlYTE5MTM3MTBjM2YwODZhMDQzMGI1NWFmMjUwODFjYjNiODk3NzUy
-    ZTU5NTE2NTFmNGUxZjM3MWQ5MDkyNjM4MzFmODIyMzE2ZjliNDAyZjI5NGZm
-    MDY3Mzc5OTcyN2FmNzRiMTE2YmJjZWYwYWUyMTlkZTZkMmJlMTE=
+    NjZlZWJkYzUwMTEyNmVhNDg5YjNiMzVlYTE2MThiYzNjYTVkM2RkMDU4ZWFh
+    OTFiZDcxZjA5NDU5Y2JlYTc3Y2IxMzg1ZGY1OWZmM2ZiYzFhNTgwYzMxOWM1
+    ZGNhNWRiMGQyNjI5MDE4Mzk1NWVlYmQ3NDdhODA4YWUwNzg2MWI=
   data.tar.gz: !binary |-
-    YjRiNmZiOTZkMGUzMTJmNzdiYjBmYzQ4YjQ1YThhYjQzYTQ3MDczN2JmM2U5
-    ZDI5M2EyNTlmZmM5ZjQzN2ZmN2MxODdmOWM5ZWZlOTA5OWQ5YThiM2IwM2Jj
-    NmM0MjIyNGZjMDg3ZTI3ODc3MjBkNzI1ZGU2NWZlNzQ2ZDBlY2U=
+    YzlkNWU5ODMyYjZlMzg2M2IzYTFiMThlOGQ4OWY0OTE4NmI2MDIzNTVkNDcx
+    NTMwMjViM2Q4OTA3N2FjNTEyNmE1MDMxMTg0Njg5MjYzMjZkODk5MTY4ZDQ4
+    YjMxOTUxN2VlNjRmYWM5YzI5NmNkZTJkYzQ1MDY2YWFiNzE5Mzc=

data/lib/dor/models/describable.rb

@@ -56,6 +56,8 @@ module Dor
       doc = self.descMetadata.ng_xml.dup(1)
       add_collection_reference(doc)
       add_access_conditions(doc)
+      doc.xpath('//comment()').remove
+
       new_doc = Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
       new_doc.encoding = 'UTF-8'
       new_doc.to_xml

data/lib/dor/models/presentable.rb

@@ -63,6 +63,7 @@ module Dor
       add_metadata 'Contributor', '//oai_dc:dc/dc:contributor', metadata, pub_obj_doc
       add_metadata 'Publisher', '//oai_dc:dc/dc:publisher', metadata, pub_obj_doc
       add_metadata 'Date', '//oai_dc:dc/dc:date', metadata, pub_obj_doc
+      add_metadata 'PublishVersion', '/publicObject/@publishVersion', metadata, pub_obj_doc
 
       # Save off the first dc:description without displayLabel
       if(desc = pub_obj_doc.at_xpath('//oai_dc:dc/dc:description[not(@displayLabel)]', DC_NS))
@@ -81,9 +82,9 @@ module Dor
       count = 0
       pub_obj_doc.xpath('/publicObject/contentMetadata/resource[@type="image" or @type="page"]').each do |res_node|
         count += 1
-        img_file_name = res_node.at_xpath('file/@id').text.split('.').first
-        height = res_node.at_xpath('file/imageData/@height').text.to_i
-        width = res_node.at_xpath('file/imageData/@width').text.to_i
+        img_file_name = res_node.at_xpath('file[@mimetype="image/jp2"]/@id').text.split('.').first
+        height = res_node.at_xpath('file[@mimetype="image/jp2"]/imageData/@height').text.to_i
+        width = res_node.at_xpath('file[@mimetype="image/jp2"]/imageData/@width').text.to_i
         stacks_uri = "#{Dor::Config.stacks.url}/image/iiif/#{id}%2F#{img_file_name}"
 
         canv = IIIF::Presentation::Canvas.new

data/lib/dor/models/publishable.rb

@@ -39,6 +39,7 @@ module Dor
       pub = Nokogiri::XML("<publicObject/>").root
       pub['id'] = pid
       pub['published'] = Time.now.xmlschema
+      pub['publishVersion'] = 'dor-services/' + Dor::VERSION
       release_xml=Nokogiri(self.generate_release_xml).xpath('//release')
 
       im=self.datastreams['identityMetadata'].ng_xml.clone

data/lib/dor/models/workflow_object.rb

@@ -5,13 +5,13 @@ module Dor
     include Identifiable
     include SolrDocHelper
     include Governable
-    @@xml_cache = {}
+    @@xml_cache  = {}
     @@repo_cache = {}
 
     has_object_type 'workflow'
     has_metadata :name => "workflowDefinition", :type => Dor::WorkflowDefinitionDs, :label => 'Workflow Definition'
 
-    def self.find_by_name(name, opts={})
+    def self.find_by_name(name, opts = {})
       Dor.find_all(%{objectType_t:"#{self.object_type}" workflow_name_s:"#{name}"}, opts).first
     end
 
@@ -21,8 +21,7 @@ module Dor
     # @param [String] name the name of the workflow
     # @return [String] the initial workflow xml
     def self.initial_workflow(name)
-      return @@xml_cache[name] if(@@xml_cache.include?(name))
-
+      return @@xml_cache[name] if @@xml_cache.include?(name)
       self.find_and_cache_workflow_xml_and_repo name
       @@xml_cache[name]
     end
@@ -32,8 +31,7 @@ module Dor
     # @param [String] name the name of the workflow
     # @return [String] the initial workflow xml
     def self.initial_repo(name)
-      return @@repo_cache[name] if(@@repo_cache.include?(name))
-
+      return @@repo_cache[name] if @@repo_cache.include?(name)
       self.find_and_cache_workflow_xml_and_repo name
       @@repo_cache[name]
     end
@@ -42,16 +40,16 @@ module Dor
       datastreams['workflowDefinition']
     end
 
-    def graph *args
+    def graph(*args)
       self.definition.graph *args
     end
 
-    def to_solr solr_doc=Hash.new, *args
+    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
-      add_solr_value(solr_doc,"#{definition.name}_archived",count,:integer,[:displayable])
+      add_solr_value(solr_doc, "#{definition.name}_archived", count, :integer, [:displayable])
       solr_doc
     end
 
@@ -63,12 +61,13 @@ module Dor
 
     # Searches DOR for the workflow definition object.  It then caches the workflow repository and xml
     # @param [String] name the name of the workflow
+    # @return [Object] a Dor::xxxx object, e.g. a Dor::Item object
     def self.find_and_cache_workflow_xml_and_repo(name)
       wobj = find_by_name(name)
       raise "Failed to find workflow via find_by_name('#{name}')" if wobj.nil?
-      wf_xml = wobj.generate_initial_workflow
       @@repo_cache[name] = wobj.definition.repo
-      @@xml_cache[name] = wf_xml
+      @@xml_cache[name]  = wobj.generate_initial_workflow
+      wobj
     end
 
   end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.22.1'
+  VERSION = '4.22.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.22.1
+  version: 4.22.2
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora