moab-versioning 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf042d5123eebc1b9c1b9693e05c45c99912b39
-  data.tar.gz: 6e52763c9a40797606c858e7794eb9014d2fab7c
+  metadata.gz: b141f93a04b4ad8240f247a8a060c6b4b9ebb413
+  data.tar.gz: 7cc328d69cc4589730e5b8b35350ef327fd1ea3d
 SHA512:
-  metadata.gz: b2ee7236ad243d907c51fdd82835c0e12829dc99a2b1a65bc1f9ed2b3c0d70ce396ebe7c58459cfdf0a2c4aa3479363fa80352ce3a343e31a308ba78e2e52652
-  data.tar.gz: 0c61777fa909a4b57563ad3a9a94f1a8c46a6096dc58d97dd8c4ae86370c0e59899ae9dfb6805f3a96d00a20cb4a398e9bb3fc3d7615c5e0ba50d1b0bade36dd
+  metadata.gz: f8fcd9e0ad6d4fce690fbc88af68474e28693eb7e9bea7abf41beff93322fce78716d49ade6fb3a1c3410aaf3c55ec4262c411906e0efb8678e59fb0d1f2e792
+  data.tar.gz: fd3fab12cac688a8685aee5f30b50dba29d6ae2115adc2918b329c8a749577c6a1fb394fdf51c226c2c8e3fd5d6a716523928f2c0decb0d1ee7d585d6a575536

data/lib/moab/stanford.rb

@@ -5,6 +5,7 @@ require 'stanford/storage_repository'
 require 'stanford/storage_services'
 require 'stanford/active_fedora_object'
 require 'stanford/moab_storage_directory'
+require 'stanford/storage_object_validator'
 
 # Stanford is a module that isolates classes specific to the Stanford Digital Repository
 #

data/lib/moab/storage_object_validator.rb

@@ -23,18 +23,6 @@ module Moab
     VERSIONS_NOT_IN_ORDER = 7
     FILES_IN_VERSION_DIR = 8
 
-    ERROR_CODE_TO_MESSAGES = {
-      INCORRECT_DIR=> "Incorrect items in path",
-      MISSING_DIR => "Missing directory: %{addl}",
-      EXTRA_CHILD_DETECTED => "Unexpected item in path: %{addl}",
-      VERSION_DIR_BAD_FORMAT => "Version directory name not in 'v00xx' format",
-      FILES_IN_VERSION_DIR => "Top level should contain only sequential version directories. Also contains files: %{addl}",
-      NO_SIGNATURE_CATALOG => "Version: %{addl} Missing signatureCatalog.xml",
-      NO_MANIFEST_INVENTORY => "Version: %{addl} Missing manifestInventory.xml",
-      NO_XML_FILES => "Version: %{addl} Missing all required metadata files",
-      VERSIONS_NOT_IN_ORDER => "Should contain only sequential version directories. Current directories: %{addl}"
-    }.freeze
-
     attr_reader :storage_obj_path
 
     def initialize(storage_object)
@@ -50,6 +38,21 @@ module Moab
       errors
     end
 
+    def self.error_code_to_messages
+      @error_code_to_messages ||=
+        {
+          INCORRECT_DIR => "Incorrect items in path",
+          MISSING_DIR => "Missing directory: %{addl}",
+          EXTRA_CHILD_DETECTED => "Unexpected item in path: %{addl}",
+          VERSION_DIR_BAD_FORMAT => "Version directory name not in 'v00xx' format",
+          FILES_IN_VERSION_DIR => "Top level should contain only sequential version directories. Also contains files: %{addl}",
+          NO_SIGNATURE_CATALOG => "Version: %{addl} Missing signatureCatalog.xml",
+          NO_MANIFEST_INVENTORY => "Version: %{addl} Missing manifestInventory.xml",
+          NO_XML_FILES => "Version: %{addl} Missing all required metadata files",
+          VERSIONS_NOT_IN_ORDER => "Should contain only sequential version directories. Current directories: %{addl}"
+        }.freeze
+    end
+
     # TODO: Figure out which methods should be public
 
     private
@@ -157,7 +160,7 @@ module Moab
     end
 
     def error_code_msg(response_code, addl=nil)
-      format(ERROR_CODE_TO_MESSAGES[response_code], addl: addl)
+      format(self.class.error_code_to_messages[response_code], addl: addl)
     end
 
     def check_required_manifest_files(dir, version)
@@ -176,5 +179,13 @@ module Moab
       errors << result if result
       errors
     end
+
+    def latest_manifest_inventory
+      "#{storage_obj_path}/#{version_directories.last}/#{MANIFEST_INVENTORY_PATH}"
+    end
+
+    def object_id_from_manifest_inventory
+      Nokogiri::XML(File.open(latest_manifest_inventory)).at_xpath('//fileInventory/@objectId').value
+    end
   end
 end

data/lib/stanford/storage_object_validator.rb

@@ -0,0 +1,35 @@
+require 'moab'
+
+module Stanford
+  # druids are Stanford specific entities
+  class StorageObjectValidator < Moab::StorageObjectValidator
+
+    # TODO: test to make sure constants don't collide on underlying int vals?
+    # keep from stepping on previously defined error code constants.
+    DRUID_MISMATCH = superclass.error_code_to_messages.keys.max + 1
+
+    def validation_errors
+      errors = []
+      errors.concat super
+      errors.concat identify_druid
+    end
+
+    def identify_druid
+      druid_from_filepath == object_id_from_manifest_inventory ? [] : [result_hash(DRUID_MISMATCH)]
+    end
+
+    # the Stanford validator expects keys to be in ascending numerical order
+    def self.error_code_to_messages
+      @error_code_to_messages ||=
+        {
+          DRUID_MISMATCH => 'manifestInventory object_id does not match druid'
+        }.merge!(superclass.error_code_to_messages).freeze
+    end
+
+    private
+
+    def druid_from_filepath
+      "druid:#{File.basename(storage_obj_path)}"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Darren Weber
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: confstruct
@@ -277,6 +277,7 @@ files:
 - lib/stanford/content_inventory.rb
 - lib/stanford/dor_metadata.rb
 - lib/stanford/moab_storage_directory.rb
+- lib/stanford/storage_object_validator.rb
 - lib/stanford/storage_repository.rb
 - lib/stanford/storage_services.rb
 - lib/tasks/yard.rake
@@ -300,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by the SULAIR