iiif-presentation 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5d2ae4eba89da3249e90fd07899b0c959a2ad6d1
-  data.tar.gz: 2b9d3fb56e25a15c4d66f1d8b44488a873a3adba
+SHA256:
+  metadata.gz: 595091b364990a3c3c5119ad55629ad137b9f59ad2b59b5fd0ae763b12afc340
+  data.tar.gz: ad8be940ec5dd37006b619456d23eb0d410f201a36587a6045917739ba69c94f
 SHA512:
-  metadata.gz: 30779f16f6794adfac654ea104a49a5d4970a28248fde2b93fdc941e55f2da3bb050fd046ea2fdcde639886ce3cc3a0a71550be74acbce139cd8c123928944a4
-  data.tar.gz: 6c14f0bf0d3c3a5ea647372267634768f8a6ef9dde304c68a5ed0c598e22f937fcd4428d653cb73cd2871123f00f828cdeb56626d0a6bf8d37a786637df5cbdf
+  metadata.gz: 23600bbc87868cc9b7d0455228d0c7f8a1dca235a4e732b343e9dc0987f485f0dd4e59f64ae6434afec341ba8ae36add4ab48b91a0bc4d2be9e94596879b247e
+  data.tar.gz: ddd645e0cb9fd3464547826504b4078798e02cb06d766c6b9e10fb28d7b4999e0a643414f7ddb737bf91d2469e6693e7cbdbb556bd73d191d50063442c3dae18

data/.travis.yml

@@ -1,11 +1,11 @@
 language: ruby
 rvm:
-  - 2.1.0
-  - 2.3.0
+  - 2.7.0
+
+env:
+  - RAILS_VERSION='~> 5.2'
+  - RAILS_VERSION='~> 6.0'
+  - RAILS_VERSION='~> 6.0' FARADAY_VERSION='< 1.0'
 install:
   - "gem install bundler"
   - "bundle install --jobs=3 --retry=3"
-
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile

data/Gemfile

@@ -1,2 +1,10 @@
 source "https://rubygems.org"
 gemspec
+
+if ENV['RAILS_VERSION']
+  gem 'activesupport', ENV['RAILS_VERSION']
+end
+
+if ENV['FARADAY_VERSION']
+  gem 'faraday', ENV['FARADAY_VERSION']
+end

data/README.md

@@ -82,7 +82,7 @@ puts manifest.to_json(pretty: true, force: true) # force: true skips validations
 ## Parsing Existing Objects
 
 Use `IIIF::Service#parse`. It will figure out what the object
-should be, based on `@type`, and fall back to `ActiveSupport::OrderedHash` when
+should be, based on `@type`, and fall back to `Hash` when
 it can't e.g.:
 
 ```ruby
@@ -133,7 +133,7 @@ puts obj.class
 puts obj.see_also.class
 
 > IIIF::Presentation::Manifest
-> ActiveSupport::OrderedHash
+> Hash
 ```
 
 ## Validation and Exceptions

data/VERSION

@@ -1 +1 @@
-0.2.0
+1.0.0

data/iiif-presentation.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'multi_json'
-  spec.add_development_dependency 'vcr', '~> 2.9.3'
+  spec.add_development_dependency 'vcr', '~> 5'
 
   spec.add_dependency 'json'
   spec.add_dependency 'activesupport', '>= 3.2.18'

data/lib/iiif/presentation/abstract_resource.rb

@@ -46,8 +46,7 @@ module IIIF
       end
 
       # Initialize a Presentation node
-      # @param [Hash] hsh - Anything in this hash will be added to the Object.'
-      #   Order is only guaranteed if an ActiveSupport::OrderedHash is passed.
+      # @param [Hash] hsh - Anything in this hash will be added to the Object.
       # @param [boolean] include_context (default: false). Pass true if the'
       #   context should be included.
       def initialize(hsh={})

data/lib/iiif/presentation/image_resource.rb

@@ -103,7 +103,12 @@ module IIIF
         def get_info(svc_id)
           conn = Faraday.new("#{svc_id}/info.json") do |c|
             c.use Faraday::Response::RaiseError
-            c.use Faraday::Adapter::NetHttp
+
+            if c.respond_to? :adapter
+              c.adapter Faraday.default_adapter
+            else
+              c.use Faraday::Adapter::NetHttp
+            end
           end
           resp = conn.get # raises exceptions that indicate HTTP problems
           JSON.parse(resp.body)

data/lib/iiif/service.rb

@@ -206,17 +206,13 @@ module IIIF
 
       hsh.keys.each do |key|
         new_key = key.underscore == key ? key : key.underscore
-        if new_key == 'service'
-          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Service)
-        elsif new_key == 'resource'
-          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Presentation::Resource)
-        elsif hsh[key].kind_of?(Hash)
-          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key])
-        elsif hsh[key].kind_of?(Array)
+        if hsh[key].kind_of?(Array)
           new_object[new_key] = []
           hsh[key].each do |member|
             if new_key == 'service'
               new_object[new_key] << IIIF::Service.from_ordered_hash(member, IIIF::Service)
+            elsif new_key == 'resource'
+              new_object[new_key] << IIIF::Service.from_ordered_hash(hsh[key], IIIF::Presentation::Resource)
             elsif member.kind_of?(Hash)
               new_object[new_key] << IIIF::Service.from_ordered_hash(member)
             else
@@ -224,6 +220,12 @@ module IIIF
               # Again, no nested arrays, right?
             end
           end
+        elsif new_key == 'service'
+          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Service)
+        elsif new_key == 'resource'
+          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Presentation::Resource)
+        elsif hsh[key].kind_of?(Hash)
+          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key])
         else
           new_object[new_key] = hsh[key]
         end

data/spec/fixtures/vcr_cassettes/pul_loris_cassette.json

@@ -1,159 +1 @@
-{
-  "http_interactions": [
-    {
-      "request": {
-        "method": "get",
-        "uri": "http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2/info.json",
-        "body": {
-          "encoding": "US-ASCII",
-          "string": ""
-        },
-        "headers": {
-          "User-Agent": [
-            "Faraday v0.9.0"
-          ],
-          "Accept-Encoding": [
-            "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
-          ],
-          "Accept": [
-            "*/*"
-          ]
-        }
-      },
-      "response": {
-        "status": {
-          "code": 200,
-          "message": "OK"
-        },
-        "headers": {
-          "Server": [
-            "Apache/2.2.22 (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": [
-            "*"
-          ],
-          "Last-Modified": [
-            "Wed, 26 Nov 2014 21:16:14 GMT"
-          ],
-          "Cache-Control": [
-            "max-age=5184000"
-          ],
-          "Expires": [
-            "Sun, 25 Jan 2015 21:16:14 GMT"
-          ],
-          "Content-Type": [
-            "application/json"
-          ],
-          "Content-Length": [
-            "737"
-          ],
-          "Accept-Ranges": [
-            "bytes"
-          ],
-          "Date": [
-            "Thu, 27 Nov 2014 00:55:14 GMT"
-          ],
-          "X-Varnish": [
-            "1471998866 1471996229"
-          ],
-          "Age": [
-            "13140"
-          ],
-          "Via": [
-            "1.1 varnish"
-          ],
-          "Connection": [
-            "keep-alive"
-          ]
-        },
-        "body": {
-          "encoding": "UTF-8",
-          "string": "{\"profile\": [\"http://iiif.io/api/image/2/level2.json\", {\"supports\": [\"canonicalLinkHeader\", \"profileLinkHeader\", \"mirroring\", \"rotationArbitrary\", \"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\": \"http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2\"}"
-        },
-        "http_version": null
-      },
-      "recorded_at": "Thu, 27 Nov 2014 01:00:58 GMT"
-    },
-    {
-      "request": {
-        "method": "get",
-        "uri": "http://libimages.princeton.edu/loris2/xxxx%2F4612422%2F00000001.jp2/info.json",
-        "body": {
-          "encoding": "US-ASCII",
-          "string": ""
-        },
-        "headers": {
-          "User-Agent": [
-            "Faraday v0.9.0"
-          ],
-          "Accept-Encoding": [
-            "gzip;q=1.0,deflate;q=0.6,identity;q=0.3"
-          ],
-          "Accept": [
-            "*/*"
-          ]
-        }
-      },
-      "response": {
-        "status": {
-          "code": 404,
-          "message": "NOT FOUND"
-        },
-        "headers": {
-          "Server": [
-            "Apache/2.2.22 (Ubuntu)"
-          ],
-          "Link": [
-            "<http://iiif.io/api/image/2/level2.json>;rel=\"profile\""
-          ],
-          "Access-Control-Allow-Origin": [
-            "*"
-          ],
-          "Cache-Control": [
-            "max-age=5184000"
-          ],
-          "Expires": [
-            "Mon, 26 Jan 2015 10:20:46 GMT"
-          ],
-          "Vary": [
-            "Accept-Encoding"
-          ],
-          "Content-Type": [
-            "text/plain"
-          ],
-          "Content-Length": [
-            "88"
-          ],
-          "Accept-Ranges": [
-            "bytes"
-          ],
-          "Date": [
-            "Thu, 27 Nov 2014 10:20:46 GMT"
-          ],
-          "X-Varnish": [
-            "1472002765"
-          ],
-          "Age": [
-            "0"
-          ],
-          "Via": [
-            "1.1 varnish"
-          ],
-          "Connection": [
-            "keep-alive"
-          ]
-        },
-        "body": {
-          "encoding": "UTF-8",
-          "string": "Not Found: could not resolve identifier: xxxx%2F4612422%2F00000001.jp2  (404)"
-        },
-        "http_version": null
-      },
-      "recorded_at": "Thu, 27 Nov 2014 10:26:31 GMT"
-    }
-  ],
-  "recorded_with": "VCR 2.9.3"
-}
+{"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/integration/iiif/presentation/image_resource_spec.rb

@@ -7,7 +7,8 @@ describe IIIF::Presentation::ImageResource do
 
   describe 'self#create_image_api_image_resource', vcr: vcr_options do
 
-    let(:image_server) { 'http://libimages.princeton.edu/loris2' }
+    # 301 moved to https.../loris
+    let(:image_server) { 'https://libimages.princeton.edu/loris' }
 
     let(:valid_service_id) {
       id = 'pudl0001%2F4612422%2F00000001.jp2'
@@ -31,31 +32,31 @@ describe IIIF::Presentation::ImageResource do
         resource = described_class.create_image_api_image_resource(opts)
         # expect(resource['@context']).to eq 'http://iiif.io/api/presentation/2/context.json'
         # @context is only added when we call to_json...
-        expect(resource['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
+        expect(resource['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
         expect(resource['@type']).to eq 'dctypes:Image'
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
         expect(resource.service['@context']).to eq 'http://iiif.io/api/image/2/context.json'
-        expect(resource.service['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2'
+        expect(resource.service['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2'
         expect(resource.service['profile']).to eq 'http://iiif.io/api/image/2/level2.json'
       end
-      it 'copies over all teh infos (when copy_info is true)' do
+      it 'copies over all the info (when copy_info is true)' do
         opts = { service_id: valid_service_id, copy_info: true }
         resource = described_class.create_image_api_image_resource(opts)
-        expect(resource['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
+        expect(resource['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2/full/!200,200/0/default.jpg'
         expect(resource['@type']).to eq 'dctypes:Image'
         expect(resource.format).to eq "image/jpeg"
         expect(resource.width).to eq 3047
         expect(resource.height).to eq 7200
         expect(resource.service['@context']).to eq 'http://iiif.io/api/image/2/context.json'
-        expect(resource.service['@id']).to eq 'http://libimages.princeton.edu/loris2/pudl0001%2F4612422%2F00000001.jp2'
+        expect(resource.service['@id']).to eq 'https://libimages.princeton.edu/loris/pudl0001%2F4612422%2F00000001.jp2'
         expect(resource.service['profile']).to eq [
           'http://iiif.io/api/image/2/level2.json',
           {
             'supports' => [
               'canonicalLinkHeader', 'profileLinkHeader', 'mirroring',
-              'rotationArbitrary', 'sizeAboveFull'
+              'rotationArbitrary', 'regionSquare', 'sizeAboveFull'
             ],
             'qualities' => ['default', 'bitonal', 'gray', 'color'],
             'formats'=>['jpg', 'png', 'gif', 'webp']
@@ -78,7 +79,8 @@ describe IIIF::Presentation::ImageResource do
 
     describe 'respects the params we supply' do
       it ':resource_id' do
-        r_id = 'http://example.edu/images/some.jpg'
+        r_id = 'http://example.edu/images/some.jpg' 
+
         opts = { service_id: valid_service_id, resource_id: r_id}
         resource = described_class.create_image_api_image_resource(opts)
         expect(resource['@id']).to eq r_id

data/spec/integration/iiif/service_spec.rb

@@ -106,6 +106,13 @@ describe IIIF::Service do
       expect(parsed['service'].class).to be expected_klass
     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
+    end
+
     it 'round-trips' do
       fp = '/tmp/osullivan-spec.json'
       parsed = described_class.from_ordered_hash(fixture)

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ require 'vcr'
 
 VCR.configure do |c|
   c.cassette_library_dir = 'spec/fixtures/vcr_cassettes'
-  c.hook_into :webmock
+  c.hook_into :faraday
   c.configure_rspec_metadata!
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iiif-presentation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jon Stroop
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2020-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +165,6 @@ files:
 - README.md
 - Rakefile
 - VERSION
-- gemfiles/rails3.gemfile
-- gemfiles/rails4.gemfile
 - iiif-presentation.gemspec
 - lib/iiif/hash_behaviours.rb
 - lib/iiif/ordered_hash.rb
@@ -228,8 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: API for working with IIIF Presentation manifests.

data/gemfiles/rails3.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activesupport', '~> 3.2', '>= 3.2.18'

data/gemfiles/rails4.gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-gemspec :path=>"../"
-
-gem 'activesupport', '~> 4.1'