cocina-models 0.37.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bfcf544ee3b4b2a024388b61fae8a9244d7db2e8b2272897b55679d81edbcb4
-  data.tar.gz: 8fb5f5a7a05a1fd070c1b4a8e0b1849d74bb6dc88d8c9e956aef984ae8970bc1
+  metadata.gz: 2c956bcb234bb19ae05ab24d3b64efd2827bf23ab0d7953c5dc8405532f2391f
+  data.tar.gz: 3fa549a561323f9cb19a595159e3c7eafd100be257920240dc2dde6800766af7
 SHA512:
-  metadata.gz: 9117e97169200229cd278e261ce211ab3927513705f0be47918d0ea1e9ec2407dc5f4ed0e6eddfd3213129493ca3b9b0b1fff783a431fb6805bc037d42918ead
-  data.tar.gz: 576242ad13d3e63263dc893cfc3e6fa6341391aa21c98735878ce9ca83969710b606987d891fa4d22cafe5899b2ee74ee3c37662afaf2e2661323546a78554cf
+  metadata.gz: 03ba5b89ddf4fdbaa9a3167004771b9bcacf92409800735e1816e3db132bc3d4199fe62218f48053d7cd2bf5faeb53d2c542b16ee1b420bf5fec154f8a444da9
+  data.tar.gz: b2fbbd2b9b1477bcdead8c3c8a186ae96c577e3b8431f7c23d92fa44b97d320f3e3f415121e26231f88f2ee594c0e3949eed5f65865e88fed24d52c7f1952cda

data/README.md

@@ -32,6 +32,17 @@ The generator is tested via its output when run against `openapi.yml`, viz., the
 
 Beyond what is necessary to test the generator, the Cocina model classes are not tested, i.e., they are assumed to be as specified in `openapi.yml`.
 
+## Releasing
+
+The release process is much like any other gem. First bump the version in `lib/cocina/models/version.rb`, and commit the result. Then run:
+```
+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 .
+
+Finally, you must release versions of [sdr-client](https://github.com/sul-dlss/sdr-client) and [dor-services-client](https://github.com/sul-dlss/dor-services-client/) pinned to this version because [Argo](https://github.com/sul-dlss/argo) depends on both of those. When [dor-services-app](https://github.com/sul-dlss/dor-services-app) is updated to use the new models (via the auto-update script), the clients must be updated at the same time or there is risk of models produced by dor-services-app not being acceptable to the clients.
+
+
 ## Using this gem
 
 If you are using this gem in an application that has an API that accepts Cocina models (e.g., SDR API, Dor-Services-App), make sure that the `openapi.yml` for the application includes the schemas that match the schemas in this `openapi.yml`.

data/docs/maps/DRO.json

@@ -298,8 +298,11 @@
           }
         },
         "isMemberOf": {
-          "description": "Collection that this DRO is a member of",
-          "type": "string"
+          "description": "Collections that this DRO is a member of",
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
         },
         "isTargetOf": {
           "description": "An Annotation instance that applies to the DRO.",

data/lib/cocina/generator/datatype.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Generator
+    # Class for generating from an openapi schema
+    class Datatype < SchemaBase
+      def generate
+        <<~RUBY
+          # frozen_string_literal: true
+
+          module Cocina
+            module Models
+              #{name} = Types::String.constrained(
+                format: /#{schema_doc.pattern}/i
+              )
+            end
+          end
+        RUBY
+      end
+    end
+  end
+end

data/lib/cocina/generator/generator.rb

@@ -56,9 +56,14 @@ module Cocina
 
       def schema_for(schema_name)
         schema_doc = schemas[schema_name]
-        return nil if schema_doc.nil? || schema_doc.type != 'object'
+        return nil if schema_doc.nil?
 
-        Schema.new(schema_doc)
+        case schema_doc.type
+        when 'object'
+          Schema.new(schema_doc)
+        when 'string'
+          Datatype.new(schema_doc)
+        end
       end
 
       def generate_for(schema)

data/lib/cocina/models/dro_structural.rb

@@ -5,8 +5,7 @@ module Cocina
     class DROStructural < Struct
       attribute :contains, Types::Strict::Array.of(FileSet).meta(omittable: true)
       attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
-      # example: druid:bc123df4567
-      attribute :isMemberOf, Types::Strict::String.meta(omittable: true)
+      attribute :isMemberOf, Types::Strict::Array.of(Druid).meta(omittable: true)
       # Agreement that covers the deposit of the DRO into SDR.
       attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
     end

data/lib/cocina/models/druid.rb

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

data/lib/cocina/models/identification.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     class Identification < Struct
-      # 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.
+      # 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, Types::Strict::String.meta(omittable: true)

data/lib/cocina/models/request_dro_structural.rb

@@ -5,8 +5,7 @@ module Cocina
     class RequestDROStructural < Struct
       attribute :contains, Types::Strict::Array.of(RequestFileSet).meta(omittable: true)
       attribute :hasMemberOrders, Types::Strict::Array.of(Sequence).meta(omittable: true)
-      # example: druid:bc123df4567
-      attribute :isMemberOf, Types::Strict::String.meta(omittable: true)
+      attribute :isMemberOf, Types::Strict::Array.of(Druid).meta(omittable: true)
       attribute :hasAgreement, Types::Strict::String.meta(omittable: true)
     end
   end

data/lib/cocina/models/request_identification.rb

@@ -3,7 +3,7 @@
 module Cocina
   module Models
     class RequestIdentification < Struct
-      # 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.
+      # 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, Types::Strict::String

data/lib/cocina/models/source_id.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Cocina
+  module Models
+    SourceId = Types::String.constrained(
+      format: /^.+:.+$/i
+    )
+  end
+end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.37.0'
+    VERSION = '0.38.0'
   end
 end

data/openapi.yml

@@ -624,7 +624,10 @@ components:
           items:
             $ref: '#/components/schemas/Sequence'
         isMemberOf:
-          $ref: '#/components/schemas/Druid'
+          description: Collections that this DRO is a member of
+          type: array
+          items:
+            $ref: '#/components/schemas/Druid'
         hasAgreement:
           description: Agreement that covers the deposit of the DRO into SDR.
           type: string
@@ -839,15 +842,7 @@ components:
       additionalProperties: false
       properties:
         sourceId:
-          type: string
-          description: >
-            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.
-          example: 'sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026'
+          $ref: '#/components/schemas/SourceId'
         catalogLinks:
           type: array
           items:
@@ -1096,7 +1091,10 @@ components:
           items:
             $ref: '#/components/schemas/Sequence'
         isMemberOf:
-          $ref: '#/components/schemas/Druid'
+          description: Collections that this DRO is a member of
+          type: array
+          items:
+            $ref: '#/components/schemas/Druid'
         hasAgreement:
           type: string
     RequestFile:
@@ -1173,15 +1171,7 @@ components:
       additionalProperties: false
       properties:
         sourceId:
-          type: string
-          description: >
-            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.
-          example: 'sul:PC0170_s3_Fiesta_Bowl_2012-01-02_210609_2026'
+          $ref: '#/components/schemas/SourceId'
         catalogLinks:
           type: array
           items:
@@ -1248,3 +1238,14 @@ components:
             $ref: "#/components/schemas/DescriptiveValue"
         source:
           $ref: "#/components/schemas/Source"
+    SourceId:
+      type: string
+      pattern: '^.+:.+$'
+      description: >
+        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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.37.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -244,6 +244,7 @@ files:
 - docs/sampleETD/xn109qc9773_taco.json
 - exe/generator
 - lib/cocina/generator.rb
+- lib/cocina/generator/datatype.rb
 - lib/cocina/generator/generator.rb
 - lib/cocina/generator/schema.rb
 - lib/cocina/generator/schema_array.rb
@@ -273,6 +274,7 @@ files:
 - lib/cocina/models/dro.rb
 - lib/cocina/models/dro_access.rb
 - lib/cocina/models/dro_structural.rb
+- lib/cocina/models/druid.rb
 - lib/cocina/models/embargo.rb
 - lib/cocina/models/event.rb
 - lib/cocina/models/file.rb
@@ -297,6 +299,7 @@ files:
 - lib/cocina/models/request_identification.rb
 - lib/cocina/models/sequence.rb
 - lib/cocina/models/source.rb
+- lib/cocina/models/source_id.rb
 - lib/cocina/models/standard.rb
 - lib/cocina/models/validator.rb
 - lib/cocina/models/version.rb