jhove-service 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1422e93ce5a6f16d9582ee9aa74e818415717f8
-  data.tar.gz: d484c7740c2adf9b716abe1f5fa297fec1148665
+  metadata.gz: aa0685c415e5e2008e19e4a1e349e614e5d716b9
+  data.tar.gz: e8bdfc822598531f9cb5784a11e9f99ebc1c5b37
 SHA512:
-  metadata.gz: d97605cf406b47cf9bca37fa1828b9c7fe03c6e30f124206ed2d96076d547dfc8b892fc6a384ef0f6678d0218313c89c998d2f457ef42861c113faa66fc1ade1
-  data.tar.gz: bf4ce1ef96d65ad07194e3f064b79e1f73d055d41ecce31d831b99ee2188a706dae81858b21e90e0902c3dcb7c30e860c263d7da83efcb398356dc5d3d60efe2
+  metadata.gz: 24f290d188efd7cc70cd68be08702640cc7d3edb94dfc679092439424960cab50ad720faada26f85b31e205f66f8ed2b0a0e90e22986b112e6eada1bdb0740e3
+  data.tar.gz: 5f86847ce28c2265df555f13b2c92efb4b3a3eafbddadd4a067df0ad066c3a2af58286fe891a45839d1d45ff74214cf1c9e241300d99995d8391e596a16d5dfe

data/README.rdoc

@@ -10,10 +10,8 @@ This will give you:
   JhoveService
 
 == Build and release procedure
-Modify the version number in jhove-service.gemspec, then push your commits to AFS.  DO NOT TAG!
-Run: 'rake dlss_release' to tag, build, and publish the gem
-See the Rakefile and the LyberCore::DlssRelease task in lyberteam-devel/lib/dlss/rake/dlss_release.rb
-for more details
+Modify the version number in jhove-service.gemspec, then push your commits to github.  DO NOT TAG!
+Run: 'rake release' to tag, build, and publish the gem
 
 == Releases
 - <b>0.1.0</b> First release
@@ -25,7 +23,9 @@ for more details
 - <b>1.0.1</b> Updated to use new sul-gems server and new lyberteam-gems-devel utility
 - <b>1.0.2</b> Fixed negative indentation problem for empty elements( e.g. <elem/>)
 - <b>1.0.3</b> Upgraded bin/jhoveApp.jar to copy from Jhove 1.9 release
+- <b>1.1.0</b> Upgraded bin/*.jar apps to 1.14.6
+- <b>1.1.1</b> Ensure only relative paths are shown in xml output
 
 == Copyright
 
-Copyright (c) 2013 Stanford University Library. See LICENSE for details.
+Copyright (c) 2017 Stanford University Library. See LICENSE for details.

data/lib/jhove_service.rb

@@ -2,6 +2,7 @@ require 'nokogiri'
 require 'pathname'
 require 'jhove_technical_metadata'
 require 'stringio'
+require 'uri'
 
   class JhoveService
 
@@ -37,6 +38,7 @@ require 'stringio'
     raise "Content #{content_dir} not found" unless File.directory? content_dir
     if fileset_file.nil? # a simple directory gets called directly
       exec_command(get_jhove_command(content_dir))
+      jhove_output_xml_ng = File.open(jhove_output) { |f| Nokogiri::XML(f) }
     else # a filelist gets run one by one, jhove cannot do this out of the box, so we need to run jhove file by file and then assemble the results ourselves into a single XML
       raise "File list #{fileset_file} not found" unless File.exists? fileset_file
       files = File.new(fileset_file).readlines
@@ -51,10 +53,11 @@ require 'stringio'
         combined_xml_output += jhove_output_xml_ng.css("//repInfo").to_xml # build up an XML string with all output
         output_file.delete
       end
-      jhove_output_xml_ng.root.children.each {|n| n.remove} # use of the files we built up above, strip all the children to ge the root jhove node
+      jhove_output_xml_ng.root.children.each {|n| n.remove} # use all of the files we built up above, strip all the children to get the root jhove node
       jhove_output_xml_ng.root << combined_xml_output # now add the combined xml for all files
-      File.write(jhove_output, jhove_output_xml_ng.to_xml)
     end
+    remove_path_from_file_nodes(jhove_output_xml_ng,content_dir)
+    File.write(jhove_output, jhove_output_xml_ng.to_xml)
     jhove_output.to_s
   end
 
@@ -77,6 +80,14 @@ require 'stringio'
     jhove_cmd
   end
 
+  # @param jhove_output_xml_ng [ng_xml_obj] the nokogiri xml output from jhove
+  # @param path [String] the shared path that will be removed from each file name to ensure the file nodes are relative
+  def remove_path_from_file_nodes(jhove_output_xml_ng,path)
+    jhove_output_xml_ng.xpath('//jhove:repInfo', 'jhove' => 'http://hul.harvard.edu/ois/xml/ns/jhove').each do |filename_node|
+      filename_node.attributes['uri'].value = URI.decode(filename_node.attributes['uri'].value.gsub("#{path}",'').sub(/^\//,'')) # decode and remove path and any leading /
+    end
+  end
+
   # @param [Pathname,String] jhove_pathname The full path of the file containing JHOVE output to be transformed to technical metadata
   # @return [String] Convert jhove output it to technicalMetadata, returning the output file path
   def create_technical_metadata(jhove_pathname=jhove_output)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jhove-service
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Anderson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri