cocina-models 0.66.0 → 0.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: def07c3b758899fb7dafda2ab26d7376318137895cb1335ab22404ab939e6e15
-  data.tar.gz: cb8f57478510d3f40a9241e944484437889dbf4b0b09e992696da7b9d1e595c1
+  metadata.gz: d958e46bc006eefe8d06d8d1d82e877ba59b16efb805668fb3f269c04bfb200b
+  data.tar.gz: f5bdcce64f7471c944e39ddd9406f4ca93d87279cf95a1d0539943ce9481edf5
 SHA512:
-  metadata.gz: 1de2f3d0703139311d8f58f1ec24b5b579b330c0461c645ebe76d153930ab91850d694a2b7a138a8ee6c63ee8ba5562f6c24ff044a7dd0bf40355eb1007afd51
-  data.tar.gz: ecdfd2b784a0e42c30e348d08dbe7a6f092c369d7830dd86b11c2ff8185fef4238068fdc4b5e7fe8af90d1d9477e17436d03fde5058855d97819a7270ebc304e
+  metadata.gz: 40c18189082759e6611b18164ab793e26a8add49fdb8bc74b9e333e59d7be73a3268e3d98bc11e066a924206dc8501c52e56bcde64f1ef38d8b40d943ff3ef75
+  data.tar.gz: 0660a591a00e07846274f123f2a6f3e1715244e24c9a5998a5ed7e36753c6d6ab302365b1a09bf5368c61aeb7a15ad32b9656bd136cc4e194883345abf6e6dbd

data/.rubocop.yml

@@ -83,9 +83,16 @@ Metrics/MethodLength:
   Max: 14
   Exclude:
     - 'spec/cocina/models/file_access_spec.rb'
+    - 'spec/cocina/models/dro_access_spec.rb'
 
 # ----- RSpec ------
 
+RSpec/BeEq: # new in 2.9.0
+  Enabled: true
+
+RSpec/BeNil: # new in 2.9.0
+  Enabled: true
+
 RSpec/ExampleLength:
   Max: 18
   Exclude:

data/README.md

@@ -26,6 +26,11 @@ exe/generator generate
 exe/generator generate_schema DRO
 ```
 
+### Controlled vocabularies
+```
+exe/generator generate_vocab
+```
+
 ## Testing
 
 The generator is tested via its output when run against `openapi.yml`, viz., the Cocina model classes. Thus, `generate` should be run after any changes to `openapi.yml`.

data/cocina-models.gemspec

@@ -28,7 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-struct', '~> 1.0'
   spec.add_dependency 'dry-types', '~> 1.1'
   spec.add_dependency 'openapi3_parser' # Parsing openapi doc
-  spec.add_dependency 'openapi_parser' # Validating openapi requests
+  # Match these version requirements to what committee wants,
+  # so that our client (non-committee) users have the same dependencies.
+  spec.add_dependency 'openapi_parser', '>= 0.11.1', '< 1.0'
   spec.add_dependency 'thor'
   spec.add_dependency 'zeitwerk', '~> 2.1'
 

data/lib/cocina/generator/generator.rb

@@ -42,12 +42,7 @@ module Cocina
 
       desc 'generate_vocab', 'generate vocab'
       def generate_vocab
-        vocab = Vocab.new(schemas)
-        filepath = "#{options[:output]}/#{vocab.filename}"
-        FileUtils.rm_f(filepath)
-
-        create_file filepath, vocab.generate
-        run("rubocop -a #{filepath} > /dev/null")
+        Vocab.generate(schemas, output_dir: options[:output])
       end
 
       private

data/lib/cocina/generator/vocab.rb

@@ -4,36 +4,47 @@ module Cocina
   module Generator
     # Class for generating a vocab
     class Vocab
-      def initialize(schemas)
-        @schemas = schemas
+      CLASS_COMMENT = {
+        'ObjectType' => 'This vocabulary defines the top level object type',
+        'FileSetType' => 'This vocabulary defines the types of file sets'
+      }.freeze
+
+      def self.generate(schemas, output_dir:)
+        new(schemas, output_dir: output_dir).generate
       end
 
-      def filename
-        'vocab.rb'
+      def initialize(schemas, output_dir:)
+        @schemas = schemas
+        @output_dir = output_dir
       end
 
       def generate
-        <<~RUBY
-                    # frozen_string_literal: true
-
-                    module Cocina
-                      module Models
-                        # A digital repository object.  See http://sul-dlss.github.io/cocina-models/maps/DRO.json
-                        class Vocab
+        names.each do |namespace, v|
+          filepath = File.join(output_dir, "#{namespace.underscore}.rb")
+          File.write(filepath, contents(namespace, v))
+        end
+      end
 
-          #{vocab_methods}
+      def contents(namespace, methods)
+        <<~RUBY
+          # frozen_string_literal: true
 
-                        end
-                      end
+          module Cocina
+            module Models
+              # #{CLASS_COMMENT.fetch(namespace)}
+              class #{namespace}
+          #{draw_ruby_methods(methods, 6)}
+              end
+            end
           end
         RUBY
       end
 
       private
 
-      attr_reader :schemas
+      attr_reader :schemas, :output_dir
 
-      BASE = 'http://cocina.sul.stanford.edu/models/'
+      BASE = 'https://cocina.sul.stanford.edu/models/'
 
       def vocabs
         type_properties = schemas.values.map { |schema| schema.properties['type'] }.compact
@@ -43,37 +54,23 @@ module Cocina
                        .sort
       end
 
-      def vocab_methods
-        names = vocabs.each_with_object({}) do |vocab, object|
+      def names
+        @names ||= vocabs.each_with_object({}) do |vocab, object|
           # Note special handling of 3d
-          namespaced = vocab.delete_prefix(BASE).delete_suffix('.jsonld')
+          namespaced = vocab.delete_prefix(BASE)
                             .gsub('-', '_').gsub('3d', 'three_dimensional')
-          namespace, name = namespaced.include?('/') ? namespaced.split('/') : [:root, namespaced]
+          namespace, name = namespaced.include?('/') ? namespaced.split('/') : ['ObjectType', namespaced]
+          namespace = 'FileSetType' if namespace == 'resources'
           object[namespace] ||= {}
           object[namespace][name] = vocab
         end
-        draw_namespaced_methods(names)
       end
 
-      def draw_namespaced_methods(names)
-        names.flat_map do |namespace, methods|
-          [].tap do |items|
-            items << "class #{namespace.capitalize}" unless namespace == :root
-            items << draw_ruby_methods(methods)
-            items << 'end' unless namespace == :root
-          end
-        end.join("\n")
-      end
-
-      def draw_ruby_methods(methods)
+      def draw_ruby_methods(methods, indent)
+        spaces = ' ' * indent
         methods.map do |name, vocab|
-          <<~RUBY
-            def self.#{name}
-              "#{vocab}"
-            end
-
-          RUBY
-        end.join("\n")
+          "#{spaces}def self.#{name}\n#{spaces}  '#{vocab}'\n#{spaces}end"
+        end.join("\n\n")
       end
     end
   end

data/lib/cocina/models/access.rb

@@ -5,13 +5,13 @@ module Cocina
     class Access < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :access, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
-      # If access is "location-based", which location should have access.
+      # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :readLocation, Types::Strict::String.optional.meta(omittable: true)
+      attribute :location, Types::Strict::String.optional.meta(omittable: true)
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
     end

data/lib/cocina/models/admin_policy.rb

@@ -7,7 +7,7 @@ module Cocina
 
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/admin_policy.jsonld'].freeze
+      TYPES = ['https://cocina.sul.stanford.edu/models/admin_policy'].freeze
 
       # The version of Cocina with which this object conforms.
       # example: 1.2.3

data/lib/cocina/models/{admin_policy_default_access.rb → admin_policy_access_template.rb}

@@ -2,8 +2,8 @@
 
 module Cocina
   module Models
-    class AdminPolicyDefaultAccess < Struct
-      attribute :access, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
+    class AdminPolicyAccessTemplate < Struct
+      attribute :view, Types::Strict::String.enum('world', 'stanford', 'location-based', 'citation-only', 'dark').meta(omittable: true)
       # Available for controlled digital lending.
       attribute :controlledDigitalLending, Types::Strict::Bool.meta(omittable: true)
       # The human readable copyright statement that applies
@@ -12,9 +12,9 @@ module Cocina
       # 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').meta(omittable: true)
-      # If access is "location-based", which location should have access. This is used in the transition from Fedora as a way to set a default readLocation at registration that is copied down to all the files.
+      # 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 :readLocation, Types::Strict::String.optional.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
+      attribute :location, Types::Strict::String.optional.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m').meta(omittable: true)
       # 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.meta(omittable: true)

data/lib/cocina/models/admin_policy_administrative.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     class AdminPolicyAdministrative < Struct
-      attribute :defaultAccess, AdminPolicyDefaultAccess.optional.meta(omittable: true)
+      attribute(:accessTemplate, AdminPolicyAccessTemplate.default { AdminPolicyAccessTemplate.new })
       attribute :registrationWorkflow, Types::Strict::Array.of(Types::Strict::String).default([].freeze)
       # An additional workflow to start for objects managed by this admin policy once the end-accession workflow step is complete
       # example: wasCrawlPreassemblyWF

data/lib/cocina/models/administrative.rb

@@ -6,9 +6,6 @@ module Cocina
       # example: druid:bc123df4567
       attribute :hasAdminPolicy, Types::Strict::String
       attribute :releaseTags, Types::Strict::Array.of(ReleaseTag).default([].freeze)
-      # Administrative or Internal project this resource is a part of
-      # example: Google Books
-      attribute :partOfProject, Types::Strict::String.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/citation_only_access.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class CitationOnlyAccess < Struct
       # Access level.
-      attribute :access, Types::Strict::String.enum('citation-only')
+      attribute :view, Types::Strict::String.enum('citation-only')
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
-      # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.optional.enum('').meta(omittable: true)
+      # Not used for this access type, must be null.
+      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
       attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
     end
   end

data/lib/cocina/models/collection.rb

@@ -7,11 +7,11 @@ module Cocina
 
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/collection.jsonld',
-               'http://cocina.sul.stanford.edu/models/curated-collection.jsonld',
-               'http://cocina.sul.stanford.edu/models/user-collection.jsonld',
-               'http://cocina.sul.stanford.edu/models/exhibit.jsonld',
-               'http://cocina.sul.stanford.edu/models/series.jsonld'].freeze
+      TYPES = ['https://cocina.sul.stanford.edu/models/collection',
+               'https://cocina.sul.stanford.edu/models/curated-collection',
+               'https://cocina.sul.stanford.edu/models/user-collection',
+               'https://cocina.sul.stanford.edu/models/exhibit',
+               'https://cocina.sul.stanford.edu/models/series'].freeze
 
       # The version of Cocina with which this object conforms.
       # example: 1.2.3
@@ -26,7 +26,7 @@ module Cocina
       attribute :version, Types::Strict::Integer
       attribute(:access, CollectionAccess.default { CollectionAccess.new })
       attribute :administrative, Administrative.optional.meta(omittable: true)
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute(:description, Description.default { Description.new })
       attribute :identification, CollectionIdentification.optional.meta(omittable: true)
     end
   end

data/lib/cocina/models/collection_access.rb

@@ -4,7 +4,7 @@ module Cocina
   module Models
     class CollectionAccess < Struct
       # Access level
-      attribute :access, Types::Strict::String.default('dark').enum('world', 'dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.default('dark').enum('world', 'dark').meta(omittable: true)
       # The human readable copyright statement that applies
       # example: Copyright World Trade Organization
       attribute :copyright, Types::Strict::String.optional.meta(omittable: true)

data/lib/cocina/models/controlled_digital_lending_access.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class ControlledDigitalLendingAccess < Struct
       # Access level.
-      attribute :access, Types::Strict::String.enum('stanford')
+      attribute :view, Types::Strict::String.enum('stanford')
       # Download access level.
       attribute :download, Types::Strict::String.enum('none')
-      # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.optional.enum('').meta(omittable: true)
+      # Not used for this access type, must be null.
+      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
       # Available for controlled digital lending.
       attribute :controlledDigitalLending, Types::Strict::Bool.default(false)
     end

data/lib/cocina/models/dark_access.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class DarkAccess < Struct
       # Access level.
-      attribute :access, Types::Strict::String.default('dark').enum('dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.default('dark').enum('dark').meta(omittable: true)
       # Download access level.
       attribute :download, Types::Strict::String.default('none').enum('none').meta(omittable: true)
-      # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.optional.enum('').meta(omittable: true)
+      # Not used for this access type, must be null.
+      attribute :location, Types::Strict::String.optional.enum('').meta(omittable: true)
       attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
     end
   end

data/lib/cocina/models/dro.rb

@@ -7,21 +7,21 @@ module Cocina
 
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/object.jsonld',
-               'http://cocina.sul.stanford.edu/models/3d.jsonld',
-               'http://cocina.sul.stanford.edu/models/agreement.jsonld',
-               'http://cocina.sul.stanford.edu/models/book.jsonld',
-               'http://cocina.sul.stanford.edu/models/document.jsonld',
-               'http://cocina.sul.stanford.edu/models/geo.jsonld',
-               'http://cocina.sul.stanford.edu/models/image.jsonld',
-               'http://cocina.sul.stanford.edu/models/page.jsonld',
-               'http://cocina.sul.stanford.edu/models/photograph.jsonld',
-               'http://cocina.sul.stanford.edu/models/manuscript.jsonld',
-               'http://cocina.sul.stanford.edu/models/map.jsonld',
-               'http://cocina.sul.stanford.edu/models/media.jsonld',
-               'http://cocina.sul.stanford.edu/models/track.jsonld',
-               'http://cocina.sul.stanford.edu/models/webarchive-binary.jsonld',
-               'http://cocina.sul.stanford.edu/models/webarchive-seed.jsonld'].freeze
+      TYPES = ['https://cocina.sul.stanford.edu/models/object',
+               'https://cocina.sul.stanford.edu/models/3d',
+               'https://cocina.sul.stanford.edu/models/agreement',
+               'https://cocina.sul.stanford.edu/models/book',
+               'https://cocina.sul.stanford.edu/models/document',
+               'https://cocina.sul.stanford.edu/models/geo',
+               'https://cocina.sul.stanford.edu/models/image',
+               'https://cocina.sul.stanford.edu/models/page',
+               'https://cocina.sul.stanford.edu/models/photograph',
+               'https://cocina.sul.stanford.edu/models/manuscript',
+               'https://cocina.sul.stanford.edu/models/map',
+               'https://cocina.sul.stanford.edu/models/media',
+               'https://cocina.sul.stanford.edu/models/track',
+               'https://cocina.sul.stanford.edu/models/webarchive-binary',
+               'https://cocina.sul.stanford.edu/models/webarchive-seed'].freeze
 
       # The version of Cocina with which this object conforms.
       # example: 1.2.3
@@ -36,7 +36,7 @@ module Cocina
       attribute :version, Types::Strict::Integer
       attribute(:access, DROAccess.default { DROAccess.new })
       attribute(:administrative, Administrative.default { Administrative.new })
-      attribute :description, Description.optional.meta(omittable: true)
+      attribute(:description, Description.default { Description.new })
       attribute :identification, Identification.optional.meta(omittable: true)
       attribute :structural, DROStructural.optional.meta(omittable: true)
       attribute :geographic, Geographic.optional.meta(omittable: true)

data/lib/cocina/models/dro_access.rb

@@ -5,13 +5,13 @@ module Cocina
     class DROAccess < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :access, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
-      # If access is "location-based", which location should have access.
+      # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :readLocation, Types::Strict::String.optional.meta(omittable: true)
+      attribute :location, Types::Strict::String.optional.meta(omittable: true)
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
       # The human readable copyright statement that applies
@@ -22,7 +22,7 @@ module Cocina
       # 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.meta(omittable: true)
       # 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', 'http://cocina.sul.stanford.edu/licenses/none').meta(omittable: true)
+      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').meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/embargo.rb

@@ -5,13 +5,13 @@ module Cocina
     class Embargo < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :access, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
-      # If access is "location-based", which location should have access.
+      # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :readLocation, Types::Strict::String.optional.meta(omittable: true)
+      attribute :location, Types::Strict::String.optional.meta(omittable: true)
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
       # Date when the Collection is released from an embargo.

data/lib/cocina/models/file.rb

@@ -5,7 +5,7 @@ module Cocina
     class File < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/file.jsonld'].freeze
+      TYPES = ['https://cocina.sul.stanford.edu/models/file'].freeze
 
       # The content type of the File.
       attribute :type, Types::Strict::String.enum(*File::TYPES)

data/lib/cocina/models/file_access.rb

@@ -5,13 +5,13 @@ module Cocina
     class FileAccess < Struct
       # Access level.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :access, Types::Strict::String.optional.default('dark').meta(omittable: true)
+      attribute :view, Types::Strict::String.optional.default('dark').meta(omittable: true)
       # Download access level.
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :download, Types::Strict::String.optional.default('none').meta(omittable: true)
-      # If access is "location-based", which location should have access.
+      # Not used for this access type, must be null.
       # Validation of this property is relaxed. See the openapi for full validation.
-      attribute :readLocation, Types::Strict::String.optional.meta(omittable: true)
+      attribute :location, Types::Strict::String.optional.meta(omittable: true)
       # Validation of this property is relaxed. See the openapi for full validation.
       attribute :controlledDigitalLending, Types::Strict::Bool.optional.meta(omittable: true)
     end

data/lib/cocina/models/file_set.rb

@@ -5,22 +5,22 @@ module Cocina
     class FileSet < Struct
       include Checkable
 
-      TYPES = ['http://cocina.sul.stanford.edu/models/resources/audio.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/attachment.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/document.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/file.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/image.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/main-augmented.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/main-original.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/media.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/object.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/page.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/permissions.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/preview.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/supplement.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/3d.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/thumb.jsonld',
-               'http://cocina.sul.stanford.edu/models/resources/video.jsonld'].freeze
+      TYPES = ['https://cocina.sul.stanford.edu/models/resources/audio',
+               'https://cocina.sul.stanford.edu/models/resources/attachment',
+               'https://cocina.sul.stanford.edu/models/resources/document',
+               'https://cocina.sul.stanford.edu/models/resources/file',
+               'https://cocina.sul.stanford.edu/models/resources/image',
+               'https://cocina.sul.stanford.edu/models/resources/main-augmented',
+               'https://cocina.sul.stanford.edu/models/resources/main-original',
+               'https://cocina.sul.stanford.edu/models/resources/media',
+               'https://cocina.sul.stanford.edu/models/resources/object',
+               'https://cocina.sul.stanford.edu/models/resources/page',
+               'https://cocina.sul.stanford.edu/models/resources/permissions',
+               'https://cocina.sul.stanford.edu/models/resources/preview',
+               'https://cocina.sul.stanford.edu/models/resources/supplement',
+               'https://cocina.sul.stanford.edu/models/resources/3d',
+               'https://cocina.sul.stanford.edu/models/resources/thumb',
+               'https://cocina.sul.stanford.edu/models/resources/video'].freeze
 
       # The content type of the Fileset.
       attribute :type, Types::Strict::String.enum(*FileSet::TYPES)

data/lib/cocina/models/file_set_type.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # This vocabulary defines the types of file sets
+    class FileSetType
+      def self.three_dimensional
+        'https://cocina.sul.stanford.edu/models/resources/3d'
+      end
+
+      def self.attachment
+        'https://cocina.sul.stanford.edu/models/resources/attachment'
+      end
+
+      def self.audio
+        'https://cocina.sul.stanford.edu/models/resources/audio'
+      end
+
+      def self.document
+        'https://cocina.sul.stanford.edu/models/resources/document'
+      end
+
+      def self.file
+        'https://cocina.sul.stanford.edu/models/resources/file'
+      end
+
+      def self.image
+        'https://cocina.sul.stanford.edu/models/resources/image'
+      end
+
+      def self.main_augmented
+        'https://cocina.sul.stanford.edu/models/resources/main-augmented'
+      end
+
+      def self.main_original
+        'https://cocina.sul.stanford.edu/models/resources/main-original'
+      end
+
+      def self.media
+        'https://cocina.sul.stanford.edu/models/resources/media'
+      end
+
+      def self.object
+        'https://cocina.sul.stanford.edu/models/resources/object'
+      end
+
+      def self.page
+        'https://cocina.sul.stanford.edu/models/resources/page'
+      end
+
+      def self.permissions
+        'https://cocina.sul.stanford.edu/models/resources/permissions'
+      end
+
+      def self.preview
+        'https://cocina.sul.stanford.edu/models/resources/preview'
+      end
+
+      def self.supplement
+        'https://cocina.sul.stanford.edu/models/resources/supplement'
+      end
+
+      def self.thumb
+        'https://cocina.sul.stanford.edu/models/resources/thumb'
+      end
+
+      def self.video
+        'https://cocina.sul.stanford.edu/models/resources/video'
+      end
+    end
+  end
+end

data/lib/cocina/models/location_based_access.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class LocationBasedAccess < Struct
       # Access level.
-      attribute :access, Types::Strict::String.enum('location-based')
+      attribute :view, Types::Strict::String.enum('location-based')
       # Download access level.
       attribute :download, Types::Strict::String.enum('location-based', 'none')
-      # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
+      # If access or download is "location-based", which location should have access.
+      attribute :location, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
       attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
     end
   end

data/lib/cocina/models/location_based_download_access.rb

@@ -4,11 +4,11 @@ module Cocina
   module Models
     class LocationBasedDownloadAccess < Struct
       # Access level.
-      attribute :access, Types::Strict::String.enum('stanford', 'world')
+      attribute :view, Types::Strict::String.enum('stanford', 'world')
       # Download access level.
       attribute :download, Types::Strict::String.enum('location-based')
-      # If access is "location-based", which location should have access.
-      attribute :readLocation, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
+      # Which location should have download access.
+      attribute :location, Types::Strict::String.enum('spec', 'music', 'ars', 'art', 'hoover', 'm&m')
       attribute :controlledDigitalLending, Types::Strict::Bool.enum(false).meta(omittable: true)
     end
   end