iiif-presentation 1.1.0 → 1.3.0

data/lib/iiif/v3/presentation.rb

@@ -0,0 +1,37 @@
+require_relative 'abstract_resource'
+require_relative '../ordered_hash'
+
+# NOTE: image_resource must follow resource due to inheritance
+# NOTE: range must follow sequence due to inheritance
+%w{
+  annotation
+  annotation_collection
+  annotation_page
+  canvas
+  choice
+  collection
+  manifest
+  nav_place
+  resource
+  image_resource
+  sequence
+  range
+  service
+}.each do |f|
+  require File.join(File.dirname(__FILE__), 'presentation', f)
+end
+
+module IIIF
+  module V3
+    module Presentation
+      CONTEXT ||= [
+       'http://www.w3.org/ns/anno.jsonld',
+       'http://iiif.io/api/presentation/3/context.json'
+      ]
+
+      class MissingRequiredKeyError < StandardError; end
+      class ProhibitedKeyError < StandardError; end
+      class IllegalValueError < StandardError; end
+    end
+  end
+end

data/spec/fixtures/v3/manifests/complete_from_spec.json

@@ -0,0 +1,195 @@
+{
+  "@context": [
+    "http://iiif.io/api/presentation/3/context.json",
+    "http://www.w3.org/ns/anno.jsonld"
+  ],
+  "id": "http://www.example.org/iiif/book1/manifest",
+  "type": "Manifest",
+  "label": { "en": [ "Book 1" ] },
+  "metadata": [
+    {
+      "label": "Author",
+      "value": "Anne Author"
+    },
+    {
+      "label": "Published",
+      "value": [
+        {
+          "@value": "Paris, circa 1400",
+          "@language": "en"
+        },
+        {
+          "@value": "Paris, environ 14eme siecle",
+          "@language": "fr"
+        }
+      ]
+    }
+  ],
+  "description": "A longer description of this example book. It should give some real information.",
+  "rights": "http://www.example.org/license.html",
+  "attribution": "Provided by Example Organization",
+  "service": {
+    "@context": "http://example.org/ns/jsonld/context.json",
+    "id": "http://example.org/service/example",
+    "profile": "http://example.org/docs/example-service.html"
+  },
+  "seeAlso": {
+    "id": "http://www.example.org/library/catalog/book1.marc",
+    "format": "application/marc"
+  },
+  "within": "http://www.example.org/collections/books/",
+  "sequences": [
+    {
+      "id": "http://www.example.org/iiif/book1/sequence/normal",
+      "type": "Sequence",
+      "label": "Current Page Order",
+      "viewingDirection": "left-to-right",
+      "viewingHint": "paged",
+      "canvases": [
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p1",
+          "type": "Canvas",
+          "label": "p. 1",
+          "height": 1000,
+          "width": 750,
+          "content": [
+            {
+              "id": "http://www.example.org/iiif/book1/page/p1",
+              "type": "AnnotationPage",
+              "items": [
+                {
+                  "type": "Annotation",
+                  "motivation": "painting",
+                  "target": "http://www.example.org/iiif/book1/canvas/p1",
+                  "body": {
+                    "id": "http://www.example.org/iiif/book1/res/page1.jpg",
+                    "type": "Image",
+                    "format": "image/jpeg",
+                    "height": 2000,
+                    "width": 1500,
+                    "service": {
+                      "@context": "http://iiif.io/api/image/2/context.json",
+                      "id": "http://www.example.org/images/book1-page1",
+                      "profile": "http://iiif.io/api/image/2/level1.json"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "id": "http://www.example.org/iiif/book1/page/p666",
+              "type": "AnnotationPage"
+            }
+          ]
+        },
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p2",
+          "type": "Canvas",
+          "label": "p. 2",
+          "height": 1000,
+          "width": 750,
+          "content": [
+            {
+              "id": "http://www.example.org/iiif/book1/page/p1",
+              "type": "AnnotationPage",
+              "items": [
+                {
+                  "type": "Annotation",
+                  "motivation": "painting",
+                  "body": {
+                    "id": "http://www.example.org/images/book1-page2/full/1500,2000/0/default.jpg",
+                    "type": "Image",
+                    "format": "image/jpeg",
+                    "height": 2000,
+                    "width": 1500,
+                    "service": {
+                      "@context": "http://iiif.io/api/image/2/context.json",
+                      "id": "http://www.example.org/images/book1-page2",
+                      "profile": "http://iiif.io/api/image/2/level1.json",
+                      "height": 8000,
+                      "width": 6000,
+                      "tiles": [
+                        {
+                          "width": 512,
+                          "scaleFactors": [
+                            1,
+                            2,
+                            4,
+                            8,
+                            16
+                          ]
+                        }
+                      ]
+                    }
+                  },
+                  "target": "http://www.example.org/iiif/book1/canvas/p2"
+                }
+              ]
+            },
+            {
+              "id": "http://www.example.org/iiif/book1/list/p2",
+              "type": "AnnotationPage"
+            }
+          ]
+        },
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p3",
+          "type": "Canvas",
+          "label": "p. 3",
+          "height": 1000,
+          "width": 750,
+          "content": [
+            {
+              "id": "http://www.example.org/iiif/book1/page/p1",
+              "type": "AnnotationPage",
+              "items": [
+                {
+                  "type": "Annotation",
+                  "motivation": "painting",
+                  "target": "http://www.example.org/iiif/book1/canvas/p3",
+                  "body": {
+                    "id": "http://www.example.org/iiif/book1/res/page3.jpg",
+                    "type": "Image",
+                    "format": "image/jpeg",
+                    "height": 2000,
+                    "width": 1500,
+                    "service": {
+                      "@context": "http://iiif.io/api/image/2/context.json",
+                      "id": "http://www.example.org/images/book1-page3",
+                      "profile": "http://iiif.io/api/image/2/level1.json"
+                    }
+                  }
+                }
+              ]
+            },
+            {
+              "id": "http://www.example.org/iiif/book1/page/p333",
+              "type": "AnnotationPage"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "structures": [
+    {
+      "id": "http://www.example.org/iiif/book1/range/r1",
+      "type": "Range",
+      "label": "Introduction",
+      "members": [
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p1",
+          "type": "Canvas"
+        },
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p2",
+          "type": "Canvas"
+        },
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p3#xywh=0,0,750,300",
+          "type": "Canvas"
+        }
+      ]
+    }
+  ]
+}

data/spec/fixtures/v3/manifests/minimal.json

@@ -0,0 +1,49 @@
+{
+  "@context": [
+    "http://iiif.io/api/presentation/3/context.json",
+    "http://www.w3.org/ns/anno.jsonld"
+  ],
+  "type": "Manifest",
+  "id": "http://www.example.org/iiif/book1/manifest",
+  "label": "Book 1",
+  "sequences": [
+    {
+      "id": "http://www.example.org/iiif/book1/sequence/normal",
+      "label": "Current Page Order",
+      "canvases": [
+        {
+          "id": "http://www.example.org/iiif/book1/canvas/p1",
+          "type": "Canvas",
+          "label": "p. 1",
+          "height": 1000,
+          "width": 750,
+          "content": [
+            {
+              "id": "http://www.example.org/iiif/book1/page/p1",
+              "type": "AnnotationPage",
+              "items": [
+                {
+                  "type": "Annotation",
+                  "motivation": "painting",
+                  "target": "http://www.example.org/iiif/book1/canvas/p1",
+                  "body": {
+                    "id": "http://www.example.org/iiif/book1/res/page1.jpg",
+                    "type": "Image",
+                    "format": "image/jpeg",
+                    "height": 2000,
+                    "width": 1500,
+                    "service": {
+                      "@context": "http://iiif.io/api/image/2/context.json",
+                      "id": "http://www.example.org/images/book1-page1",
+                      "profile": "http://iiif.io/api/image/2/level1.json"
+                    }
+                  }
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/spec/fixtures/v3/manifests/service_only.json

@@ -0,0 +1,14 @@
+{
+  "@context": [
+    "http://iiif.io/api/presentation/3/context.json",
+    "http://www.w3.org/ns/anno.jsonld"
+  ],
+  "type": "Manifest",
+  "id": "http://www.example.org/iiif/book1/manifest",
+  "label": "Book 1",
+  "service": {
+    "@context": "http://example.org/ns/jsonld/context.json",
+    "id": "http://example.org/service/example",
+    "profile": "http://example.org/docs/example-service.html"
+  }
+}

data/spec/fixtures/vcr_cassettes/pul_loris_cassette.json

@@ -1 +1 @@
-{"http_interactions":[{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v1.0.1"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"date":["Wed, 17 Jun 2020 19:38:19 GMT"],"server":["Apache/2.4.18 (Ubuntu)"],"link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\",<http://iiif.io/api/image/2/context.json>;rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\""],"access-control-allow-origin":["*"],"access-control-allow-methods":["GET"],"access-control-allow-headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"last-modified":["Sat, 25 Jan 2020 18:37:32 GMT"],"content-length":["753"],"content-type":["application/json"]},"body":{"encoding":"UTF-8","string":"{\"profile\": [\"http://iiif.io/api/image/2/level2.json\", {\"supports\": [\"canonicalLinkHeader\", \"profileLinkHeader\", \"mirroring\", \"rotationArbitrary\", \"regionSquare\", \"sizeAboveFull\"], \"qualities\": [\"default\", \"bitonal\", \"gray\", \"color\"], \"formats\": [\"jpg\", \"png\", \"gif\", \"webp\"]}], \"tiles\": [{\"width\": 1024, \"scaleFactors\": [1, 2, 4, 8, 16, 32]}], \"protocol\": \"http://iiif.io/api/image\", \"sizes\": [{\"width\": 96, \"height\": 225}, {\"width\": 191, \"height\": 450}, {\"width\": 381, \"height\": 900}, {\"width\": 762, \"height\": 1800}, {\"width\": 1524, \"height\": 3600}, {\"width\": 3047, \"height\": 7200}], \"height\": 7200, \"width\": 3047, \"@context\": \"http://iiif.io/api/image/2/context.json\", \"@id\": \"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2\"}"},"http_version":null},"recorded_at":"Wed, 17 Jun 2020 19:38:19 GMT"},{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/xxxx%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v1.0.1"]}},"response":{"status":{"code":404,"message":"NOT FOUND"},"headers":{"date":["Wed, 17 Jun 2020 19:38:20 GMT"],"server":["Apache/2.4.18 (Ubuntu)"],"link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\""],"access-control-allow-origin":["*"],"access-control-allow-methods":["GET"],"access-control-allow-headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"content-length":["86"],"content-type":["text/plain"]},"body":{"encoding":"UTF-8","string":"Not Found: Source image not found for identifier: xxxx%2F4612422%2F00000001.jp2. (404)"},"http_version":null},"recorded_at":"Wed, 17 Jun 2020 19:38:20 GMT"}],"recorded_with":"VCR 5.1.0"}
+{"http_interactions":[{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v1.0.1"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"date":["Wed, 17 Jun 2020 19:38:19 GMT"],"server":["Apache/2.4.18 (Ubuntu)"],"link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\",<http://iiif.io/api/image/2/context.json>;rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\""],"access-control-allow-origin":["*"],"access-control-allow-methods":["GET"],"access-control-allow-headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"last-modified":["Sat, 25 Jan 2020 18:37:32 GMT"],"content-length":["753"],"content-type":["application/json"]},"body":{"encoding":"UTF-8","string":"{\"profile\": [\"http://iiif.io/api/image/2/level2.json\", {\"supports\": [\"canonicalLinkHeader\", \"profileLinkHeader\", \"mirroring\", \"rotationArbitrary\", \"regionSquare\", \"sizeAboveFull\"], \"qualities\": [\"default\", \"bitonal\", \"gray\", \"color\"], \"formats\": [\"jpg\", \"png\", \"gif\", \"webp\"]}], \"tiles\": [{\"width\": 1024, \"scaleFactors\": [1, 2, 4, 8, 16, 32]}], \"protocol\": \"http://iiif.io/api/image\", \"sizes\": [{\"width\": 96, \"height\": 225}, {\"width\": 191, \"height\": 450}, {\"width\": 381, \"height\": 900}, {\"width\": 762, \"height\": 1800}, {\"width\": 1524, \"height\": 3600}, {\"width\": 3047, \"height\": 7200}], \"height\": 7200, \"width\": 3047, \"@context\": \"http://iiif.io/api/image/2/context.json\", \"@id\": \"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2\"}"},"http_version":null},"recorded_at":"Wed, 17 Jun 2020 19:38:19 GMT"},{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/xxxx%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v1.0.1"]}},"response":{"status":{"code":404,"message":"NOT FOUND"},"headers":{"date":["Wed, 17 Jun 2020 19:38:20 GMT"],"server":["Apache/2.4.18 (Ubuntu)"],"link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\""],"access-control-allow-origin":["*"],"access-control-allow-methods":["GET"],"access-control-allow-headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"content-length":["86"],"content-type":["text/plain"]},"body":{"encoding":"UTF-8","string":"Not Found: Source image not found for identifier: xxxx%2F4612422%2F00000001.jp2. (404)"},"http_version":null},"recorded_at":"Wed, 17 Jun 2020 19:38:20 GMT"}],"recorded_with":"VCR 5.1.0"}

data/spec/fixtures/vcr_cassettes/pul_loris_cassette_v3.json

@@ -0,0 +1 @@
+{"http_interactions":[{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v0.12.1"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],"Accept":["*/*"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Date":["Tue, 27 Jun 2017 22:33:33 GMT"],"Server":["Apache/2.4.18 (Ubuntu)"],"Link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\",<http://iiif.io/api/image/2/context.json>;rel=\"http://www.w3.org/ns/json-ld#context\";type=\"application/ld+json\""],"Access-Control-Allow-Origin":["*"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"Last-Modified":["Tue, 11 Apr 2017 07:03:53 GMT"],"Content-Length":["753"],"Content-Type":["application/json"]},"body":{"encoding":"UTF-8","string":"{\"profile\": [\"http://iiif.io/api/image/2/level2.json\", {\"supports\": [\"canonicalLinkHeader\", \"profileLinkHeader\", \"mirroring\", \"rotationArbitrary\", \"regionSquare\", \"sizeAboveFull\"], \"qualities\": [\"default\", \"bitonal\", \"gray\", \"color\"], \"formats\": [\"jpg\", \"png\", \"gif\", \"webp\"]}], \"tiles\": [{\"width\": 1024, \"scaleFactors\": [1, 2, 4, 8, 16, 32]}], \"protocol\": \"http://iiif.io/api/image\", \"sizes\": [{\"width\": 96, \"height\": 225}, {\"width\": 191, \"height\": 450}, {\"width\": 381, \"height\": 900}, {\"width\": 762, \"height\": 1800}, {\"width\": 1524, \"height\": 3600}, {\"width\": 3047, \"height\": 7200}], \"height\": 7200, \"width\": 3047, \"@context\": \"http://iiif.io/api/image/2/context.json\", \"@id\": \"https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2\"}"},"http_version":null},"recorded_at":"Tue, 27 Jun 2017 22:33:33 GMT"},{"request":{"method":"get","uri":"https://libimages.princeton.edu/loris/xxxx%2F4612422%2F00000001.jp2/info.json","body":{"encoding":"US-ASCII","string":""},"headers":{"User-Agent":["Faraday v0.12.1"],"Accept-Encoding":["gzip;q=1.0,deflate;q=0.6,identity;q=0.3"],"Accept":["*/*"]}},"response":{"status":{"code":404,"message":"NOT FOUND"},"headers":{"Date":["Tue, 27 Jun 2017 22:33:33 GMT"],"Server":["Apache/2.4.18 (Ubuntu)"],"Link":["<http://iiif.io/api/image/2/level2.json>;rel=\"profile\""],"Access-Control-Allow-Origin":["*"],"Access-Control-Allow-Methods":["GET"],"Access-Control-Allow-Headers":["X-Requested-With, Content-Type, Origin, Authorization, Accept, Client-Security-Token, Accept-Encoding"],"Content-Length":["86"],"Content-Type":["text/plain"]},"body":{"encoding":"UTF-8","string":"Not Found: Source image not found for identifier: xxxx%2F4612422%2F00000001.jp2. (404)"},"http_version":null},"recorded_at":"Tue, 27 Jun 2017 22:33:33 GMT"}],"recorded_with":"VCR 2.9.3"}

data/spec/integration/iiif/presentation/image_resource_spec.rb

@@ -7,7 +7,6 @@ describe IIIF::Presentation::ImageResource do
 
   describe 'self#create_image_api_image_resource', vcr: vcr_options do
 
-    # 301 moved to https.../loris
     let(:image_server) { 'https://libimages.princeton.edu/loris' }
 
     let(:valid_service_id) {

data/spec/integration/iiif/service_spec.rb

@@ -1,7 +1,4 @@
-require 'active_support/inflector'
-require 'json'
-
-describe IIIF::Service do
+RSpec.describe IIIF::Service do
 
   let(:fixtures_dir) { File.join(File.dirname(__FILE__), '../../fixtures') }
   let(:manifest_from_spec_path) { File.join(fixtures_dir, 'manifests/complete_from_spec.json') }
@@ -39,6 +36,7 @@ describe IIIF::Service do
   end
 
   describe 'self#from_ordered_hash' do
+    subject(:parsed) { described_class.from_ordered_hash(fixture) }
     let(:fixture) { JSON.parse('{
         "@context": "http://iiif.io/api/presentation/2/context.json",
         "@id": "http://example.com/manifest",
@@ -87,35 +85,28 @@ describe IIIF::Service do
       }')
     }
     it 'doesn\'t raise a NoMethodError when we check the keys' do
-      expect { described_class.from_ordered_hash(fixture) }.to_not raise_error
+      expect { parsed }.to_not raise_error
     end
+
     it 'turns the fixture into a Manifest instance' do
-      expected_klass = IIIF::Presentation::Manifest
-      parsed = described_class.from_ordered_hash(fixture)
-      expect(parsed.class).to be expected_klass
+      expect(parsed).to be_a IIIF::Presentation::Manifest
     end
+
     it 'turns keys without "@type" into an OrderedHash' do
-      expected_klass = IIIF::OrderedHash
-      parsed = described_class.from_ordered_hash(fixture)
-      expect(parsed['some_other_thing'].class).to be expected_klass
+      expect(parsed['some_other_thing']).to be_a IIIF::OrderedHash
     end
 
     it 'turns services into Services' do
-     expected_klass = IIIF::Service
-      parsed = described_class.from_ordered_hash(fixture)
-      expect(parsed['service'].class).to be expected_klass
+      expect(parsed['service']).to be_a IIIF::Presentation::Service
     end
 
     it 'works with arrays of services' do
-      expected_klass = IIIF::Service
       fixture['service'] = [fixture['service']]
-      parsed = described_class.from_ordered_hash(fixture)
-      expect(parsed['service'].first.class).to be expected_klass
+      expect(parsed['service'].first).to be_a IIIF::Presentation::Service
     end
 
     it 'round-trips' do
       fp = '/tmp/osullivan-spec.json'
-      parsed = described_class.from_ordered_hash(fixture)
       File.open(fp,'w') do |f|
         f.write(parsed.to_json)
       end
@@ -125,31 +116,25 @@ describe IIIF::Service do
       expect(parsed.to_ordered_hash.to_a - from_file.to_ordered_hash.to_a).to eq []
       expect(from_file.to_ordered_hash.to_a - parsed.to_ordered_hash.to_a).to eq []
     end
+
     it 'turns each memeber of "sequences" into an instance of Sequence' do
-      expected_klass = IIIF::Presentation::Sequence
-      parsed = described_class.from_ordered_hash(fixture)
-      parsed['sequences'].each do |s|
-        expect(s.class).to be expected_klass
-      end
+      expect(parsed['sequences']).to all be_a IIIF::Presentation::Sequence
     end
+
     it 'turns each member of sequences/canvaes in an instance of Canvas' do
-      expected_klass = IIIF::Presentation::Canvas
-      parsed = described_class.from_ordered_hash(fixture)
       parsed['sequences'].each do |s|
-        s.canvases.each do |c|
-          expect(c.class).to be expected_klass
-        end
+        expect(s.canvases).to all be_a IIIF::Presentation::Canvas
       end
     end
+
     it 'turns the keys into snakes' do
-      expect(described_class.from_ordered_hash(fixture).has_key?('seeAlso')).to be_falsey
-      expect(described_class.from_ordered_hash(fixture).has_key?('see_also')).to be_truthy
+      expect(parsed.has_key?('seeAlso')).to be false
+      expect(parsed.has_key?('see_also')).to be true
     end
+
     it 'copies over plain-old key-values' do
-      parsed = described_class.from_ordered_hash(fixture)
       expect(parsed['label']).to eq 'My Manifest'
     end
-
   end
 
   describe '#to_ordered_hash' do

data/spec/integration/iiif/v3/abstract_resource_spec.rb

@@ -0,0 +1,202 @@
+require 'active_support/inflector'
+require 'json'
+
+describe IIIF::V3::AbstractResource do
+
+  let(:fixtures_dir) { File.join(File.dirname(__FILE__), '../../../fixtures') }
+  let(:manifest_from_spec_path) { File.join(fixtures_dir, 'v3/manifests/complete_from_spec.json') }
+
+  describe 'self.parse' do
+    it 'works from a file' do
+      s = described_class.parse(manifest_from_spec_path)
+      expect(s['label']['en']).to include 'Book 1'
+    end
+    it 'works from a string of JSON' do
+      file = File.open(manifest_from_spec_path, 'rb')
+      json_string = file.read
+      file.close
+      s = described_class.parse(json_string)
+      expect(s['label']['en']).to include 'Book 1'
+    end
+    describe 'works from a hash' do
+      it 'plain old' do
+        h = JSON.parse(IO.read(manifest_from_spec_path))
+        s = described_class.parse(h)
+        expect(s['label']['en']).to include 'Book 1'
+      end
+      it 'IIIF::OrderedHash' do
+        h = JSON.parse(IO.read(manifest_from_spec_path))
+        oh = IIIF::OrderedHash[h]
+        s = described_class.parse(oh)
+        expect(s['label']['en']).to include 'Book 1'
+      end
+    end
+    it 'turns camels to snakes' do
+      s = described_class.parse(manifest_from_spec_path)
+      expect(s.keys.include?('see_also')).to be_truthy
+      expect(s.keys.include?('seeAlso')).to be_falsey
+    end
+  end
+
+  describe 'self#from_ordered_hash' do
+    let(:fixture) { JSON.parse('{
+        "@context": [
+          "http://iiif.io/api/presentation/3/context.json",
+          "http://www.w3.org/ns/anno.jsonld"
+        ],
+        "id": "http://example.com/manifest",
+        "type": "Manifest",
+        "label": "My Manifest",
+        "service": {
+          "@context": "http://iiif.io/api/image/2/context.json",
+          "@id":"http://www.example.org/images/book1-page1",
+          "id":"http://www.example.org/images/book1-page1",
+          "profile":"http://iiif.io/api/image/2/profiles/level2.json"
+        },
+        "some_other_thing": {
+          "foo" : "bar"
+        },
+        "seeAlso": {
+          "id": "http://www.example.org/library/catalog/book1.marc",
+          "format": "application/marc"
+        },
+        "items": [
+          {
+            "id": "http://example.com/canvas",
+            "type": "Canvas",
+            "width": 10,
+            "height": 20,
+            "label": "My Canvas",
+            "content": [
+              {
+                "id": "http://example.com/content",
+                "type": "AnnotationPage",
+                "motivation": "painting"
+              }
+            ]
+          }
+        ]
+      }')
+    }
+    it 'doesn\'t raise a NoMethodError when we check the keys' do
+      expect { described_class.from_ordered_hash(fixture) }.to_not raise_error
+    end
+    it 'turns the fixture into a Manifest instance' do
+      expected_klass = IIIF::V3::Presentation::Manifest
+      parsed = described_class.from_ordered_hash(fixture)
+      expect(parsed.class).to be expected_klass
+    end
+    it 'turns keys without "type" into an OrderedHash' do
+      expected_klass = IIIF::OrderedHash
+      parsed = described_class.from_ordered_hash(fixture)
+      expect(parsed['some_other_thing'].class).to be expected_klass
+    end
+
+    it 'turns services into Services' do
+      expected_klass = IIIF::V3::Presentation::Service
+      parsed = described_class.from_ordered_hash(fixture)
+      expect(parsed['service'].class).to be expected_klass
+    end
+
+    it 'round-trips' do
+      fp = '/tmp/osullivan-spec.json'
+      parsed = described_class.from_ordered_hash(fixture)
+      File.open(fp,'w') do |f|
+        f.write(parsed.to_json)
+      end
+      from_file = IIIF::V3::Presentation::Service.parse('/tmp/osullivan-spec.json')
+      File.delete(fp)
+      # is this sufficient?
+      expect(parsed.to_ordered_hash.to_a - from_file.to_ordered_hash.to_a).to eq []
+      expect(from_file.to_ordered_hash.to_a - parsed.to_ordered_hash.to_a).to eq []
+    end
+    it 'turns each member of "items" into an instance of Sequence' do
+      parsed = described_class.from_ordered_hash(fixture)
+      parsed['items'].each do |s|
+        expect(s.class).to be IIIF::V3::Presentation::Canvas
+      end
+    end
+    it 'turns each member of sequences/items into an instance of Canvas' do
+      parsed = described_class.from_ordered_hash(fixture)
+      parsed['items'].each do |s|
+        s.items.each do |c|
+          expect(c.class).to be IIIF::V3::Presentation::Canvas
+        end
+      end
+    end
+    it 'turns the keys into snakes' do
+      expect(described_class.from_ordered_hash(fixture).has_key?('seeAlso')).to be_falsey
+      expect(described_class.from_ordered_hash(fixture).has_key?('see_also')).to be_truthy
+    end
+    it 'copies over plain-old key-values' do
+      parsed = described_class.from_ordered_hash(fixture)
+      expect(parsed['label']).to eq 'My Manifest'
+    end
+  end
+
+  describe '#to_ordered_hash' do
+    let(:logo_uri) { 'http://www.example.org/logos/institution1.jpg' }
+    let(:within_uri) { 'http://www.example.org/collections/books/' }
+    let(:see_also) { 'http://www.example.org/library/catalog/book1.xml' }
+    # NOTE:  Using Service to test, as we can't initialize the abstract class
+    let(:instantiated_class) { IIIF::V3::Presentation::Service.new }
+
+    describe 'it puts the json-ld keys at the top' do
+      let(:extra_props) { [
+        ['label','foo'],
+        ['logo','http://example.com/logo.jpg'],
+        ['within','http://example.com/something']
+      ] }
+      let(:sorted_ld_keys) {
+        instantiated_class.keys.select { |k| k.start_with?('@') }.sort!
+      }
+      before(:each) {
+        extra_props.reverse.each do |k,v|
+          instantiated_class.unshift(k,v)
+        end
+      }
+
+      it 'by default' do
+        (0..extra_props.length-1).each do |i|
+          expect(instantiated_class.keys[i]).to eq(extra_props[i][0])
+        end
+        oh = instantiated_class.to_ordered_hash
+        (0..sorted_ld_keys.length-1).each do |i|
+          expect(oh.keys[i]).to eq(sorted_ld_keys[i])
+        end
+      end
+      it 'unless you say not to' do
+        (0..extra_props.length-1).each do |i|
+          expect(instantiated_class.keys[i]).to eq(extra_props[i][0])
+        end
+        oh = instantiated_class.to_ordered_hash(sort_json_ld_keys: false)
+        (0..extra_props.length-1).each do |i|
+          expect(oh.keys[i]).to eq(extra_props[i][0])
+        end
+      end
+    end
+
+    describe 'removes empty keys' do
+      it 'if they\'re arrays' do
+        instantiated_class['logo'] = logo_uri
+        instantiated_class['within'] = []
+        ordered_hash = instantiated_class.to_ordered_hash
+        expect(ordered_hash.has_key?('within')).to be_falsey
+      end
+      it 'if they\'re nil' do
+        instantiated_class['logo'] = logo_uri
+        instantiated_class['within'] = nil
+        ordered_hash = instantiated_class.to_ordered_hash
+        expect(ordered_hash.has_key?('within')).to be_falsey
+      end
+    end
+
+    it 'converts snake_case keys to camelCase' do
+      instantiated_class['see_also'] = logo_uri
+      instantiated_class['within'] = within_uri
+      ordered_hash = instantiated_class.to_ordered_hash
+      expect(ordered_hash.keys.include?('seeAlso')).to be_truthy
+    end
+  end
+
+end