cocina-models 0.88.0 → 0.89.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc554199583e2b12406431ed5078bae08509c75989a7aafdcf22715530f3d5da
-  data.tar.gz: f2bd63b4b242d7f48156499fdf729935bccc728635c692628cd1e3ebb0c84cd5
+  metadata.gz: a0dbfb214630511f046a824a0f6774e203db38bcef1c7af9dc6118932148caa4
+  data.tar.gz: d087a39d4cb3270cd01d8fc77beb0c053a45431867c47570715c09fc0868e856
 SHA512:
-  metadata.gz: afaca98ac0c7260962d483ed4ff4bc0a4c9bf1c3aa538b1571541b98b2ef6d6efd9a00e0575fffd3117adc8dbd75426b4e4dffeb1ebfae4a46fa0db1c1a3e3b1
-  data.tar.gz: '090a1137f535c219c96966b44a8af03a9a60bdf9dd871c4b6024a033d4323ffc3f000132835d71d55aa60a80f38b7601663b6403b05e6df69a699395ccdf9f99'
+  metadata.gz: b083699765ee6bd9715ff5fe575ca994220ebb7f1d8ec9e7526b15f2af320c8c99b7c85cabb843e00027f37fddf68a50cf91b2c2e7513b8cdc82e5cd16a70bfe
+  data.tar.gz: f3d50447698ba52af5d8f71565cd77235970f318ba78105de1e88dc4bd23134d9e826d167ad745adfd3aeeb0d2add3bf854fad0f713f512984188b5e9ea355c3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.88.0)
+    cocina-models (0.89.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -33,7 +33,7 @@ GEM
       openapi_parser (>= 0.11.1, < 1.0)
       rack (>= 1.5)
     commonmarker (0.23.8)
-    concurrent-ruby (1.2.0)
+    concurrent-ruby (1.2.2)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
@@ -69,7 +69,7 @@ GEM
     jsonpath (1.1.2)
       multi_json
     mini_portile2 (2.8.1)
-    minitest (5.17.0)
+    minitest (5.18.0)
     multi_json (1.15.0)
     nokogiri (1.14.2)
       mini_portile2 (~> 2.8.0)
@@ -84,7 +84,7 @@ GEM
     patience_diff (1.2.0)
       optimist (~> 3.0)
     racc (1.6.2)
-    rack (3.0.4.1)
+    rack (3.0.4.2)
     rainbow (3.1.1)
     rake (13.0.6)
     regexp_parser (2.7.0)
@@ -106,17 +106,17 @@ GEM
       rspec-core (>= 2, < 4, != 2.12.0)
     rss (0.2.9)
       rexml
-    rubocop (1.45.1)
+    rubocop (1.48.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      rubocop-ast (>= 1.26.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.26.0)
+    rubocop-ast (1.27.0)
       parser (>= 3.2.1.0)
     rubocop-capybara (2.17.1)
       rubocop (~> 1.41)
@@ -125,7 +125,7 @@ GEM
     rubocop-rspec (2.18.1)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
-    ruby-progressbar (1.11.0)
+    ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)

data/lib/cocina/generator/datatype.rb

@@ -10,13 +10,23 @@ module Cocina
 
           module Cocina
             module Models
-              #{name} = Types::String.constrained(
-                format: /#{schema_doc.pattern}/
-              )
+              #{name} = Types::String#{pattern}#{enum}
             end
           end
         RUBY
       end
+
+      def pattern
+        return unless schema_doc.pattern
+
+        ".constrained(format: /#{schema_doc.pattern}/)"
+      end
+
+      def enum
+        return unless schema_doc.enum
+
+        ".enum(#{schema_doc.enum.map { |item| quote(item) }.join(', ')})"
+      end
     end
   end
 end

data/lib/cocina/generator/generator.rb

