assembly-objectfile 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04ee4aa95c21e1ef894bc760f83bf38bc4ce18cb18ca543451fc9645ee43f20b
-  data.tar.gz: e6e6f2a9a6d9e075470f412bcd299d4da9dbeb3e5aa673c6b371e3d20c3e06fc
+  metadata.gz: ab94538c86ddec92361ad8be34b75f30d5c5c2991ddbb25e3375593e6c079b94
+  data.tar.gz: b03077ed3ae19b4c77615ce407e600b8cacdaa190cded54e98edc5461d360af8
 SHA512:
-  metadata.gz: 23c5882333d2c6b95eb107672c374986c8b048d9844ed40c8716cae9f1d8ad4a1904c187f0bdc308ac97262010a0e386eaae833524100fd4de7d8f9dcf672c23
-  data.tar.gz: 15114a44a00b614f41d6cb8467c1fbaf16986dc570ed7e4decc574eebfdc1fe52321fc8c87cce37ba45199347860b47044ea8fde6467e4399569ac6c84eafe77
+  metadata.gz: e77fd23ee31f26f9d9cd4502b760670381e5e97ade348274e52f9b70e318b4d8dd54bd45fe7529535a8912f60c822dfb616f71306f8381f6923bffa37c631993
+  data.tar.gz: 8d92581381a3464cc0cfb44bf0e7dabd3222edf70acf477c293d79c7b1791ca5c626bf2458d1faebe05a1ef5f4606d53e1a7a1266ff18e68257dbfe1f66ddfcd

data/.rubocop.yml

@@ -13,3 +13,28 @@ RSpec/MessageSpies:
 
 RSpec/NestedGroups:
   Max: 4 # default: 3
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*_spec.rb
+
+Layout/SpaceAroundMethodCallOperator:
+  Enabled: true
+
+Lint/RaiseException:
+  Enabled: true
+
+Lint/StructNewOverride:
+  Enabled: true
+
+Style/ExponentialNotation:
+  Enabled: true
+
+Style/HashEachMethods:
+  Enabled: true
+
+Style/HashTransformKeys:
+  Enabled: true
+
+Style/HashTransformValues:
+  Enabled: true

data/.rubocop_todo.yml

@@ -1,36 +1,33 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-17 23:28:35 -0500 using RuboCop version 0.75.1.
+# on 2020-04-23 10:59:56 -0500 using RuboCop version 0.82.0.
 # 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: 1
-Lint/AmbiguousBlockAssociation:
-  Exclude:
-    - 'spec/content_metadata_spec.rb'
-
 # Offense count: 1
 Lint/UselessAssignment:
   Exclude:
     - 'config/boot.rb'
 
 # Offense count: 3
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 51
 
-# Offense count: 11
+# Offense count: 2
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
-  Max: 577
+  Max: 27
 
-# Offense count: 3
+# Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 30
@@ -46,6 +43,7 @@ Metrics/ParameterLists:
   Max: 11
 
 # Offense count: 2
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 12
 
@@ -57,10 +55,10 @@ Naming/FileName:
     - 'lib/assembly-objectfile.rb'
 
 # Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
@@ -80,7 +78,7 @@ RSpec/FilePath:
     - 'spec/content_metadata_spec.rb'
     - 'spec/object_file_spec.rb'
 
-# Offense count: 67
+# Offense count: 71
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -101,20 +99,19 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/object_file_spec.rb'
 
+# Offense count: 8
+RSpec/RepeatedExampleGroupDescription:
+  Exclude:
+    - 'spec/content_metadata_spec.rb'
+
 # Offense count: 2
 Style/CommentedKeyword:
   Exclude:
     - 'lib/assembly-objectfile/content_metadata.rb'
 
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/assembly-objectfile/object_file.rb'
-
-# Offense count: 346
+# Offense count: 409
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
-Metrics/LineLength:
-  Max: 304
+Layout/LineLength:
+  Max: 284

data/assembly-objectfile.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'activesupport', '>= 5.2.0'
+  s.add_dependency 'deprecation'
   s.add_dependency 'dry-struct', '~> 1.0'
   s.add_dependency 'dry-types', '~> 1.1'
   s.add_dependency 'mime-types', '> 3'

data/lib/assembly-objectfile.rb

@@ -14,26 +14,6 @@ module Assembly
   #  by the file command, then a check will be made to see if exif data exists...if so, the mimetype returned by the exif data will be used
   #  if no exif data exists, then the mimetype returned by the unix file command will be used
   TRUSTED_MIMETYPES = ['text/plain', 'plain/text', 'application/pdf', 'text/html', 'application/xml'].freeze
-
-  # default publish/preserve/shelve attributes used in content metadata
-  # if no mimetype specific attributes are specified for a given file, define some defaults, and override for specific mimetypes below
-  FILE_ATTRIBUTES = {
-    'default' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'image/tif' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'image/tiff' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'image/jp2' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
-    'image/jpeg' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'audio/wav' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'audio/x-wav' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'audio/mp3' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
-    'audio/mpeg' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
-    'application/pdf' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
-    'plain/text' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
-    'text/plain' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
-    'image/png' => { preserve: 'yes', shelve: 'yes', publish: 'no' },
-    'application/zip' => { preserve: 'yes', shelve: 'no', publish: 'no' },
-    'application/json' => { preserve: 'yes', shelve: 'yes', publish: 'yes' }
-  }.freeze
 end
 
 require 'assembly-objectfile/content_metadata'

data/lib/assembly-objectfile/content_metadata.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'nokogiri'
+require 'deprecation'
 require 'active_support'
 require 'assembly-objectfile/content_metadata/file'
 require 'assembly-objectfile/content_metadata/file_set'
@@ -13,6 +14,7 @@ module Assembly
   # these are used when :bundle=>:dpg only
 
   DEPRECATED_STYLES = %i[book_with_pdf book_as_image].freeze
+  VALID_STYLES = %i[simple_image simple_book file map document 3d].freeze
 
   # This class generates content metadata for image files
   class ContentMetadata
@@ -60,7 +62,6 @@ module Assembly
       common_path = find_common_path(objects) unless preserve_common_paths # find common paths to all files provided if needed
 
       filesets = FileSetBuilder.build(bundle: bundle, objects: objects, style: style)
-
       config = Config.new(auto_labels: auto_labels,
                           flatten_folder_structure: flatten_folder_structure,
                           add_file_attributes: add_file_attributes,
@@ -98,21 +99,16 @@ module Assembly
     private_class_method :find_common_path
 
     def self.object_level_type(style)
-      puts "WARNING - the style #{style} is now deprecated and should not be used." if DEPRECATED_STYLES.include? style
+      Deprecation.warn(self, "the style #{style} is now deprecated and should not be used. This will be removed in assembly-objectfile 2.0") if DEPRECATED_STYLES.include? style
+      raise "Supplied style (#{style}) not valid" unless (VALID_STYLES + DEPRECATED_STYLES).include? style
 
       case style
       when :simple_image
         'image'
-      when :file
-        'file'
       when :simple_book, :book_with_pdf, :book_as_image
         'book'
-      when :map
-        'map'
-      when :'3d'
-        '3d'
       else
-        raise "Supplied style (#{style}) not valid"
+        style.to_s
       end
     end
   end # class

data/lib/assembly-objectfile/content_metadata/config.rb

@@ -12,7 +12,7 @@ module Assembly
 
     # Represents a configuration for generating the content metadata
     class Config < Dry::Struct
-      STYLES = %w[image file book map 3d].freeze
+      STYLES = %w[image file book map 3d document].freeze
       attribute :auto_labels, Types::Strict::Bool.default(true)
       attribute :flatten_folder_structure, Types::Strict::Bool.default(false)
       attribute :add_file_attributes, Types::Strict::Bool.default(false)

data/lib/assembly-objectfile/content_metadata/file.rb

@@ -6,6 +6,26 @@ module Assembly
   class ContentMetadata
     # Represents a single File
     class File
+      # default publish/preserve/shelve attributes used in content metadata
+      # if no mimetype specific attributes are specified for a given file, define some defaults, and override for specific mimetypes below
+      ATTRIBUTES_FOR_TYPE = {
+        'default' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'image/tif' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'image/tiff' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'image/jp2' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
+        'image/jpeg' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'audio/wav' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'audio/x-wav' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'audio/mp3' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
+        'audio/mpeg' => { preserve: 'no', shelve: 'yes', publish: 'yes' },
+        'application/pdf' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
+        'plain/text' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
+        'text/plain' => { preserve: 'yes', shelve: 'yes', publish: 'yes' },
+        'image/png' => { preserve: 'yes', shelve: 'yes', publish: 'no' },
+        'application/zip' => { preserve: 'yes', shelve: 'no', publish: 'no' },
+        'application/json' => { preserve: 'yes', shelve: 'yes', publish: 'yes' }
+      }.freeze
+
       # @param [Symbol] bundle
       # @param [Assembly::ObjectFile] file
       # @param style
@@ -28,7 +48,7 @@ module Assembly
       end
 
       def file_attributes(provided_file_attributes)
-        file.file_attributes || provided_file_attributes[mimetype] || provided_file_attributes['default'] || Assembly::FILE_ATTRIBUTES[mimetype] || Assembly::FILE_ATTRIBUTES['default']
+        file.file_attributes || provided_file_attributes[mimetype] || provided_file_attributes['default'] || ATTRIBUTES_FOR_TYPE[mimetype] || ATTRIBUTES_FOR_TYPE['default']
       end
 
       def image_data

data/lib/assembly-objectfile/content_metadata/file_set.rb

@@ -39,6 +39,7 @@ module Assembly
         resource_files.collect { |obj| ContentMetadata.special_dpg_folder?(obj.dpg_folder) }.include?(true)
       end
 
+      # rubocop:disable Metrics/CyclomaticComplexity
       def resource_type_descriptions
         # grab all of the file types within a resource into an array so we can decide what the resource type should be
         resource_file_types = resource_files.collect(&:object_type)
@@ -57,6 +58,8 @@ module Assembly
           resource_has_non_images ? 'object' : 'page'
         when :map
           'image'
+        when :document
+          'document'
         when :'3d'
           resource_extensions = resource_files.collect(&:ext)
           if (resource_extensions & VALID_THREE_DIMENSION_EXTENTIONS).empty? # if this resource contains no known 3D file extensions, the resource type is file
@@ -66,6 +69,7 @@ module Assembly
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

data/lib/assembly-objectfile/version.rb

@@ -4,6 +4,6 @@
 module Assembly
   class ObjectFile
     # Project version number
-    VERSION = '1.9.0'
+    VERSION = '1.10.0'
   end
 end

data/spec/content_metadata_spec.rb

@@ -2,610 +2,731 @@
 
 require 'spec_helper'
 
-describe Assembly::ContentMetadata do
-  it 'generates valid content metadata with exif for a single tif and jp2 of style=simple_image, adding file attributes' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: true, add_file_attributes: true, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//resource/file/checksum').length).to be 4
-    expect(xml.xpath('//resource/file/checksum')[0].text).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
-    expect(xml.xpath('//resource/file/checksum')[1].text).to eq('a2400500acf21e43f5440d93be894101')
-    expect(xml.xpath('//resource/file/checksum')[2].text).to eq('b965b5787e0100ec2d43733144120feab327e88c')
-    expect(xml.xpath('//resource/file/checksum')[3].text).to eq('4eb54050d374291ece622d45e84f014d')
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//label')[0].text).to match(/Image 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Image 2/)
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource/file')[0].attributes['size'].value).to eq('63542')
-    expect(xml.xpath('//resource/file')[0].attributes['mimetype'].value).to eq('image/tiff')
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
-    expect(xml.xpath('//resource/file/imageData')[0].attributes['width'].value).to eq('100')
-    expect(xml.xpath('//resource/file/imageData')[0].attributes['height'].value).to eq('100')
-    expect(xml.xpath('//resource/file')[1].attributes['size'].value).to eq('306')
-    expect(xml.xpath('//resource/file')[1].attributes['mimetype'].value).to eq('image/jp2')
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file/imageData')[1].attributes['width'].value).to eq('100')
-    expect(xml.xpath('//resource/file/imageData')[1].attributes['height'].value).to eq('100')
-  end
+RSpec.describe Assembly::ContentMetadata do
+  describe '#create_content_metadata' do
+    subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, style: style, objects: objects) }
 
-  it 'generates valid content metadata with no exif for a single tif and jp2 of style=simple_image, adding specific file attributes for 2 objects, and defaults for 1 object' do
-    obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    obj2 = Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)
-    obj3 = Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)
-    obj1.file_attributes = { publish: 'no', preserve: 'no', shelve: 'no' }
-    obj2.file_attributes = { publish: 'yes', preserve: 'yes', shelve: 'yes' }
-    objects = [obj1, obj2, obj3]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: false, add_file_attributes: true, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 3
-    expect(xml.xpath('//resource/file/checksum').length).to be 0
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath('//label').length).to be 3
-    expect(xml.xpath('//label')[0].text).to match(/Image 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Image 2/)
-    expect(xml.xpath('//label')[2].text).to match(/Image 3/)
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no') # specificially set in object
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no') # specificially set in object
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no') # specificially set in object
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes') # specificially set in object
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes') # specificially set in object
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')  # specificially set in object
-    expect(xml.xpath('//resource/file')[2].attributes['publish'].value).to eq('yes') # defaults by mimetype
-    expect(xml.xpath('//resource/file')[2].attributes['preserve'].value).to eq('no') # defaults by mimetype
-    expect(xml.xpath('//resource/file')[2].attributes['shelve'].value).to eq('yes') # defaults by mimetype
-  end
+    let(:xml) { Nokogiri::XML(result) }
 
