cocina-models 0.67.0 → 0.69.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14a49c375a660bd05882ee93aeaf458dddb883e88ea55ed4e80bb48b2458446b
-  data.tar.gz: ef9426b29aedcfc6cbc1cb55118de413f7bd64f9df9234f5203d2f67eee19583
+  metadata.gz: e198b8822ac577fc855cf1c4f9b41c4d675ea0cc26f9f34be5a2336d490f8bae
+  data.tar.gz: 85b616f47c334c92b236a72afb5d3614556055e85e2dd59bb195c0cf6ab6c3f7
 SHA512:
-  metadata.gz: 25aed0abff20bc69292031adf1eee12b4b6ca528525ad9898e0baf464ec1e99c6c0e518a7585fdab4dc63651175da88e5f179dfdb1ef35e79ba1d1087cf1efbc
-  data.tar.gz: babf7508c4aab20689bfd7d7618711b51a254405bd111117dd9a758b6dc556f571af9f90fb50929f515698a22a35c36275a26641ee5c93a3d51faa658a92481a
+  metadata.gz: c71aae2c9278daf30c101163fce072e584898c0726332d2bd09fb888649aae68b5fe5e32bb028c8e06f8dd22f30abaf81662f1fdcb989af448209427025bd243
+  data.tar.gz: f3b60727a439c71abbbbc41405797a34c0363526ef19296c067f562b4bab3341f6d3a9a5e31a55f146d705bed0e4ff17a2dec1a0d3cc285995c5ea76b5123664

data/.rubocop.yml

@@ -78,6 +78,7 @@ Metrics/BlockLength:
   Exclude:
     - cocina-models.gemspec
     - spec/cocina/**/*
+    - lib/cocina/rspec/matchers.rb
 
 Metrics/MethodLength:
   Max: 14
@@ -87,6 +88,12 @@ Metrics/MethodLength:
 
 # ----- RSpec ------
 
+RSpec/BeEq: # new in 2.9.0
+  Enabled: true
+
+RSpec/BeNil: # new in 2.9.0
+  Enabled: true
+
 RSpec/ExampleLength:
   Max: 18
   Exclude:
@@ -99,6 +106,9 @@ RSpec/MultipleExpectations:
 RSpec/StubbedMock: # (new in 1.44)
   Enabled: true
 
+RSpec/MultipleMemoizedHelpers:
+  Max: 6
+
 # ----- Style ------
 
 Style/Documentation:
@@ -270,3 +280,5 @@ RSpec/FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
 RSpec/Rails/AvoidSetupHook: # new in 2.4
   Enabled: true
+Style/NestedFileDirname: # new in 1.26
+  Enabled: true

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`.
@@ -98,3 +103,17 @@ The following are the recommended naming conventions for code using Cocina model
 * `cocina_admin_policy`: `Cocina::Models::AdminPolicy` instance
 * `cocina_collection`: `Cocina::Models::Collection` instance
 * `cocina_object`: `Cocina::Models::DRO` or `Cocina::Models::AdminPolicy` or `Cocina::Models::Collection` instance
+
+## RSpec matchers
+
+As of the 0.69.0 release, the `cocina-models` gem provides RSpec matchers for downstream apps to make it easier to compare Cocina data structures. The matchers provided include:
+
+* `equal_cocina_model`: Compare a Cocina JSON string with a model instance. This matcher is especially valuable coupled with the `super_diff` gem (a dependency of `cocina-models` since the 0.69.0 release). Example usage:
+  * `expect(http_response_body_with_cocina_json).to equal_cocina_model(cocina_instance)`
+* `cocina_object_with` (AKA `match_cocina_object_with`): Compare a Cocina model instance with a hash containining part of the structure of a Cocina object. Example usage:
+  * `expect(CocinaObjectStore).to have_received(:save).with(cocina_object_with(access: { view: 'world' }, structural: { contains: [...] }))`
+  * expect(updated_cocina_item).to match_cocina_object_with(structural: { hasMemberOrders: [] })
+* `cocina_object_with_types`: Check a Cocina object's type information. Example usage:
+  * `expect(object_client).to have_received(:update).with(params: cocina_object_with_types(content_type: Cocina::Models::ObjectType.book, viewing_direction: 'left-to-right'))`
+* `cocina_admin_policy_with_registration_collections`: Check a Cocina admin policy's collections. Example usage:
+  * `expect(object_client).to have_received(:update).with(params: cocina_admin_policy_with_registration_collections([collection_id]))`

data/cocina-models.gemspec

@@ -28,7 +28,10 @@ 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', '~> 1.0' # 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 'super_diff'
   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
@@ -76,18 +71,26 @@ module Cocina
         run("rubocop -a #{filepath} > /dev/null")
       end
 
-      # rubocop:disable Metrics/AbcSize
+      NO_CLEAN = [
+        'checkable.rb',
+        'dro_rights_description_builder.rb',
+        'license.rb',
+        'rights_description_builder.rb',
+        'title_builder.rb',
+        'validatable.rb',
+        'validator.rb',
+        'version.rb',
+        'vocabulary.rb'
+      ].freeze
+
       def clean_output
         FileUtils.mkdir_p(options[:output])
         files = Dir.glob("#{options[:output]}/*.rb")
         # Leave alone
-        files.delete("#{options[:output]}/version.rb")
-        files.delete("#{options[:output]}/checkable.rb")
-        files.delete("#{options[:output]}/validator.rb")
-        files.delete("#{options[:output]}/validatable.rb")
+        NO_CLEAN.each { |filename| files.delete("#{options[:output]}/#{filename}") }
+
         FileUtils.rm_f(files)
       end
-      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/cocina/generator/vocab.rb

@@ -4,36 +4,51 @@ 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} < Vocabulary('#{URIS.fetch(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/'
+      URIS = {
+        'ObjectType' => BASE,
+        'FileSetType' => "#{BASE}resources/"
+      }.freeze
 
       def vocabs
         type_properties = schemas.values.map { |schema| schema.properties['type'] }.compact
@@ -43,38 +58,27 @@ module Cocina
                        .sort
       end
 
-      def vocab_methods
-        names = vocabs.each_with_object({}) do |vocab, object|
-          # Note special handling of 3d
-          namespaced = vocab.delete_prefix(BASE).delete_suffix('.jsonld')
-                            .gsub('-', '_').gsub('3d', 'three_dimensional')
-          namespace, name = namespaced.include?('/') ? namespaced.split('/') : [:root, namespaced]
-          object[namespace] ||= {}
-          object[namespace][name] = vocab
+      def names
+        @names ||= vocabs.each_with_object({}) do |vocab, object|
+          namespaced = vocab.delete_prefix(BASE)
+          namespace, name = namespaced.include?('/') ? namespaced.split('/') : ['ObjectType', namespaced]
+          namespace = 'FileSetType' if namespace == 'resources'
+          object[namespace] ||= []
+          object[namespace] << name
         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
+      def draw_ruby_methods(methods, indent)
+        spaces = ' ' * indent
+        methods.map do |name|
+          if name == '3d'
+            "#{spaces}property :'3d', method_name: :three_dimensional"
+          else
+            name = "'#{name}'" if name.match?(/(^\d)|-/)
+            "#{spaces}property :#{name}"
           end
         end.join("\n")
       end
-
-      def draw_ruby_methods(methods)
-        methods.map do |name, vocab|
-          <<~RUBY
-            def self.#{name}
-              "#{vocab}"
-            end
-
-          RUBY
-        end.join("\n")
-      end
     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.default { AdminPolicyDefaultAccess.new })
+      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.optional.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

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

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/dro_rights_description_builder.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # Rights description builder for items
+    class DroRightsDescriptionBuilder < RightsDescriptionBuilder
+      # @param [Cocina::Models::DRO] cocina_item
+
+      # This overrides the superclass
+      # @return [Cocina::Models::DROAccess]
+      def object_access
+        @object_access ||= cocina.access
+      end
+
+      private
+
+      def object_level_access
+        super + access_level_from_files.uniq.map { |str| "#{str} (file)" }
+      end
+
+      def access_level_from_files
+        # dark access doesn't permit any file access
+        return [] if object_access.view == 'dark'
+
+        file_access_nodes.reject { |fa| same_as_object_access?(fa) }.flat_map do |fa|
+          file_access_from_file(fa)
+        end
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def file_access_from_file(file_access)
+        basic_access = if file_access[:view] == 'location-based'
+                         "location: #{file_access[:location]}"
+                       else
+                         file_access[:view]
+                       end
+
+        return [basic_access] if file_access[:view] == file_access[:download]
+
+        basic_access += ' (no-download)' if file_access[:view] != 'dark'
+
+        case file_access[:download]
+        when 'stanford'
+          [basic_access, 'stanford']
+        when 'location-based'
+          # Here we're using location to mean download location.
+          [basic_access, "location: #{file_access[:location]}"]
+        else
+          [basic_access]
+        end
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def same_as_object_access?(file_access)
+        (file_access[:view] == object_access.view && file_access[:download] == object_access.download) ||
+          (object_access.view == 'citation-only' && file_access[:view] == 'dark')
+      end
+
+      def file_access_nodes
+        Array(cocina.structural.contains)
+          .flat_map { |fs| Array(fs.structural.contains) }
+          .map { |file| file.access.to_h }
+          .uniq
+      end
+    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