cocina-models 0.61.1 → 0.62.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04d6817bcbdb69d319cc3506afef0f7d8374bb8668e6fbdf05a47b6eab40cb3a
-  data.tar.gz: d36dc1283dc12c3f9bdd881f3c9268e2b6088f0c11d35dcbc9d5adf2bf749513
+  metadata.gz: cec7a3ac1ecbadbdbcb8faaa1311e9c03843af53b4256d3694e23c6834b91bbe
+  data.tar.gz: 12d1fa927c36ba962b790ef6b2c2d048c7af6251416d286a6392dc6175551164
 SHA512:
-  metadata.gz: e75b2cd3134d4b75a30f3511cc5f861001e70f274b53c92988575640460b9869993e18378bf05484d21ab18a7f0ce0a56db714b46718aab288b26202db1ed384
-  data.tar.gz: 152173ef29e9b971ee2c58ddbd77f6b284576c6be8cbe02fdd043535615d773a50f1df890b9bd7b2c8e10c8a36b3e4b9cb851390132103121cf52534453dce07
+  metadata.gz: 10aed08575f11ceb53cebd61603448de768690b10cd06b64bfc6964f4b23fb0827546e18e1a25a5e14c338cc60e0147ad608dbdccb92cd7993dc9c6c2a6c8e86
+  data.tar.gz: 6fb48b45f9c87fbb8f517ca523d58c22884f3b1e2dc1b428718083e4463fb59909d02306373bfa999a1cc66237d857dc3cc7c56353666883517325cf718628c0

data/docs/sampleETD/foxml.xml

@@ -944,7 +944,7 @@ xsi:schemaLocation="info:fedora/fedora-system:def/foxml# http://www.fedora.info/
   <note>Submitted to the Graduate School of Education.</note>
   <note type="thesis">Thesis (Ph.D.)--Stanford University, 2015.</note>
   <location>
-  <url displayLabel="electronic resource" usage="primary display">http://purl.stanford.edu/xn109qc9773</url>
+  <url displayLabel="electronic resource" usage="primary display">https://purl.stanford.edu/xn109qc9773</url>
   </location>
   <recordInfo>
   <recordContentSource authority="marcorg">CSt</recordContentSource>

data/docs/sampleETD/xn109qc9773_bibframe.ttl

@@ -86,7 +86,7 @@
 
 :xn109qc9773_item [ a bf:Item ;
     bf:electronicLocator [ a rdf:Resource ;
-        rdf:value <http://purl.stanford.edu/xn109qc9773> ;
+        rdf:value <https://purl.stanford.edu/xn109qc9773> ;
         bf:note [ a bf:Note ;
             rdfs:label "primary display" ;
             bf:noteType "URL usage"

data/docs/sampleETD/xn109qc9773_taco.json

@@ -151,7 +151,7 @@
         ],
         "accessURL": [{
             "type": "purl",
-            "url": "http://purl.stanford.edu/xn109qc9773",
+            "url": "https://purl.stanford.edu/xn109qc9773",
             "primary": "TRUE"
         }]
     }

data/lib/cocina/models/doi.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     DOI = Types::String.constrained(
-      format: %r{^10\.25740/druid:[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$}i
+      format: %r{^10\.(25740|80343)/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$}i
     )
   end
 end

data/lib/cocina/models/purl.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     Purl = Types::String.constrained(
-      format: %r{^http://}i
+      format: %r{^https://}i
     )
   end
 end

data/lib/cocina/models/request_identification.rb

@@ -6,9 +6,6 @@ module Cocina
       # A barcode
       attribute :barcode, Types::Nominal::Any.meta(omittable: true)
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).meta(omittable: true)
-      # Digital Object Identifier (https://www.doi.org)
-      # example: 10.25740/druid:bc123df4567
-      attribute :doi, Types::Strict::String.meta(omittable: true)
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.61.1'
+    VERSION = '0.62.1'
   end
 end

data/lib/cocina/models.rb

@@ -8,6 +8,7 @@ require 'json'
 require 'yaml'
 require 'openapi_parser'
 require 'openapi3_parser'
+require 'active_support'
 require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string'
 require 'thor'

data/openapi.yml

@@ -878,8 +878,9 @@ components:
     DOI:
       type: string
       description: Digital Object Identifier (https://www.doi.org)
-      pattern: '^10\.25740\/druid:[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$'
-      example: '10.25740/druid:bc123df4567'
+      # The prod and test prefixes are permitted
+      pattern: '^10\.(25740|80343)\/[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$'
+      example: '10.25740/bc123df4567'
     DRO:
       description: Domain-defined abstraction of a 'work'. Digital Repository Objects' abstraction is describable for our domain’s purposes, i.e. for management needs within our system.
       type: object
@@ -1395,8 +1396,8 @@ components:
       description: Stanford persistent URL associated with the related resource. Note this is http, not https.
       type: string
       format: uri
-      # Canonical URI is http, even though this redirects to https.
-      pattern: '^http:\/\/'
+      # Canonical URI is https
+      pattern: '^https:\/\/'
     RelatedResource:
       description: Other resource associated with the described resource.
       type: object
@@ -1704,7 +1705,9 @@ components:
           items:
             $ref: '#/components/schemas/RequestFile'
     RequestIdentification:
-      description: Same as a Identification, but requires a sourceId.
+      # Doesn't permit a DOI because our DOIs all use the DRUID as part of the DOI.
+      # You have to register the object in order to get the DRUID before you can mint a DOI
+      description: Same as a Identification, but requires a sourceId and doesn't permit a DOI.
       type: object
       additionalProperties: false
       properties:
@@ -1714,8 +1717,6 @@ components:
           type: array
           items:
             $ref: '#/components/schemas/CatalogLink'
-        doi:
-          $ref: '#/components/schemas/DOI'
         sourceId:
           $ref: '#/components/schemas/SourceId'
       required:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.61.1
+  version: 0.62.1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport