iiif_manifest 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a5aee09b4751f68e8ee7a56e328a842fae63f439df914743ba04be4159b233
-  data.tar.gz: aba2e5b1ae194000b48fb0d31dca76a9ebc7e6a48da5bf295d6d44184804cf3d
+  metadata.gz: 21edd1255e73222b1c238869e8c2d47fb0d33bc22fd0e490e0b64e034de1a147
+  data.tar.gz: f969ee0b9bc4c9f1e2933d0cce4aeaec8cbcd532520cfa1b03e88a07f0f55d9e
 SHA512:
-  metadata.gz: e14265c4bd0f290d3a7c6c3c782ce420609d4212406c4121aece8199d71f537f2d9db96c4ec81cd9e6c6c4542e1e675812627ffb119018cb9093a65563ea32c7
-  data.tar.gz: 9b5cdc68f0141a3df37c80f86d5234084b0a480ccccc11b5e01cc7197dc0e1a5e3f775ee59c19d67c18ba7987632de66bad3cd95cf6cbdbf26d5bf0c86697159
+  metadata.gz: 9dba593b91faf18b8ba717e668cad98c1ca3384a97b989fa380e15ba20cced1c4e7d9d01d8698860d2a45fdaf3d7808cf93ba767853cac8af7acc2fbc8aef417
+  data.tar.gz: 1e9738fc181e851f23ab5bf37f797c9aa40c561a6201e9c6d56590a84d7b088641eef3d884fa59107a6e9f47d5570b22151a87f04c4747bc9b59558b249bc50f

data/.circleci/config.yml

@@ -34,6 +34,9 @@ workflows:
   version: 2
   ci:
     jobs:
+      - test:
+          name: "ruby3-3"
+          ruby_version: "3.3.0"
       - test:
           name: "ruby3-2"
           ruby_version: "3.2.0"
@@ -62,6 +65,9 @@ workflows:
               only:
                 - main
     jobs:
+      - test:
+          name: "ruby3-3"
+          ruby_version: "3.3.0"
       - test:
           name: "ruby3-2"
           ruby_version: "3.2.0"

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.byebug_history

data/README.md

@@ -32,6 +32,8 @@ Additionally it **_should_** implement `#manifest_metadata` to provide an array
 
 Additionally it **_may_** implement `#search_service` to contain the url for a IIIF search api compliant search endpoint and `#autocomplete_service` to contain the url for a IIIF search api compliant autocomplete endpoint. Please note, the autocomplete service is embedded within the search service description so if an autocomplete_service is supplied without a search_service it will be ignored. The IIIF `profile` added to the service descriptions is version 0 as this is the version supported by the current version of Universal Viewer. Only include a search_service within the manifest if your application has implemented a IIIF search service at the endpoint specified in the manifest.
 
+Additionally it **_may_** implement `#service` to contain an array of hashes for services other than `search_service` or `autocomplete_service`.  Each must contain "@id" (V2) or "id" (V3) and "@context" (V2) or "type" (V3) and may contain any other arbitrary properties.
+
 Additionally it **_may_** implement `#sequence_rendering` to contain an array of hashes for file downloads to be offered at sequences level. Each hash must contain "@id", "format" (mime type) and "label" (eg. `{ "@id" => "download url", "format" => "application/pdf", "label" => "user friendly label" }`).
 
 Finally, it **_may_** implement `ranges`, which returns an array of objects which represent a table of contents or similar structure, each of which responds to `label`, `ranges`, and `file_set_presenters`.
@@ -76,6 +78,16 @@ For example:
       "http://test.host/books/#{@id}/autocomplete"
     end
 
+    def service
+      [
+        {
+          "@context" => "http://iiif.io/api/annext/services/example/context.json",
+          "@id" => "https://example.org/service",
+          "profile" => "https://example.org/docs/service"
+        }
+      ]
+    end
+
     def sequence_rendering
       [{"@id" => "http://test.host/file_set/id/download", "format" => "application/pdf", "label" => "Download"}]
     end
