normalize content types in pre-assembly to match current set #758
Conversation
peetucket
force-pushed
the
normalize-content-types
branch
2 times, most recently
from
5d70bae
to
c8d68bb
Compare
| @@ -10,7 +10,7 @@ | |||
| let(:bare_druid) { 'tx666tx9999' } | |||
| let(:object_staging_dir) { Rails.root.join(Settings.assembly_staging_dir, 'tx', '666', 'tx', '9999', bare_druid) } | |||
| let(:cocina_model_dark_access) { instance_double(Cocina::Models::Access, access: 'dark') } | |||
| let(:item) { instance_double(Cocina::Models::DRO, type: Cocina::Models::Vocab.media, access: cocina_model_dark_access) } | |||
| let(:item) { instance_double(Cocina::Models::DRO, type: Cocina::Models::Vocab.object, access: cocina_model_dark_access) } | |||
There was a problem hiding this comment.
The tests should really use the correct object type, media happened to work, but its not really reflective of the test. Same for other tests below.
peetucket
force-pushed
the
normalize-content-types
branch
from
c8d68bb
to
d5bda39
Compare
| @@ -47,6 +47,7 @@ def content_md_creation_style | |||
| Cocina::Models::Vocab.object => :file, | |||
| Cocina::Models::Vocab.book => :simple_book, | |||
| Cocina::Models::Vocab.manuscript => :simple_book, | |||
| Cocina::Models::Vocab.document => :document, | |||
There was a problem hiding this comment.
I noticed this mapping to contentMetadata type was missing, so I added it. Valid styles are here: https://github.com/sul-dlss/assembly-objectfile/blob/main/lib/assembly-objectfile/content_metadata.rb#L17
peetucket
force-pushed
the
normalize-content-types
branch
from
3c92526
to
c5152b9
Compare
peetucket
force-pushed
the
normalize-content-types
branch
from
c5152b9
to
a7f2b2e
Compare
| @@ -23,7 +23,9 @@ class BatchContext < ApplicationRecord | |||
| 'file' => 3, | |||
| 'media' => 4, | |||
| '3d' => 5, | |||
| 'document' => 6 | |||
| 'document' => 6, | |||
| 'maps' => 7, | |||
There was a problem hiding this comment.
Note: it has to be maps because map is a reserved keyword for enums:
You tried to define an enum named "content_structure" on the model "BatchContext", but this will generate a class method "map", which is already defined by ActiveRecord::Relation.
There was a problem hiding this comment.
Where is it trying to eval the key?
There was a problem hiding this comment.
Seems to happen when the class is required, the tests don't even run if you use a key of map:
$ bundle exec rspec
An error occurred while loading ./spec/models/batch_context_spec.rb.
Failure/Error:
enum content_structure: {
'simple_image' => 0,
'simple_book' => 1,
'book_as_image' => 2, # Deprecated
'file' => 3,
'media' => 4,
'3d' => 5,
'document' => 6,
'map' => 7,
'webarchive_seed' => 8,
ArgumentError:
You tried to define an enum named "content_structure" on the model "BatchContext", but this will generate a class method "map", which is already defined by ActiveRecord::Relation.
# ./app/models/batch_context.rb:19:in `<class:BatchContext>'
# ./app/models/batch_context.rb:3:in `<top (required)>'
# /Users/petucket/.rvm/gems/ruby-2.7.1/gems/zeitwerk-2.4.2/lib/zeitwerk/kernel.rb:26:in `require'
# /Users/petucket/.rvm/gems/ruby-2.7.1/gems/zeitwerk-2.4.2/lib/zeitwerk/kernel.rb:26:in `require'
# ./spec/models/batch_context_spec.rb:3:in `<top (required)>'
There was a problem hiding this comment.
Ah, because it's the ActiveRecord enum method.
| @@ -20,6 +20,8 @@ | |||
| ['File', 'file'], | |||
| ['Media', 'media'], | |||
| ['3D', '3d'], | |||
| ['Map', 'maps'], | |||
There was a problem hiding this comment.
Same comment as above, re: maps vs map
There was a problem hiding this comment.
Renamed 'simple image' and 'simple book' to 'image' and 'book' in the UI to match what is in Argo.
peetucket
force-pushed
the
normalize-content-types
branch
from
838ec92
to
ec8ab12
Compare
peetucket
force-pushed
the
normalize-content-types
branch
from
a7e7421
to
c4d5cf6
Compare
peetucket
force-pushed
the
normalize-content-types
branch
from
c4d5cf6
to
a685965
Compare
Why was this change made?
Part of sul-dlss/argo#2427 and #753 and #759
Adds 'Map' as an option.
We can't add Webarchive-seed, as pre-assembly does not know how to generate content-metadata right now for that kind of object.UPDATE: Adding webarchive_seed as an option, which becomes dependent on the assembly-objectfile gem knowing how to create it.
UPDATE 2: adding reading order as a new book option, also dependent on some updates to assembly-objectfile gem
Todo:
How was this change tested?
Updated tests and added new tests for books (both reading directions), map and webarchive-seed content metadata generation.
Which documentation and/or configurations were updated?