moab-versioning 4.2.1 → 4.4.2

data/lib/stanford/dor_metadata.rb

@@ -1,4 +1,4 @@
-require 'moab/stanford'
+# frozen_string_literal: true
 
 module Stanford
   # Stanford-specific utility methods for interfacing with DOR metadata files
@@ -31,11 +31,12 @@ module Stanford
     # @return [FileInventory]  Inventory of the files under the specified directory
     def inventory_from_directory(directory, version_id = nil)
       version_id ||= @version_id
-      version_inventory = Moab::FileInventory.new(type: 'version', digital_object_id: @digital_object_id, version_id: version_id)
+      version_inventory = Moab::FileInventory.new(type: 'version', digital_object_id: @digital_object_id,
+                                                  version_id: version_id)
       content_metadata = IO.read(File.join(directory, 'contentMetadata.xml'))
       content_group = Stanford::ContentInventory.new.group_from_cm(content_metadata, 'preserve')
       version_inventory.groups << content_group
-      metadata_group = Moab::FileGroup.new(:group_id => 'metadata').group_from_directory(directory)
+      metadata_group = Moab::FileGroup.new(group_id: 'metadata').group_from_directory(directory)
       version_inventory.groups << metadata_group
       version_inventory
     end

data/lib/stanford/moab_storage_directory.rb

@@ -1,11 +1,13 @@
+# frozen_string_literal: true
+
 require 'find'
 
 module Stanford
   ##
   # methods for dealing with a directory which stores Moab objects
   class MoabStorageDirectory
-    DRUID_TREE_REGEXP = '[[:lower:]]{2}/\\d{3}/[[:lower:]]{2}/\\d{4}'.freeze
-    DRUID_REGEXP = '[[:lower:]]{2}\\d{3}[[:lower:]]{2}\\d{4}'.freeze
+    DRUID_TREE_REGEXP = '[[:lower:]]{2}/\\d{3}/[[:lower:]]{2}/\\d{4}'
+    DRUID_REGEXP = '[[:lower:]]{2}\\d{3}[[:lower:]]{2}\\d{4}'
 
     def self.find_moab_paths(storage_dir)
       Find.find(storage_dir) do |path|

data/lib/stanford/storage_object_validator.rb

@@ -1,4 +1,4 @@
-require 'moab'
+# frozen_string_literal: true
 
 module Stanford
   # druids are Stanford specific entities

data/lib/stanford/storage_repository.rb

@@ -1,4 +1,5 @@
-require 'moab/stanford'
+# frozen_string_literal: true
+
 require 'druid-tools'
 
 module Stanford
@@ -22,7 +23,7 @@ module Stanford
     end
 
     # @param object_id [String] The identifier of the digital object
-    # @return [Pathname] The branch segment of the object deposit path
+    # @return [String] The branch segment of the object deposit path
     def deposit_branch(object_id)
       object_id.split(/:/)[-1]
     end
@@ -30,12 +31,14 @@ module Stanford
     # @param object_id [String] The identifier of the digital object whose path is requested
     # @return [String] the druid tree directory path based on the given object identifier.
     def druid_tree(object_id)
-      # Note: this seems an odd place to do druid validation, but leaving it here for now
+      # NOTE: this seems an odd place to do druid validation, but leaving it here for now
       syntax_msg = "Identifier has invalid suri syntax: #{object_id}"
-      raise syntax_msg + " nil or empty" if object_id.to_s.empty?
+      raise(Moab::InvalidSuriSyntaxError, "#{syntax_msg} nil or empty") if object_id.to_s.empty?
+
       identifier = object_id.split(':')[-1]
-      raise syntax_msg if identifier.to_s.empty?
-      raise syntax_msg unless DruidTools::Druid.valid?(identifier, true)
+      raise(Moab::InvalidSuriSyntaxError, syntax_msg) if identifier.to_s.empty?
+      raise(Moab::InvalidSuriSyntaxError, syntax_msg) unless DruidTools::Druid.valid?(identifier, true)
+
       DruidTools::Druid.new(identifier, true).tree.join(File::SEPARATOR)
     end
   end

data/lib/stanford/storage_services.rb

@@ -1,4 +1,4 @@
-require 'moab/stanford'
+# frozen_string_literal: true
 
 module Stanford
   # An interface class to support access to SDR storage via a RESTful server
@@ -17,9 +17,9 @@ module Stanford
       new_inventory = Stanford::ContentInventory.new.inventory_from_cm(new_content_metadata, object_id, subset)
       begin
         # ObjectNotFoundException is raised if the object does not exist in storage
-        base_version ||= self.current_version(object_id)
+        base_version ||= current_version(object_id)
         # FileNotFoundException is raised if object exists but has no contentMetadata file
-        base_cm_pathname = self.retrieve_file('metadata', 'contentMetadata.xml', object_id, base_version)
+        base_cm_pathname = retrieve_file('metadata', 'contentMetadata.xml', object_id, base_version)
         base_inventory = Stanford::ContentInventory.new.inventory_from_cm(base_cm_pathname.read, object_id, subset, base_version)
       rescue Moab::ObjectNotFoundException, Moab::FileNotFoundException
         # Create a skeletal FileInventory object, containing no file entries
@@ -41,7 +41,7 @@ module Stanford
       new_inventory = Stanford::ContentInventory.new.inventory_from_cm(new_content_metadata, object_id, 'preserve')
       begin
         # ObjectNotFoundException is raised if the object does not exist in storage
-        version_id ||= self.current_version(object_id)
+        version_id ||= current_version(object_id)
         storage_object_version = @@repository.storage_object(object_id).find_object_version(version_id)
         signature_catalog = storage_object_version.signature_catalog
       rescue Moab::ObjectNotFoundException
@@ -56,8 +56,8 @@ module Stanford
     # @param version_id [Integer] The ID of the version whose file data is to be used, if nil use latest version
     # @return [String] Returns a remediated copy of the contentMetadata with fixity data filled in
     def self.cm_remediate(object_id, version_id = nil)
-      cm = self.retrieve_file('metadata', 'contentMetadata.xml', object_id, version_id)
-      group = self.retrieve_file_group('content', object_id, version_id)
+      cm = retrieve_file('metadata', 'contentMetadata.xml', object_id, version_id)
+      group = retrieve_file_group('content', object_id, version_id)
       Stanford::ContentInventory.new.remediate_content_metadata(cm, group)
     end
   end

metadata

@@ -1,34 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Darren Weber
 - Richard Anderson
 - Lynn McRae
 - Hannah Frost
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-10 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: confstruct
+  name: druid-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -42,7 +42,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nokogiri-happymapper
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -56,7 +56,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: nokogiri-happymapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -70,21 +70,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: druid-tools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,7 +84,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -112,7 +98,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,7 +112,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -140,7 +126,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -159,28 +145,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.50.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: '2.1'
 description: Contains classes to process digital object version content and metadata
 email:
 - darren.weber@stanford.edu
@@ -229,24 +215,23 @@ homepage: https://github.com/sul-dlss/moab-versioning
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by the SULAIR
   Digital Library