ddr-core 1.11.0 → 1.12.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24f4fed2b42d1f48074cd74968a711b515f908027a2b80c8d326f35241fcda3b
-  data.tar.gz: d6c8439ba1348b4d150664d030969d6dfa7f39d115895a4cbfe3a0c1fe22590d
+  metadata.gz: 1747ec2e17d7996e200306167e43b58e2dc131e90dc53e60cea8e743330d427e
+  data.tar.gz: 198b5d9ec8d996df0d90244e28b2256494f7dacd97e3f912f7f9aa35a0b43dd2
 SHA512:
-  metadata.gz: df5920709b822332092b9e27d7f9c244667841e47cdafc6ddbaadb60d18d744189872d7c916c4a1f866bf5f6312846ac11c29d15cfe041be5aa1eb7d9e465995
-  data.tar.gz: 7ab212e5d5ad58ca775f676213034a504643a02ce20e15b76c39a0be7ecb6684f7eb995e1fe8c65a0112251081fc64fc15b062492c8083d269bd31f181fce429
+  metadata.gz: 66cb2bce2d80a04dcad5fa2fc4903ea3f2a73a98acb419ee108acaf8410864444f7e149f35fe841e672b070f06531fa5f750a053e73d1f13a1ef0bf4c9c96bc7
+  data.tar.gz: 1e13d74efb54b66264639ccefeecf9b9b0a07496d76bff8d93e7207562637bac6cd22e0376f0cfb2a6a61a5d9a09a82ee9a1eb1a6a8393dfa9301655adb4f4db

data/lib/ddr/auth/ability_definitions/publication_ability_definitions.rb

@@ -4,8 +4,7 @@ module Ddr
 
       # An object can't be published if it's already published or not publishable
       # It can't be unpublished if it's already unpublished
-      # It can't be made nonpublishable if it's already published (must be unpublished 
-      # first) or already nonpublishable
+      # It can't be made nonpublishable if it's already nonpublishable
       def call
         cannot :publish, Ddr::Resource do |obj|
           obj.published? || !obj.publishable?
@@ -14,7 +13,7 @@ module Ddr
           !obj.published? && !obj.nonpublishable?
         end
         cannot :make_nonpublishable, Ddr::Resource do |obj|
-          obj.published? || !obj.publishable?
+          obj.nonpublishable?
         end
       end
 

data/lib/ddr/core.rb

@@ -20,11 +20,6 @@ module Ddr
     extend ActiveSupport::Autoload
     autoload :Agent
     autoload :Div
-    autoload :File
-    autoload :FileGrp
-    autoload :FileSec
-    autoload :FLocat
-    autoload :Fptr
     autoload :MetsHdr
     autoload :Mptr
     autoload :StructMap

data/lib/ddr/index/query_result.rb

@@ -59,9 +59,11 @@ module Ddr::Index
     end
 
     def objects
+      resource_factory = Valkyrie::MetadataAdapter.find(:index_solr).resource_factory
+
       Enumerator.new do |e|
-        each_id do |id|
-          e << ActiveFedora::Base.find(id)
+        each do |obj|
+          e << resource_factory.to_resource(object: obj)
         end
       end
     end

data/lib/ddr/structure.rb

@@ -11,43 +11,16 @@ module Ddr
 
     TYPE_DEFAULT = 'default'.freeze
 
-    # Based on the PCDM Extension 'Use' ontology -- https://github.com/duraspace/pcdm/blob/master/pcdm-ext/use.rdf
-    USE_EXTRACTED_TEXT = 'ExtractedText'.freeze
-    USE_INTERMEDIATE_FILE = 'IntermediateFile'.freeze
-    USE_ORIGINAL_FILE = 'OriginalFile'.freeze
-    USE_PRESERVATION_MASTER_FILE = 'PreservationMasterFile'.freeze
-    USE_SERVICE_FILE = 'ServiceFile'.freeze
-    USE_THUMBNAIL_IMAGE = 'ThumbnailImage'.freeze
-    USE_TRANSCRIPT = 'Transcript'.freeze
-
-    def filesec
-      @filesec ||= Ddr::Structures::FileSec.new(fileSec_node)
-    end
-
-    def files
-      @files ||= collect_files
-    end
-
-    def uses
-      @uses ||= collect_uses
-    end
-
-    def structmap(type=nil)
-      sm = type ? structMap_node(type) : structMap_nodes.first
-      @structmap ||= Ddr::Structures::StructMap.new(sm)
-    end
-
     def structmaps
       @structmaps ||= structMap_nodes.map { |sm| Ddr::Structures::StructMap.new(sm) }
     end
 
     def metshdr
-      @metshdr ||=  Ddr::Structures::MetsHdr.new(metsHdr_node)
+      @metshdr ||= Ddr::Structures::MetsHdr.new(metsHdr_node)
     end
 
     def creator
-      @creator ||= metshdr.empty? ? nil
-                                  : Ddr::Structures::MetsHdr.new(metsHdr_node).agents.first.name
+      metshdr.agents.first&.name
     end
 
     def repository_maintained?
@@ -55,89 +28,49 @@ module Ddr
     end
 
     def dereferenced_structure
-      deref_struct = {}
-      structmaps.each do |sm|
-        deref_struct[sm.type] = sm.dereferenced_hash
-      end
-      deref_struct
+      Hash[structmaps.map { |sm| [sm.type, sm.dereferenced_hash] }]
     end
 
     def as_xml_document
       __getobj__
     end
 
-    def add_metshdr(id:nil, createdate:nil, lastmoddate:nil, recordstatus:nil)
+    def add_metshdr(id: nil, createdate: nil, lastmoddate: nil, recordstatus: nil)
       metshdr = Ddr::Structures::MetsHdr.build(id: id, createdate: createdate, lastmoddate: lastmoddate,
-                                                       recordstatus: recordstatus, document: as_xml_document)
+                                               recordstatus: recordstatus, document: as_xml_document)
       root.add_child(metshdr)
       metshdr
     end
 
-    def add_agent(parent:, id:nil, role:, otherrole:nil, type:nil, othertype:nil, name:nil)
+    def add_agent(parent:, id: nil, role:, otherrole: nil, type: nil, othertype: nil, name: nil)
       agent = Ddr::Structures::Agent.build(id: id, role: role, otherrole: otherrole, type: type,
-                                                   othertype: othertype, name: name, document: as_xml_document)
+                                           othertype: othertype, name: name, document: as_xml_document)
       parent.add_child(agent)
       agent
     end
 
-    def add_filesec(id:nil)
-      filesec = Ddr::Structures::FileSec.build(id: id, document: as_xml_document)
-      
-      root.add_child(filesec)
-      filesec
-    end
-
-    def add_filegrp(parent:, id:nil, use:nil)
-      filegrp = Ddr::Structures::FileGrp.build(id: id, use: use, document: as_xml_document)
-      parent.add_child(filegrp)
-      filegrp
-    end
-
-    def add_file(parent:, id: "id_" + SecureRandom.uuid, use:nil)
-      file = Ddr::Structures::File.build(id: id, use: use, document: as_xml_document)
-      parent.add_child(file)
-      file
-    end
-
-    def add_flocat(parent:, id:nil, loctype:'ARK', otherloctype: nil, use:nil, href:)
-      flocat = Ddr::Structures::FLocat.build(id: id, loctype: loctype, otherloctype: otherloctype, use: use,
-                                                     href: href, document: as_xml_document)
-      parent.add_child(flocat)
-      flocat
-    end
-
-    def add_structmap(id:nil, label:nil, type:)
+    def add_structmap(id: nil, label: nil, type:)
       structmap = Ddr::Structures::StructMap.build(id: id, label: label, type: type, document: as_xml_document)
       root.add_child(structmap)
       structmap
     end
 
-    def add_div(parent:, id:nil, label:nil, order:nil, orderlabel: nil, type:nil)
+    def add_div(parent:, id: nil, label: nil, order: nil, orderlabel: nil, type: nil)
       div = Ddr::Structures::Div.build(id: id, label: label, order:order, orderlabel: orderlabel, type: type,
-                                               document: as_xml_document)
+                                       document: as_xml_document)
       parent.add_child(div)
       div
     end
 
-    def add_fptr(parent:, id: nil, fileid:)
-      fptr = Ddr::Structures::Fptr.build(id: id, fileid: fileid, document: as_xml_document)
-      parent.add_child(fptr)
-      fptr
-    end
-
-    def add_mptr(parent:, id: nil, loctype:'ARK', otherloctype: nil, href:)
+    def add_mptr(parent:, id: nil, loctype: 'ARK', otherloctype: nil, href:)
       mptr = Ddr::Structures::Mptr.build(id: id, loctype: loctype, otherloctype: otherloctype, href: href,
-                                                 document: as_xml_document)
+                                         document: as_xml_document)
       parent.add_child(mptr)
       mptr
     end
 
     private
 
-    def fileSec_node
-      xpath("//xmlns:fileSec").first
-    end
-
     def structMap_nodes
       xpath("//xmlns:structMap")
     end
@@ -150,33 +83,6 @@ module Ddr
       xpath("//xmlns:metsHdr")
     end
 
-    def file_nodes
-      xpath("//xmlns:file")
-    end
-
-    def flocat_nodes
-      xpath("//xmlns:FLocat")
-    end
-
-    def collect_files
-      files = {}
-      file_nodes.each do |file_node|
-        file = Ddr::Structures::File.new(file_node)
-        files[file.id] = file
-      end
-      files
-    end
-
-    def collect_uses
-      uses = {}
-      flocat_nodes.each do |flocat_node|
-        flocat = Ddr::Structures::FLocat.new(flocat_node)
-        uses[flocat.effective_use] ||= []
-        uses[flocat.effective_use] << flocat
-      end
-      uses
-    end
-
     def self.xml_template
       Nokogiri::XML(
           '<mets xmlns="http://www.loc.gov/METS/" xmlns:xlink="http://www.w3.org/1999/xlink" />'

data/lib/ddr/structures/div.rb

@@ -28,10 +28,6 @@ module Ddr::Structures
       xpath('xmlns:div').map { |node| Div.new(node) }
     end
 
-    def fptrs
-      xpath('xmlns:fptr').map { |node| Fptr.new(node) }
-    end
-
     def mptrs
       xpath('xmlns:mptr').map { |node| Mptr.new(node) }
     end
@@ -43,7 +39,6 @@ module Ddr::Structures
     def dereferenced_hash
       contents = []
       contents.concat(divs.map { |div| div.dereferenced_hash }) unless divs.empty?
-      contents.concat(fptrs.map { |fptr| fptr.dereferenced_hash }) unless fptrs.empty?
       contents.concat(mptrs.map { |mptr| mptr.dereferenced_hash }) unless mptrs.empty?
       dh = { id: id, label: label, order: order, orderlabel: orderlabel, type: type }.compact
       dh[:contents] = contents unless contents.empty?

data/lib/ddr/structures/mptr.rb

@@ -24,12 +24,20 @@ module Ddr::Structures
       loctype == 'ARK'
     end
 
+    def urn?
+      loctype == 'URN'
+    end
+
     def ark
       href if ark?
     end
 
     def repo_id
-      SolrDocument.find_by_permanent_id(ark).id if ark?
+      if ark?
+        SolrDocument.find_by_permanent_id(ark).id
+      elsif urn?
+        href.sub(/^urn:uuid:/, '')
+      end
     end
 
     def dereferenced_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.12.2
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -416,11 +416,6 @@ files:
 - lib/ddr/structures/agent.rb
 - lib/ddr/structures/component_type_term.rb
 - lib/ddr/structures/div.rb
-- lib/ddr/structures/f_locat.rb
-- lib/ddr/structures/file.rb
-- lib/ddr/structures/file_grp.rb
-- lib/ddr/structures/file_sec.rb
-- lib/ddr/structures/fptr.rb
 - lib/ddr/structures/mets_hdr.rb
 - lib/ddr/structures/mptr.rb
 - lib/ddr/structures/struct_map.rb
@@ -452,7 +447,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.8
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository

data/lib/ddr/structures/f_locat.rb

@@ -1,54 +0,0 @@
-module Ddr::Structures
-  #
-  # Wraps a Nokogiri (XML) 'FLocat' node
-  #
-  class FLocat < SimpleDelegator
-
-    def id
-      self['ID']
-    end
-
-    def loctype
-      self['LOCTYPE']
-    end
-
-    def otherloctype
-      self['OTHERLOCTYPE']
-    end
-
-    def use
-      self['USE']
-    end
-
-    def href
-      self['xlink:href']
-    end
-
-    def ark?
-      loctype == 'ARK'
-    end
-
-    def ark
-      href if ark?
-    end
-
-    def effective_use
-      use ? use : File.new(parent).effective_use
-    end
-
-    def repo_id
-      SolrDocument.find_by_permanent_id(ark).id if ark?
-    end
-
-    def self.build(args)
-      node = Nokogiri::XML::Node.new('FLocat', args[:document])
-      node['ID'] = args[:id] if args[:id]
-      node['LOCTYPE'] = args[:loctype] if args[:loctype]
-      node['OTHERLOCTYPE'] = args[:otherloctype] if args[:otherloctype]
-      node['USE'] = args[:use] if args[:use]
-      node['xlink:href'] = args[:href] if args[:href]
-      node
-    end
-
-  end
-end

data/lib/ddr/structures/file.rb

@@ -1,52 +0,0 @@
-module Ddr::Structures
-  #
-  # Wraps a Nokogiri (XML) 'file' node
-  #
-  class File < SimpleDelegator
-
-    def id
-      self['ID']
-    end
-
-    def use
-      self['USE']
-    end
-
-    def files
-      xpath('xmlns:file').map { |node| File.new(node) }
-    end
-
-    def flocats
-      xpath('xmlns:FLocat').map { |node| FLocat.new(node) }
-    end
-
-    def effective_use
-      if use
-        use
-      else
-        case parent.name
-          when "file"
-            File.new(parent).effective_use
-          when "fileGrp"
-            FileGrp.new(parent).effective_use
-        end
-      end
-    end
-
-    def repo_ids
-      flocats.map(&:repo_id)
-    end
-
-    def self.build(args)
-      node = Nokogiri::XML::Node.new('file', args[:document])
-      node['ID'] = args[:id] if args[:id]
-      node['USE'] = args[:use] if args[:use]
-      node
-    end
-
-    def self.find(structure, fileid)
-      structure.files[fileid]
-    end
-
-  end
-end

data/lib/ddr/structures/file_grp.rb

@@ -1,35 +0,0 @@
-module Ddr::Structures
-  #
-  # Wraps a Nokogiri (XML) 'fileGrp' node
-  #
-  class FileGrp < SimpleDelegator
-
-    def id
-      self['ID']
-    end
-
-    def use
-      self['USE']
-    end
-
-    def filegrps
-      xpath('xmlns:filegrp').map { |node| FileGrp.new(node) }
-    end
-
-    def files
-      xpath('xmlns:file').map { |node| File.new(node) }
-    end
-
-    def effective_use
-      use
-    end
-
-    def self.build(args)
-      node = Nokogiri::XML::Node.new('fileGrp', args[:document])
-      node['ID'] = args[:id] if args[:id]
-      node['USE'] = args[:use] if args[:use]
-      node
-    end
-
-  end
-end

data/lib/ddr/structures/file_sec.rb

@@ -1,22 +0,0 @@
-module Ddr::Structures
-  #
-  # Wraps a Nokogiri (XML) 'fileSec' node
-  #
-  class FileSec < SimpleDelegator
-
-    def id
-      self['ID']
-    end
-
-    def filegrps
-      xpath('xmlns:fileGrp').map { |node| FileGrp.new(node) }
-    end
-
-    def self.build(args)
-      node = Nokogiri::XML::Node.new('fileSec', args[:document])
-      node['ID'] = args[:id] if args[:id]
-      node
-    end
-
-  end
-end

data/lib/ddr/structures/fptr.rb

@@ -1,31 +0,0 @@
-module Ddr::Structures
-  #
-  # Wraps a Nokogiri (XML) 'fptr' node
-  #
-  class Fptr < SimpleDelegator
-
-    def id
-      self['ID']
-    end
-
-    def fileid
-      self['FILEID']
-    end
-
-    def dereferenced_hash
-      structure = Ddr::Structure.new(document)
-      file = File.find(structure, fileid)
-      repo_id = file.repo_ids.first
-      use = file.flocats.first.effective_use
-      { id: id, repo_id: repo_id, use: use }.compact
-    end
-
-    def self.build(args)
-      node = Nokogiri::XML::Node.new('fptr', args[:document])
-      node['ID'] = args[:id] if args[:id]
-      node['FILEID'] = args[:fileid] if args[:fileid]
-      node
-    end
-
-  end
-end