cocina-models 0.78.0 → 0.79.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/description_types.yml +2 -0
- data/lib/cocina/models/mapping/to_mods/name_writer.rb +0 -2
- data/lib/cocina/models/validators/associated_name_validator.rb +2 -4
- data/lib/cocina/models/validators/description_types_validator.rb +2 -3
- data/lib/cocina/models/validators/description_values_validator.rb +2 -3
- data/lib/cocina/models/validators/validator.rb +1 -2
- data/lib/cocina/models/version.rb +1 -1
- data/lib/cocina/models.rb +2 -2
- data/lib/cocina/rspec/factories.rb +13 -6
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 193f5886756d2fd6432e90ab5323f6ed5a11c699cb97f49d61394bc5fafd5f53
|
4
|
+
data.tar.gz: ecb1493a56b7b20f9733084c8a9a115e3a3c6639a8072bc371f53a51d69d0a2c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8cc210b897872f3b90fd59e12f381f049b1389b0cf3d798a0375eea57282cf456c6591a8d474c5c612253123bca01ed9a9b931129c89153b8a8dae3ad713254b
|
7
|
+
data.tar.gz: f1a23590223b7760780e3b547b053355a1ba600fdc468ce563aef20a4c38cd3571345bde621f3f9f23248d27c29f0f3b5a829dd0c7d5c08d95d27efec472453d
|
data/description_types.yml
CHANGED
@@ -11,7 +11,7 @@ module Cocina
|
|
11
11
|
|
12
12
|
def initialize(clazz, attributes)
|
13
13
|
@clazz = clazz
|
14
|
-
@attributes = attributes
|
14
|
+
@attributes = attributes
|
15
15
|
@error_paths = []
|
16
16
|
end
|
17
17
|
|
@@ -29,9 +29,7 @@ module Cocina
|
|
29
29
|
attr_reader :clazz, :attributes, :error_paths
|
30
30
|
|
31
31
|
def meets_preconditions?
|
32
|
-
|
33
|
-
titles_with_associated_name_note_for(resource).present?
|
34
|
-
end
|
32
|
+
[Cocina::Models::Description, Cocina::Models::RequestDescription].include?(clazz)
|
35
33
|
end
|
36
34
|
|
37
35
|
def valid?(resource)
|
@@ -11,7 +11,7 @@ module Cocina
|
|
11
11
|
|
12
12
|
def initialize(clazz, attributes)
|
13
13
|
@clazz = clazz
|
14
|
-
@attributes = attributes
|
14
|
+
@attributes = attributes
|
15
15
|
@error_paths = []
|
16
16
|
end
|
17
17
|
|
@@ -30,8 +30,7 @@ module Cocina
|
|
30
30
|
attr_reader :clazz, :attributes, :error_paths
|
31
31
|
|
32
32
|
def meets_preconditions?
|
33
|
-
|
34
|
-
Cocina::Models::RequestDescription].include?(clazz)
|
33
|
+
[Cocina::Models::Description, Cocina::Models::RequestDescription].include?(clazz)
|
35
34
|
end
|
36
35
|
|
37
36
|
def validate_hash(hash, path)
|
@@ -11,7 +11,7 @@ module Cocina
|
|
11
11
|
|
12
12
|
def initialize(clazz, attributes)
|
13
13
|
@clazz = clazz
|
14
|
-
@attributes = attributes
|
14
|
+
@attributes = attributes
|
15
15
|
@error_paths = []
|
16
16
|
end
|
17
17
|
|
@@ -30,8 +30,7 @@ module Cocina
|
|
30
30
|
attr_reader :clazz, :attributes, :error_paths
|
31
31
|
|
32
32
|
def meets_preconditions?
|
33
|
-
|
34
|
-
Cocina::Models::RequestDescription].include?(clazz)
|
33
|
+
[Cocina::Models::Description, Cocina::Models::RequestDescription].include?(clazz)
|
35
34
|
end
|
36
35
|
|
37
36
|
def validate_hash(hash, path)
|
@@ -26,8 +26,7 @@ module Cocina
|
|
26
26
|
# In the meantime, copying code.
|
27
27
|
attributes_hash = deep_transform_values(attributes.to_h) do |value|
|
28
28
|
value.class.name.starts_with?('Cocina::Models') ? value.to_h : value
|
29
|
-
end.with_indifferent_access
|
30
|
-
|
29
|
+
end.deep_symbolize_keys.with_indifferent_access
|
31
30
|
VALIDATORS.each { |validator| validator.validate(clazz, attributes_hash) }
|
32
31
|
end
|
33
32
|
|
data/lib/cocina/models.rb
CHANGED
@@ -119,7 +119,7 @@ module Cocina
|
|
119
119
|
# @param [DROWithMetadata,CollectionWithMetadata,AdminPolicyWithMetadata] cocina_object
|
120
120
|
# @return [DRO,Collection,AdminPolicy]
|
121
121
|
def self.without_metadata(cocina_object)
|
122
|
-
build(cocina_object.to_h.except(:created, :modified, :lock))
|
122
|
+
build(cocina_object.to_h.except(:created, :modified, :lock), validate: false)
|
123
123
|
end
|
124
124
|
|
125
125
|
# Adds metadata to a DRO, Collection, AdminPolicy
|
@@ -144,7 +144,7 @@ module Cocina
|
|
144
144
|
else
|
145
145
|
AdminPolicyWithMetadata
|
146
146
|
end
|
147
|
-
clazz.new(props)
|
147
|
+
clazz.new(props, false, false)
|
148
148
|
end
|
149
149
|
|
150
150
|
def self.type_for(dyn)
|
@@ -45,24 +45,31 @@ module Cocina
|
|
45
45
|
type: Cocina::Models::ObjectType.object,
|
46
46
|
id: 'druid:bc234fg5678',
|
47
47
|
version: 1,
|
48
|
-
label: '
|
49
|
-
title: '
|
48
|
+
label: 'factory DRO label',
|
49
|
+
title: 'factory DRO title',
|
50
50
|
source_id: 'sul:1234',
|
51
51
|
admin_policy_id: 'druid:hv992ry2431'
|
52
52
|
}.freeze
|
53
53
|
|
54
54
|
REQUEST_DRO_DEFAULTS = DRO_DEFAULTS.except(:id)
|
55
55
|
|
56
|
-
COLLECTION_DEFAULTS =
|
56
|
+
COLLECTION_DEFAULTS = {
|
57
|
+
type: Cocina::Models::ObjectType.collection,
|
58
|
+
id: 'druid:bb222ff5555',
|
59
|
+
version: 1,
|
60
|
+
label: 'factory collection label',
|
61
|
+
title: 'factory collection title',
|
62
|
+
admin_policy_id: 'druid:hv992ry2431'
|
63
|
+
}.freeze
|
57
64
|
|
58
65
|
REQUEST_COLLECTION_DEFAULTS = COLLECTION_DEFAULTS.except(:id)
|
59
66
|
|
60
67
|
ADMIN_POLICY_DEFAULTS = {
|
61
68
|
type: Cocina::Models::ObjectType.admin_policy,
|
62
|
-
id: 'druid:
|
69
|
+
id: 'druid:cb432gf8765',
|
63
70
|
version: 1,
|
64
|
-
label: '
|
65
|
-
title: '
|
71
|
+
label: 'factory APO label',
|
72
|
+
title: 'factory APO title',
|
66
73
|
admin_policy_id: 'druid:hv992ry2431',
|
67
74
|
agreement_id: 'druid:hp308wm0436'
|
68
75
|
}.freeze
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: cocina-models
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.79.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Justin Coyne
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-05-
|
11
|
+
date: 2022-05-09 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|