assembly-objectfile 1.8.4 → 1.10.3

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

@@ -12,13 +12,15 @@ 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 webarchive-seed].freeze
+      READING_ORDERS = %w[ltr rtl].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)
       attribute :add_exif, Types::Strict::Bool.default(false)
       attribute :file_attributes, Types::Strict::Hash.default({}.freeze)
       attribute :type, Types::Strict::String.enum(*STYLES)
+      attribute :reading_order, Types::Strict::String.default('ltr').enum(*READING_ORDERS)
     end
   end
 end

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

@@ -6,10 +6,30 @@ 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
-      def initialize(bundle: nil, file:, style: nil)
+      def initialize(file:, bundle: nil, style: nil)
         @bundle = bundle
         @file = file
         @style = 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

@@ -7,9 +7,9 @@ module Assembly
     # Represents a groups of related Files, such as a single master file and the derivatives
     class FileSet
       # @param [Boolean] dpg (false) is it a dpg bundle?
-      # @param [Array] resource_files
+      # @param [Array<Assembly::ObjectFile>] resource_files
       # @param style
-      def initialize(dpg: false, resource_files:, style:)
+      def initialize(resource_files:, style:, dpg: false)
         @dpg = dpg
         @resource_files = resource_files
         @style = style
@@ -39,13 +39,14 @@ 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)
         resource_has_non_images = !(resource_file_types - [:image]).empty?
 
         case style
-        when :simple_image
+        when :simple_image, :map, :'webarchive-seed'
           'image'
         when :file
           'file'
@@ -55,8 +56,8 @@ module Assembly
           resource_has_non_images && resource_file_types.include?(:image) == false ? 'object' : 'image'
         when :book_with_pdf # in book with PDF type, if we find a resource with *any* non images, switch it's type from book to object
           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 +67,7 @@ module Assembly
           end
         end
       end
+      # rubocop:enable Metrics/CyclomaticComplexity
     end
   end
 end

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

@@ -4,6 +4,9 @@ module Assembly
   class ContentMetadata
     # Builds a groups of related Files, based on bundle
     class FileSetBuilder
+      # @param [Symbol] bundle one of: :default, :filename, :dpg or :prebundled
+      # @param [Array<Assembly::ObjectFile>] objects
+      # @param [Symbol] style one of: :simple_image, :file, :simple_book, :book_as_image, :book_with_pdf, :map, or :'3d'
       def self.build(bundle:, objects:, style:)
         new(bundle: bundle, objects: objects, style: style).build
       end
@@ -25,6 +28,7 @@ module Assembly
           build_for_dpg
         when :prebundled
           # if the user specifies this method, they will pass in an array of arrays, indicating resources, so we don't need to bundle in the gem
+          # This is used by the assemblyWF if you have stubContentMetadata.xml
           objects.map { |inner| FileSet.new(resource_files: inner, style: style) }
         else
           raise 'Invalid bundle method'

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

@@ -15,6 +15,8 @@ module Assembly
 
         Nokogiri::XML::Builder.new do |xml|
           xml.contentMetadata(objectId: druid.to_s, type: config.type) do
+            xml.bookData(readingOrder: config.reading_order) if config.type == 'book'
+
             filesets.each_with_index do |fileset, index| # iterate over all the resources
               # start a new resource element
               sequence = index + 1

data/lib/assembly-objectfile/object_file.rb

@@ -19,10 +19,10 @@ module Assembly
       x = strings.last
       n += 1 while strings.all? { |s| s[n] && (s[n] == x[n]) }
       common_prefix = x[0...n]
-      if common_prefix[-1, 1] != '/' # check if last element of the common string is the end of a directory
-        common_prefix.split('/')[0..-2].join('/') + '/' # if not, split string along directories, and reject last one
+      if common_prefix[-1, 1] == '/' # check if last element of the common string is the end of a directory
+        common_prefix # if not, split string along directories, and reject last one
       else
-        common_prefix # if it was, then return the common prefix directly
+        "#{common_prefix.split('/')[0..-2].join('/')}/" # if it was, then return the common prefix directly
       end
     end
   end

data/lib/assembly-objectfile/object_fileable.rb

@@ -2,12 +2,13 @@
 
 require 'mini_exiftool'
 require 'mime/types'
-# require 'checksum-tools'
 
 module Assembly
   # Common behaviors we need for other classes in the gem
   module ObjectFileable
-    attr_accessor :file_attributes, :label, :path, :provider_md5, :provider_sha1, :relative_path
+    attr_accessor :file_attributes, :label, :path, :provider_md5, :provider_sha1, :relative_path, :mime_type_order
+
+    VALID_MIMETYPE_METHODS = %i[override exif file extension].freeze
 
     # @param [String] path full path to the file to be worked with
     # @param [Hash<Symbol => Object>] params options used during content metadata generation
@@ -16,6 +17,10 @@ module Assembly
     # @option params [String] :provider_md5 pre-computed MD5 checksum
     # @option params [String] :provider_sha1 pre-computed SHA1 checksum
     # @option params [String] :relative_path if you want the file ids in the content metadata it can be set, otherwise content metadata will get the full path
+    # @option params [Array] :mime_type_order can be set to the order in which you want mimetypes to be determined
+    #                                          options are :override (from manual overide mapping if exists), :exif (from exif if exists),
+    #                                                      :extension (from file extension), and :file (from unix file system command)
+    #                                          the default is defined in the private `default_mime_type_order` method but you can override to set your own order
     # @example
     #   Assembly::ObjectFile.new('/input/path_to_file.tif')
     def initialize(path, params = {})
@@ -25,6 +30,7 @@ module Assembly
       @relative_path = params[:relative_path]
       @provider_md5 = params[:provider_md5]
       @provider_sha1 = params[:provider_sha1]
+      @mime_type_order = params[:mime_type_order] || default_mime_type_order
     end
 
     # @return [String] DPG base filename, removing the extension and the '00','05', etc. placeholders
@@ -83,11 +89,11 @@ module Assembly
     #   puts source_file.exif # hash with exif information
     def exif
       @exif ||= begin
-                  check_for_file
-                  MiniExiftool.new(path, replace_invalid_chars: '?')
-                rescue StandardError
-                  nil
-                end
+        check_for_file
+        MiniExiftool.new(path, replace_invalid_chars: '?')
+      rescue StandardError
+        nil
+      end
     end
 
     # Computes md5 checksum or returns cached value
@@ -110,22 +116,42 @@ module Assembly
       @sha1 ||= Digest::SHA1.file(path).hexdigest
     end
 
-    # Returns mimetype information for the current file based on
-    #   (1) exifdata (if available), (2) unix file type or (3) file extension using the mimetypes gem, in this priority order
+    # Returns mimetype information for the current file based on the ordering set in default_mime_type_order
+    #   We stop computing mimetypes as soon as we have a method that returns a value
     # @return [String] mime type
     # @example
     #   source_file = Assembly::ObjectFile.new('/input/path_to_file.txt')
     #   puts source_file.mimetype # 'text/plain'
     def mimetype
       @mimetype ||= begin
-        if exif_mimetype # first, try the exif data
-          exif_mimetype
-        elsif file_mimetype # next, try exif/unix file system command
-          file_mimetype
-        else # finally, get it from the mime-types gem (using the file extension) if both of those failed for some reason
-          mtype = MIME::Types.type_for(path).first
-          mtype ? mtype.content_type : ''
+        check_for_file
+        mimetype = ''
+        mime_type_order.each do |mime_type_method|
+          mimetype = public_send("#{mime_type_method}_mimetype") if VALID_MIMETYPE_METHODS.include?(mime_type_method)
+          break if mimetype.present?
         end
+        mimetype
+      end
+    end
+
+    # Returns mimetype information using the manual override mapping (based on a file extension lookup)
+    # @return [String] mime type for supplied file if a mapping exists for the file's extension
+    # @example
+    #   source_file = Assembly::ObjectFile.new('/input/path_to_file.json')
+    #   puts source_file.override_mimetype # 'application/json'
+    def override_mimetype
+      @override_mimetype ||= Assembly::OVERRIDE_MIMETYPES.fetch(ext.to_sym, '')
+    end
+
+    # Returns mimetype information using the mime-types gem (based on a file extension lookup)
+    # @return [String] mime type for supplied file
+    # @example
+    #   source_file = Assembly::ObjectFile.new('/input/path_to_file.txt')
+    #   puts source_file.extension_mimetype # 'text/plain'
+    def extension_mimetype
+      @extension_mimetype ||= begin
+        mtype = MIME::Types.type_for(path).first
+        mtype ? mtype.content_type : ''
       end
     end
 
@@ -193,7 +219,7 @@ exif&.mimetype && prefer_exif
     def valid_image?
       return false unless image?
 
-      mimetype == 'image/jp2' || jp2able? ? true : false
+      mimetype == 'image/jp2' || jp2able?
     end
 
     # @return [Boolean] true if image has a color profile, false if not.
@@ -234,11 +260,16 @@ exif&.mimetype && prefer_exif
     #   source_file = Assembly::ObjectFile.new('/input/path_to_file.tif')
     #   puts source_file.file_exists? # true
     def file_exists?
-      File.exist?(path) && !File.directory?(path)
+      @file_exists ||= (File.exist?(path) && !File.directory?(path))
     end
 
     private
 
+    # prive method defining default preferred ordering of how mimetypes are determined
+    def default_mime_type_order
+      %i[override exif file extension]
+    end
+
     # private method to check for file existence before operating on it
     def check_for_file
       raise "input file #{path} does not exist" unless file_exists?

data/lib/assembly-objectfile/version.rb

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

data/spec/content_metadata_spec.rb

@@ -2,610 +2,790 @@
 
 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 style=simple_image' do
+      context 'when using a single tif and jp2' 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' 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' 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
+
+      context 'when using a single tif and jp2' 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
+
+      context 'when using a single tif and jp2' 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
+
+      context 'when using a single tif and jp2' 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
+
+      context 'when using two tifs and two associated jp2s 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
+
+      context 'when using two tifs and two associated jp2s 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
+
+      context 'when using two tifs and two associated jp2s 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
+
+      context 'when using two tifs and two associated jp2s 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
+
+      context 'when 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
+
+          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
 
-  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')
+          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
     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 style=webarchive-seed' do
+      context 'when using a jp2' do
+        it 'generates valid content metadata with exif, adding file attributes' do
+          objects = [Assembly::ObjectFile.new(TEST_JP2_INPUT_FILE)]
+          result = described_class.create_content_metadata(style: :'webarchive-seed', 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('webarchive-seed')
+          expect(xml.xpath('//bookData').length).to eq 0
+          expect(xml.xpath('//resource').length).to eq 1
+          expect(xml.xpath('//resource/file').length).to eq 1
+          expect(xml.xpath('//resource/file/checksum').length).to eq 2
+          expect(xml.xpath('//resource/file/checksum')[0].text).to eq('b965b5787e0100ec2d43733144120feab327e88c')
+          expect(xml.xpath('//resource/file/checksum')[1].text).to eq('4eb54050d374291ece622d45e84f014d')
+          expect(xml.xpath('//label').length).to eq 1
+          expect(xml.xpath('//label')[0].text).to match(/Image 1/)
+          expect(xml.xpath('//resource')[0].attributes['type'].value).to eq('image')
+          expect(xml.xpath('//resource/file')[0].attributes['size'].value).to eq('306')
+          expect(xml.xpath('//resource/file')[0].attributes['mimetype'].value).to eq('image/jp2')
+          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('yes')
+          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')
+        end
+      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 style=map' do
+      context 'when using a single tif and jp2' 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('//bookData').length).to eq 0
+          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
-  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 style=simple_book' do
+      context 'when using two tifs, two associated jp2s, one combined pdf and one special tif 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('//bookData')[0].attributes['readingOrder'].value).to eq('ltr')
+          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
+
+      context "when item has a 'druid:' prefix and specified book order. Using two tifs, two associated jp2s, two associated pdfs and one lingering PDF 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, reading_order: 'rtl')
+          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(xml.xpath('//bookData')[0].attributes['readingOrder'].value).to eq('rtl')
+          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
+
+      context 'throws an error with invalid reading order' do
+        subject(:result) { described_class.create_content_metadata(druid: "druid:#{TEST_DRUID}", bundle: :dpg, objects: [], style: :simple_book, flatten_folder_structure: true, reading_order: 'bogus') }
+
+        it 'generates valid content metadata with flattening folder structure' do
+          expect { result }.to raise_error(Dry::Struct::Error)
+        end
+      end
+
+      context 'when using two tifs' 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
     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 style=book_with_pdf' do
+      context 'when using two tiffs and a 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
+
+      context 'when using two tifs, two associated jp2s, two associated pdfs and one lingering 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
-    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 style=file' do
+      context 'when using two tifs and two associated jp2s' 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('//bookData').length).to eq 0
+          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
     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 style=book_as_image' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE),
+         Assembly::ObjectFile.new(TEST_TIF_INPUT_FILE2)]
+      end
+
+      let(:style) { :book_as_image }
 
-  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')
+      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('//bookData').length).to eq 1
+        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 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 style=document' do
+      let(:objects) do
+        [Assembly::ObjectFile.new(TEST_PDF_FILE)]
+      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('//bookData').length).to eq 0
+        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
-  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 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
-  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 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
-    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 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 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
+      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('//bookData').length).to eq 0
+        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
-    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 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
-    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 no objects are passed in' do
+      subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: style, objects: objects) }
 
-  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(:objects) { [] }
 
-  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')
+      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
-  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 an unknown style is passed in' do
+      subject(:result) { described_class.create_content_metadata(druid: TEST_DRUID, bundle: :prebundled, style: style, objects: objects) }
 
-  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(:objects) { [] }
+
+      let(:style) { :borked }
 
-  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')
-    }
+      it 'generates an error message' do
+        expect { result }.to raise_error 'Supplied style (borked) not valid'
+      end
+    end
   end
 end