iiif_manifest 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5708ab4381068e5d90cbc1607d2e8dafceb391e
-  data.tar.gz: 6e064f9d5faa44116fdf986b09c05bf796f5267f
+  metadata.gz: 9bf49dd68d7cea2339444aafd8eb4f98ac3cdcd9
+  data.tar.gz: ddee2270d2cf0f5098c40ecee97fd696a59a36f1
 SHA512:
-  metadata.gz: b736502a559e0a94918587c3ca9d94e3584050ad619431795b19be30e038b79a62e2272d14abcfe144f7324f33ec841018dccffd80faa1546e6642b9dac97774
-  data.tar.gz: 4e6415c54ee2c842f98492259f1be5326947414d312b949f30c71b67a9893c2847c8dfd0003c0af310f3206543d457ace81a35f484245b211aacebdbdc6c06b9
+  metadata.gz: ef3820b328e75af3da30aee55bafd526ae0d6ae7c7533cc53bf0ae743d61d83cf027cca5048a70460a02eb39103c94c2e03e900be19ffe29b57e3cee3b61b4bc
+  data.tar.gz: 5c948e5dc59e0926ce983c9ba6445d4f7011f342eae3bd18cff854a5183687affb78e396e2498c54f8be240268b6774d415be69ec38fa77fe2526df8f2916908

data/.rubocop.yml

@@ -0,0 +1,15 @@
+require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  DisplayCopNames: true
+
+Metrics/LineLength:
+  Max: 120
+
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*.rb'
+
+RSpec/MultipleExpectations:
+  Enabled: false

data/.rubocop_todo.yml

@@ -0,0 +1,84 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-07-26 10:46:37 -0500 using RuboCop version 0.49.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 2
+Metrics/AbcSize:
+  Exclude:
+    - 'lib/iiif_manifest/manifest_builder/resource_builder.rb'
+    - 'lib/iiif_manifest/manifest_factory.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Exclude:
+    - 'iiif_manifest.gemspec'
+
+# Offense count: 1
+# Configuration parameters: AssignmentOnly.
+RSpec/InstanceVariable:
+  Exclude:
+    - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
+
+# Offense count: 8
+RSpec/NamedSubject:
+  Exclude:
+    - 'spec/lib/iiif_manifest/display_image_spec.rb'
+    - 'spec/lib/iiif_manifest/iiif_endpoint_spec.rb'
+    - 'spec/lib/iiif_manifest/manifest_builder/resource_builder_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: IgnoreSymbolicNames.
+RSpec/VerifiedDoubles:
+  Exclude:
+    - 'spec/lib/iiif_manifest/display_image_spec.rb'
+
+RSpec/ExampleLength:
+  Exclude:
+    - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
+
+# Offense count: 20
+Style/Documentation:
+  Exclude:
+    - 'lib/iiif_manifest/display_image.rb'
+    - 'lib/iiif_manifest/iiif_collection.rb'
+    - 'lib/iiif_manifest/iiif_endpoint.rb'
+    - 'lib/iiif_manifest/manifest_builder/canvas_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/canvas_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb'
+    - 'lib/iiif_manifest/manifest_builder/child_manifest_builder_factory.rb'
+    - 'lib/iiif_manifest/manifest_builder/composite_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/composite_builder_factory.rb'
+    - 'lib/iiif_manifest/manifest_builder/deep_canvas_builder_factory.rb'
+    - 'lib/iiif_manifest/manifest_builder/image_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/image_service_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/record_property_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/resource_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/sequence_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder/structure_builder.rb'
+    - 'lib/iiif_manifest/manifest_builder.rb'
+    - 'lib/iiif_manifest/manifest_factory.rb'
+    - 'lib/iiif_manifest/manifest_service_locator.rb'
+    - 'lib/iiif_manifest.rb'
+    - 'spec/lib/iiif_manifest/manifest_factory_spec.rb'
+
+# Offense count: 1
+Style/MethodMissing:
+  Exclude:
+    - 'lib/iiif_manifest/manifest_builder/composite_builder.rb'
+
+Metrics/ClassLength:
+  Exclude:
+    - 'lib/iiif_manifest/manifest_service_locator.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize, SupportedStyles.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets

data/README.md

