cocina-models 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b596e537652f3adbdf99641f88e6cdd90a06a8fd60e4554c41124dcec66984e9
-  data.tar.gz: fe1a342bdd92e4400ace4e1ee9f1fa0a2145186870c5adfc32ac5fb5a77bf366
+  metadata.gz: d9154e8ca9a9e0a023094e98709e443b58570a358deb4c8b329509642bfda0f7
+  data.tar.gz: 317c6faa7072fa4441c601e277a63b60149c183ba9b836ab95c0f2ee0f96f949
 SHA512:
-  metadata.gz: f9b8910c593bcf0295cd290b2c843a93b143c9f6359d1b8d72aa9f62789731ae885bc1a24747228fd9f78adc84c75249b3732114da0b94a9fa74cb77e646acec
-  data.tar.gz: c386a293ffd53005c3afb81248b6ab7c273b3f94b36fd3f93f9db45c35c8c720fd9c478bbefb9ad8f56bf7a9391c7eb7e2092610bd2c63c1615c4bdca45ad215
+  metadata.gz: 949161b1712417293974e89d98b62116d0cba3582d60fbfb728dfb6a51b78ca737ad02509a9f711cdc3aba27886caed1ca224711ec6ba80d3ba14822febfdf64
+  data.tar.gz: 5a3b10e3b9747b3e1317754eb40b0e3c9c581cf8397aaafdd8e5a5a338b07791f32b2f54d159e2399dd7934d1a49f709dd63af04388ad1d0e85386229d3be978

data/.rubocop_todo.yml

@@ -1,18 +1,25 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-03-06 16:50:50 -0800 using RuboCop version 0.74.0.
+# on 2020-09-08 19:05:09 UTC using RuboCop version 0.89.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: 4
-Metrics/AbcSize:
-  Max: 37
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: present?, blank?, presence, try, try!
+Lint/SafeNavigationChain:
+  Exclude:
+    - 'lib/cocina/generator/schema_base.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoredMethods.
+Metrics/CyclomaticComplexity:
+  Max: 8
 
-# Offense count: 3
-# Configuration parameters: Max.
-RSpec/ExampleLength:
+# Offense count: 1
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
   Exclude:
-    - 'spec/cocina/models/dro_shared_examples.rb'
-    - 'spec/cocina/models/file_set_shared_examples.rb'
+    - 'lib/cocina/generator/schema_base.rb'

data/lib/cocina/generator/schema_base.rb

@@ -54,7 +54,11 @@ module Cocina
         when 'boolean'
           'Strict::Bool'
         else
-          raise "#{schema_doc.type} not supported"
+          if doc.one_of&.map(&:type).all? { |o| %w[integer string].include?(o) }
+            'Nominal::Any'
+          else
+            raise "#{schema_doc.type} not supported"
+          end
         end
       end
 

data/lib/cocina/models/descriptive_basic_value.rb

@@ -5,8 +5,8 @@ module Cocina
     class DescriptiveBasicValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      # String or integer value of the descriptive element.
+      attribute :value, Types::Nominal::Any.meta(omittable: true)
       # Type of value provided by the descriptive element.
       attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
@@ -23,6 +23,7 @@ module Cocina
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :language, Standard.optional.meta(omittable: true)
     end
   end
 end

data/lib/cocina/models/descriptive_value.rb

@@ -5,8 +5,8 @@ module Cocina
     class DescriptiveValue < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      # String or integer value of the descriptive element.
+      attribute :value, Types::Nominal::Any.meta(omittable: true)
       # Type of value provided by the descriptive element.
       attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
@@ -23,6 +23,7 @@ module Cocina
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :language, Standard.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/descriptive_value_required.rb

@@ -5,8 +5,8 @@ module Cocina
     class DescriptiveValueRequired < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      # String or integer value of the descriptive element.
+      attribute :value, Types::Nominal::Any.meta(omittable: true)
       # Type of value provided by the descriptive element.
       attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
@@ -23,6 +23,7 @@ module Cocina
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :language, Standard.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
     end
   end

data/lib/cocina/models/language.rb

@@ -5,8 +5,8 @@ module Cocina
     class Language < Struct
       attribute :structuredValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
       attribute :parallelValue, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
-      # String value of the descriptive element.
-      attribute :value, Types::Strict::String.meta(omittable: true)
+      # String or integer value of the descriptive element.
+      attribute :value, Types::Nominal::Any.meta(omittable: true)
       # Type of value provided by the descriptive element.
       attribute :type, Types::Strict::String.meta(omittable: true)
       # Status of the descriptive element value relative to other instances of the element.
@@ -23,6 +23,7 @@ module Cocina
       # A term providing information about the circumstances of the statement (e.g., approximate dates).
       attribute :qualifier, Types::Strict::String.meta(omittable: true)
       attribute :note, Types::Strict::Array.of(DescriptiveValue).meta(omittable: true)
+      attribute :language, Standard.optional.meta(omittable: true)
       attribute :appliesTo, Types::Strict::Array.of(DescriptiveBasicValue).meta(omittable: true)
       attribute :script, DescriptiveValue.optional.meta(omittable: true)
     end

data/lib/cocina/models/version.rb

@@ -2,6 +2,6 @@
 
 module Cocina
   module Models
-    VERSION = '0.39.0'
+    VERSION = '0.40.0'
   end
 end

data/openapi.yml

@@ -467,6 +467,9 @@ components:
               type: array
               items:
                 $ref: "#/components/schemas/DescriptiveValue"
+            language:
+              # description: Language of the descriptive element value.
+              $ref: "#/components/schemas/Standard"
     DescriptiveParallelValue:
       description: Value model for multiple representations of the same information (e.g. in different languages).
       type: object
@@ -851,7 +854,7 @@ components:
             $ref: '#/components/schemas/CatalogLink'
     Language:
       description: Languages, scripts, symbolic systems, and notations used in all
-        or part of a resource.
+        or part of a resource or its descriptive metadata.
       type: object
       additionalProperties: false
       allOf:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cocina-models
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport