cocina-models 0.89.1 → 0.91.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0dbfb214630511f046a824a0f6774e203db38bcef1c7af9dc6118932148caa4
-  data.tar.gz: d087a39d4cb3270cd01d8fc77beb0c053a45431867c47570715c09fc0868e856
+  metadata.gz: f7ef9101cd3e5b9e42625b2afbc651919ba5f8e1617d5372324cb950a8f78b23
+  data.tar.gz: 433c3651004d4f32c380f0cee4b38887fe2ef3bc550436e326af299db01d12b3
 SHA512:
-  metadata.gz: b083699765ee6bd9715ff5fe575ca994220ebb7f1d8ec9e7526b15f2af320c8c99b7c85cabb843e00027f37fddf68a50cf91b2c2e7513b8cdc82e5cd16a70bfe
-  data.tar.gz: f3d50447698ba52af5d8f71565cd77235970f318ba78105de1e88dc4bd23134d9e826d167ad745adfd3aeeb0d2add3bf854fad0f713f512984188b5e9ea355c3
+  metadata.gz: 74cfeeb356d0fd34295010870f2e81c2ef08d9db3c3679ec1b22a8e6f6325bfb62058a23654c024d58a19a59a8b1dd73d611cfec749f2adce2aa6ac938f46c92
+  data.tar.gz: 906583af0a50b81f26f4c487b3288196f918d116f617c253ce10cc72564e7f459bb1ff422bc0af6def4d222571232fa4e1c52609be82e5226eb4d85f92f1c42c

data/.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  ruby-rails: sul-dlss/ruby-rails@3.2.0
+  ruby-rails: sul-dlss/ruby-rails@4.1.0
 workflows:
   build:
     jobs:

data/.rubocop.yml

@@ -101,7 +101,6 @@ Metrics/MethodLength:
     - 'lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb'
     - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
 
-
 # Offense count: 37
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
@@ -111,6 +110,10 @@ Metrics/PerceivedComplexity:
     - 'lib/cocina/models/mapping/to_mods/*'
     - 'lib/cocina/models/mapping/normalizers/**/*'
 
+Naming/PredicateName:
+  ForbiddenPrefixes:
+    - is_
+
 # ----- RSpec ------
 
 RSpec/BeEq: # new in 2.9.0
@@ -295,7 +298,7 @@ RSpec/IdenticalEqualityAssertion: # new in 2.4
   Enabled: true
 RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
-RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
 RSpec/Rails/AvoidSetupHook: # new in 2.4
   Enabled: true
@@ -384,9 +387,9 @@ RSpec/PendingWithoutReason: # new in 2.16
   Enabled: true
 RSpec/SortMetadata: # new in 2.14
   Enabled: true
-RSpec/FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
   Enabled: true
-RSpec/FactoryBot/FactoryNameStyle: # new in 2.16
+FactoryBot/FactoryNameStyle: # new in 2.16
   Enabled: true
 RSpec/Rails/InferredSpecType: # new in 2.14
   Enabled: true
@@ -394,3 +397,62 @@ RSpec/Rails/MinitestAssertions: # new in 2.17
   Enabled: true
 Style/RedundantHeredocDelimiterQuotes: # new in 1.45
   Enabled: true
+
+Metrics/CollectionLiteralLength: # new in 1.47
+  Enabled: true
+Style/DirEmpty: # new in 1.48
+  Enabled: true
+Style/FileEmpty: # new in 1.48
+  Enabled: true
+RSpec/RedundantAround: # new in 2.19
+  Enabled: true
+RSpec/SkipBlockInsideExample: # new in 2.19
+  Enabled: true
+RSpec/Rails/TravelAround: # new in 2.19
+  Enabled: true
+
+Lint/DuplicateMatchPattern: # new in 1.50
+  Enabled: true
+Style/DataInheritance: # new in 1.49
+  Enabled: true
+Style/ExactRegexpMatch: # new in 1.51
+  Enabled: true
+Style/RedundantArrayConstructor: # new in 1.52
+  Enabled: true
+Style/RedundantFilterChain: # new in 1.52
+  Enabled: true
+Style/RedundantLineContinuation: # new in 1.49
+  Enabled: true
+Style/RedundantRegexpConstructor: # new in 1.52
+  Enabled: true
+FactoryBot/AssociationStyle: # new in 2.23
+  Enabled: true
+FactoryBot/FactoryAssociationWithStrategy: # new in 2.23
+  Enabled: true
+FactoryBot/RedundantFactoryOption: # new in 2.23
+  Enabled: true
+RSpec/BeEmpty: # new in 2.20
+  Enabled: true
+RSpec/ContainExactly: # new in 2.19
+  Enabled: true
+RSpec/IndexedLet: # new in 2.20
+  Enabled: true
+RSpec/MatchArray: # new in 2.19
+  Enabled: true
+
+Lint/MixedCaseRange: # new in 1.53
+  Enabled: true
+Lint/RedundantRegexpQuantifiers: # new in 1.53
+  Enabled: true
+Style/RedundantCurrentDirectoryInPath: # new in 1.53
+  Enabled: true
+Style/RedundantRegexpArgument: # new in 1.53
+  Enabled: true
+Style/ReturnNilInPredicateMethodDefinition: # new in 1.53
+  Enabled: true
+Style/YAMLFileRead: # new in 1.53
+  Enabled: true
+RSpec/ReceiveMessages: # new in 2.23
+  Enabled: true
+RSpec/Rails/NegationBeValid: # new in 2.23
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,15 +1,14 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --auto-gen-only-exclude`
-# on 2023-02-07 01:43:53 UTC using RuboCop version 1.44.1.
+# on 2023-06-20 05:46:00 UTC using RuboCop version 1.52.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 3
+# Offense count: 8
 # Configuration parameters: EnforcedStyle, AllowedGems, Include.
 # SupportedStyles: Gemfile, gems.rb, gemspec
-# AllowedGems: bundler
 # Include: **/*.gemspec, **/Gemfile, **/gems.rb
 Gemspec/DevelopmentDependencies:
   Exclude:
@@ -20,14 +19,6 @@ Lint/NoReturnInBeginEndBlocks:
   Exclude:
     - 'lib/cocina/models/mapping/to_mods/description.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: present?, blank?, presence, try, try!, in?
-Lint/SafeNavigationChain:
-  Exclude:
-    - 'lib/cocina/generator/schema_base.rb'
-
 # Offense count: 13
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
@@ -45,30 +36,16 @@ Lint/UnusedMethodArgument:
     - 'lib/cocina/models/mapping/from_mods/subject.rb'
     - 'lib/cocina/models/mapping/to_mods/event.rb'
 
-# Offense count: 95
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods, CountRepeatedAttributes.
+# Offense count: 98
+# Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 40
 
 # Offense count: 43
-# Configuration parameters: AllowedMethods, AllowedPatterns, IgnoredMethods.
+# Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 12
 
-# Offense count: 1
-# Configuration parameters: CountComments, Max, CountAsOne, ExcludedMethods, AllowedMethods, AllowedPatterns, IgnoredMethods.
-Metrics/MethodLength:
-  Exclude:
-    - 'spec/cocina/models/file_access_spec.rb'
-    - 'spec/cocina/models/dro_access_spec.rb'
-    - 'lib/cocina/rspec/factories.rb'
-    - 'lib/cocina/models/mapping/to_mods/*'
-    - 'lib/cocina/models/mapping/from_mods/*'
-    - 'lib/cocina/models/mapping/normalizers/mods/origin_info_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb'
-    - 'lib/cocina/models/mapping/normalizers/mods_normalizer.rb'
-    - 'lib/cocina/generator/schema_base.rb'
-
 # Offense count: 1
 # Configuration parameters: Max, CountKeywordArgs, MaxOptionalParameters.
 Metrics/ParameterLists:
@@ -83,7 +60,7 @@ RSpec/DescribeClass:
 # Offense count: 87
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 128
+  Max: 103
 
 # Offense count: 10
 # Configuration parameters: Max, AllowedGroups.
@@ -122,9 +99,9 @@ Style/MultilineBlockChain:
     - 'lib/cocina/models/mapping/to_mods/form.rb'
     - 'lib/cocina/models/mapping/to_mods/subject.rb'
 
-# Offense count: 225
+# Offense count: 239
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 187
+  Max: 267

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.89.1)
+    cocina-models (0.91.0)
       activesupport
       deprecation
       dry-struct (~> 1.0)
@@ -11,7 +11,7 @@ PATH
       jsonpath
       nokogiri
       openapi3_parser
-      openapi_parser (>= 0.11.1, < 1.0)
+      openapi_parser (~> 1.0)
       rss
       super_diff
       thor
@@ -20,25 +20,26 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.2)
+    activesupport (7.0.8)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     attr_extras (7.1.0)
+    base64 (0.1.1)
     byebug (11.1.3)
-    committee (4.99.1)
+    committee (5.0.0)
       json_schema (~> 0.14, >= 0.14.3)
-      openapi_parser (>= 0.11.1, < 1.0)
+      openapi_parser (~> 1.0)
       rack (>= 1.5)
-    commonmarker (0.23.8)
+    commonmarker (0.23.10)
     concurrent-ruby (1.2.2)
     deprecation (1.1.0)
       activesupport
     diff-lcs (1.5.0)
     docile (1.4.0)
-    dry-core (1.0.0)
+    dry-core (1.0.1)
       concurrent-ruby (~> 1.0)
       zeitwerk (~> 2.6)
     dry-inflector (1.0.0)
@@ -61,70 +62,77 @@ GEM
       activesupport (>= 3.0, < 8.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.6.3)
     json_schema (0.21.0)
-    jsonpath (1.1.2)
+    jsonpath (1.1.3)
       multi_json
-    mini_portile2 (2.8.1)
-    minitest (5.18.0)
+    language_server-protocol (3.17.0.3)
+    mini_portile2 (2.8.4)
+    minitest (5.20.0)
     multi_json (1.15.0)
-    nokogiri (1.14.2)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     openapi3_parser (0.9.2)
       commonmarker (~> 0.17)
-    openapi_parser (0.15.0)
-    optimist (3.0.1)
-    parallel (1.22.1)
-    parser (3.2.1.0)
+    openapi_parser (1.0.0)
+    optimist (3.1.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     patience_diff (1.2.0)
       optimist (~> 3.0)
-    racc (1.6.2)
-    rack (3.0.4.2)
+    racc (1.7.1)
+    rack (3.0.8)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
+    regexp_parser (2.8.1)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rss (0.2.9)
+    rss (0.3.0)
       rexml
-    rubocop (1.48.0)
+    rubocop (1.56.3)
+      base64 (~> 0.1.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.3)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.28.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.1)
+    rubocop-rspec (2.24.0)
       rubocop (~> 1.33)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -132,15 +140,15 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    super_diff (0.9.0)
+    super_diff (0.10.0)
       attr_extras (>= 6.2.4)
       diff-lcs
       patience_diff
-    thor (1.2.1)
+    thor (1.2.2)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.11)
 
 PLATFORMS
   ruby
@@ -159,4 +167,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.3.17
+   2.4.13

data/README.md

@@ -132,7 +132,7 @@ The release process is much like any other gem. First bump the version in `lib/c
 ```
 bundle exec rake release
 ```
-which pushes the gem to rubygems.org.  Next write up the release notes: https://github.com/sul-dlss/cocina-models/releases .
+which pushes the gem to rubygems.org.
 
 ### Step 2: Update client gems coupled to the models
 

data/cocina-models.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'openapi3_parser' # Parsing openapi doc
   # 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 'openapi_parser', '~> 1.0'
   spec.add_dependency 'rss' # used for date/time validation
   spec.add_dependency 'super_diff'
   spec.add_dependency 'thor'

data/lib/cocina/generator/generator.rb

@@ -24,6 +24,11 @@ module Cocina
           generate_for(schema) if schema
         end
 
+        %w[DRO Collection AdminPolicy].each do |schema_name|
+          schema = schema_for(schema_name, lite: true)
+          filepaths << generate_for(schema)
+        end
+
         auto_format(filepaths)
         generate_vocab
         generate_descriptive_docs
@@ -94,13 +99,13 @@ module Cocina
         @schemas ||= Openapi3Parser.load_file(options[:openapi]).components.schemas
       end
 
-      def schema_for(schema_name)
+      def schema_for(schema_name, lite: false)
         schema_doc = schemas[schema_name]
         return nil if schema_doc.nil?
 
         case schema_doc.type
         when 'object'
-          Schema.new(schema_doc, schemas: schemas.keys)
+          Schema.new(schema_doc, schemas: schemas.keys, lite: lite)
         when 'string'
           Datatype.new(schema_doc, schemas: schemas.keys)
         when NilClass

data/lib/cocina/generator/schema.rb

@@ -71,7 +71,7 @@ module Cocina
       end
 
       def validatable?
-        !schema_doc.node_context.document.paths["/validate/#{schema_doc.name}"].nil?
+        !schema_doc.node_context.document.paths["/validate/#{schema_doc.name}"].nil? && !lite
       end
 
       def properties
@@ -119,12 +119,14 @@ module Cocina
 
       def schema_properties_for(doc)
         doc.properties.map do |key, properties_doc|
-          property_class_for(properties_doc).new(properties_doc,
-                                                 key: key,
-                                                 required: doc.requires?(key),
-                                                 nullable: properties_doc.nullable?,
-                                                 parent: self,
-                                                 schemas: schemas)
+          clazz = property_class_for(properties_doc)
+          clazz.new(properties_doc,
+                    key: key,
+                    required: doc.requires?(key),
+                    relaxed: lite && clazz != SchemaValue,
+                    nullable: properties_doc.nullable?,
+                    parent: self,
+                    schemas: schemas)
         end
       end
     end

data/lib/cocina/generator/schema_base.rb

@@ -4,9 +4,9 @@ module Cocina
   module Generator
     # Base class for generating from openapi
     class SchemaBase
-      attr_reader :schema_doc, :key, :required, :nullable, :parent, :relaxed, :schemas
+      attr_reader :schema_doc, :key, :required, :nullable, :parent, :relaxed, :schemas, :lite
 
-      def initialize(schema_doc, key: nil, required: false, nullable: false, parent: nil, relaxed: false, schemas: [])
+      def initialize(schema_doc, key: nil, required: false, nullable: false, parent: nil, relaxed: false, schemas: [], lite: false)
         @schema_doc = schema_doc
         @key = key
         @required = required
@@ -14,6 +14,7 @@ module Cocina
         @parent = parent
         @relaxed = relaxed
         @schemas = schemas
+        @lite = lite
       end
 
       def filename
@@ -21,7 +22,7 @@ module Cocina
       end
 
       def name
-        key || schema_doc.name
+        "#{key || schema_doc.name}#{lite ? 'Lite' : ''}"
       end
 
       # Allows nullable values to be set to nil. This is useful when doing an

data/lib/cocina/models/admin_policy_lite.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    class AdminPolicyLite < Struct
+      include Checkable
+
+      TYPES = ['https://cocina.sul.stanford.edu/models/admin_policy'].freeze
+
+      # The version of Cocina with which this object conforms.
+      # example: 1.2.3
+      attribute :cocinaVersion, CocinaVersion.default(VERSION)
+      attribute :type, Types::Strict::String.enum(*AdminPolicyLite::TYPES)
+      # example: druid:bc123df4567
+      attribute :externalIdentifier, Druid
+      attribute :label, Types::Strict::String
+      attribute :version, Types::Strict::Integer
+      attribute? :administrative, AdminPolicyAdministrative.optional
+      attribute? :description, Description.optional
+    end
+  end
+end

data/lib/cocina/models/collection_lite.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # A group of Digital Repository Objects that indicate some type of conceptual grouping within the domain that is worth reusing across the system.
+    class CollectionLite < Struct
+      include Checkable
+
+      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
+      attribute :cocinaVersion, CocinaVersion.default(VERSION)
+      # The content type of the Collection. Selected from an established set of values.
+      attribute :type, Types::Strict::String.enum(*CollectionLite::TYPES)
+      # example: druid:bc123df4567
+      attribute :externalIdentifier, Druid
+      # Primary processing label (can be same as title) for a Collection.
+      attribute :label, Types::Strict::String
+      # Version for the Collection within SDR.
+      attribute :version, Types::Strict::Integer
+      attribute? :access, CollectionAccess.optional
+      attribute? :administrative, Administrative.optional
+      attribute? :description, Description.optional
+      attribute? :identification, CollectionIdentification.optional
+    end
+  end
+end

data/lib/cocina/models/dro_lite.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    # Domain-defined abstraction of a 'work'. Digital Repository Objects' abstraction is describable for our domain’s purposes, i.e. for management needs within our system.
+    class DROLite < Struct
+      include Checkable
+
+      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
+      attribute :cocinaVersion, CocinaVersion.default(VERSION)
+      # The content type of the DRO. Selected from an established set of values.
+      attribute :type, Types::Strict::String.enum(*DROLite::TYPES)
+      # example: druid:bc123df4567
+      attribute :externalIdentifier, Druid
+      # Primary processing label (can be same as title) for a DRO.
+      attribute :label, Types::Strict::String
+      # Version for the DRO within SDR.
+      attribute :version, Types::Strict::Integer
+      attribute? :access, DROAccess.optional
+      attribute? :administrative, Administrative.optional
+      attribute? :description, Description.optional
+      attribute? :identification, Identification.optional
+      attribute? :structural, DROStructural.optional
+      attribute? :geographic, Geographic.optional
+    end
+  end
+end

data/lib/cocina/models/file_set.rb

@@ -11,14 +11,10 @@ module Cocina
                '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

data/lib/cocina/models/file_set_type.rb

@@ -10,14 +10,10 @@ module Cocina
       property :document
       property :file
       property :image
-      property :'main-augmented'
-      property :'main-original'
       property :media
       property :object
       property :page
-      property :permissions
       property :preview
-      property :supplement
       property :thumb
       property :video
     end

data/lib/cocina/models/mapping/from_mods/event.rb

@@ -145,7 +145,7 @@ module Cocina
             return if raw_type.blank?
 
             first_event_type = event_type(origin_info_nodes.first)
-            return first_event_type if origin_info_nodes.all? { |node| event_type(node) == first_event_type }
+            first_event_type if origin_info_nodes.all? { |node| event_type(node) == first_event_type }
           end
 
           # @return String displayLabel for the cocina event if it is the same for all the origin_info_nodes, o.w. nil
@@ -154,7 +154,7 @@ module Cocina
             return if raw_label.blank?
 
             first_label = display_label(origin_info_nodes.first)
-            return first_label if origin_info_nodes.all? { |node| display_label(node) == first_label }
+            first_label if origin_info_nodes.all? { |node| display_label(node) == first_label }
           end
 
           def add_info_to_event(event, origin_info_node)

data/lib/cocina/models/mapping/from_mods/geographic.rb

@@ -93,7 +93,8 @@ module Cocina
 
           def build_subject
             return [build_subject_for_center_point] unless centerpoint.empty?
-            return build_subject_for_bounding_box unless envelope.empty?
+
+            build_subject_for_bounding_box unless envelope.empty?
           end
 
           def build_subject_for_center_point

data/lib/cocina/models/mapping/from_mods/name_builder.rb

@@ -235,7 +235,7 @@ module Cocina
             cocina_roles = role_nodes.filter_map { |role_node| role_for(role_node) }.presence
             return if cocina_roles.blank?
 
-            return 'event' if cocina_roles.first[:value] == 'event'
+            'event' if cocina_roles.first[:value] == 'event'
           end
 
           def activity_date?(name_part_node)

data/lib/cocina/models/mapping/from_mods/subject_authority_codes.rb

@@ -6,6 +6,7 @@ module Cocina
     module Mapping
       module FromMods
         # Helper class - provides subject authority codes
+        # rubocop:disable Metrics/CollectionLiteralLength
         class SubjectAuthorityCodes
           # Subject codes: https://id.loc.gov/vocabulary/subjectSchemes.html
           # curl https://id.loc.gov/vocabulary/subjectSchemes.madsrdf.json | jq '[.[0]."http://www.loc.gov/mads/rdf/v1#hasMADSSchemeMember"[]."@id"[44:]]'
@@ -787,6 +788,7 @@ module Cocina
             + CARTOGRAPHIC_CODES + OCCUPATION_CODES + COUNTRY_CODES + GEOGRAPHIC_CODES \
             + ISO_CODES + MARC_CODES + PARKER + OTHER_CODES
         end
+        # rubocop:enable Metrics/CollectionLiteralLength
       end
     end
   end

data/lib/cocina/models/mapping/normalizers/mods/subject_normalizer.rb

@@ -108,7 +108,6 @@ module Cocina
             # rubocop:enable Metrics/CyclomaticComplexity
             # rubocop:enable Metrics/AbcSize
 
-            # rubocop:disable Naming/PredicateName
             def has_authority?(nodes)
               nodes_to_a(nodes).all? { |node| node[:authority] }
             end
@@ -116,7 +115,6 @@ module Cocina
             def has_same_authority?(nodes, same_node)
               nodes_to_a(nodes).all? { |node| same_node[:authority] == node[:authority] || (lcsh_or_naf?(same_node) && lcsh_or_naf?(node)) }
             end
-            # rubocop:enable Naming/PredicateName
 
             def lcsh_or_naf?(node)
               %w[lcsh naf].include?(node[:authority])
@@ -136,7 +134,6 @@ module Cocina
             end
 
             # rubocop:disable Naming/MethodName
-            # rubocop:disable Naming/PredicateName
             def has_authorityURI?(nodes)
               nodes_to_a(nodes).all? { |node| node[:authorityURI] }
             end
@@ -156,9 +153,8 @@ module Cocina
             def add_valueURI(nodes, from_node)
               nodes_to_a(nodes).each { |node| node[:valueURI] = from_node[:valueURI] }
             end
-            # rubocop:enable Naming/MethodName
-            # rubocop:enable Naming/PredicateName
 
+            # rubocop:enable Naming/MethodName
             def nodes_to_a(nodes)
               nodes.is_a?(Nokogiri::XML::NodeSet) ? nodes : [nodes]
             end

data/lib/cocina/models/request_file_set.rb

@@ -10,14 +10,10 @@ module Cocina
                '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

data/lib/cocina/models/version.rb

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

data/lib/cocina/models.rb

@@ -23,6 +23,7 @@ class CocinaModelsInflector < Zeitwerk::Inflector
     'dro' => 'DRO',
     'request_dro' => 'RequestDRO',
     'dro_access' => 'DROAccess',
+    'dro_lite' => 'DROLite',
     'dro_structural' => 'DROStructural',
     'dro_with_metadata' => 'DROWithMetadata',
     'request_dro_structural' => 'RequestDROStructural',
@@ -75,6 +76,8 @@ module Cocina
     end
     # rubocop:enable Naming/MethodName
 
+    METADATA_KEYS = %i[created modified lock].freeze
+
     # @param [Hash] dyn a ruby hash representation of the JSON serialization of a collection or DRO
     # @param [boolean] validate
     # @return [DRO,Collection,AdminPolicy]
@@ -84,11 +87,11 @@ module Cocina
     def self.build(dyn, validate: true)
       clazz = case type_for(dyn)
               when *DRO::TYPES
-                DRO
+                has_metadata?(dyn) ? DROWithMetadata : DRO
               when *Collection::TYPES
-                Collection
+                has_metadata?(dyn) ? ColectionWithMetadata : Collection
               when *AdminPolicy::TYPES
-                AdminPolicy
+                has_metadata?(dyn) ? AdminPolicyWithMetadata : AdminPolicy
               else
                 raise UnknownTypeError, "Unknown type: '#{dyn.with_indifferent_access.fetch('type')}'"
               end
@@ -115,11 +118,36 @@ module Cocina
       clazz.new(dyn, false, validate)
     end
 
+    # Build "lite" versions of DROs, Collections, and AdminPolicies.
+    # Lite versions do not require attributes that are required in the normal versions.
+    # For example, "description" is required for a DRO, but optional for a DROLite.
+    # Lite versions also are not validated / validatable.
+    # Lite versions are useful for instantiating partially populated cocina objects similar to an
+    # ActiveRecord instantiated using .select (See https://guides.rubyonrails.org/active_record_querying.html#selecting-specific-fields)
+    # @param [Hash] dyn a ruby hash representation of the JSON serialization of a Collection, DRO, or AdminPolicy
+    # @return [DROLite,CollectionLite,AdminPolicyLite]
+    # @raises [UnknownTypeError] if a valid type is not found in the data
+    # @raises [ValidationError] if a type field cannot be found in the data
+    def self.build_lite(dyn)
+      clazz = case type_for(dyn)
+              when *DRO::TYPES
+                DROLite
+              when *Collection::TYPES
+                CollectionLite
+              when *AdminPolicy::TYPES
+                AdminPolicyLite
+              else
+                raise UnknownTypeError, "Unknown type: '#{dyn.with_indifferent_access.fetch('type')}'"
+              end
+      # dyn for lite may contain extra keys
+      clazz.new(dyn.with_indifferent_access.slice(*clazz.attribute_names))
+    end
+
     # Coerces DROWithMetadata, CollectionWithMetadata, AdminPolicyWithMetadata to DRO, Collection, AdminPolicy
     # @param [DROWithMetadata,CollectionWithMetadata,AdminPolicyWithMetadata] cocina_object
     # @return [DRO,Collection,AdminPolicy]
     def self.without_metadata(cocina_object)
-      build(cocina_object.to_h.except(:created, :modified, :lock), validate: false)
+      build(cocina_object.to_h.except(*METADATA_KEYS), validate: false)
     end
 
     # Adds metadata to a DRO, Collection, AdminPolicy
@@ -158,6 +186,13 @@ module Cocina
     end
     private_class_method :type_for
 
+    def self.has_metadata?(dyn)
+      # Intentionally checking both string- and symbol-type keys in the hash via `#[]`
+      #  instead of `#with_indifferent_access` (and/or `#fetch`) in order to be more memory-efficient
+      METADATA_KEYS.any? { |key| dyn[key] || dyn[key.to_s] }
+    end
+    private_class_method :has_metadata?
+
     def self.druid_regex
       @druid_regex ||= begin
         str = Openapi3Parser.load_file('openapi.yml').components.schemas['Druid'].pattern

data/lib/cocina/rspec/factories.rb

@@ -15,10 +15,13 @@ module Cocina
       SUPPORTED_TYPES = %i[
         admin_policy
         admin_policy_with_metadata
+        admin_policy_lite
         collection
         collection_with_metadata
+        collection_lite
         dro
         dro_with_metadata
+        dro_lite
         request_admin_policy
         request_collection
         request_dro
@@ -88,6 +91,10 @@ module Cocina
         Cocina::Models.build(build_dro_properties(**DRO_DEFAULTS.merge(attributes)))
       end
 
+      def self.build_dro_lite(attributes)
+        Cocina::Models.build_lite(build_dro_properties(**DRO_DEFAULTS.merge(attributes)))
+      end
+
       # rubocop:disable Metrics/ParameterLists
       def self.build_request_dro_properties(type:, version:, label:, title:, source_id:, admin_policy_id:,
                                             barcode: nil, catkeys: [], folio_instance_hrids: [], collection_ids: [])
@@ -166,6 +173,10 @@ module Cocina
         Cocina::Models.build(build_collection_properties(**COLLECTION_DEFAULTS.merge(attributes)))
       end
 
+      def self.build_collection_lite(attributes)
+        Cocina::Models.build_lite(build_collection_properties(**COLLECTION_DEFAULTS.merge(attributes)))
+      end
+
       def self.build_request_collection(attributes)
         Cocina::Models.build_request(build_request_collection_properties(**REQUEST_COLLECTION_DEFAULTS.merge(attributes)))
       end
@@ -174,6 +185,10 @@ module Cocina
         Cocina::Models.build(build_admin_policy_properties(**ADMIN_POLICY_DEFAULTS.merge(attributes)))
       end
 
+      def self.build_admin_policy_lite(attributes)
+        Cocina::Models.build_lite(build_admin_policy_properties(**ADMIN_POLICY_DEFAULTS.merge(attributes)))
+      end
+
       def self.build_request_admin_policy(attributes)
         Cocina::Models.build_request(build_request_admin_policy_properties(**REQUEST_ADMIN_POLICY_DEFAULTS.merge(attributes)))
       end

data/openapi.yml

@@ -1109,14 +1109,10 @@ components:
             - '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'
@@ -1813,14 +1809,10 @@ components:
             - '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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.89.1
+  version: 0.91.0
 platform: ruby
 authors:
 - Justin Coyne
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -140,20 +140,14 @@ dependencies:
   name: openapi_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
@@ -367,6 +361,7 @@ files:
 - lib/cocina/models/admin_policy.rb
 - lib/cocina/models/admin_policy_access_template.rb
 - lib/cocina/models/admin_policy_administrative.rb
+- lib/cocina/models/admin_policy_lite.rb
 - lib/cocina/models/admin_policy_with_metadata.rb
 - lib/cocina/models/administrative.rb
 - lib/cocina/models/applies_to.rb
@@ -384,6 +379,7 @@ files:
 - lib/cocina/models/collection.rb
 - lib/cocina/models/collection_access.rb
 - lib/cocina/models/collection_identification.rb
+- lib/cocina/models/collection_lite.rb
 - lib/cocina/models/collection_with_metadata.rb
 - lib/cocina/models/contributor.rb
 - lib/cocina/models/controlled_digital_lending_access.rb
@@ -407,6 +403,7 @@ files:
 - lib/cocina/models/doi_pattern.rb
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
+- lib/cocina/models/dro_lite.rb
 - lib/cocina/models/dro_structural.rb
 - lib/cocina/models/dro_with_metadata.rb
 - lib/cocina/models/druid.rb
@@ -533,7 +530,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
@@ -549,7 +546,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: []