-  it 'generates valid content metadata with exif for a single tif and jp2 of style=simple_image overriding file labels' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE, label: 'Sample tif label!'), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE, label: 'Sample jp2 label!')]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: true, add_file_attributes: true, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//resource/file/checksum').length).to be 4
-    expect(xml.xpath('//resource/file/checksum')[0].text).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
-    expect(xml.xpath('//resource/file/checksum')[1].text).to eq('a2400500acf21e43f5440d93be894101')
-    expect(xml.xpath('//resource/file/checksum')[2].text).to eq('b965b5787e0100ec2d43733144120feab327e88c')
-    expect(xml.xpath('//resource/file/checksum')[3].text).to eq('4eb54050d374291ece622d45e84f014d')
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//label')[0].text).to match(/Sample tif label!/)
-    expect(xml.xpath('//label')[1].text).to match(/Sample jp2 label!/)
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource/file')[0].attributes['size'].value).to eq('63542')
-    expect(xml.xpath('//resource/file')[0].attributes['mimetype'].value).to eq('image/tiff')
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
-    expect(xml.xpath('//resource/file/imageData')[0].attributes['width'].value).to eq('100')
-    expect(xml.xpath('//resource/file/imageData')[0].attributes['height'].value).to eq('100')
-    expect(xml.xpath('//resource/file')[1].attributes['size'].value).to eq('306')
-    expect(xml.xpath('//resource/file')[1].attributes['mimetype'].value).to eq('image/jp2')
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file/imageData')[1].attributes['width'].value).to eq('100')
-    expect(xml.xpath('//resource/file/imageData')[1].attributes['height'].value).to eq('100')
-  end
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with exif, adding file attributes' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: true, add_file_attributes: true, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//resource/file/checksum').length).to eq 4
+        expect(xml.xpath('//resource/file/checksum')[0].text).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
+        expect(xml.xpath('//resource/file/checksum')[1].text).to eq('a2400500acf21e43f5440d93be894101')
+        expect(xml.xpath('//resource/file/checksum')[2].text).to eq('b965b5787e0100ec2d43733144120feab327e88c')
+        expect(xml.xpath('//resource/file/checksum')[3].text).to eq('4eb54050d374291ece622d45e84f014d')
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//label')[0].text).to match(/Image 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Image 2/)
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource/file')[0].attributes['size'].value).to eq('63542')
+        expect(xml.xpath('//resource/file')[0].attributes['mimetype'].value).to eq('image/tiff')
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
+        expect(xml.xpath('//resource/file/imageData')[0].attributes['width'].value).to eq('100')
+        expect(xml.xpath('//resource/file/imageData')[0].attributes['height'].value).to eq('100')
+        expect(xml.xpath('//resource/file')[1].attributes['size'].value).to eq('306')
+        expect(xml.xpath('//resource/file')[1].attributes['mimetype'].value).to eq('image/jp2')
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file/imageData')[1].attributes['width'].value).to eq('100')
+        expect(xml.xpath('//resource/file/imageData')[1].attributes['height'].value).to eq('100')
+      end
+    end
 
-  it 'generates valid content metadata with exif for a single tif and jp2 of style=simple_image overriding file labels for one, and skipping auto labels for the others or for where the label is set but is blank' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE, label: 'Sample tif label!'), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE, label: '')]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, auto_labels: false, add_file_attributes: true, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 3
-    expect(xml.xpath('//label').length).to be 1
-    expect(xml.xpath('//label')[0].text).to match(/Sample tif label!/)
-  end
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with no exif adding specific file attributes for 2 objects, and defaults for 1 object' do
+        obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
+        obj2 = Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)
+        obj3 = Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)
+        obj1.file_attributes = { publish: 'no', preserve: 'no', shelve: 'no' }
+        obj2.file_attributes = { publish: 'yes', preserve: 'yes', shelve: 'yes' }
+        objects = [obj1, obj2, obj3]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: false, add_file_attributes: true, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to eq 3
+        expect(xml.xpath('//resource/file/checksum').length).to eq 0
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath('//label').length).to eq 3
+        expect(xml.xpath('//label')[0].text).to match(/Image 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Image 2/)
+        expect(xml.xpath('//label')[2].text).to match(/Image 3/)
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no') # specificially set in object
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no') # specificially set in object
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no') # specificially set in object
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes') # specificially set in object
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes') # specificially set in object
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')  # specificially set in object
+        expect(xml.xpath('//resource/file')[2].attributes['publish'].value).to eq('yes') # defaults by mimetype
+        expect(xml.xpath('//resource/file')[2].attributes['preserve'].value).to eq('no') # defaults by mimetype
+        expect(xml.xpath('//resource/file')[2].attributes['shelve'].value).to eq('yes') # defaults by mimetype
+      end
+    end
 
-  it 'generates valid content metadata for a single tif and jp2 of style=simple_image with overriding file attributes and no exif data' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'image/tiff' => { publish: 'no', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath('//label')[0].text).to match(/Image 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Image 2/)
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource/file')[0].attributes['size']).to be nil
-    expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[0].attributes['role']).to be nil
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[1].attributes['size']).to be nil
-    expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[1].attributes['role']).to be nil
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
-  end
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with exif, overriding file labels' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE, label: 'Sample tif label!'), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE, label: 'Sample jp2 label!')]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: true, add_file_attributes: true, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//resource/file/checksum').length).to eq 4
+        expect(xml.xpath('//resource/file/checksum')[0].text).to eq('8d11fab63089a24c8b17063d29a4b0eac359fb41')
+        expect(xml.xpath('//resource/file/checksum')[1].text).to eq('a2400500acf21e43f5440d93be894101')
+        expect(xml.xpath('//resource/file/checksum')[2].text).to eq('b965b5787e0100ec2d43733144120feab327e88c')
+        expect(xml.xpath('//resource/file/checksum')[3].text).to eq('4eb54050d374291ece622d45e84f014d')
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//label')[0].text).to match(/Sample tif label!/)
+        expect(xml.xpath('//label')[1].text).to match(/Sample jp2 label!/)
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource/file')[0].attributes['size'].value).to eq('63542')
+        expect(xml.xpath('//resource/file')[0].attributes['mimetype'].value).to eq('image/tiff')
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
+        expect(xml.xpath('//resource/file/imageData')[0].attributes['width'].value).to eq('100')
+        expect(xml.xpath('//resource/file/imageData')[0].attributes['height'].value).to eq('100')
+        expect(xml.xpath('//resource/file')[1].attributes['size'].value).to eq('306')
+        expect(xml.xpath('//resource/file')[1].attributes['mimetype'].value).to eq('image/jp2')
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file/imageData')[1].attributes['width'].value).to eq('100')
+        expect(xml.xpath('//resource/file/imageData')[1].attributes['height'].value).to eq('100')
+      end
+    end
 