@@ -124,7 +124,6 @@ module Cocina
 
       NO_CLEAN = [
         'checkable.rb',
-        'license.rb',
         'validatable.rb',
         'version.rb',
         'vocabulary.rb'

data/lib/cocina/models/admin_policy_access_template.rb

@@ -2,25 +2,27 @@
 
 module Cocina
   module Models
-    # Provides the template of access settings that is copied to the items goverend by an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.
+    # Provides the template of access settings that is copied to the items governed by an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.
     class AdminPolicyAccessTemplate < Struct
-      attribute? :view, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark')
-      # Available for controlled digital lending.
-      attribute? :controlledDigitalLending, Types::Strict::Bool.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute? :copyright, Types::Strict::String.optional
-      # Download access level. This is used in the transition from Fedora as a way to set a default download level at registration that is copied down to all the files.
-
-      attribute? :download, Types::Strict::String.enum('world', 'stanford', 'location-based', 'none')
-      # If access or download is "location-based", this indicates which location should have access. This is used in the transition from Fedora as a way to set a default location at registration that is copied down to all the files.
-
-      attribute? :location, Types::Strict::String.optional.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
+      attribute? :copyright, Copyright.optional
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute? :useAndReproductionStatement, Types::Strict::String.optional
-      # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute? :license, Types::Strict::String.optional
+      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
+      # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+      # Access level.
+      # Validation of this property is relaxed. See the openapi for full validation.
+      attribute? :view, Types::Strict::String.optional.default('dark')
+      # Download access level.
+      # Validation of this property is relaxed. See the openapi for full validation.
+      attribute? :download, Types::Strict::String.optional.default('none')
+      # Not used for this access type, must be null.
+      # Validation of this property is relaxed. See the openapi for full validation.
+      attribute? :location, Types::Strict::String.optional
+      # Validation of this property is relaxed. See the openapi for full validation.
+      attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
     end
   end
 end

data/lib/cocina/models/business_barcode.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    BusinessBarcode = Types::String.constrained(
-      format: /^2050[0-9]{7}$/
-    )
+    BusinessBarcode = Types::String.constrained(format: /^2050[0-9]{7}$/)
   end
 end

data/lib/cocina/models/catkey_barcode.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    CatkeyBarcode = Types::String.constrained(
-      format: /^[0-9]+-[0-9]+$/
-    )
+    CatkeyBarcode = Types::String.constrained(format: /^[0-9]+-[0-9]+$/)
   end
 end

data/lib/cocina/models/cocina_version.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    CocinaVersion = Types::String.constrained(
-      format: /^\d+\.\d+\.\d+$/
-    )
+    CocinaVersion = Types::String.constrained(format: /^\d+\.\d+\.\d+$/)
   end
 end

data/lib/cocina/models/collection_access.rb

@@ -8,12 +8,12 @@ module Cocina
       attribute? :view, Types::Strict::String.default('dark').enum('world', 'dark')
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute? :copyright, Types::Strict::String.optional
+      attribute? :copyright, Copyright.optional
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute? :useAndReproductionStatement, Types::Strict::String.optional
-      # The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute? :license, Types::Strict::String.optional
+      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
+      # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
     end
   end
 end

data/lib/cocina/models/copyright.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    Copyright = Types::String
+  end
+end

data/lib/cocina/models/created_in_folio_identifier.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    CreatedInFolioIdentifier = Types::String.constrained(
-      format: /^in\d+$/
-    )
+    CreatedInFolioIdentifier = Types::String.constrained(format: /^in\d+$/)
   end
 end

data/lib/cocina/models/doi_exceptions.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    DoiExceptions = Types::String.constrained(
-      format: %r{^10\.(25740/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936/629[tT]-[bB][xX]79)$}
-    )
+    DoiExceptions = Types::String.constrained(format: %r{^10\.(25740/([vV][aA]90-[cC][tT]15|[sS][yY][xX][aA]-[mM]256|12[qQ][fF]-5243|65[jJ]8-6114)|25936/629[tT]-[bB][xX]79)$})
   end
 end

data/lib/cocina/models/doi_pattern.rb

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

data/lib/cocina/models/dro_access.rb

@@ -16,13 +16,13 @@ module Cocina
       attribute? :controlledDigitalLending, Types::Strict::Bool.optional.default(false)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
-      attribute? :copyright, Types::Strict::String.optional
+      attribute? :copyright, Copyright.optional
       attribute? :embargo, Embargo.optional
       # The human readable use and reproduction statement that applies
       # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-      attribute? :useAndReproductionStatement, Types::Strict::String.optional
+      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
       # The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-      attribute? :license, Types::Strict::String.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
+      attribute? :license, License.optional.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
     end
   end
 end

data/lib/cocina/models/druid.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    Druid = Types::String.constrained(
-      format: /^druid:[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$/
-    )
+    Druid = Types::String.constrained(format: /^druid:[b-df-hjkmnp-tv-z]{2}[0-9]{3}[b-df-hjkmnp-tv-z]{2}[0-9]{4}$/)
   end
 end

data/lib/cocina/models/embargo.rb

@@ -17,9 +17,9 @@ module Cocina
       # Date when the Collection is released from an embargo.
       # example: 2029-06-22T07:00:00.000+00:00
       attribute :releaseDate, Types::Params::DateTime
-      # The human readable use and reproduction statement that applies when the embargo expires.
-      # example: These materials are in the public domain.
-      attribute? :useAndReproductionStatement, Types::Strict::String.optional
+      # The human readable use and reproduction statement that applies
+      # example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+      attribute? :useAndReproductionStatement, UseAndReproductionStatement.optional
     end
   end
 end

data/lib/cocina/models/folio_catalog_link.rb

@@ -7,7 +7,7 @@ module Cocina
       # Catalog that is the source of the linked record.
       # example: folio
       attribute :catalog, Types::Strict::String.enum('folio', 'previous folio')
-      # Only one of the catkeys should be designated for refreshing. This means that this key is the one used to pull metadata from the catalog if there is more than one key present.
+      # Only one of the Folio instance HRIDs should be designated for refreshing. This means that this HRID is the one used to pull metadata from the catalog if there is more than one HRID present.
       attribute :refresh, Types::Strict::Bool.default(false)
       # Record identifier that is unique within the context of the linked record's catalog.
       attribute :catalogRecordId, MigratedFromSymphonyIdentifier | MigratedFromVoyagerIdentifier | CreatedInFolioIdentifier

data/lib/cocina/models/lane_medical_barcode.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    LaneMedicalBarcode = Types::String.constrained(
-      format: /^245[0-9]{8}$/
-    )
+    LaneMedicalBarcode = Types::String.constrained(format: /^245[0-9]{8}$/)
   end
 end

data/lib/cocina/models/license.rb

@@ -2,9 +2,6 @@
 
 module Cocina
   module Models
-    # This vocabulary defines some of the supported licenses
-    class License < Vocabulary('https://cocina.sul.stanford.edu/licenses/')
-      property :none
-    end
+    License = Types::String.enum('https://www.gnu.org/licenses/agpl.txt', 'https://www.apache.org/licenses/LICENSE-2.0', 'https://opensource.org/licenses/BSD-2-Clause', 'https://opensource.org/licenses/BSD-3-Clause', 'https://creativecommons.org/licenses/by/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode', 'https://creativecommons.org/licenses/by-nd/4.0/legalcode', 'https://creativecommons.org/licenses/by-sa/4.0/legalcode', 'https://creativecommons.org/publicdomain/zero/1.0/legalcode', 'https://opensource.org/licenses/cddl1', 'https://www.eclipse.org/legal/epl-2.0', 'https://www.gnu.org/licenses/gpl-3.0-standalone.html', 'https://www.isc.org/downloads/software-support-policy/isc-license/', 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html', 'https://opensource.org/licenses/MIT', 'https://www.mozilla.org/MPL/2.0/', 'https://opendatacommons.org/licenses/by/1-0/', 'http://opendatacommons.org/licenses/odbl/1.0/', 'https://opendatacommons.org/licenses/odbl/1-0/', 'https://creativecommons.org/publicdomain/mark/1.0/', 'https://opendatacommons.org/licenses/pddl/1-0/', 'https://creativecommons.org/licenses/by/3.0/legalcode', 'https://creativecommons.org/licenses/by-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nd/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode', 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode', 'https://cocina.sul.stanford.edu/licenses/none')
   end
 end

data/lib/cocina/models/migrated_from_symphony_identifier.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    MigratedFromSymphonyIdentifier = Types::String.constrained(
-      format: /^a\d+$/
-    )
+    MigratedFromSymphonyIdentifier = Types::String.constrained(format: /^a\d+$/)
   end
 end

data/lib/cocina/models/migrated_from_voyager_identifier.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    MigratedFromVoyagerIdentifier = Types::String.constrained(
-      format: /^L\d+$/
-    )
+    MigratedFromVoyagerIdentifier = Types::String.constrained(format: /^L\d+$/)
   end
 end

data/lib/cocina/models/purl.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    Purl = Types::String.constrained(
-      format: %r{^https://}
-    )
+    Purl = Types::String.constrained(format: %r{^https://})
   end
 end

data/lib/cocina/models/source_id.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    SourceId = Types::String.constrained(
-      format: /^.+:.+$/
-    )
+    SourceId = Types::String.constrained(format: /^.+:.+$/)
   end
 end

data/lib/cocina/models/standard_barcode.rb

@@ -2,8 +2,6 @@
 
 module Cocina
   module Models
-    StandardBarcode = Types::String.constrained(
-      format: /^36105[0-9]{9}$/
-    )
+    StandardBarcode = Types::String.constrained(format: /^36105[0-9]{9}$/)
   end
 end

data/lib/cocina/models/use_and_reproduction_statement.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    UseAndReproductionStatement = Types::String
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.88.0'
+    VERSION = '0.89.1'
   end
 end

data/lib/cocina/rspec/factories.rb

@@ -90,7 +90,7 @@ module Cocina
 
       # rubocop:disable Metrics/ParameterLists
       def self.build_request_dro_properties(type:, version:, label:, title:, source_id:, admin_policy_id:,
-                                            barcode: nil, catkeys: [], collection_ids: [])
+                                            barcode: nil, catkeys: [], folio_instance_hrids: [], collection_ids: [])
         {
           type: type,
           version: version,
@@ -112,6 +112,11 @@ module Cocina
               { catalog: 'symphony', catalogRecordId: catkey, refresh: index.zero? }
             end
           end
+          if folio_instance_hrids.present?
+            props[:identification][:catalogLinks] = folio_instance_hrids.map.with_index do |folio_id, index|
+              { catalog: 'folio', catalogRecordId: folio_id, refresh: index.zero? }
+            end
+          end
           props[:identification][:barcode] = barcode if barcode
         end
       end
@@ -130,7 +135,7 @@ module Cocina
       end
 
       # rubocop:disable Metrics/ParameterLists
-      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil, catkeys: [])
+      def self.build_request_collection_properties(type:, version:, label:, title:, admin_policy_id:, source_id: nil, catkeys: [], folio_instance_hrids: [])
         {
           type: type,
           version: version,
@@ -147,6 +152,11 @@ module Cocina
               { catalog: 'symphony', catalogRecordId: catkey, refresh: index.zero? }
             end
           end
+          if folio_instance_hrids.present?
+            props[:identification][:catalogLinks] = folio_instance_hrids.map.with_index do |folio_id, index|
+              { catalog: 'folio', catalogRecordId: folio_id, refresh: index.zero? }
+            end
+          end
           props[:identification][:sourceId] = source_id if source_id
         end
       end

data/openapi.yml

@@ -237,63 +237,24 @@ components:
       required:
         - hasAdminPolicy
     AdminPolicyAccessTemplate:
-      description: 'Provides the template of access settings that is copied to the items goverend by an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.'
+      description: 'Provides the template of access settings that is copied to the items governed by an AdminPolicy. This is almost the same as DROAccess, but it provides no defaults and has no embargo.'
       type: object
       additionalProperties: false
+      oneOf:
+        - $ref: '#/components/schemas/DarkAccess'
+        - $ref: '#/components/schemas/CitationOnlyAccess'
+        - $ref: '#/components/schemas/ControlledDigitalLendingAccess'
+        - $ref: '#/components/schemas/LocationBasedAccess'
+        - $ref: '#/components/schemas/LocationBasedDownloadAccess'
+        - $ref: '#/components/schemas/StanfordAccess'
+        - $ref: '#/components/schemas/WorldAccess'
       properties:
-        view:
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'citation-only'
-            - 'dark'
-        controlledDigitalLending:
-          description: Available for controlled digital lending.
-          type: boolean
         copyright:
-          description: The human readable copyright statement that applies
-          example: Copyright World Trade Organization
-          type: string
-          nullable: true
-        download:
-          description: >
-            Download access level. This is used in the transition from Fedora as
-            a way to set a default download level at registration that is copied
-            down to all the files.
-
-          type: string
-          enum:
-            - 'world'
-            - 'stanford'
-            - 'location-based'
-            - 'none'
-        location:
-          description: >
-            If access or download is "location-based", this indicates which
-            location should have access. This is used in the transition from
-            Fedora as a way to set a default location at registration that is
-            copied down to all the files.
-
-          type: string
-          nullable: true
-          enum:
-            - 'spec'
-            - 'music'
-            - 'ars'
-            - 'art'
-            - 'hoover'
-            - 'm&m'
+          $ref: "#/components/schemas/Copyright"
         useAndReproductionStatement:
-          description: The human readable use and reproduction statement that applies
-          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-          type: string
-          nullable: true
+          $ref: "#/components/schemas/UseAndReproductionStatement"
         license:
-          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-          type: string
-          nullable: true
+          $ref: "#/components/schemas/License"
     AdminPolicyAdministrative:
       description: Administrative properties for an AdminPolicy
       type: object
@@ -455,19 +416,11 @@ components:
             - 'dark'
           default: 'dark'
         copyright:
-          description: The human readable copyright statement that applies
-          example: Copyright World Trade Organization
-          type: string
-          nullable: true
+          $ref: "#/components/schemas/Copyright"
         useAndReproductionStatement:
-          description: The human readable use and reproduction statement that applies
-          example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-          type: string
-          nullable: true
+          $ref: "#/components/schemas/UseAndReproductionStatement"
         license:
-          description: The license governing reuse of the Collection. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-          type: string
-          nullable: true
+          $ref: "#/components/schemas/License"
     CollectionIdentification:
       type: object
       additionalProperties: false
@@ -554,6 +507,11 @@ components:
       required:
         - view
         - download
+    Copyright:
+      description: The human readable copyright statement that applies
+      example: Copyright World Trade Organization
+      type: string
+      nullable: true
     CreatedInFolioIdentifier:
       description: A record identifier created in Folio
       type: string
@@ -629,52 +587,13 @@ components:
         - type: object
           properties:
             copyright:
-              description: The human readable copyright statement that applies
-              example: Copyright World Trade Organization
-              type: string
-              nullable: true
+              $ref: "#/components/schemas/Copyright"
             embargo:
               $ref: '#/components/schemas/Embargo'
             useAndReproductionStatement:
-              description: The human readable use and reproduction statement that applies
-              example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
-              type: string
-              nullable: true
+              $ref: "#/components/schemas/UseAndReproductionStatement"
             license:
-              description: The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
-              type: string
-              nullable: true
-              enum:
-                - 'https://www.gnu.org/licenses/agpl.txt'
-                - 'https://www.apache.org/licenses/LICENSE-2.0'
-                - 'https://opensource.org/licenses/BSD-2-Clause'
-                - 'https://opensource.org/licenses/BSD-3-Clause'
-                - 'https://creativecommons.org/licenses/by/4.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc/4.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nd/4.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-sa/4.0/legalcode'
-                - 'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
-                - 'https://opensource.org/licenses/cddl1'
-                - 'https://www.eclipse.org/legal/epl-2.0'
-                - 'https://www.gnu.org/licenses/gpl-3.0-standalone.html'
-                - 'https://www.isc.org/downloads/software-support-policy/isc-license/'
-                - 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html'
-                - 'https://opensource.org/licenses/MIT'
-                - 'https://www.mozilla.org/MPL/2.0/'
-                - 'https://opendatacommons.org/licenses/by/1-0/'
-                - 'http://opendatacommons.org/licenses/odbl/1.0/' # Non cannonical, but in some of our data
-                - 'https://opendatacommons.org/licenses/odbl/1-0/'
-                - 'https://creativecommons.org/publicdomain/mark/1.0/'
-                - 'https://opendatacommons.org/licenses/pddl/1-0/'
-                - 'https://creativecommons.org/licenses/by/3.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-sa/3.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nd/3.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc/3.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode'
-                - 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode'
-                - 'https://cocina.sul.stanford.edu/licenses/none' # Only used in some legacy ETDs and not actually permitted per the Project Chimera docs.
+              $ref: "#/components/schemas/License"
     DROStructural:
       description: Structural metadata
       type: object
@@ -1046,10 +965,7 @@ components:
               format: date-time
               example: '2029-06-22T07:00:00.000+00:00'
             useAndReproductionStatement:
-              description: The human readable use and reproduction statement that applies when the embargo expires.
-              example: These materials are in the public domain.
-              type: string
-              nullable: true
+              $ref: "#/components/schemas/UseAndReproductionStatement"
           required:
             - releaseDate
     Event:
@@ -1242,9 +1158,9 @@ components:
             - previous folio
           example: folio
         refresh:
-          description: Only one of the catkeys should be designated for refreshing.
-            This means that this key is the one used to pull metadata from the catalog
-            if there is more than one key present.
+          description: Only one of the Folio instance HRIDs should be designated for refreshing.
+            This means that this HRID is the one used to pull metadata from the catalog
+            if there is more than one HRID present.
           type: boolean
           default: false
         catalogRecordId:
@@ -1357,6 +1273,41 @@ components:
         valueLanguage:
           # description: present for mapping to additional schemas in the future and for consistency but not otherwise used
           $ref: "#/components/schemas/DescriptiveValueLanguage"
+    License:
+      description: The license governing reuse of the DRO. Should be an IRI for known licenses (i.e. CC, RightsStatement.org URI, etc.).
+      type: string
+      nullable: true
+      enum:
+        - 'https://www.gnu.org/licenses/agpl.txt'
+        - 'https://www.apache.org/licenses/LICENSE-2.0'
+        - 'https://opensource.org/licenses/BSD-2-Clause'
+        - 'https://opensource.org/licenses/BSD-3-Clause'
+        - 'https://creativecommons.org/licenses/by/4.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc/4.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc-nd/4.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nd/4.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-sa/4.0/legalcode'
+        - 'https://creativecommons.org/publicdomain/zero/1.0/legalcode'
+        - 'https://opensource.org/licenses/cddl1'
+        - 'https://www.eclipse.org/legal/epl-2.0'
+        - 'https://www.gnu.org/licenses/gpl-3.0-standalone.html'
+        - 'https://www.isc.org/downloads/software-support-policy/isc-license/'
+        - 'https://www.gnu.org/licenses/lgpl-3.0-standalone.html'
+        - 'https://opensource.org/licenses/MIT'
+        - 'https://www.mozilla.org/MPL/2.0/'
+        - 'https://opendatacommons.org/licenses/by/1-0/'
+        - 'http://opendatacommons.org/licenses/odbl/1.0/' # Non cannonical, but in some of our data
+        - 'https://opendatacommons.org/licenses/odbl/1-0/'
+        - 'https://creativecommons.org/publicdomain/mark/1.0/'
+        - 'https://opendatacommons.org/licenses/pddl/1-0/'
+        - 'https://creativecommons.org/licenses/by/3.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-sa/3.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nd/3.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc/3.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc-sa/3.0/legalcode'
+        - 'https://creativecommons.org/licenses/by-nc-nd/3.0/legalcode'
+        - 'https://cocina.sul.stanford.edu/licenses/none' # Only used in some legacy ETDs and not actually permitted per the Project Chimera docs.
     LocationBasedAccess:
       type: object
       properties:
@@ -2068,6 +2019,11 @@ components:
             - type: object
               required:
                 - valueAt
+    UseAndReproductionStatement:
+      description: The human readable use and reproduction statement that applies
+      example: Property rights reside with the repository. Literary rights reside with the creators of the documents or their heirs. To obtain permission to publish or reproduce, please contact the Public Services Librarian of the Dept. of Special Collections (http://library.stanford.edu/spc).
+      type: string
+      nullable: true
     WorldAccess:
       type: object
       properties:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.89.1
 platform: ruby
 authors:
 - Justin Coyne
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-22 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -387,6 +387,7 @@ files:
 - lib/cocina/models/collection_with_metadata.rb
 - lib/cocina/models/contributor.rb
 - lib/cocina/models/controlled_digital_lending_access.rb
+- lib/cocina/models/copyright.rb
 - lib/cocina/models/created_in_folio_identifier.rb
 - lib/cocina/models/dark_access.rb
 - lib/cocina/models/description.rb
@@ -510,6 +511,7 @@ files:
 - lib/cocina/models/stanford_access.rb
 - lib/cocina/models/symphony_catalog_link.rb
 - lib/cocina/models/title.rb
+- lib/cocina/models/use_and_reproduction_statement.rb
 - lib/cocina/models/validatable.rb
 - lib/cocina/models/validators/associated_name_validator.rb
 - lib/cocina/models/validators/catalog_links_validator.rb
@@ -531,7 +533,7 @@ homepage: https://github.com/sul-dlss/cocina-models
 licenses: []
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -547,7 +549,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.7
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Data models for the SDR
 test_files: []