@@ -107,7 +119,12 @@ For example:
 
 The class that represents the leaf nodes, must implement `#id`. It must also implement `#display_image` which returns an instance of `IIIFManifest::DisplayImage`
 
-Additionally it **_may_** implement `#sequence_rendering` to contain an array of hashes for file downloads to be offered at each leaf node. This follows a similar format as `#sequence_rendering` at sequences level.
+In Presentation 3.0, additionally it **_may_** implement;
+- `#item_metadata` to contain an array of hashes for metadata to be displayed at each leaf node. Items must contain "label" and "value" properties.
+- `#sequence_rendering` to contain an array of hashes for file downloads to be offered at each leaf node. This follows a similar format as `#sequence_rendering` at sequences level
+- `#see_also` to contain an array of hashes for related resources to be offered at each leaf node. Items must contain "id" and "type" properties. Items should contain "label", "format", and "profile" properties.
+- `#part_of` to contain an array of hashes for parent resources to be offered at each leaf node. Items must contain "id" and "type" properties. Items should contain "label".
+- `#placeholder_content` to contain an instance of `IIIFManifest::V3::DisplayContent` for [`placeholderCanvas`](https://iiif.io/api/presentation/3.0/#placeholdercanvas) at each leaf node
 
 ```ruby
   class Page
@@ -128,10 +145,28 @@ Additionally it **_may_** implement `#sequence_rendering` to contain an array of
                                      )
     end
 
+    # --------------------------------------- Presentation 3.0 (Alpha) ---------------------------------------
     def sequence_rendering
       [{"@id" => "http://test.host/display_image/id/download", "format" => "application/pdf", "label" => "Download"}]
     end
 
+    def see_also
+      [{"id" => "http://test.host/display_image/id/image.json", "type" => "dataset", "format" => "application/json", "label" => "Related Resource"}]
+    end
+
+    def part_of
+      [{"id" => "http://test.host/display_image/id/parent.json", "type" => "manifest"}]
+    end
+
+    def placeholder_content
+      IIIFManifest::V3::DisplayContent.new(id,
+                                           width: 100,
+                                           height: 100,
+                                           type: "Image",
+                                           format: "image/jpeg")
+    end
+    # --------------------------------------- Presentation 3.0 (Alpha) ---------------------------------------
+
     private
 
       def endpoint
@@ -148,9 +183,9 @@ Then you can produce the manifest on the book object like this:
   IIIFManifest::ManifestFactory.new(book).to_h.to_json
 ```
 
-## Presentation 3.0 (Alpha)
+## Presentation 3.0
 
-Provisional support for the [3.0 alpha version of the IIIF presentation api spec](https://iiif.io/api/presentation/3.0/) has been added with a focus on audiovisual content. The [change log](https://iiif.io/api/presentation/3.0/change-log/) lists the changes to the specification.
+Provisional support for the [3.0 version of the IIIF presentation api spec](https://iiif.io/api/presentation/3.0/) has been added with a focus on audiovisual content. The [change log](https://iiif.io/api/presentation/3.0/change-log/) lists the changes to the specification.
 
 The presentation 3.0 support has been contained to the `V3` namespace. Version 2.0 manifests are still being built using `IIIFManifest::ManifestFactory` while version 3.0 manifests can now be built using `IIIFManifest::V3::ManifestFactory`.
 
@@ -166,7 +201,13 @@ The presentation 3.0 support has been contained to the `V3` namespace. Version 2
 - Presenters **_may_** implement `#homepage` to contain a hash for linking back to a repository webpage for this manifest. The hash must contain "id", "format" (mime type), "type", and "label" (eg. `{ "id" => "repository url", "format" => "text/html", "type" => "Text", "label" => { "en": ["View in repository"] }`).
 - File set presenters may target a fragment of its content by providing `#media_fragment` which will be appended to its `id`.
 - Range objects may now implement `#items` instead of `#ranges` and `#file_set_presenters` to allow for interleaving these objects. `#items` is not required and existing range objects should continue to work.
-- File set presenters may provide `#display_content` which should return an instance of `IIIFManifest::V3::DisplayContent` (or an array of instances in the case of a user `Choice`). `#display_image` is no longer required but will still work if provided.
+- File set presenters may provide,
+  - `#display_content` which should return an instance of `IIIFManifest::V3::DisplayContent` (or an array of instances in the case of a user `Choice`)
+  - `#annotation_content` which should return an instance of `IIIFManifest::V3::AnnotationContent` (or an array of instances in the case of a canvas having multiple annotations)
+  - `#display_image` is no longer required but will still work if provided
+  - `#sequence_rendering` is supported at leaf node level, to present an array of file downloads available at each leaf node
+  - `#part_of` is supported at leaf node level, to present an array of parent resources available at each leaf node.
+  - `#placeholder_content` which returns an instance of `IIIFManifest::V3::DisplayContent` presents a [`placeholderCanvas`](https://iiif.io/api/presentation/3.0/#placeholdercanvas) at leaf node level
 - DisplayContent may provide `#auth_service` which should return a hash containing a IIIF Authentication service definition (<https://iiif.io/api/auth/1.0/>) that will be included on the content resource.
 
 ## Configuration

data/lib/iiif_manifest/manifest_builder/record_property_builder.rb

@@ -48,15 +48,24 @@ module IIIFManifest
         @iiif_autocomplete_service ||= iiif_autocomplete_service_factory.new
       end
 
+      def custom_services
+        record.respond_to?(:service) ? record.send(:service) : []
+      end
+
         # Build services. Currently supported:
         #   search_service, with (optional) embedded autocomplete service
         #
         # @return [Array] array of services
       def services
-        iiif_search_service.search_service = search_service
-        iiif_autocomplete_service.autocomplete_service = autocomplete_service
-        iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
-        [iiif_search_service]
+        services = []
+        if search_service.present?
+          iiif_search_service.search_service = search_service
+          iiif_autocomplete_service.autocomplete_service = autocomplete_service
+          iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
+          services << iiif_search_service
+        end
+        services += Array(custom_services)
+        services
       end
 
         # Validate manifest_metadata against the IIIF spec format for metadata

data/lib/iiif_manifest/v3/annotation_content.rb

@@ -0,0 +1,23 @@
+module IIIFManifest
+  module V3
+    class AnnotationContent
+      attr_reader :annotation_id, :body_id, :type, :motivation, :format, :language, :label, :value, :media_fragment
+
+      def initialize(type:, motivation:, **kwargs)
+        # If a user requires a specific ID at the annotation level, this attr overrides
+        # the automatic ID creation.
+        @annotation_id = kwargs[:annotation_id]
+        # Body level ids are only required for annotations delivering content,
+        # such as a transcript/caption file or an annotation containing an image.
+        @body_id = kwargs[:body_id]
+        @type = type
+        @motivation = motivation
+        @format = kwargs[:format]
+        @language = kwargs[:language]
+        @label = kwargs[:label]
+        @value = kwargs[:value]
+        @media_fragment = kwargs[:media_fragment]
+      end
+    end
+  end
+end

data/lib/iiif_manifest/v3/manifest_builder/annotation_content_builder.rb

@@ -0,0 +1,58 @@
+module IIIFManifest
+  module V3
+    class ManifestBuilder
+      class AnnotationContentBuilder
+        attr_reader :annotation_content, :iiif_annotation_factory, :body_builder_factory
+        def initialize(annotation_content, iiif_annotation_factory:, body_builder_factory:)
+          @annotation_content = annotation_content
+          @iiif_annotation_factory = iiif_annotation_factory
+          @body_builder_factory = body_builder_factory
+          build_annotation_resource
+        end
+
+        def apply(canvas)
+          # Assume first item in canvas annotations is an annotation page
+          canvas_id = canvas.annotations.first['id']
+          generic_annotation['id'] = annotation_id(canvas_id)
+          generic_annotation['target'] = target(canvas)
+          generic_annotation['motivation'] = motivation
+          generic_annotation
+        end
+
+        private
+
+        def build_annotation_resource
+          annotation_body_builder.apply(generic_annotation)
+        end
+
+        def annotation_body_builder
+          body_builder_factory.new(annotation_content)
+        end
+
+        def generic_annotation
+          @generic_annotation ||= iiif_annotation_factory.new
+        end
+
+        def annotation_id(canvas_id)
+          if annotation_content.try(:annotation_id).blank?
+            "#{canvas_id}/#{motivation.presence || 'annotation'}/#{generic_annotation.index}"
+          else
+            annotation_content.annotation_id
+          end
+        end
+
+        def motivation
+          annotation_content.motivation if annotation_content.try(:motivation).present?
+        end
+
+        def target(canvas)
+          if annotation_content.try(:media_fragment).present?
+            canvas['id'] + "##{annotation_content.media_fragment}"
+          else
+            canvas['id']
+          end
+        end
+      end
+    end
+  end
+end

data/lib/iiif_manifest/v3/manifest_builder/body_builder.rb

@@ -2,9 +2,9 @@ module IIIFManifest
   module V3
     class ManifestBuilder
       class BodyBuilder
-        attr_reader :display_content, :iiif_body_factory, :image_service_builder_factory
-        def initialize(display_content, iiif_body_factory:, image_service_builder_factory:)
-          @display_content = display_content
+        attr_reader :content, :iiif_body_factory, :image_service_builder_factory
+        def initialize(content, iiif_body_factory:, image_service_builder_factory:)
+          @content = content
           @iiif_body_factory = iiif_body_factory
           @image_service_builder_factory = image_service_builder_factory
         end
@@ -19,25 +19,40 @@ module IIIFManifest
         private
 
         def build_body
-          body['id'] = display_content.url
+          body['id'] = body_id
           body['type'] = body_type
-          body['height'] = display_content.height if display_content.try(:height).present?
-          body['width'] = display_content.width if display_content.try(:width).present?
-          body['duration'] = display_content.duration if display_content.try(:duration).present?
-          body['format'] = display_content.format if display_content.try(:format).present?
-          body['label'] = ManifestBuilder.language_map(display_content.label) if display_content.try(:label).present?
+          body_display_dimensions
+          body['format'] = content.format if content.try(:format).present?
+          body['label'] = ManifestBuilder.language_map(content.label) if content.try(:label).present?
+          body['language'] = content.language if content.try(:language).present?
+          body['value'] = content.value if content.try(:value).present?
         end
 
         def body
           @body ||= iiif_body_factory.new
         end
 
+        def body_id
+          return if content.try(:body_id).blank? && content.try(:url).blank?
+          if content.try(:body_id).present?
+            content.body_id
+          else
+            content.url
+          end
+        end
+
         def body_type
-          display_content.try(:type) || 'Image'
+          content.try(:type) || 'Image'
+        end
+
+        def body_display_dimensions
+          body['height'] = content.height if content.try(:height).present?
+          body['width'] = content.width if content.try(:width).present?
+          body['duration'] = content.duration if content.try(:duration).present?
         end
 
         def iiif_endpoint
-          display_content.try(:iiif_endpoint)
+          content.try(:iiif_endpoint)
         end
 
         def image_service_builder
@@ -45,7 +60,7 @@ module IIIFManifest
         end
 
         def auth_service
-          display_content.try(:auth_service)
+          content.try(:auth_service)
         end
 
         def apply_auth_service

data/lib/iiif_manifest/v3/manifest_builder/canvas_builder.rb

@@ -2,28 +2,35 @@ module IIIFManifest
   module V3
     class ManifestBuilder
       class CanvasBuilder
-        attr_reader :record, :parent, :iiif_canvas_factory, :content_builder,
-                    :choice_builder, :iiif_annotation_page_factory, :thumbnail_builder_factory
+        attr_reader :record, :parent, :iiif_canvas_factory, :content_builder, :choice_builder,
+                    :annotation_content_builder, :iiif_annotation_page_factory,
+                    :thumbnail_builder_factory, :placeholder_canvas_builder_factory
 
         def initialize(record,
                        parent,
                        iiif_canvas_factory:,
                        content_builder:,
                        choice_builder:,
+                       annotation_content_builder:,
                        iiif_annotation_page_factory:,
-                       thumbnail_builder_factory:)
+                       thumbnail_builder_factory:,
+                       placeholder_canvas_builder_factory:)
           @record = record
           @parent = parent
           @iiif_canvas_factory = iiif_canvas_factory
           @content_builder = content_builder
           @choice_builder = choice_builder
+          @annotation_content_builder = annotation_content_builder
           @iiif_annotation_page_factory = iiif_annotation_page_factory
           @thumbnail_builder_factory = thumbnail_builder_factory
+          @placeholder_canvas_builder_factory = placeholder_canvas_builder_factory
           apply_record_properties
           # Presentation 2.x approach
           attach_image if display_image
           # Presentation 3.0 approach
           attach_content if display_content
+          attach_annotation if annotation_content
+          attach_placeholder_canvas if placeholder_content
         end
 
         def canvas
@@ -44,22 +51,43 @@ module IIIFManifest
         private
 
         def display_image
-          record.display_image if record.respond_to?(:display_image)
+          @display_image ||= record.display_image if record.respond_to?(:display_image)
         end
 
         # @return [Array<Object>] if the record has a display content
         # @return [NilClass] if there is no display content
         def display_content
-          Array.wrap(record.display_content) if record.respond_to?(:display_content) && record.display_content.present?
+          @display_content ||= Array.wrap(record.display_content) if record.respond_to?(:display_content)
+          @display_content.presence
         end
 
+        # @return [Array<Object>] if the record has generic annotation content
+        # @return [NilClass] if there is no annotation content
+        def annotation_content
+          @annotation_content ||= Array.wrap(record.annotation_content) if record.respond_to?(:annotation_content)
+          @annotation_content.presence
+        end
+
+        def placeholder_content
+          @placeholder_content ||= record.placeholder_content if record.respond_to?(:placeholder_content)
+        end
+
+        # rubocop:disable Metrics/AbcSize
         def apply_record_properties
           canvas['id'] = path
-          canvas.label = ManifestBuilder.language_map(record.to_s) if record.to_s.present?
           annotation_page['id'] = "#{path}/annotation_page/#{annotation_page.index}"
           canvas.items = [annotation_page]
+          apply_canvas_attributes(canvas)
+          apply_annotation_content_to(canvas)
           apply_thumbnail_to(canvas)
-          canvas.rendering = populate_rendering if populate_rendering.present?
+        end
+        # rubocop:enable Metrics/AbcSize
+
+        def apply_annotation_content_to(canvas)
+          return if annotation_content.blank?
+
+          generic_annotation_page['id'] = "#{path}/annotation_page/#{generic_annotation_page.index}"
+          canvas.annotations = [generic_annotation_page]
         end
 
         def apply_thumbnail_to(canvas)
@@ -70,10 +98,26 @@ module IIIFManifest
           end
         end
 
+        # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+        def apply_canvas_attributes(canvas)
+          canvas.label = ManifestBuilder.language_map(record.to_s) if record.to_s.present?
+          canvas.rendering = populate(:rendering) if populate(:rendering).present?
+          canvas.see_also = populate(:see_also) if populate(:see_also).present?
+          canvas.part_of = populate(:part_of) if populate(:part_of).present?
+          canvas.metadata = metadata_from_record(record) if metadata_from_record(record).present?
+          canvas.summary = ManifestBuilder.language_map(record.description) if record.respond_to?(:description) &&
+                                                                               record.description.present?
+        end
+        # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
         def annotation_page
           @annotation_page ||= iiif_annotation_page_factory.new
         end
 
+        def generic_annotation_page
+          @generic_annotation_page ||= iiif_annotation_page_factory.new
+        end
+
         def attach_image
           content_builder.new(display_image).apply(canvas)
         end
@@ -86,15 +130,52 @@ module IIIFManifest
           end
         end
 
-        def populate_rendering
-          return unless record.respond_to?(:sequence_rendering)
-          record.sequence_rendering.collect do |rendering|
-            sequence_rendering = rendering.to_h.except('@id', 'label')
-            sequence_rendering['id'] = rendering['@id']
-            if rendering['label'].present?
-              sequence_rendering['label'] = ManifestBuilder.language_map(rendering['label'])
-            end
-            sequence_rendering
+        def attach_annotation
+          annotation_content.each do |an|
+            annotation = annotation_content_builder.new(an).apply(canvas)
+            generic_annotation_page.items += [annotation]
+          end
+        end
+
+        def attach_placeholder_canvas
+          canvas.placeholder_canvas = placeholder_canvas_builder_factory.new(placeholder_content, path).build
+        end
+
+        def populate(property)
+          property = :sequence_rendering if property == :rendering
+
+          return unless record.respond_to?(property) && record.send(property).present?
+          record.send(property).collect do |prop|
+            output = prop.to_h.except('@id', 'label')
+            output['id'] = prop['@id']
+            output['label'] = ManifestBuilder.language_map(prop['label']) if prop['label'].present?
+            output
+          end
+        end
+
+        def metadata_from_record(record)
+          return unless valid_v3_metadata?
+          record.item_metadata
+        end
+
+        # Validate item_metadata against the IIIF spec format for metadata
+        #
+        # @return [Boolean]
+        def valid_v3_metadata?
+          return false unless record.respond_to?(:item_metadata)
+          metadata = record.item_metadata
+          valid_v3_metadata_fields?(metadata)
+        end
+
+        # Item metadata must be an array containing hashes
+        #
+        # @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
+        # @return [Boolean]
+        def valid_v3_metadata_fields?(metadata)
+          metadata.is_a?(Array) && metadata.all? do |metadata_field|
+            metadata_field.is_a?(Hash) &&
+              ManifestBuilder.valid_language_map?(metadata_field['label']) &&
+              ManifestBuilder.valid_language_map?(metadata_field['value'])
           end
         end
       end

data/lib/iiif_manifest/v3/manifest_builder/iiif_service.rb

@@ -140,6 +140,44 @@ module IIIFManifest
           def rendering=(rendering)
             inner_hash['rendering'] = rendering
           end
+
+          def placeholder_canvas=(placeholder_canvas)
+            return unless placeholder_canvas.present?
+            inner_hash['placeholderCanvas'] = placeholder_canvas
+          end
+
+          def placeholderCanvas
+            inner_hash['placeholderCanvas']
+          end
+
+          def annotations
+            inner_hash['annotations']
+          end
+
+          def annotations=(annotations)
+            inner_hash['annotations'] = annotations
+          end
+
+          def see_also=(see_also)
+            inner_hash['seeAlso'] = see_also
+          end
+
+          def part_of=(part_of)
+            inner_hash['partOf'] = part_of
+          end
+
+          def metadata=(metadata)
+            inner_hash['metadata'] = metadata
+          end
+
+          def summary
+            inner_hash['summary']
+          end
+
+          def summary=(summary)
+            return unless summary.present?
+            inner_hash['summary'] = summary
+          end
         end
 
         class Range < IIIFService

data/lib/iiif_manifest/v3/manifest_builder/placeholdercanvas_builder.rb

@@ -0,0 +1,57 @@
+module IIIFManifest
+  module V3
+    class ManifestBuilder
+      class PlaceholderCanvasBuilder
+        attr_reader :placeholder_content, :canvas_path, :iiif_placeholder_canvas_factory, :iiif_annotation_page_factory,
+                    :content_builder
+        def initialize(placeholder_content,
+                       canvas_path,
+                       iiif_placeholder_canvas_factory:,
+                       iiif_annotation_page_factory:,
+                       content_builder:)
+          @placeholder_content = placeholder_content
+          @canvas_path = canvas_path
+          @iiif_placeholder_canvas_factory = iiif_placeholder_canvas_factory
+          @iiif_annotation_page_factory = iiif_annotation_page_factory
+          @content_builder = content_builder
+        end
+
+        def build
+          return nil if placeholder_content.nil?
+
+          build_placeholder_canvas
+          attach_content
+
+          placeholder_canvas
+        end
+
+        private
+
+        def path
+          "#{canvas_path}/placeholder"
+        end
+
+        def placeholder_canvas
+          @placeholder_canvas ||= iiif_placeholder_canvas_factory.new
+        end
+
+        def build_placeholder_canvas
+          placeholder_canvas['id'] = path
+          placeholder_canvas['width'] = placeholder_content.width if placeholder_content.width.present?
+          placeholder_canvas['height'] = placeholder_content.height if placeholder_content.height.present?
+          placeholder_canvas['duration'] = placeholder_content.duration if placeholder_content.duration.present?
+          annotation_page['id'] = "#{path}/annotation_page/#{annotation_page.index}"
+          placeholder_canvas.items = [annotation_page]
+        end
+
+        def attach_content
+          content_builder.new(placeholder_content).apply(placeholder_canvas)
+        end
+
+        def annotation_page
+          @annotation_page ||= iiif_annotation_page_factory.new
+        end
+      end
+    end
+  end
+end

data/lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb

@@ -53,7 +53,7 @@ module IIIFManifest
           manifest.behavior = viewing_hint if viewing_hint.present?
           manifest.metadata = metadata_from_record(record) if metadata_from_record(record).present?
           manifest.viewing_direction = viewing_direction if viewing_direction.present?
-          manifest.service = services if search_service.present?
+          manifest.service = services if services.present?
           manifest.rendering = populate_rendering if populate_rendering.present?
           homepage = ::IIIFManifest.config.manifest_value_for(record, property: :homepage)
           manifest.homepage = homepage if homepage.present?

data/lib/iiif_manifest/v3/manifest_builder/structure_builder.rb

@@ -32,7 +32,7 @@ module IIIFManifest
           range['id'] = path
           range['label'] = ManifestBuilder.language_map(record.label) if record.try(:label).present?
           range['behavior'] = 'top' if top?
-          range['items'] = canvas_builders.collect { |cb| { 'type' => 'Canvas', 'id' => cb.path } }
+          range['items'] = file_set_presenters.collect { |fs| { 'type' => 'Canvas', 'id' => build_canvas_id(fs) } }
         end
 
         def canvas_builders
@@ -69,8 +69,7 @@ module IIIFManifest
         end
 
         def canvas_range_item(range_item)
-          canvas_builder = canvas_builder_factory.new(range_item, parent)
-          { 'type' => 'Canvas', 'id' => canvas_builder.path }
+          { 'type' => 'Canvas', 'id' => build_canvas_id(range_item) }
         end
 
         def range_range_item(range_item)
@@ -81,6 +80,20 @@ module IIIFManifest
             iiif_range_factory: iiif_range_factory
           )
         end
+
+        private
+
+        def file_set_presenters
+          record.respond_to?(:file_set_presenters) ? record.file_set_presenters : []
+        end
+
+        def build_canvas_id(canvas_item)
+          path = "#{parent.manifest_url}/canvas/#{canvas_item.id}"
+          if canvas_item.respond_to?(:media_fragment) && canvas_item.media_fragment.present?
+            path << "##{canvas_item.media_fragment}"
+          end
+          path
+        end
       end
     end
   end

data/lib/iiif_manifest/v3/manifest_builder.rb

@@ -3,6 +3,8 @@ require_relative 'manifest_builder/canvas_builder'
 require_relative 'manifest_builder/record_property_builder'
 require_relative 'manifest_builder/choice_builder'
 require_relative 'manifest_builder/content_builder'
+require_relative 'manifest_builder/annotation_content_builder'
+require_relative 'manifest_builder/placeholdercanvas_builder'
 require_relative 'manifest_builder/body_builder'
 require_relative 'manifest_builder/structure_builder'
 require_relative 'manifest_builder/image_service_builder'

data/lib/iiif_manifest/v3/manifest_service_locator.rb

@@ -56,8 +56,19 @@ module IIIFManifest
             iiif_canvas_factory: iiif_canvas_factory,
             content_builder: content_builder,
             choice_builder: choice_builder,
+            annotation_content_builder: annotation_content_builder,
             iiif_annotation_page_factory: iiif_annotation_page_factory,
-            thumbnail_builder_factory: thumbnail_builder_factory
+            thumbnail_builder_factory: thumbnail_builder_factory,
+            placeholder_canvas_builder_factory: placeholder_canvas_builder_factory
+          )
+        end
+
+        def placeholder_canvas_builder_factory
+          IIIFManifest::ManifestServiceLocator::InjectedFactory.new(
+            ManifestBuilder::PlaceholderCanvasBuilder,
+            iiif_placeholder_canvas_factory: iiif_placeholder_canvas_factory,
+            iiif_annotation_page_factory: iiif_annotation_page_factory,
+            content_builder: content_builder
           )
         end
 
@@ -78,6 +89,14 @@ module IIIFManifest
           )
         end
 
+        def annotation_content_builder
+          IIIFManifest::ManifestServiceLocator::InjectedFactory.new(
+            ManifestBuilder::AnnotationContentBuilder,
+            iiif_annotation_factory: iiif_annotation_factory,
+            body_builder_factory: body_builder_factory
+          )
+        end
+
         def body_builder_factory
           IIIFManifest::ManifestServiceLocator::InjectedFactory.new(
             ManifestBuilder::BodyBuilder,
@@ -141,6 +160,10 @@ module IIIFManifest
           IIIFManifest::V3::ManifestBuilder::IIIFManifest::Canvas
         end
 
+        def iiif_placeholder_canvas_factory
+          IIIFManifest::V3::ManifestBuilder::IIIFManifest::Canvas
+        end
+
         def iiif_range_factory
           IIIFManifest::V3::ManifestBuilder::IIIFManifest::Range
         end

data/lib/iiif_manifest/v3.rb

@@ -9,5 +9,6 @@ module IIIFManifest
     autoload :ManifestFactory
     autoload :ManifestServiceLocator
     autoload :DisplayContent
+    autoload :AnnotationContent
   end
 end

data/lib/iiif_manifest/version.rb

@@ -1,3 +1,3 @@
 module IIIFManifest
-  VERSION = '1.3.1'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_manifest
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -159,14 +159,17 @@ files:
 - lib/iiif_manifest/manifest_factory.rb
 - lib/iiif_manifest/manifest_service_locator.rb
 - lib/iiif_manifest/v3.rb
+- lib/iiif_manifest/v3/annotation_content.rb
 - lib/iiif_manifest/v3/display_content.rb
 - lib/iiif_manifest/v3/manifest_builder.rb
+- lib/iiif_manifest/v3/manifest_builder/annotation_content_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/body_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/canvas_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/choice_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/content_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/iiif_service.rb
 - lib/iiif_manifest/v3/manifest_builder/image_service_builder.rb
+- lib/iiif_manifest/v3/manifest_builder/placeholdercanvas_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/record_property_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/structure_builder.rb
 - lib/iiif_manifest/v3/manifest_builder/thumbnail_builder.rb
@@ -192,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.6
 signing_key: 
 specification_version: 4
 summary: Generate IIIF presentation manifests for Hydra::Works