-  it 'generates valid content metadata for a single tif and jp2 of style=simple_image with overriding file attributes, including a default value, and no exif data' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'default' => { publish: 'yes', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 1
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with exif, overriding file labels for one, and skipping auto labels for the others or for where the label is set but is blank' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE, label: 'Sample tif label!'), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE, label: '')]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, auto_labels: false, add_file_attributes: true, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to eq 3
+        expect(xml.xpath('//label').length).to eq 1
+        expect(xml.xpath('//label')[0].text).to match(/Sample tif label!/)
+      end
     end
-  end
 
-  it 'generates valid content metadata for a single tif and jp2 of style=map with overriding file attributes, including a default value, and no exif data' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
-    result = described_class.create_content_metadata(style: :map, druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'default' => { publish: 'yes', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('map')
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
-    expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be nil
-    expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
-    expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 1
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with overriding file attributes and no exif data' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'image/tiff' => { publish: 'no', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath('//label')[0].text).to match(/Image 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Image 2/)
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource/file')[0].attributes['size']).to be_nil
+        expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[0].attributes['role']).to be_nil
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[1].attributes['size']).to be_nil
+        expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[1].attributes['role']).to be_nil
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs two associated jp2s of style=simple_image using bundle=filename and no exif data' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :filename, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('test.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('test.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('test2.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('test2.jp2')
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 2
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context 'when using a single tif and jp2 of style=simple_image' do
+      it 'generates valid content metadata with overriding file attributes, including a default value, and no exif data' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'default' => { publish: 'yes', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 1
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs two associated jp2s of style=simple_image using bundle=dpg and no exif data and no root xml node' do
-    objects = [Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2)]
-    test_druid = TEST_DRUID.to_s
-    result = described_class.create_content_metadata(druid: test_druid, bundle: :dpg, objects: objects, include_root_xml: false)
-    expect(result.class).to be String
-    expect(result.include?('<?xml')).to be false
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(test_druid).to eq(TEST_DRUID)
-    expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(TEST_DRUID.to_s)
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_001.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_001.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_002.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_002.jp2')
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 2
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context 'when using a single tif and jp2 of style=map' do
+      it 'generates valid content metadata with overriding file attributes, including a default value, and no exif data' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
+        result = described_class.create_content_metadata(style: :map, druid: TEST_DRUID, add_file_attributes: true, file_attributes: { 'default' => { publish: 'yes', preserve: 'no', shelve: 'no' }, 'image/jp2' => { publish: 'yes', preserve: 'yes', shelve: 'yes' } }, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('map')
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//resource/file')[0].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[0].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[0].attributes['preserve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[0].attributes['shelve'].value).to eq('no')
+        expect(xml.xpath('//resource/file')[1].attributes['mimetype']).to be_nil
+        expect(xml.xpath('//resource/file')[1].attributes['publish'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['preserve'].value).to eq('yes')
+        expect(xml.xpath('//resource/file')[1].attributes['shelve'].value).to eq('yes')
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 1
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs, two associated jp2s, one combined pdf and one special tif of style=simple_book using bundle=dpg and no exif data and no root xml node, flattening folder structure' do
-    objects = [Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF2), Assembly::ObjectFile.new(TEST_DPG_SPECIAL_TIF), Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, bundle: :dpg, objects: objects, include_root_xml: false, flatten_folder_structure: true)
-    expect(result.class).to be String
-    expect(result.include?('<?xml')).to be false
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(TEST_DRUID.to_s)
-    expect(xml.xpath('//resource').length).to be 4
-    expect(xml.xpath('//resource/file').length).to be 6
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_001.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_001.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_002.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_002.jp2')
-    expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_31_001.pdf')
-    expect(xml.xpath("//resource[@sequence='4']/file")[0].attributes['id'].value).to eq('oo000oo0001_50_001.tif')
-    expect(xml.xpath('//label').length).to be 4
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 2
-      expect(xml.xpath('//label')[i].text).to eq("Page #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('page')
+    context 'when using two tifs and two associated jp2s of style=simple_image using bundle=filename' do
+      it 'generates valid content metadata and no exif data' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :filename, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('test.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('test.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('test2.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('test2.jp2')
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 2
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-    expect(xml.xpath("//resource[@sequence='3']/file").length).to be 1
-    expect(xml.xpath('//label')[2].text).to eq('Object 1')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
-    expect(xml.xpath("//resource[@sequence='4']/file").length).to be 1
-    expect(xml.xpath('//label')[3].text).to eq('Object 2')
-    expect(xml.xpath('//resource')[3].attributes['type'].value).to eq('object')
-  end
 
-  it "generates valid content metadata with item having a 'druid:' prefix for two tifs,two associated jp2s,two associated pdfs, and one lingering PDF of style=simple_book using bundle=dpg, flattening folder structure" do
-    objects = [Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_PDF), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2), Assembly::ObjectFile.new(TEST_DPG_PDF2), Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF1)]
-    test_druid = "druid:#{TEST_DRUID}"
-    result = described_class.create_content_metadata(druid: test_druid, bundle: :dpg, objects: objects, style: :simple_book, flatten_folder_structure: true)
-    expect(result.class).to be String
-    expect(result.include?('<?xml')).to be true
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(test_druid)
-    expect(test_druid).to eq("druid:#{TEST_DRUID}")
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 7
-
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_001.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_001.jp2')
-    expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('oo000oo0001_15_001.pdf')
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_002.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_002.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[2].attributes['id'].value).to eq('oo000oo0001_15_002.pdf')
-    expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_book.pdf')
-    expect(xml.xpath('//label').length).to be 3
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 3
-      expect(xml.xpath('//label')[i].text).to eq("Page #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('page')
+    context 'when using two tifs and two associated jp2s of style=simple_image using bundle=dpg' do
+      it 'generates valid content metadata and no exif data and no root xml node' do
+        objects = [Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2)]
+        test_druid = TEST_DRUID.to_s
+        result = described_class.create_content_metadata(druid: test_druid, bundle: :dpg, objects: objects, include_root_xml: false)
+        expect(result.class).to be String
+        expect(result.include?('<?xml')).to be false
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(test_druid).to eq(TEST_DRUID)
+        expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(TEST_DRUID.to_s)
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_001.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_001.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_002.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_002.jp2')
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 2
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-    expect(xml.xpath("//resource[@sequence='3']/file").length).to be 1
-    expect(xml.xpath('//label')[2].text).to eq('Object 1')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
-  end
 
-  it 'generates valid content metadata for two tifs,two associated jp2s,two associated pdfs, and one lingering PDF of style=book_with_pdf using bundle=dpg' do
-    objects = [Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_PDF), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2), Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF1)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :dpg, objects: objects, style: :book_with_pdf)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 6
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_001.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_001.jp2')
-    expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('15/oo000oo0001_15_001.pdf')
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_002.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_002.jp2')
-    expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_book.pdf')
-    expect(xml.xpath('//label').length).to be 3
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath("//resource[@sequence='1']/file").length).to be 3
-    expect(xml.xpath('//label')[0].text).to eq('Object 1')
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('object')
-    expect(xml.xpath("//resource[@sequence='2']/file").length).to be 2
-    expect(xml.xpath('//label')[1].text).to eq('Page 1')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
-    expect(xml.xpath("//resource[@sequence='3']/file").length).to be 1
-    expect(xml.xpath('//label')[2].text).to eq('Object 2')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
-  end
+    context 'when using two tifs, two associated jp2s, one combined pdf and one special tif of style=simple_book using bundle=dpg' do
+      it 'generates valid content metadata and no exif data and no root xml node, flattening folder structure' do
+        objects = [Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF2), Assembly::ObjectFile.new(TEST_DPG_SPECIAL_TIF), Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP), Assembly::ObjectFile.new(TEST_DPG_TIF2), Assembly::ObjectFile.new(TEST_DPG_JP2)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, bundle: :dpg, objects: objects, include_root_xml: false, flatten_folder_structure: true)
+        expect(result.class).to be String
+        expect(result.include?('<?xml')).to be false
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(TEST_DRUID.to_s)
+        expect(xml.xpath('//resource').length).to eq 4
+        expect(xml.xpath('//resource/file').length).to eq 6
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_001.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_001.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_002.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_002.jp2')
+        expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_31_001.pdf')
+        expect(xml.xpath("//resource[@sequence='4']/file")[0].attributes['id'].value).to eq('oo000oo0001_50_001.tif')
+        expect(xml.xpath('//label').length).to eq 4
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 2
+          expect(xml.xpath('//label')[i].text).to eq("Page #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('page')
+        end
+        expect(xml.xpath("//resource[@sequence='3']/file").length).to eq 1
+        expect(xml.xpath('//label')[2].text).to eq('Object 1')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
+        expect(xml.xpath("//resource[@sequence='4']/file").length).to eq 1
+        expect(xml.xpath('//label')[3].text).to eq('Object 2')
+        expect(xml.xpath('//resource')[3].attributes['type'].value).to eq('object')
+      end
+    end
 
-  it 'generates valid content metadata for two tifs two associated jp2s of style=simple_image using bundle=default and no exif data' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :default, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 4
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath('//resource/file')[0].attributes['id'].value).to eq('test.tif')
-    expect(xml.xpath('//resource/file')[1].attributes['id'].value).to eq('test.jp2')
-    expect(xml.xpath('//resource/file')[2].attributes['id'].value).to eq('test2.tif')
-    expect(xml.xpath('//resource/file')[3].attributes['id'].value).to eq('test2.jp2')
-    expect(xml.xpath('//label').length).to be 4
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..3).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 1
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context "when item has a 'druid:' prefix. Using two tifs, two associated jp2s, two associated pdfs and one lingering PDF of style=simple_book using bundle=dpg" do
+      it 'generates valid content metadata with flattening folder structure' do
+        objects = [Assembly::ObjectFile.new(TEST_DPG_TIF), Assembly::ObjectFile.new(TEST_DPG_JP),
+                   Assembly::ObjectFile.new(TEST_DPG_PDF), Assembly::ObjectFile.new(TEST_DPG_TIF2),
+                   Assembly::ObjectFile.new(TEST_DPG_JP2), Assembly::ObjectFile.new(TEST_DPG_PDF2),
+                   Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF1)]
+        test_druid = "druid:#{TEST_DRUID}"
+        result = described_class.create_content_metadata(druid: test_druid, bundle: :dpg, objects: objects, style: :simple_book, flatten_folder_structure: true)
+        expect(result.class).to be String
+        expect(result.include?('<?xml')).to be true
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//contentMetadata')[0].attributes['objectId'].value).to eq(test_druid)
+        expect(test_druid).to eq("druid:#{TEST_DRUID}")
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to be 7
+
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_001.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_001.jp2')
+        expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('oo000oo0001_15_001.pdf')
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('oo000oo0001_00_002.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('oo000oo0001_05_002.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[2].attributes['id'].value).to eq('oo000oo0001_15_002.pdf')
+        expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_book.pdf')
+        expect(xml.xpath('//label').length).to eq 3
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 3
+          expect(xml.xpath('//label')[i].text).to eq("Page #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('page')
+        end
+        expect(xml.xpath("//resource[@sequence='3']/file").length).to eq 1
+        expect(xml.xpath('//label')[2].text).to eq('Object 1')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs two associated jp2s of style=simple_image using bundle=default and no exif data, preserving full paths' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :default, objects: objects, preserve_common_paths: true)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 4
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq(TEST_TIF_INPUT_FILE)
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq(TEST_JP2_INPUT_FILE)
-    expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq(TEST_TIF_INPUT_FILE2)
-    expect(xml.xpath("//resource[@sequence='4']/file")[0].attributes['id'].value).to eq(TEST_JP2_INPUT_FILE2)
-    expect(xml.xpath('//label').length).to be 4
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..3).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 1
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+    context 'when using two tifs, two associated jp2s, two associated pdfs and one lingering PDF of style=book_with_pdf using bundle=dpg' do
+      subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, bundle: :dpg, style: style, objects: objects) }
+
+      let(:objects) do
+        [
+          Assembly::ObjectFile.new(TEST_DPG_TIF),
+          Assembly::ObjectFile.new(TEST_DPG_JP),
+          Assembly::ObjectFile.new(TEST_DPG_PDF),
+          Assembly::ObjectFile.new(TEST_DPG_TIF2),
+          Assembly::ObjectFile.new(TEST_DPG_JP2),
+          Assembly::ObjectFile.new(TEST_DPG_SPECIAL_PDF1)
+        ]
+      end
+      let(:style) { :book_with_pdf }
+
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
+
+      it 'generates valid content metadata' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to eq 6
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_001.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_001.jp2')
+        expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('15/oo000oo0001_15_001.pdf')
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('00/oo000oo0001_00_002.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('05/oo000oo0001_05_002.jp2')
+        expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('oo000oo0001_book.pdf')
+        expect(xml.xpath('//label').length).to eq 3
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath("//resource[@sequence='1']/file").length).to eq 3
+        expect(xml.xpath('//label')[0].text).to eq('Object 1')
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('object')
+        expect(xml.xpath("//resource[@sequence='2']/file").length).to eq 2
+        expect(xml.xpath('//label')[1].text).to eq('Page 1')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
+        expect(xml.xpath("//resource[@sequence='3']/file").length).to eq 1
+        expect(xml.xpath('//label')[2].text).to eq('Object 2')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs two associated jp2s of style=file using specific content metadata paths' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
-    objects[0].relative_path = 'input/test.tif'
-    objects[1].relative_path = 'input/test.jp2'
-    objects[2].relative_path = 'input/test2.tif'
-    objects[3].relative_path = 'input/test2.jp2'
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :file, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('file')
-    expect(xml.xpath('//resource').length).to be 4
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath('//label').length).to be 4
-    expect(xml.xpath('//resource/file')[0].attributes['id'].value).to eq('input/test.tif')
-    expect(xml.xpath('//resource/file')[1].attributes['id'].value).to eq('input/test.jp2')
-    expect(xml.xpath('//resource/file')[2].attributes['id'].value).to eq('input/test2.tif')
-    expect(xml.xpath('//resource/file')[3].attributes['id'].value).to eq('input/test2.jp2')
-    (0..3).each do |i|
-      expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to be 1
-      expect(xml.xpath('//label')[i].text).to eq("File #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('file')
+    context 'when using two tifs and two associated jp2s of style=simple_image using bundle=default' do
+      it 'generates valid content metadata and no exif data' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :default, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 4
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath('//resource/file')[0].attributes['id'].value).to eq('test.tif')
+        expect(xml.xpath('//resource/file')[1].attributes['id'].value).to eq('test.jp2')
+        expect(xml.xpath('//resource/file')[2].attributes['id'].value).to eq('test2.tif')
+        expect(xml.xpath('//resource/file')[3].attributes['id'].value).to eq('test2.jp2')
+        expect(xml.xpath('//label').length).to eq 4
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..3).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 1
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-  end
 
-  it 'generates valid content metadata for two tifs of style=simple_book' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//label')[0].text).to match(/Page 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Page 2/)
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath('//resource/file')[i].attributes['size']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['mimetype']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['publish']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['preserve']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['shelve']).to be nil
+    context 'when using two tifs and two associated jp2s of style=simple_image using bundle=default' do
+      it 'generates valid content metadata and no exif data, preserving full paths' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :default, objects: objects, preserve_common_paths: true)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 4
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq(TEST_TIF_INPUT_FILE)
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq(TEST_JP2_INPUT_FILE)
+        expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq(TEST_TIF_INPUT_FILE2)
+        expect(xml.xpath("//resource[@sequence='4']/file")[0].attributes['id'].value).to eq(TEST_JP2_INPUT_FILE2)
+        expect(xml.xpath('//label').length).to eq 4
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..3).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 1
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
     end
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
-  end
 
-  it 'generates valid content metadata for two tifs and one pdf of style=book_with_pdf' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_PDF_FILE)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :book_with_pdf, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 3
-    expect(xml.xpath('//label').length).to be 3
-    expect(xml.xpath('//label')[0].text).to match(/Page 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Page 2/)
-    expect(xml.xpath('//label')[2].text).to match(/Object 1/)
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
-  end
+    context 'when using two tifs and two associated jp2s of style=file' do
+      it 'generates valid content metadata using specific content metadata paths' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2), Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE2)]
+        objects[0].relative_path = 'input/test.tif'
+        objects[1].relative_path = 'input/test.jp2'
+        objects[2].relative_path = 'input/test2.tif'
+        objects[3].relative_path = 'input/test2.jp2'
+        result = described_class.create_content_metadata(druid: TEST_DRUID, style: :file, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('file')
+        expect(xml.xpath('//resource').length).to eq 4
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath('//label').length).to eq 4
+        expect(xml.xpath('//resource/file')[0].attributes['id'].value).to eq('input/test.tif')
+        expect(xml.xpath('//resource/file')[1].attributes['id'].value).to eq('input/test.jp2')
+        expect(xml.xpath('//resource/file')[2].attributes['id'].value).to eq('input/test2.tif')
+        expect(xml.xpath('//resource/file')[3].attributes['id'].value).to eq('input/test2.jp2')
+        (0..3).each do |i|
+          expect(xml.xpath("//resource[@sequence='#{i + 1}']/file").length).to eq 1
+          expect(xml.xpath('//label')[i].text).to eq("File #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('file')
+        end
+      end
+    end
 
-  it 'generates valid content metadata for two tifs of style=book_as_image' do
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :book_as_image, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//label')[0].text).to match(/Image 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Image 2/)
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..1).each do |i|
-      expect(xml.xpath('//resource/file')[i].attributes['size']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['mimetype']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['publish']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['preserve']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['shelve']).to be nil
+    context 'when using two tifs of style=simple_book' do
+      it 'generates valid content metadata for two tifs of style=simple_book' do
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//label')[0].text).to match(/Page 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Page 2/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          expect(xml.xpath('//resource/file')[i].attributes['size']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['mimetype']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['publish']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['preserve']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['shelve']).to be_nil
+        end
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
+      end
     end
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
-  end
 
-  it 'generates valid content metadata with no exif but with user supplied checksums for two tifs of style=simple_book' do
-    obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    obj1.provider_md5 = '123456789'
-    obj1.provider_sha1 = 'abcdefgh'
-    obj2 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)
-    obj2.provider_md5 = 'qwerty'
-    objects = [obj1, obj2]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
-    expect(xml.xpath('//resource').length).to be 2
-    expect(xml.xpath('//resource/file').length).to be 2
-    expect(xml.xpath('//resource/file/checksum').length).to be 3
-    expect(xml.xpath('//label').length).to be 2
-    expect(xml.xpath('//label')[0].text).to match(/Page 1/)
-    expect(xml.xpath('//label')[1].text).to match(/Page 2/)
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath('//resource/file/checksum')[0].text).to eq('abcdefgh')
-    expect(xml.xpath('//resource/file/checksum')[1].text).to eq('123456789')
-    expect(xml.xpath('//resource/file/checksum')[2].text).to eq('qwerty')
-    (0..1).each do |i|
-      expect(xml.xpath('//resource/file')[i].attributes['size']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['mimetype']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['publish']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['preserve']).to be nil
-      expect(xml.xpath('//resource/file')[i].attributes['shelve']).to be nil
+    context 'when using style=book_with_pdf' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE),
+         Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2),
+         Assembly::ObjectFile.new(TEST_PDF_FILE)]
+      end
+      let(:style) { :book_with_pdf }
+
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
+
+      it 'generates valid content metadata for two tifs' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to eq 3
+        expect(xml.xpath('//label').length).to eq 3
+        expect(xml.xpath('//label')[0].text).to match(/Page 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Page 2/)
+        expect(xml.xpath('//label')[2].text).to match(/Object 1/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('object')
+      end
     end
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
-  end
 
-  it 'does not generate valid content metadata if not all input files exist' do
-    expect(File.exist?(TEST_TIF_INPUT_FILE)).to be true
-    junk_file = '/tmp/flim_flam_floom.jp2'
-    expect(File.exist?(junk_file)).to be false
-    objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(junk_file)]
-    expect { described_class.create_content_metadata(druid: TEST_DRUID, objects: objects) }.to raise_error(RuntimeError, "File '#{junk_file}' not found")
-  end
+    context 'when using style=book_as_image' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE),
+         Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)]
+      end
 
-  it 'generates valid content metadata for a 3d object with one 3d type files and three other supporting files (where one supporting file is a non-viewable but downloadable 3d file)' do
-    objects = [Assembly::ObjectFile.new(TEST_OBJ_FILE), Assembly::ObjectFile.new(TEST_PLY_FILE), Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(TEST_PDF_FILE)]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, style: :'3d', objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('3d')
-    expect(xml.xpath('//resource').length).to be 4
-    expect(xml.xpath('//resource/file').length).to be 4
-    expect(xml.xpath('//label').length).to be 4
-    expect(xml.xpath('//label')[0].text).to match(/3d 1/)
-    expect(xml.xpath('//label')[1].text).to match(/File 1/)
-    expect(xml.xpath('//label')[2].text).to match(/File 2/)
-    expect(xml.xpath('//label')[3].text).to match(/File 3/)
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('3d')
-    expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('file')
-    expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('file')
-    expect(xml.xpath('//resource')[3].attributes['type'].value).to eq('file')
-  end
+      let(:style) { :book_as_image }
+
+      before do
+        allow(Deprecation).to receive(:warn)
+      end
 
-  it 'generates valid content metadata for images and associated text files, of style=simple_image using bundle=prebundled, and no exif data' do
-    files = [[TEST_RES1_TIF1, TEST_RES1_JP1, TEST_RES1_TIF2, TEST_RES1_JP2, TEST_RES1_TEI, TEST_RES1_TEXT, TEST_RES1_PDF], [TEST_RES2_TIF1, TEST_RES2_JP1, TEST_RES2_TIF2, TEST_RES2_JP2, TEST_RES2_TEI, TEST_RES2_TEXT], [TEST_RES3_TIF1, TEST_RES3_JP1, TEST_RES3_TEI]]
-    objects = files.collect { |resource| resource.collect { |file| Assembly::ObjectFile.new(file) } }
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: :simple_image, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 3
-    expect(xml.xpath('//resource/file').length).to be 16
-    expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('res1_image1.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('res1_image1.jp2')
-    expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('res1_image2.tif')
-    expect(xml.xpath("//resource[@sequence='1']/file")[3].attributes['id'].value).to eq('res1_image2.jp2')
-    expect(xml.xpath("//resource[@sequence='1']/file")[4].attributes['id'].value).to eq('res1_teifile.txt')
-    expect(xml.xpath("//resource[@sequence='1']/file")[5].attributes['id'].value).to eq('res1_textfile.txt')
-    expect(xml.xpath("//resource[@sequence='1']/file")[6].attributes['id'].value).to eq('res1_transcript.pdf')
-    expect(xml.xpath("//resource[@sequence='1']/file").length).to be 7
-
-    expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('res2_image1.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('res2_image1.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[2].attributes['id'].value).to eq('res2_image2.tif')
-    expect(xml.xpath("//resource[@sequence='2']/file")[3].attributes['id'].value).to eq('res2_image2.jp2')
-    expect(xml.xpath("//resource[@sequence='2']/file")[4].attributes['id'].value).to eq('res2_teifile.txt')
-    expect(xml.xpath("//resource[@sequence='2']/file")[5].attributes['id'].value).to eq('res2_textfile.txt')
-    expect(xml.xpath("//resource[@sequence='2']/file").length).to be 6
-
-    expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('res3_image1.tif')
-    expect(xml.xpath("//resource[@sequence='3']/file")[1].attributes['id'].value).to eq('res3_image1.jp2')
-    expect(xml.xpath("//resource[@sequence='3']/file")[2].attributes['id'].value).to eq('res3_teifile.txt')
-    expect(xml.xpath("//resource[@sequence='3']/file").length).to be 3
-
-    expect(xml.xpath('//label').length).to be 3
-    expect(xml.xpath('//resource/file/imageData').length).to be 0
-    (0..2).each do |i|
-      expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
-      expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+      it 'generates valid content metadata for two tifs' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//label')[0].text).to match(/Image 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Image 2/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..1).each do |i|
+          file = xml.xpath('//resource/file')[i]
+
+          expect(file.attributes['size']).to be_nil
+          expect(file.attributes['mimetype']).to be_nil
+          expect(file.attributes['publish']).to be_nil
+          expect(file.attributes['preserve']).to be_nil
+          expect(file.attributes['shelve']).to be_nil
+        end
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('image')
+      end
     end
-  end
 
-  it 'generates role attributes for content metadata for a tif' do
-    obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
-    obj1.file_attributes = { publish: 'no', preserve: 'no', shelve: 'no', role: 'master-role' }
-    objects = [obj1]
-    result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: false, add_file_attributes: true, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
-    expect(xml.xpath('//resource').length).to be 1
-    expect(xml.xpath('//resource/file').length).to be 1
-    expect(xml.xpath('//resource/file').length).to be 1
-    expect(xml.xpath('//resource/file')[0].attributes['role'].value).to eq('master-role')
-  end
+    context 'when using style=document' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_PDF_FILE)]
+      end
 
-  it 'generates content metadata even when no objects are passed in' do
-    objects = []
-    result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: :file, objects: objects)
-    expect(result.class).to be String
-    xml = Nokogiri::XML(result)
-    expect(xml.errors.size).to be 0
-    expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('file')
-    expect(xml.xpath('//resource').length).to be 0
-    expect(xml.xpath('//resource/file').length).to be 0
-  end
+      let(:style) { :document }
+
+      it 'generates valid content metadata' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('document')
+        expect(xml.xpath('//resource').length).to eq 1
+        expect(xml.xpath('//resource/file').length).to eq 1
+        expect(xml.xpath('//label').length).to eq 1
+        expect(xml.xpath('//label')[0].text).to match(/Document 1/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        file = xml.xpath('//resource/file').first
+        expect(file.attributes['size']).to be_nil
+        expect(file.attributes['mimetype']).to be_nil
+        expect(file.attributes['publish']).to be_nil
+        expect(file.attributes['preserve']).to be_nil
+        expect(file.attributes['shelve']).to be_nil
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('document')
+      end
+    end
+
+    context 'when using user supplied checksums for two tifs and style=simple_book' do
+      it 'generates valid content metadata with no exif' do
+        obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
+        obj1.provider_md5 = '123456789'
+        obj1.provider_sha1 = 'abcdefgh'
+        obj2 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)
+        obj2.provider_md5 = 'qwerty'
+        objects = [obj1, obj2]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, style: :simple_book, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('book')
+        expect(xml.xpath('//resource').length).to eq 2
+        expect(xml.xpath('//resource/file').length).to eq 2
+        expect(xml.xpath('//resource/file/checksum').length).to eq 3
+        expect(xml.xpath('//label').length).to eq 2
+        expect(xml.xpath('//label')[0].text).to match(/Page 1/)
+        expect(xml.xpath('//label')[1].text).to match(/Page 2/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath('//resource/file/checksum')[0].text).to eq('abcdefgh')
+        expect(xml.xpath('//resource/file/checksum')[1].text).to eq('123456789')
+        expect(xml.xpath('//resource/file/checksum')[2].text).to eq('qwerty')
+        (0..1).each do |i|
+          expect(xml.xpath('//resource/file')[i].attributes['size']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['mimetype']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['publish']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['preserve']).to be_nil
+          expect(xml.xpath('//resource/file')[i].attributes['shelve']).to be_nil
+        end
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('page')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('page')
+      end
+    end
+
+    context 'when not all input files exist' do
+      it 'does not generate valid content metadata' do
+        expect(File.exist?(TEST_TIF_INPUT_FILE)).to be true
+        junk_file = '/tmp/flim_flam_floom.jp2'
+        expect(File.exist?(junk_file)).to be false
+        objects = [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE), Assembly::ObjectFile.new(junk_file)]
+        expect { described_class.create_content_metadata(druid: TEST_DRUID, objects: objects) }.to raise_error(RuntimeError, "File '#{junk_file}' not found")
+      end
+    end
+
+    context 'when using a 3d object with one 3d type files and three other supporting files (where one supporting file is a non-viewable but downloadable 3d file)' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_OBJ_FILE),
+         Assembly::ObjectFile.new(TEST_PLY_FILE),
+         Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE),
+         Assembly::ObjectFile.new(TEST_PDF_FILE)]
+      end
+      let(:style) { :'3d' }
+
+      it 'generates valid content metadata' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('3d')
+        expect(xml.xpath('//resource').length).to eq 4
+        expect(xml.xpath('//resource/file').length).to eq 4
+        expect(xml.xpath('//label').length).to eq 4
+        expect(xml.xpath('//label')[0].text).to match(/3d 1/)
+        expect(xml.xpath('//label')[1].text).to match(/File 1/)
+        expect(xml.xpath('//label')[2].text).to match(/File 2/)
+        expect(xml.xpath('//label')[3].text).to match(/File 3/)
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('3d')
+        expect(xml.xpath('//resource')[1].attributes['type'].value).to eq('file')
+        expect(xml.xpath('//resource')[2].attributes['type'].value).to eq('file')
+        expect(xml.xpath('//resource')[3].attributes['type'].value).to eq('file')
+      end
+    end
+
+    context 'when style=simple_image using bundle=prebundled' do
+      it 'generates valid content metadata for images and associated text files and no exif data' do
+        files = [[TEST_RES1_TIF1, TEST_RES1_JP1, TEST_RES1_TIF2, TEST_RES1_JP2, TEST_RES1_TEI, TEST_RES1_TEXT, TEST_RES1_PDF], [TEST_RES2_TIF1, TEST_RES2_JP1, TEST_RES2_TIF2, TEST_RES2_JP2, TEST_RES2_TEI, TEST_RES2_TEXT], [TEST_RES3_TIF1, TEST_RES3_JP1, TEST_RES3_TEI]]
+        objects = files.collect { |resource| resource.collect { |file| Assembly::ObjectFile.new(file) } }
+        result = described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: :simple_image, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 3
+        expect(xml.xpath('//resource/file').length).to eq 16
+        expect(xml.xpath("//resource[@sequence='1']/file")[0].attributes['id'].value).to eq('res1_image1.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[1].attributes['id'].value).to eq('res1_image1.jp2')
+        expect(xml.xpath("//resource[@sequence='1']/file")[2].attributes['id'].value).to eq('res1_image2.tif')
+        expect(xml.xpath("//resource[@sequence='1']/file")[3].attributes['id'].value).to eq('res1_image2.jp2')
+        expect(xml.xpath("//resource[@sequence='1']/file")[4].attributes['id'].value).to eq('res1_teifile.txt')
+        expect(xml.xpath("//resource[@sequence='1']/file")[5].attributes['id'].value).to eq('res1_textfile.txt')
+        expect(xml.xpath("//resource[@sequence='1']/file")[6].attributes['id'].value).to eq('res1_transcript.pdf')
+        expect(xml.xpath("//resource[@sequence='1']/file").length).to be 7
 
-  it 'generates an error message when an unknown style is passed in' do
-    objects = []
-    expect do
-      described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: :borked, objects: objects)
-    end.to raise_error { |error|
-      expect(error.message).to eq('Supplied style (borked) not valid')
-    }
+        expect(xml.xpath("//resource[@sequence='2']/file")[0].attributes['id'].value).to eq('res2_image1.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[1].attributes['id'].value).to eq('res2_image1.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[2].attributes['id'].value).to eq('res2_image2.tif')
+        expect(xml.xpath("//resource[@sequence='2']/file")[3].attributes['id'].value).to eq('res2_image2.jp2')
+        expect(xml.xpath("//resource[@sequence='2']/file")[4].attributes['id'].value).to eq('res2_teifile.txt')
+        expect(xml.xpath("//resource[@sequence='2']/file")[5].attributes['id'].value).to eq('res2_textfile.txt')
+        expect(xml.xpath("//resource[@sequence='2']/file").length).to eq 6
+
+        expect(xml.xpath("//resource[@sequence='3']/file")[0].attributes['id'].value).to eq('res3_image1.tif')
+        expect(xml.xpath("//resource[@sequence='3']/file")[1].attributes['id'].value).to eq('res3_image1.jp2')
+        expect(xml.xpath("//resource[@sequence='3']/file")[2].attributes['id'].value).to eq('res3_teifile.txt')
+        expect(xml.xpath("//resource[@sequence='3']/file").length).to eq 3
+
+        expect(xml.xpath('//label').length).to eq 3
+        expect(xml.xpath('//resource/file/imageData').length).to eq 0
+        (0..2).each do |i|
+          expect(xml.xpath('//label')[i].text).to eq("Image #{i + 1}")
+          expect(xml.xpath('//resource')[i].attributes['type'].value).to eq('image')
+        end
+      end
+    end
+
+    context 'when providing file attributes' do
+      it 'generates role attributes for content metadata' do
+        obj1 = Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE)
+        obj1.file_attributes = { publish: 'no', preserve: 'no', shelve: 'no', role: 'master-role' }
+        objects = [obj1]
+        result = described_class.create_content_metadata(druid: TEST_DRUID, add_exif: false, add_file_attributes: true, objects: objects)
+        expect(result.class).to be String
+        xml = Nokogiri::XML(result)
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('image')
+        expect(xml.xpath('//resource').length).to eq 1
+        expect(xml.xpath('//resource/file').length).to eq 1
+        expect(xml.xpath('//resource/file').length).to eq 1
+        expect(xml.xpath('//resource/file')[0].attributes['role'].value).to eq('master-role')
+      end
+    end
+
+    context 'when no objects are passed in' do
+      subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: style, objects: objects) }
+
+      let(:objects) { [] }
+
+      let(:style) { :file }
+
+      it 'generates content metadata even when no objects are passed in' do
+        expect(xml.errors.size).to eq 0
+        expect(xml.xpath('//contentMetadata')[0].attributes['type'].value).to eq('file')
+        expect(xml.xpath('//resource').length).to eq 0
+        expect(xml.xpath('//resource/file').length).to eq 0
+      end
+    end
+
+    context 'when an unknown style is passed in' do
+      subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: style, objects: objects) }
+
+      let(:objects) { [] }
+
+      let(:style) { :borked }
+
+      it 'generates an error message' do
+        expect { result }.to raise_error 'Supplied style (borked) not valid'
+      end
+    end
   end
 end