ddr-core 1.8.0 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ecf0c2c7b9b7cbe1c4a6f97c52b9890e6baf5bb5de8696cd79c0fc9a9b1ed5c
-  data.tar.gz: c5962101e2e49c746565a9de779f9e23d0aa00a410129bb766ea2d9fd19b96b6
+  metadata.gz: 24f4fed2b42d1f48074cd74968a711b515f908027a2b80c8d326f35241fcda3b
+  data.tar.gz: d6c8439ba1348b4d150664d030969d6dfa7f39d115895a4cbfe3a0c1fe22590d
 SHA512:
-  metadata.gz: f11f35d59878e82b1c5d81571ecfcb914d48541280745df1df7a2c0f7434afb02897a54a26c777a683dc3a27b6734fe863b2016c2bc761e587b3b65cc259eee9
-  data.tar.gz: 8406cd5b5f19da79f2b618f33d56c0a9fb4e779485df5a3856ce533f291d44d4b93c547f6d70fb27eac0d29c5524cc922b7c0fc2f3b5c9779be2e1f7b6b7cccf
+  metadata.gz: df5920709b822332092b9e27d7f9c244667841e47cdafc6ddbaadb60d18d744189872d7c916c4a1f866bf5f6312846ac11c29d15cfe041be5aa1eb7d9e465995
+  data.tar.gz: 7ab212e5d5ad58ca775f676213034a504643a02ce20e15b76c39a0be7ecb6684f7eb995e1fe8c65a0112251081fc64fc15b062492c8083d269bd31f181fce429

data/app/models/concerns/ddr/describable.rb

@@ -2,22 +2,17 @@ module Ddr
   module Describable
     extend ActiveSupport::Concern
 
+    TERM_NAMES = (Ddr.vocab[:dcmi_terms] + Ddr.vocab[:duke_terms] - [:license]).freeze
+
     def self.term_names
-      term_names = []
-      vocabularies.each do |vocab|
-        Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
-          term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
-          unless term_name == :license
-            term_names << term_name
-          end
-        end
-      end
-      term_names
+      TERM_NAMES
     end
 
-    # Dublin Core vocabulary comes from the rdf-vocab gem (https://github.com/ruby-rdf/rdf-vocab)
-    # DDR vocabulary is defined locally
+    # @deprecated
     def self.vocabularies
+      warn "[DEPRECATION] `Ddr::Describable.vocabularies` is deprecated."
+
+      require 'ddr/vocab'
       [RDF::Vocab::DC, Ddr::Vocab::DukeTerms].freeze
     end
 
@@ -44,16 +39,11 @@ module Ddr
       end
     end
 
-    # Used in dul-hydra view
+    # Used in ddr-admin view
     def has_desc_metadata?
       desc_metadata_terms(:present).present?
     end
 
-    # Used in dul-hydra
-    ######################
-    # Commenting out the :required argument since validation is not a model concern in the Valkyrie paradigm.
-    # This will break the `desc_metadata_form_fields` helper in dul-hydra and we'll have to fix it there eventually.
-    ######################
     def desc_metadata_terms *args
       return Ddr::Describable.term_names if args.empty?
       arg = args.pop
@@ -64,15 +54,14 @@ module Ddr
                 desc_metadata_terms.select { |t| values(t).present? }
               when :defined_attributes
                 desc_metadata_terms
-              # when :required
-              #   desc_metadata_terms(:defined_attributes).select {|t| required? t}
               when :dcterms
-                Ddr::Vocab::Vocabulary.term_names(RDF::Vocab::DC11) +
-                    (Ddr::Vocab::Vocabulary.term_names(RDF::Vocab::DC) - Ddr::Vocab::Vocabulary.term_names(RDF::Vocab::DC11))
+                # Why? I think we did this to put the DCMI Elements terms in front ...
+                # Do we still need that?  Also, we didn't remove :license here, which is probably wrong.
+                Ddr.vocab[:dcmi_elements] + (Ddr.vocab[:dcmi_terms] - Ddr.vocab[:dcmi_elements])
               when :dcterms_elements11
-                Ddr::Vocab::Vocabulary.term_names(RDF::Vocab::DC11)
+                Ddr.vocab[:dcmi_elements]
               when :duke
-                Ddr::Vocab::Vocabulary.term_names(Ddr::Vocab::DukeTerms)
+                Ddr.vocab[:duke_terms]
               else
                 raise ArgumentError, "Invalid argument: #{arg.inspect}"
               end
@@ -83,8 +72,10 @@ module Ddr
       end
     end
 
-    # Used in dul-hydra helper -- replace there with Ddr::Describable.vocabularies?
+    # @deprecated
     def desc_metadata_vocabs
+      warn "[DEPRECATION] `Ddr::Describable#desc_metadata_vocabs` is deprecated."
+
       Ddr::Describable.vocabularies
     end
 
@@ -100,5 +91,7 @@ module Ddr
       desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
     end
 
+
+
   end
 end

data/app/models/ddr/component.rb

@@ -9,7 +9,6 @@ module Ddr
     include HasIntermediateFile
     include HasMultiresImage
     include HasParent
-    include HasStructMetadata
     include Streamable
 
     alias_method :item_id, :parent_id

data/config/vocab.json

@@ -0,0 +1,5 @@
+{
+    "dcmi_terms": ["abstract", "accessRights", "accrualMethod", "accrualPeriodicity", "accrualPolicy", "alternative", "audience", "available", "bibliographicCitation", "conformsTo", "contributor", "coverage", "created", "creator", "date", "dateAccepted", "dateCopyrighted", "dateSubmitted", "description", "educationLevel", "extent", "format", "hasFormat", "hasPart", "hasVersion", "identifier", "instructionalMethod", "isFormatOf", "isPartOf", "isReferencedBy", "isReplacedBy", "isRequiredBy", "isVersionOf", "issued", "language", "license", "mediator", "medium", "modified", "provenance", "publisher", "references", "relation", "replaces", "requires", "rights", "rightsHolder", "source", "spatial", "subject", "tableOfContents", "temporal", "title", "type", "valid"],
+    "duke_terms": ["arranger", "artist", "awards", "biblical_book", "box_number", "call_number", "category", "chapter_and_verse", "chimpanzee", "choreographer", "company", "composer", "dcmitype", "dedicatee", "digitized", "duke_opponent", "engraver", "first_line", "folder", "genre", "headline", "illustrated", "illustrator", "instrumentation", "interview_date", "interview_location", "interview_number", "interview_state", "interviewee_birthplace", "interviewee_date_of_birth", "interviewee_gender", "interviewee_occupation", "interviewee_residence", "interviewee_state_of_birth", "interviewer_name", "issue_date", "issue_number", "lithographer", "lyricist", "negative_number", "oclc_number", "people", "performer", "placement_company", "print_number", "producer", "product", "pubcity", "pubcountry", "publication", "pubregion", "pubstate", "race", "record_type", "refrain", "roll_number", "season", "series", "setting", "site_alignment", "source_collection", "sponsor", "staging", "subseries", "tag", "time_of_photo", "tone", "venue", "volume"],
+    "dcmi_elements": ["contributor", "coverage", "creator", "date", "description", "format", "identifier", "language", "publisher", "relation", "rights", "source", "subject", "title", "type"]
+}

data/lib/ddr/core.rb

@@ -58,6 +58,12 @@ module Ddr
     @storage_adapter = storage_adapter
   end
 
+  # This static vocab list is to replace the ones generated from RDF.
+  def self.vocab
+    @vocab ||= JSON.load_file(File.expand_path('../../config/vocab.json', __dir__), symbolize_names: true)
+                 .transform_values { |v| v.map(&:to_sym).freeze }.freeze
+  end
+
   mattr_accessor :default_mime_type do
     "application/octet-stream"
   end
@@ -121,7 +127,6 @@ module Ddr
   end
 
   module Core
-
   end
 
 end

data/lib/ddr/vocab/duke_terms.rb

@@ -1,5 +1,7 @@
 module Ddr::Vocab
 
+  warn "[DEPRECATION] `#{self.name}::DukeTerms` is deprecated."
+
   class DukeTerms < RDF::StrictVocabulary("http://library.duke.edu/metadata/terms/")
 
     RDFVocabularyParser.new(

data/lib/ddr/vocab/rdf_vocabulary_parser.rb

@@ -3,6 +3,8 @@ require 'rdf/rdfxml'
 module Ddr::Vocab
   class RDFVocabularyParser
 
+    warn "[DEPRECATION] `#{self.name}` is deprecated."
+
     attr_reader :source, :prefix
 
     def initialize(source, prefix = "")

data/lib/ddr/vocab/vocabulary.rb

@@ -3,6 +3,8 @@ require 'rdf/vocab'
 module Ddr::Vocab
   class Vocabulary
 
+    warn "[DEPRECATION] `#{self.name}` is deprecated."
+
     def self.label(rdf_vocabulary)
       case rdf_vocabulary.to_uri
       when RDF::Vocab::DC.to_uri

data/lib/ddr/vocab.rb

@@ -1,22 +1,13 @@
 require "rdf/vocab"
 
+warn "[DEPRECATION] 'Ddr::Vocab' is deprecated."
+
 module Ddr::Vocab
   extend ActiveSupport::Autoload
 
   BASE_URI = "http://repository.lib.duke.edu/vocab"
 
-  PREMIS = begin
-             RDF::Vocab::PREMIS::V1
-           rescue NameError
-             RDF::Vocab::PREMIS
-           end
-
-  autoload :Asset
-  autoload :Contact
-  autoload :Display
   autoload :DukeTerms
   autoload :RDFVocabularyParser
-  autoload :Roles
   autoload :Vocabulary
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ddr-core
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.11.0
 platform: ruby
 authors:
 - Jim Coble
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-07 00:00:00.000000000 Z
+date: 2022-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -341,6 +341,7 @@ files:
 - config/initializers/devise.rb
 - config/locales/ddr-core.en.yml
 - config/routes.rb
+- config/vocab.json
 - db/migrate/20141104181418_create_users.rb
 - db/migrate/20141107124012_add_columns_to_user.rb
 - db/migrate/20200207194453_add_default_to_lock_version.rb
@@ -425,12 +426,8 @@ files:
 - lib/ddr/structures/struct_map.rb
 - lib/ddr/utils.rb
 - lib/ddr/vocab.rb
-- lib/ddr/vocab/asset.rb
-- lib/ddr/vocab/contact.rb
-- lib/ddr/vocab/display.rb
 - lib/ddr/vocab/duke_terms.rb
 - lib/ddr/vocab/rdf_vocabulary_parser.rb
-- lib/ddr/vocab/roles.rb
 - lib/ddr/vocab/sources/duketerms.rdf
 - lib/ddr/vocab/vocabulary.rb
 - lib/ddr/workflow.rb
@@ -455,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.8
 signing_key: 
 specification_version: 4
 summary: Models used in the Duke Digital Repository

data/lib/ddr/vocab/asset.rb

@@ -1,55 +0,0 @@
-module Ddr::Vocab
-  class Asset < RDF::StrictVocabulary("http://repository.lib.duke.edu/vocab/asset/")
-
-    property "permanentId",
-             label: "Permanent Identifier"
-
-    property "permanentUrl",
-             label: "Permanent URL"
-
-    property "workflowState",
-             label: "Workflow State"
-
-    property "adminSet",
-             label: "Administrative Set",
-             comment: "A name under which objects (principally collections) are grouped for administrative purposes."
-
-    property "eadId",
-             label: "EAD ID"
-
-    property "archivesSpaceId",
-             label: "ArchivesSpace Identifier"
-
-    property "isLocked",
-             label: "Is Locked?"
-
-    property "ingestedBy",
-             label: "Ingested By",
-             comment: "The agent (person or software) that initiated or performed the ingestion of the object."
-
-    property "ingestionDate",
-             label: "Ingestion Date",
-             comment: "The date/time at which the object was originally ingested into the repository."
-
-    property "rightsNote",
-             label: "Rights Note",
-             comment: "Free-text statement about the rights status of the resource."
-
-    property "alephId",
-             label: "Aleph ID",
-             comment: "The Aleph identifier for a catalog record corresponding to the object."
-
-    property "affiliation",
-             label: "Affiliation",
-             comment: "An organizational entity associated with the object content."
-
-    property "nestedPath",
-             label: "Nested Path",
-             comment: "The nested/tree path to the object to be reflected in structural metadata."
-
-    property "contentdmId",
-             label: "CONTENTdm ID"
-             comment: "The CONTENTdm reference corresponding to the object."
-
-  end
-end

data/lib/ddr/vocab/contact.rb

@@ -1,9 +0,0 @@
-module Ddr::Vocab
-  class Contact < RDF::StrictVocabulary("#{BASE_URI}/contact/")
-
-    property "assistance",
-             label: "Research Assistance",
-             comment: "Contact for research assistance with this object."
-
-  end
-end

data/lib/ddr/vocab/display.rb

@@ -1,9 +0,0 @@
-module Ddr::Vocab
-  class Display < RDF::StrictVocabulary("#{BASE_URI}/display/")
-
-    property "format",
-             label: "Display Format",
-             comment: "Format to use when displaying the object."
-
-  end
-end

data/lib/ddr/vocab/roles.rb

@@ -1,25 +0,0 @@
-module Ddr::Vocab
-  class Roles < RDF::StrictVocabulary("#{BASE_URI}/roles/")
-
-    term :Role,
-         label: "Role",
-         comment: "An assertion of a role granted to an agent."
-
-    property :hasRole,
-             label: "Has Role",
-             comment: "Asserts the granting of a role on the subject to an agent."
-
-    property :type,
-             label: "Type",
-             comment: "The type of role granted to the agent."
-
-    property :agent,
-             label: "Agent",
-             comment: "The agent to whom the role is granted."
-
-    property :scope,
-             label: "Scope",
-             comment: "The scope within which the role applies."
-
-  end
-end