iiif-presentation 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39369e50dc0a31ebfdac97d49008eb26e020ac21c595c400906dc6a54de45097
-  data.tar.gz: e127162464e102ef0d2ee9800cf81713e0cd681edde07e3123bf5353b1b1fb90
+  metadata.gz: a766530b4d9f912c49a41e9c6d5982282671c4188a26b27e5a4fb99176fae90c
+  data.tar.gz: bbb25e477c3563ab2a65ec0de5bfc634acffa93c00e7504992dfe539f0e89ad2
 SHA512:
-  metadata.gz: 230c5a28d5e5dbc405b32f9e6ca1f3d60e7f8e2d3cbbeab85f9650dbf24bb701d0a1c6af1b29d1cd844ac971e11e1ab8a65644cf10f33778e1465d8b1fcc01ad
-  data.tar.gz: 0ab62efe7287d7eaae0ae7ab2a569b18cd2238753569e15857478976a834e5746df1dd919befe211299f31fae63822a735e25fe9da22b5e74b7d05b08457e608
+  metadata.gz: ac981b561c8e99f41891f2e5246bf46e6de9766abde2269e5eb46e35baeabb4a74404366b8e83ff2eef4e8656ddcb3e8946cd07bfcf14a96c40ba10b29f2fab7
+  data.tar.gz: 126391967ebc6b1e3db349daed94e3aad1ba43f8083729c49b0c976131f5e3c85f8f507713d0f04721f98c494b0193b761a714f1129b9b044d0dcf181e21e112

data/.github/workflows/ruby.yml

@@ -9,9 +9,9 @@ name: Ruby
 
 on:
   push:
-    branches: [ "development" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "development" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read

data/.gitignore

@@ -1,4 +1,5 @@
 coverage/
 pkg/
 Gemfile.lock
+.pry_history
 

data/Gemfile

@@ -8,3 +8,5 @@ end
 if ENV['FARADAY_VERSION']
   gem 'faraday', ENV['FARADAY_VERSION']
 end
+
+gem 'debug'

data/README.md

@@ -1,6 +1,7 @@
 # O'Sullivan: A Ruby API for working with IIIF Presentation manifests
 
 [![Coverage Status](https://coveralls.io/repos/github/iiif-prezi/osullivan/badge.svg?branch=development)](https://coveralls.io/github/iiif-prezi/osullivan?branch=development)
+[![Gem Version](https://badge.fury.io/rb/iiif-presentation.svg)](https://badge.fury.io/rb/iiif-presentation)
 
 
 ## Installation
@@ -24,6 +25,11 @@ seed = {
 # Any options you add are added to the object
 manifest = IIIF::Presentation::Manifest.new(seed)
 
+# sequences array is generated for you, but let's add a sequence object
+sequence = IIIF::Presentation::Sequence.new()
+sequence['@id'] = "http://example.com/manifest/seq/"
+manifest.sequences << sequence
+
 canvas = IIIF::Presentation::Canvas.new()
 # All classes act like `ActiveSupport::OrderedHash`es, for the most part.
 # Use `[]=` to set JSON-LD properties...
@@ -34,10 +40,25 @@ canvas.width = 10
 canvas.height = 20
 canvas.label = 'My Canvas'
 
+# Add images 
+service = IIIF::Presentation::Resource.new('@context' => 'http://iiif.io/api/image/2/context.json', 'profile' => 'http://iiif.io/api/image/2/level2.json', '@id' => "http://images.exampl.com/loris2/my-image")
+
+image = IIIF::Presentation::ImageResource.new()
+i['@id'] = "http://images.exampl.com/loris2/my-image/full/#{canvas.width},#{canvas.height}/0/default.jpg"
+i.format = "image/jpeg"
+i.width = canvas.width
+i.height = canvas.height
+i.service = service
+
+images = IIIF::Presentation::Resource.new('@type' => 'oa:Annotation', 'motivation' => 'sc:painting', '@id' => "#{canvas['@id']}/images", 'resource' => i)
+
+canvas.images << images
+
+# Add other content resources
 oc = IIIF::Presentation::Resource.new('@id' => 'http://example.com/content')
 canvas.other_content << oc
 
-manifest.sequences << canvas
+manifest.sequences.first.canvases << canvas
 
 puts manifest.to_json(pretty: true)
 ```

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/iiif-presentation.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'json'
   spec.add_dependency 'activesupport', '>= 3.2.18'
-  spec.add_dependency 'faraday', '>= 0.9'
+  spec.add_dependency 'faraday', '~> 2.7'
 end

data/lib/iiif/presentation/canvas.rb

@@ -25,6 +25,10 @@ module IIIF
         super + %w{ width height }
       end
 
+      def numeric_only_keys
+        super + %w{ duration }
+      end
+
       def legal_viewing_hint_values
         super + %w{ non-paged }
       end

data/lib/iiif/presentation/service.rb

@@ -0,0 +1,12 @@
+require File.join(File.dirname(__FILE__), 'abstract_resource')
+
+module IIIF
+  module Presentation
+    class Service < AbstractResource
+      def required_keys
+        []
+      end
+    end
+  end
+end
+

data/lib/iiif/presentation.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'service')
 %w{
-abstract_resource
+  abstract_resource
   annotation
   annotation_list
   canvas
@@ -8,9 +8,10 @@ abstract_resource
   layer
   manifest
   resource
-    image_resource 
-  sequence 
-    range
+  image_resource 
+  sequence
+  service
+  range
 }.each do |f|
   require File.join(File.dirname(__FILE__), 'presentation', f)
 end

data/lib/iiif/service.rb

@@ -17,6 +17,7 @@ module IIIF
     def abstract_resource_only_keys; %w{ }; end
     def hash_only_keys; %w{ }; end
     def int_only_keys; %w{ }; end
+    def numeric_only_keys; %w{ }; end
 
     def initialize(hsh={})
       @data = IIIF::OrderedHash[hsh]
@@ -24,6 +25,7 @@ module IIIF
       self.define_methods_for_array_only_keys
       self.define_methods_for_string_only_keys
       self.define_methods_for_int_only_keys
+      self.define_methods_for_numeric_only_keys
       self.define_methods_for_abstract_resource_only_keys
       self.snakeize_keys
     end
@@ -210,7 +212,7 @@ module IIIF
           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)
+              new_object[new_key] << IIIF::Service.from_ordered_hash(member, IIIF::Presentation::Service)
             elsif new_key == 'resource'
               new_object[new_key] << IIIF::Service.from_ordered_hash(hsh[key], IIIF::Presentation::Resource)
             elsif member.kind_of?(Hash)
@@ -221,7 +223,7 @@ module IIIF
             end
           end
         elsif new_key == 'service'
-          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Service)
+          new_object[new_key] = IIIF::Service.from_ordered_hash(hsh[key], IIIF::Presentation::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)
@@ -255,56 +257,22 @@ module IIIF
     end
 
     def define_methods_for_any_type_keys
+      define_accessor_methods(*any_type_keys)
+
+      # override the getter defined by define_accessor_methods to avoid returning
+      # an array for empty values.
       any_type_keys.each do |key|
-        # Setters
-        define_singleton_method("#{key}=") do |arg|
-          self.send('[]=', key, arg)
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method("#{key.camelize(:lower)}=") do |arg|
-            self.send('[]=', key, arg)
-          end
-        end
-        # Getters
         define_singleton_method(key) do
           self.send('[]', key)
         end
-        if key.camelize(:lower) != key
-          define_singleton_method(key.camelize(:lower)) do
-            self.send('[]', key)
-          end
-        end
       end
     end
 
     def define_methods_for_array_only_keys
-      array_only_keys.each do |key|
-        # Setters
-        define_singleton_method("#{key}=") do |arg|
-          unless arg.kind_of?(Array)
-            m = "#{key} must be an Array."
-            raise IIIF::Presentation::IllegalValueError, m
-          end
-          self.send('[]=', key, arg)
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method("#{key.camelize(:lower)}=") do |arg|
-            unless arg.kind_of?(Array)
-              m = "#{key} must be an Array."
-              raise IIIF::Presentation::IllegalValueError, m
-            end
-            self.send('[]=', key, arg)
-          end
-        end
-        # Getters
-        define_singleton_method(key) do
-          self[key] ||= []
-          self[key]
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method(key.camelize(:lower)) do
-            self.send('[]', key)
-          end
+      define_accessor_methods(*array_only_keys) do |key, arg|
+        unless arg.kind_of?(Array)
+          m = "#{key} must be an Array."
+          raise IIIF::Presentation::IllegalValueError, m
         end
       end
     end
@@ -314,85 +282,53 @@ module IIIF
       abstract_resource_only_keys.each do |hsh|
         key = hsh[:key]
         type = hsh[:type]
-        # Setters
-        define_singleton_method("#{key}=") do |arg|
+
+        define_accessor_methods(key) do |key, arg|
           unless arg.kind_of?(type)
             m = "#{key} must be an #{type}."
             raise IIIF::Presentation::IllegalValueError, m
           end
-          self.send('[]=', key, arg)
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method("#{key.camelize(:lower)}=") do |arg|
-            unless arg.kind_of?(type)
-              m = "#{key} must be an #{type}."
-              raise IIIF::Presentation::IllegalValueError, m
-            end
-            self.send('[]=', key, arg)
-          end
-        end
-        # Getters
-        define_singleton_method(key) do
-          self[key] ||= []
-          self[key]
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method(key.camelize(:lower)) do
-            self.send('[]', key)
-          end
         end
       end
     end
 
-
     def define_methods_for_string_only_keys
-      string_only_keys.each do |key|
-        # Setter
-        define_singleton_method("#{key}=") do |arg|
-          unless arg.kind_of?(String)
-            m = "#{key} must be an String."
-            raise IIIF::Presentation::IllegalValueError, m
-          end
-          self.send('[]=', key, arg)
-        end
-        if key.camelize(:lower) != key
-          define_singleton_method("#{key.camelize(:lower)}=") do |arg|
-            unless arg.kind_of?(String)
-              m = "#{key} must be an String."
-              raise IIIF::Presentation::IllegalValueError, m
-            end
-            self.send('[]=', key, arg)
-          end
+      define_accessor_methods(*string_only_keys) do |key, arg|
+        unless arg.kind_of?(String)
+          m = "#{key} must be an String."
+          raise IIIF::Presentation::IllegalValueError, m
         end
-        # Getter
-        define_singleton_method(key) do
-          self[key] ||= []
-          self[key]
+      end
+    end
+
+    def define_methods_for_int_only_keys
+      define_accessor_methods(*int_only_keys) do |key, arg|
+        unless arg.kind_of?(Integer) && arg > 0
+          m = "#{key} must be a positive Integer."
+          raise IIIF::Presentation::IllegalValueError, m
         end
-        if key.camelize(:lower) != key
-          define_singleton_method(key.camelize(:lower)) do
-            self.send('[]', key)
-          end
+      end
+    end
+
+    def define_methods_for_numeric_only_keys
+      define_accessor_methods(*numeric_only_keys) do |key, arg|
+        unless arg.kind_of?(Numeric) && arg > 0
+          m = "#{key} must be a positive Integer or Float."
+          raise IIIF::Presentation::IllegalValueError, m
         end
       end
     end
 
-    def define_methods_for_int_only_keys
-      int_only_keys.each do |key|
+    def define_accessor_methods(*keys, &validation)
+      keys.each do |key|
         # Setter
         define_singleton_method("#{key}=") do |arg|
-          unless arg.kind_of?(Integer) && arg > 0
-            m = "#{key} must be a positive Integer."
-            raise IIIF::Presentation::IllegalValueError, m
-          end
+          validation.call(key, arg) if block_given?
           self.send('[]=', key, arg)
         end
         if key.camelize(:lower) != key
           define_singleton_method("#{key.camelize(:lower)}=") do |arg|
-            unless arg.kind_of?(Integer) && arg > 0
-              m = "#{key} must be a positive Integer."
-              raise IIIF::Presentation::IllegalValueError, m
-            end
+            validation.call(key, arg) if block_given?
             self.send('[]=', key, arg)
           end
         end
@@ -408,6 +344,5 @@ module IIIF
         end
       end
     end
-
   end
 end