cocina-models 0.87.0 → 0.87.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 272a5d8e2b026dc773452921e549241338c6c8cda4f21b3ae6da3b7511f7cec6
-  data.tar.gz: f3471e9e52d279444b8ef4bac802d116c71b23d5d937363c084f322204b9ce1f
+  metadata.gz: 90ae20c8c80e4bbcf51179f0c6cba44c76f3f1551962f4da938d297c152ed77d
+  data.tar.gz: b71a9f5c05e153ebdf93f623164a7a77c12aeae2de32b96757096a7d2f747cfa
 SHA512:
-  metadata.gz: a44093101a258a2d88b83f82955dc81c81624419baf0cf55892eb976e04ac770ddf34d8c60e5649522c1c4b14687aed0715b14b92ede2a8858af839ff2bb6b8e
-  data.tar.gz: a95e82570f152ac1498d072c0ee7320c0da738a45b80949cb098c722838d9495cd4e6c6e74aa78cf40ba6f3b88ea846779cc2adbddd42d161929ae8bd79a7856
+  metadata.gz: 26f2fe285a9249a70015b31b7fb30983d3f4fff6befe671508f56ac57d6bbcb901f5740290fcd3bcfb6a5e7ccc9697ccf8032b0d3aa07d6a743485ce34cb9c1d
+  data.tar.gz: cf8992389b7097a416f5050d196758145dd958abeef155a672fa21ffdef382f5e025e6b101dd2f26baf427aef2b195b43b93431b9faaae569d1386efe9cafb1d

data/.rubocop.yml

@@ -392,3 +392,5 @@ RSpec/Rails/InferredSpecType: # new in 2.14
   Enabled: true
 RSpec/Rails/MinitestAssertions: # new in 2.17
   Enabled: true
+Style/RedundantHeredocDelimiterQuotes: # new in 1.45
+  Enabled: true

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cocina-models (0.87.0)
+    cocina-models (0.87.1)
       activesupport
       deprecation
       dry-struct (~> 1.0)

data/lib/cocina/generator/schema_base.rb

@@ -24,10 +24,16 @@ module Cocina
         key || schema_doc.name
       end
 
-      # Allows nillable values to be set to nil. This is useful when doing
-      # an update and you want to clear out a value.
+      # Allows nullable values to be set to nil. This is useful when doing an
+      # update and you want to clear out a value. The logic also permits custom
+      # types (e.g., `Barcode`, `SourceId`) to be nullable if they are not
+      # required.
       def optional
-        nullable || relaxed ? '.optional' : ''
+        return '.optional' if nullable ||
+                              relaxed ||
+                              (custom_type? && !required)
+
+        ''
       end
 
       def quote(item)
@@ -60,6 +66,11 @@ module Cocina
         "# Validation of this property is relaxed. See the openapi for full validation.\n"
       end
 
+      # dry-types-based types contain the word `Types` (e.g., `Types::String`), and custom types (e.g., `SourceId`) do not
+      def custom_type?
+        !dry_datatype(schema_doc).match?('Types')
+      end
+
       def dry_datatype(doc)
         return doc.name if doc.name.present? && schemas.include?(doc.name)
 

data/lib/cocina/generator/schema_value.rb

@@ -5,7 +5,6 @@ module Cocina
     # Class for generating from an openapi value
     class SchemaValue < SchemaBase
       def generate
-        # optional has to come before default or the default value that gets set will be nil.
         if required && !relaxed
           "#{preamble}attribute :#{name.camelize(:lower)}, #{type}"
         else
@@ -16,6 +15,7 @@ module Cocina
       private
 
       def type
+        # optional has to come before default or the default value that gets set will be nil.
         "#{dry_datatype(schema_doc)}#{optional}#{default}#{enum}"
       end
 

data/lib/cocina/models/collection_identification.rb

@@ -7,7 +7,7 @@ module Cocina
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 
       # example: sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026
-      attribute? :sourceId, SourceId
+      attribute? :sourceId, SourceId.optional
     end
   end
 end

data/lib/cocina/models/identification.rb

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

data/lib/cocina/models/related_resource.rb

@@ -20,7 +20,7 @@ module Cocina
       attribute? :standard, Standard.optional
       attribute :subject, Types::Strict::Array.of(DescriptiveValue).default([].freeze)
       # Stanford persistent URL associated with the related resource.
-      attribute? :purl, Purl
+      attribute? :purl, Purl.optional
       attribute? :access, DescriptiveAccessMetadata.optional
       attribute :relatedResource, Types::Strict::Array.of(RelatedResource).default([].freeze)
       attribute? :adminMetadata, DescriptiveAdminMetadata.optional

data/lib/cocina/models/request_identification.rb

@@ -5,7 +5,7 @@ module Cocina
     # Same as a Identification, but requires a sourceId and doesn't permit a DOI.
     class RequestIdentification < Struct
       # A barcode
-      attribute? :barcode, Barcode
+      attribute? :barcode, Barcode.optional
       attribute :catalogLinks, Types::Strict::Array.of(CatalogLink).default([].freeze)
       # Unique identifier in some other system. This is because a large proportion of what is deposited in SDR, historically and currently, are representations of objects that are also represented in other systems. For example, digitized paper and A/V collections have physical manifestations, and those physical objects are managed in systems that have their own identifiers. Similarly, books have barcodes, archival materials have collection numbers and physical locations, etc. The sourceId allows determining if an item has been deposited before and where to look for the original item if you're looking at its SDR representation. The format is: "namespace:identifier"
 

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.87.0'
+    VERSION = '0.87.1'
   end
 end

metadata

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