@@ -5,11 +5,23 @@ IIIF http://iiif.io/ defines an API for presenting related images in a viewer. T
 
 ## Usage
 
-You application must have an object that implements `#file_set_presenters` and `#work_presenters`.  The former method should return as set of leaf nodes and the later any interstitial nodes. If none are found an empty array should be returned. Additionally it should implement `#manifest_url` that shows where the manifest can be found. Finally, it must have a `#description` method that returns a string.
+Your application ***must*** have an object that implements `#file_set_presenters` and `#work_presenters`.  The former method should return as set of leaf nodes and the later any interstitial nodes. If none are found an empty array should be returned. 
+
+Additionally, it ***must*** have a `#description` method that returns a string.
+
+Additionally it ***should*** implement `#manifest_url` that shows where the manifest can be found. 
+
+Additionally it ***should*** implement `#manifest_metadata` to provide an array containing hashes of metadata Label/Value pairs. 
+
+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`.
 
 For example:
 
-```ruby
+ ```ruby
   class Book
     def initialize(id, pages = [])
       @id = id
@@ -31,6 +43,40 @@ For example:
     def description
       'a brief description'
     end
+    
+    def manifest_metadata
+          [
+            { "label" => "Title", "value" => "Title of the Item" },
+            { "label" => "Creator", "value" => "Morrissey, Stephen Patrick" }
+          ]
+    end
+
+    def sequence_rendering
+      [{"@id" => "http://test.host/file_set/id/download", "format" => "application/pdf", "label" => "Download"}]
+    end
+
+    def ranges
+      [
+        ManifestRange.new(
+          label: "Table of Contents",
+          ranges: [
+            ManifestRange.new(
+              label: "Chapter 1",
+              file_set_presenters: @pages
+            )
+          ]
+        )
+      ]
+    end
+  end
+
+  class ManifestRange
+    attr_reader :label, :ranges, :file_set_presenters
+    def initialize(label:, ranges: [], file_set_presenters: [])
+      @label = label
+      @ranges = ranges
+      @file_set_presenters = file_set_presenters
+    end
   end
 ```
 

data/Rakefile

@@ -1,6 +1,15 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+require 'rubocop/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+desc 'Run style checker'
+RuboCop::RakeTask.new(:rubocop) do |task|
+  task.fail_on_error = true
+end
+
+desc 'Run all checks'
+task ci: [:rubocop, :spec]
+
+task default: :ci

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "iiif_manifest"
+require 'bundler/setup'
+require 'iiif_manifest'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "iiif_manifest"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/iiif_manifest.gemspec

@@ -1,27 +1,29 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'iiif_manifest/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "iiif_manifest"
+  spec.name          = 'iiif_manifest'
   spec.version       = IIIFManifest::VERSION
-  spec.authors       = ["Justin Coyne", "Trey Pendragon"]
-  spec.email         = ["jcoyne@justincoyne.com"]
+  spec.authors       = ['Justin Coyne', 'Trey Pendragon']
+  spec.email         = ['jcoyne@justincoyne.com']
 
-  spec.summary       = %q{Generate IIIF presentation manifests for Hydra::Works}
-  spec.description   = %q{IIIF http://iiif.io/ defines an API for presenting related images in a viewer. This transforms Hydra::Works objects into that format usable by players such as http://universalviewer.io/}
-  spec.homepage      = "http://github.com/projecthydra-labs/iiif_manifest"
+  spec.summary       = 'Generate IIIF presentation manifests for Hydra::Works'
+  spec.description   = 'IIIF http://iiif.io/ defines an API for presenting related images in a viewer. This transforms Hydra::Works objects into that format usable by players such as http://universalviewer.io/'
+  spec.homepage      = 'http://github.com/projecthydra-labs/iiif_manifest'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "activesupport", ">= 4"
-  spec.add_dependency "iiif-presentation", '~> 0.2.0'
-  
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_dependency 'activesupport', '>= 4'
+  spec.add_dependency 'iiif-presentation', '~> 0.2.0'
+
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'pry-byebug'
 end

data/lib/iiif_manifest/iiif_collection.rb

@@ -1,5 +1,6 @@
 class IIIFCollection < SimpleDelegator
   def viewing_hint
+    return super if __getobj__.respond_to?(:viewing_hint)
     'multi-part'
   end
 end

data/lib/iiif_manifest/iiif_endpoint.rb

@@ -7,7 +7,7 @@ module IIIFManifest
     end
 
     def context
-      "http://iiif.io/api/image/2/context.json"
+      'http://iiif.io/api/image/2/context.json'
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/canvas_builder.rb

@@ -1,17 +1,19 @@
 module IIIFManifest
   class ManifestBuilder
     class CanvasBuilder
-      attr_reader :record, :parent
+      attr_reader :record, :parent, :iiif_canvas_factory, :image_builder
 
-      def initialize(record, parent)
+      def initialize(record, parent, iiif_canvas_factory:, image_builder:)
         @record = record
         @parent = parent
+        @iiif_canvas_factory = iiif_canvas_factory
+        @image_builder = image_builder
         apply_record_properties
         attach_image if display_image
       end
 
       def canvas
-        @canvas ||= IIIF::Presentation::Canvas.new
+        @canvas ||= iiif_canvas_factory.new
       end
 
       def path
@@ -26,18 +28,18 @@ module IIIFManifest
 
       private
 
-        def display_image
-          record.display_image if record.respond_to?(:display_image)
-        end
+      def display_image
+        record.display_image if record.respond_to?(:display_image)
+      end
 
-        def apply_record_properties
-          canvas['@id'] = path
-          canvas.label = record.to_s
-        end
+      def apply_record_properties
+        canvas['@id'] = path
+        canvas.label = record.to_s
+      end
 
-        def attach_image
-          ImageBuilder.new(display_image).apply(canvas)
-        end
+      def attach_image
+        image_builder.new(display_image).apply(canvas)
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb

@@ -17,9 +17,9 @@ module IIIFManifest
 
       private
 
-        def file_set_presenters(work)
-          work.file_set_presenters
-        end
+      def file_set_presenters(work)
+        work.file_set_presenters
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/deep_canvas_builder_factory.rb

@@ -26,13 +26,13 @@ module IIIFManifest
 
       private
 
-        def file_set_presenters
-          work.try(:file_set_presenters) || []
-        end
+      def file_set_presenters
+        work.try(:file_set_presenters) || []
+      end
 
-        def work_presenters
-          work.try(:work_presenters) || []
-        end
+      def work_presenters
+        work.try(:work_presenters) || []
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/image_builder.rb

@@ -1,9 +1,11 @@
 module IIIFManifest
   class ManifestBuilder
     class ImageBuilder
-      attr_reader :display_image
-      def initialize(display_image)
+      attr_reader :display_image, :iiif_annotation_factory, :resource_builder_factory
+      def initialize(display_image, iiif_annotation_factory:, resource_builder_factory:)
         @display_image = display_image
+        @iiif_annotation_factory = iiif_annotation_factory
+        @resource_builder_factory = resource_builder_factory
         build_resource
       end
 
@@ -11,22 +13,22 @@ module IIIFManifest
         annotation['on'] = canvas['@id']
         canvas['width'] = annotation.resource['width']
         canvas['height'] = annotation.resource['height']
-        canvas.images << annotation
+        canvas.images += [annotation]
       end
 
       private
 
-        def build_resource
-          resource_builder.apply(annotation)
-        end
+      def build_resource
+        resource_builder.apply(annotation)
+      end
 
-        def resource_builder
-          ResourceBuilder.new(display_image)
-        end
+      def resource_builder
+        resource_builder_factory.new(display_image)
+      end
 
-        def annotation
-          @annotation ||= IIIF::Presentation::Annotation.new
-        end
+      def annotation
+        @annotation ||= iiif_annotation_factory.new
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/image_service_builder.rb

@@ -1,9 +1,10 @@
 module IIIFManifest
   class ManifestBuilder
     class ImageServiceBuilder
-      attr_reader :iiif_endpoint
-      def initialize(iiif_endpoint)
+      attr_reader :iiif_endpoint, :iiif_service_factory
+      def initialize(iiif_endpoint, iiif_service_factory:)
         @iiif_endpoint = iiif_endpoint
+        @iiif_service_factory = iiif_service_factory
       end
 
       def apply(resource)
@@ -15,9 +16,9 @@ module IIIFManifest
 
       private
 
-        def service
-          @service ||= IIIF::Service.new
-        end
+      def service
+        @service ||= iiif_service_factory.new
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/record_property_builder.rb

@@ -10,24 +10,41 @@ module IIIFManifest
         manifest['@id'] = record.manifest_url.to_s
         manifest.label = record.to_s
         manifest.description = record.description
-        manifest.viewing_hint = viewing_hint
+        manifest.viewing_hint = viewing_hint if viewing_hint.present?
+        manifest.metadata = record.manifest_metadata if valid_metadata?
         manifest
-        # manifest.try(:viewing_direction=, viewing_direction)
       end
 
       private
 
-        def viewing_hint
-          (record.respond_to?(:viewing_hint) && record.send(:viewing_hint)) || 'individuals'
-        end
+      def viewing_hint
+        (record.respond_to?(:viewing_hint) && record.send(:viewing_hint))
+      end
+
+      # Validate manifest_metadata against the IIIF spec format for metadata
+      #
+      # @return [Boolean]
+      def valid_metadata?
+        return false unless record.respond_to?(:manifest_metadata)
+        metadata = record.manifest_metadata
+        valid_metadata_structure?(metadata) && valid_metadata_content?(metadata)
+      end
 
-      # def viewing_direction
-      #   record.try(:viewing_direction) || "left-to-right"
-      # end
+      # Manifest metadata must be an array containing hashes
       #
-      # def viewing_hint
-      #   record.viewing_hint || "individuals"
-      # end
+      # @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
+      # @return [Boolean]
+      def valid_metadata_structure?(metadata)
+        metadata.is_a?(Array) && metadata.all? { |v| v.is_a?(Hash) }
+      end
+
+      # Manifest Metadata Hashes must contain 'label' and 'value' keys
+      #
+      # @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
+      # @return [Boolean]
+      def valid_metadata_content?(metadata)
+        metadata.all? { |v| v['label'].present? && v['value'].present? }
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/resource_builder.rb

@@ -1,9 +1,11 @@
 module IIIFManifest
   class ManifestBuilder
     class ResourceBuilder
-      attr_reader :display_image
-      def initialize(display_image)
+      attr_reader :display_image, :iiif_resource_factory, :image_service_builder_factory
+      def initialize(display_image, iiif_resource_factory:, image_service_builder_factory:)
         @display_image = display_image
+        @iiif_resource_factory = iiif_resource_factory
+        @image_service_builder_factory = image_service_builder_factory
       end
 
       def apply(annotation)
@@ -18,17 +20,17 @@ module IIIFManifest
 
       private
 
-        def resource
-          @resource ||= IIIF::Presentation::Resource.new
-        end
+      def resource
+        @resource ||= iiif_resource_factory.new
+      end
 
-        def iiif_endpoint
-          display_image.try(:iiif_endpoint)
-        end
+      def iiif_endpoint
+        display_image.try(:iiif_endpoint)
+      end
 
-        def image_service_builder
-          ImageServiceBuilder.new(iiif_endpoint)
-        end
+      def image_service_builder
+        image_service_builder_factory.new(iiif_endpoint)
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/sequence_builder.rb

@@ -1,10 +1,11 @@
 module IIIFManifest
   class ManifestBuilder
     class SequenceBuilder
-      attr_reader :work, :canvas_builder_factory
-      def initialize(work, canvas_builder_factory:)
+      attr_reader :work, :canvas_builder_factory, :sequence_factory
+      def initialize(work, canvas_builder_factory:, sequence_factory:)
         @work = work
         @canvas_builder_factory = canvas_builder_factory
+        @sequence_factory = sequence_factory
       end
 
       def apply(manifest)
@@ -19,19 +20,28 @@ module IIIFManifest
 
       private
 
-        def canvas_builder
-          canvas_builder_factory.from(work)
-        end
+      def canvas_builder
+        canvas_builder_factory.from(work)
+      end
 
-        def sequence
-          @sequence ||=
-            begin
-              sequence = IIIF::Presentation::Sequence.new
-              sequence["@id"] ||= work.manifest_url + "/sequence/normal"
-              canvas_builder.apply(sequence)
-              sequence
-            end
+      def sequence
+        @sequence ||=
+          begin
+            sequence = sequence_factory.new
+            sequence['@id'] ||= work.manifest_url + '/sequence/normal'
+            sequence['rendering'] ||= populate_sequence_rendering
+            canvas_builder.apply(sequence)
+            sequence
+          end
+      end
+
+      def populate_sequence_rendering
+        if work.respond_to?(:sequence_rendering)
+          work.sequence_rendering.each(&:to_h)
+        else
+          []
         end
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/structure_builder.rb

@@ -0,0 +1,94 @@
+module IIIFManifest
+  class ManifestBuilder
+    class StructureBuilder
+      attr_reader :record, :canvas_builder_factory, :iiif_range_factory
+      def initialize(record, canvas_builder_factory:, iiif_range_factory:)
+        @record = record
+        @canvas_builder_factory = canvas_builder_factory
+        @iiif_range_factory = iiif_range_factory
+      end
+
+      def apply(manifest)
+        top_ranges.each do |top_range|
+          manifest['structures'] ||= []
+          manifest['structures'] = range_builder(top_range).apply(manifest['structures'])
+        end
+        manifest
+      end
+
+      def range_builder(top_range)
+        RangeBuilder.new(
+          top_range,
+          record, true,
+          canvas_builder_factory: canvas_builder_factory,
+          iiif_range_factory: iiif_range_factory
+        )
+      end
+
+      def top_ranges
+        record.try(:ranges) || []
+      end
+    end
+    class RangeBuilder
+      attr_reader :record, :parent, :canvas_builder_factory, :iiif_range_factory
+      delegate :file_set_presenters, to: :record
+      def initialize(record, parent, top = false, canvas_builder_factory:, iiif_range_factory:)
+        @record = record
+        @parent = parent
+        @top = top
+        @canvas_builder_factory = canvas_builder_factory
+        @iiif_range_factory = iiif_range_factory
+        build_range
+      end
+
+      def path
+        "#{parent.manifest_url}/range/r#{index}"
+      end
+
+      def index
+        @index ||= SecureRandom.uuid
+      end
+
+      def apply(manifest)
+        manifest << range
+        sub_ranges.map do |sub_range|
+          manifest = sub_range.apply(manifest)
+        end
+        manifest
+      end
+
+      def build_range
+        range['@id'] = path
+        range['label'] = record.label
+        range['viewingHint'] = 'top' if top?
+        range['ranges'] = sub_ranges.map(&:path)
+        range['canvases'] = canvas_builders.map(&:path)
+      end
+
+      def sub_ranges
+        @sub_ranges ||= record.ranges.map do |sub_range|
+          RangeBuilder.new(
+            sub_range,
+            parent,
+            canvas_builder_factory: canvas_builder_factory,
+            iiif_range_factory: iiif_range_factory
+          )
+        end
+      end
+
+      def canvas_builders
+        @canvas_builders ||= file_set_presenters.map do |file_set_presenter|
+          canvas_builder_factory.new(file_set_presenter, parent)
+        end
+      end
+
+      def range
+        @range ||= iiif_range_factory.new
+      end
+
+      def top?
+        @top
+      end
+    end
+  end
+end

data/lib/iiif_manifest/manifest_builder.rb

@@ -9,6 +9,7 @@ require_relative 'manifest_builder/image_service_builder'
 require_relative 'manifest_builder/record_property_builder'
 require_relative 'manifest_builder/resource_builder'
 require_relative 'manifest_builder/sequence_builder'
+require_relative 'manifest_builder/structure_builder'
 
 module IIIFManifest
   class ManifestBuilder
@@ -22,8 +23,8 @@ module IIIFManifest
     end
 
     def apply(collection)
-      collection["manifests"] ||= []
-      collection["manifests"] << to_h
+      collection['manifests'] ||= []
+      collection['manifests'] << to_h
       collection
     end
 
@@ -33,12 +34,12 @@ module IIIFManifest
 
     private
 
-      def manifest
-        @manifest ||= manifest_builder_class
-      end
+    def manifest
+      @manifest ||= manifest_builder_class
+    end
 
-      def top_record
-        top_record_factory.new
-      end
+    def top_record
+      top_record_factory.new
+    end
   end
 end

data/lib/iiif_manifest/manifest_service_locator.rb

@@ -39,6 +39,7 @@ module IIIFManifest
         composite_builder_factory.new(
           record_property_builder,
           sequence_builder,
+          structure_builder,
           composite_builder: composite_builder
         )
       end
@@ -82,20 +83,34 @@ module IIIFManifest
         ManifestBuilder::RecordPropertyBuilder
       end
 
+      def structure_builder
+        InjectedFactory.new(
+          ManifestBuilder::StructureBuilder,
+          canvas_builder_factory: canvas_builder,
+          iiif_range_factory: iiif_range_factory
+        )
+      end
+
       def sequence_builder
         InjectedFactory.new(
           ManifestBuilder::SequenceBuilder,
-          canvas_builder_factory: canvas_builder_factory
+          canvas_builder_factory: canvas_builder_factory,
+          sequence_factory: sequence_factory
         )
       end
 
       def sammelband_sequence_builder
         InjectedFactory.new(
           ManifestBuilder::SequenceBuilder,
-          canvas_builder_factory: deep_canvas_builder_factory
+          canvas_builder_factory: deep_canvas_builder_factory,
+          sequence_factory: sequence_factory
         )
       end
 
+      def sequence_factory
+        IIIF::Presentation::Sequence
+      end
+
       def canvas_builder_factory
         ManifestBuilder::CanvasBuilderFactory.new(
           composite_builder: composite_builder,
@@ -111,12 +126,59 @@ module IIIFManifest
       end
 
       def canvas_builder
-        ManifestBuilder::CanvasBuilder
+        InjectedFactory.new(
+          ManifestBuilder::CanvasBuilder,
+          iiif_canvas_factory: iiif_canvas_factory,
+          image_builder: image_builder
+        )
+      end
+
+      def image_builder
+        InjectedFactory.new(
+          ManifestBuilder::ImageBuilder,
+          iiif_annotation_factory: iiif_annotation_factory,
+          resource_builder_factory: resource_builder_factory
+        )
+      end
+
+      def resource_builder_factory
+        InjectedFactory.new(
+          ManifestBuilder::ResourceBuilder,
+          iiif_resource_factory: iiif_resource_factory,
+          image_service_builder_factory: image_service_builder_factory
+        )
+      end
+
+      def image_service_builder_factory
+        InjectedFactory.new(
+          ManifestBuilder::ImageServiceBuilder,
+          iiif_service_factory: iiif_service_factory
+        )
+      end
+
+      def iiif_service_factory
+        IIIF::Service
+      end
+
+      def iiif_resource_factory
+        IIIF::Presentation::Resource
+      end
+
+      def iiif_annotation_factory
+        IIIF::Presentation::Annotation
       end
 
       def iiif_manifest_factory
         IIIF::Presentation::Manifest
       end
+
+      def iiif_canvas_factory
+        IIIF::Presentation::Canvas
+      end
+
+      def iiif_range_factory
+        IIIF::Presentation::Range
+      end
     end
 
     class InjectedFactory

data/lib/iiif_manifest/version.rb

@@ -1,3 +1,3 @@
 module IIIFManifest
-  VERSION = "0.2.0"
+  VERSION = '0.3.0'.freeze
 end

data/lib/iiif_manifest.rb

@@ -1,4 +1,4 @@
-require "iiif_manifest/version"
+require 'iiif_manifest/version'
 require 'active_support'
 require 'active_support/core_ext/module'
 require 'active_support/core_ext/object'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iiif_manifest
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -81,6 +81,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: IIIF http://iiif.io/ defines an API for presenting related images in
   a viewer. This transforms Hydra::Works objects into that format usable by players
   such as http://universalviewer.io/
@@ -92,6 +134,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -117,6 +161,7 @@ files:
 - lib/iiif_manifest/manifest_builder/record_property_builder.rb
 - lib/iiif_manifest/manifest_builder/resource_builder.rb
 - lib/iiif_manifest/manifest_builder/sequence_builder.rb
+- lib/iiif_manifest/manifest_builder/structure_builder.rb
 - lib/iiif_manifest/manifest_factory.rb
 - lib/iiif_manifest/manifest_service_locator.rb
 - lib/iiif_manifest/version.rb
@@ -139,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Generate IIIF presentation manifests for Hydra::Works