iiif-presentation 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f68d7e5cd133fa903625a262109591f8806016df292b205b9cda95f8cb4b5d0
-  data.tar.gz: 0fc72efe6625543c1c8462bbf0b810fe5882c5dbdee6156410654e9c29be6825
+  metadata.gz: 8e5872ac7de857fa05e0181916f712460413e5b08b09d0b99867cc14ae39e0e5
+  data.tar.gz: 213166e3e00800955380ed432a1b10fce3a497011af92db4657474ef56e4b2aa
 SHA512:
-  metadata.gz: bd825465b2f3d72e6003b7db8e5ac8020040daf36a924d35b0d8553e4e51910ca880e5017cc9e2b86f6424ef1ca1febe6010f28b52eb657d6d66713a6b31344d
-  data.tar.gz: dbb55a55e296777bfc1e422132604b83c53cdc16d63ba404575f1d4baee0afda7fc8cdb8f95480b4bdf83df6c23a4947d447306491ca65eb37273b717dce7e73
+  metadata.gz: 840576064059d424a68fc9917e30a6a2bc120fb7157691fae70edadaa705711301fd175a3942ce227298086c934ae0f0f471b8379a00314da9aea7b068643b07
+  data.tar.gz: 308dd4b3bcd7b4dfbfaa5147a4d0208dfaedaa69265577b43fd46e04e59be8f95f12a92667a12c935d07a534e6ef271ea2ce9d50dbc449b5a2af1a800b0a51d9

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/iiif/v3/abstract_resource.rb

@@ -31,11 +31,11 @@ module IIIF
       end
 
       def string_only_keys
-        %w{ nav_date type format viewing_direction start_canvas }
+        %w{ nav_date type format rights viewing_direction start_canvas }
       end
 
       def array_only_keys
-        %w{ metadata rights thumbnail rendering first last next prev items service }
+        %w{ metadata thumbnail rendering first last next prev items service }
       end
 
       def hash_only_keys
@@ -122,10 +122,9 @@ module IIIF
           end
         end
 
-        self.uri_only_keys.each do |k|
+        uri_only_keys.each do |k|
           if self[k]
-            vals = *self[k]
-            vals.each { |val| validate_uri(val, k) }
+            Array(self[k]).each { |val| validate_uri(val, k) }
           end
         end
 
@@ -187,20 +186,12 @@ module IIIF
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
         end
-        # rights is Array; each entry is a Hash containing 'id' with a URI value
-        if self.has_key?('rights')
-          unless self['rights'].all? { |entry| entry.kind_of?(Hash) }
-            m = 'rights must be an Array with Hash members'
-            raise IIIF::V3::Presentation::IllegalValueError, m
-          end
-          self['rights'].each do |entry|
-            unless entry.keys.include?('id')
-              m = 'rights members must be a Hash including "id"'
-              raise IIIF::V3::Presentation::IllegalValueError, m
-            end
-            validate_uri(entry['id'], 'id') # raises IllegalValueError
-          end
+
+        if key?('rights') && !self['rights'].kind_of?(String)
+          m = 'rights must be a String'
+          raise IIIF::V3::Presentation::IllegalValueError, m
         end
+
         # rendering is Array; each entry is a Hash containing 'label' and 'format' keys
         if self.has_key?('rendering') && self['rendering']
           unless self['rendering'].all? { |entry| entry.kind_of?(Hash) }

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

@@ -46,6 +46,7 @@ describe IIIF::V3::AbstractResource do
         ],
         "id": "http://example.com/manifest",
         "type": "Manifest",
+        "rights": "http://creativecommons.org/licenses/by/4.0/",
         "label": "My Manifest",
         "service": [
           {

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

@@ -139,27 +139,19 @@ describe IIIF::V3::AbstractResource do
         expect { subject.validate }.to raise_error(IIIF::V3::Presentation::IllegalValueError, exp_err_msg)
       end
     end
+
     describe 'rights' do
-      it 'raises IllegalValueError for entry that is not a Hash' do
+      it 'raises IllegalValueError for entry that is not a string' do
         subject['rights'] = ['error']
-        exp_err_msg = "rights must be an Array with Hash members"
-        expect { subject.validate }.to raise_error(IIIF::V3::Presentation::IllegalValueError, exp_err_msg)
+        expect { subject.validate }.to raise_error(IIIF::V3::Presentation::IllegalValueError)
       end
-      it 'does not raise error for entry with "id" that is URI' do
-        subject['rights'] = [{ 'id' => 'http://example.org/rights', 'format' => 'text/html' }]
+
+      it 'does not raise error for entry that is string' do
+        subject['rights'] = 'http://example.org/rights'
         expect { subject.validate }.not_to raise_error
       end
-      it 'raises IllegalValueError for entry with "id" that is not URI' do
-        subject['rights'] = [{ 'id' => 'bar', 'format' => 'text/html' }]
-        exp_err_msg = "id value must be a String containing a URI for #{subject.class}"
-        expect { subject.validate }.to raise_error(IIIF::V3::Presentation::IllegalValueError, exp_err_msg)
-      end
-      it 'raises IllegalValueError for entry that does not contain "id"' do
-        subject['rights'] = [{ 'whoops' => 'http://example.org/rights' }]
-        exp_err_msg = 'rights members must be a Hash including "id"'
-        expect { subject.validate }.to raise_error(IIIF::V3::Presentation::IllegalValueError, exp_err_msg)
-      end
     end
+
     describe 'rendering' do
       it 'raises IllegalValueError for entry that is not a Hash' do
         subject['rendering'] = ['error']

data/spec/unit/iiif/v3/presentation/manifest_spec.rb

@@ -322,9 +322,7 @@ describe IIIF::V3::Presentation::Manifest do
         "viewingDirection" => "right-to-left",
         "viewingHint" => ["paged"],
         "navDate" => "1856-01-01T00:00:00Z",
-        "rights" => [{
-          "id" =>"http://example.org/license.html",
-          "format" => "text/html"}],
+        "rights" => "http://example.org/license.html",
         "requiredStatement" => {
           "label": { "en": [ "Attribution" ] },
           "value": { "en": [ "bleah" ] },

data/spec/unit/iiif/v3/presentation/sequence_spec.rb

@@ -96,7 +96,7 @@ describe IIIF::V3::Presentation::Sequence do
         expect(sequence_object.items.first).to eq canvas_object
       end
     end
-    
+
     describe 'example from Stanford purl' do
       let(:seq_id) { 'https://example.org/abc666#sequence-1' }
       let(:sequence_object) {
@@ -184,7 +184,7 @@ describe IIIF::V3::Presentation::Sequence do
           }]
         }],
         'attribution' => 'Provided by Example Organization',
-        'rights' => [{'id' => 'http://www.example.org/license.html'}],
+        'rights' => 'Sample rights',
         'logo' => 'http://www.example.org/logos/institution1.jpg',
         'see_also' => 'http://www.example.org/library/catalog/book1.xml',
         'service' => [{

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: iiif-presentation
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Jon Stroop
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-25 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -270,7 +269,6 @@ homepage: https://github.com/iiif/osullivan
 licenses:
 - Simplified BSD
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +283,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: API for working with IIIF Presentation manifests.
 test_files: