iiif-presentation 1.4.2 → 1.5.0

data/lib/iiif/v3/abstract_resource.rb

@@ -1,4 +1,4 @@
-require_relative '../hash_behaviours'
+require_relative "../hash_behaviours"
 
 module IIIF
   module V3
@@ -6,19 +6,19 @@ module IIIF
       include IIIF::HashBehaviours
 
       # properties used by content resources only
-      CONTENT_RESOURCE_PROPERTIES = %w{ format height width duration }
+      CONTENT_RESOURCE_PROPERTIES = %w[format height width duration]
 
       # used by Collection, AnnotationCollection
-      PAGING_PROPERTIES = %w{ first last next prev total start_index }
+      PAGING_PROPERTIES = %w[first last next prev total start_index]
 
       # subclasses should override required_keys as appropriate, e.g. super + %w{ id }
       def required_keys
-        %w{ type }
+        %w[type]
       end
 
       # subclasses should override prohibited_keys as appropriate, e.g. super + PAGING_PROPERTIES
       def prohibited_keys
-        %w{ }
+        %w[]
       end
 
       # NOTE: keys associated with a single resource type are not included below in xxx_keys methods:
@@ -27,37 +27,37 @@ module IIIF
       def any_type_keys
         # values *may* be multivalued
         # NOTE: for id: "Resources that do not require URIs [for ids] may be assigned blank node identifiers"
-        %w{ id logo viewing_hint related see_also within }
+        %w[id logo viewing_hint related see_also within]
       end
 
       def string_only_keys
-        %w{ nav_date type format rights viewing_direction start_canvas }
+        %w[nav_date type format rights viewing_direction start_canvas]
       end
 
       def array_only_keys
-        %w{ metadata thumbnail rendering first last next prev items service }
+        %w[metadata thumbnail rendering first last next prev items service]
       end
 
       def hash_only_keys
-        %w{ label requiredStatement summary }
+        %w[label requiredStatement summary]
       end
 
       def int_only_keys
-        %w{ height width total start_index }
+        %w[height width total start_index]
       end
 
       def numeric_only_keys
-        %w{ duration }
+        %w[duration]
       end
 
       def uri_only_keys
-        %w{ }
+        %w[]
       end
 
       # Not every subclass is allowed to have viewingDirect, but when it is,
       # it must be one of these values
       def legal_viewing_direction_values
-        %w{ left-to-right right-to-left top-to-bottom bottom-to-top }
+        %w[left-to-right right-to-left top-to-bottom bottom-to-top]
       end
 
       def legal_viewing_hint_values
@@ -69,19 +69,19 @@ module IIIF
       #   Order is only guaranteed if an ActiveSupport::OrderedHash is passed.
       # @param [boolean] include_context (default: false). Pass true if the
       #   context should be included.
-      def initialize(hsh={})
-        if self.class == IIIF::V3::AbstractResource
+      def initialize(hsh = {})
+        if instance_of?(IIIF::V3::AbstractResource)
           raise "#{self.class} is an abstract class. Please use one of its subclasses."
         end
         @data = IIIF::OrderedHash[hsh]
-        self.define_methods_for_any_type_keys
-        self.define_methods_for_string_only_keys
-        self.define_methods_for_array_only_keys
-        self.define_methods_for_hash_only_keys
-        self.define_methods_for_int_only_keys
-        self.define_methods_for_numeric_only_keys
-        self.define_methods_for_uri_only_keys
-        self.snakeize_keys
+        define_methods_for_any_type_keys
+        define_methods_for_string_only_keys
+        define_methods_for_array_only_keys
+        define_methods_for_hash_only_keys
+        define_methods_for_int_only_keys
+        define_methods_for_numeric_only_keys
+        define_methods_for_uri_only_keys
+        snakeize_keys
       end
 
       # Static methods / alternative constructors
@@ -89,34 +89,34 @@ module IIIF
         # Parse from a file path, string, or existing hash
         def parse(s)
           ordered_hash = nil
-          if s.kind_of?(String) && File.exist?(s)
+          if s.is_a?(String) && File.exist?(s)
             ordered_hash = IIIF::OrderedHash[JSON.parse(IO.read(s))]
-          elsif s.kind_of?(String) && !File.exist?(s)
+          elsif s.is_a?(String) && !File.exist?(s)
             ordered_hash = IIIF::OrderedHash[JSON.parse(s)]
-          elsif s.kind_of?(Hash)
+          elsif s.is_a?(Hash)
             ordered_hash = IIIF::OrderedHash[s]
           else
-            m = '#parse takes a path to a file, a JSON String, or a Hash, '
+            m = "#parse takes a path to a file, a JSON String, or a Hash, "
             m += "argument was a #{s.class}."
-            if s.kind_of?(String)
-              m+= "If you were trying to point to a file, does it exist?"
+            if s.is_a?(String)
+              m += "If you were trying to point to a file, does it exist?"
             end
             raise ArgumentError, m
           end
-          return IIIF::V3::Presentation::Service.from_ordered_hash(ordered_hash)
+          IIIF::V3::Presentation::Service.from_ordered_hash(ordered_hash)
         end
       end
 
       def validate
-        self.required_keys.each do |k|
-          unless self.has_key?(k)
+        required_keys.each do |k|
+          unless has_key?(k)
             m = "A(n) #{k} is required for each #{self.class}"
             raise IIIF::V3::Presentation::MissingRequiredKeyError, m
           end
         end
 
-        self.prohibited_keys.each do |k|
-          if self.has_key?(k)
+        prohibited_keys.each do |k|
+          if has_key?(k)
             m = "#{k} is a prohibited key in #{self.class}"
             raise IIIF::V3::Presentation::ProhibitedKeyError, m
           end
@@ -133,90 +133,91 @@ module IIIF
         #  e.g. my_image_resource['format'] = 'image/jpeg'
 
         # Viewing Direction values
-        if self.has_key?('viewing_direction')
-          unless self.legal_viewing_direction_values.include?(self['viewing_direction'])
+        if has_key?("viewing_direction")
+          unless legal_viewing_direction_values.include?(self["viewing_direction"])
             m = "viewingDirection must be one of #{legal_viewing_direction_values}"
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
         end
         # Viewing Hint can be an Array ("Any resource type may have one or more viewing hints")
-        if self.has_key?('viewing_hint')
-          viewing_hint_val = self['viewing_hint']
+        if has_key?("viewing_hint")
+          viewing_hint_val = self["viewing_hint"]
           [*viewing_hint_val].each { |vh_val|
-            unless self.legal_viewing_hint_values.include?(vh_val) || (vh_val.kind_of?(String) && vh_val =~ URI::regexp)
-                m = "viewingHint for #{self.class} must be one or more of #{self.legal_viewing_hint_values} or a URI"
-                raise IIIF::V3::Presentation::IllegalValueError, m
+            valid = legal_viewing_hint_values.include?(vh_val) || (vh_val.is_a?(String) && vh_val =~ URI::RFC2396_PARSER.make_regexp)
+            unless valid
+              m = "viewingHint for #{self.class} must be one or more of #{legal_viewing_hint_values} or a URI"
+              raise IIIF::V3::Presentation::IllegalValueError, m
             end
           }
         end
         # Metadata is Array; each entry is a Hash containing (only) 'label' and 'value' properties
-        if self.has_key?('metadata') && self['metadata']
-          unless self['metadata'].all? { |entry| entry.kind_of?(Hash) }
-            m = 'metadata must be an Array with Hash members'
+        if has_key?("metadata") && self["metadata"]
+          unless self["metadata"].all? { |entry| entry.is_a?(Hash) }
+            m = "metadata must be an Array with Hash members"
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
-          self['metadata'].each do |entry|
+          self["metadata"].each do |entry|
             md_keys = entry.keys
-            unless md_keys.size == 2 && md_keys.include?('label') && md_keys.include?('value')
+            unless md_keys.size == 2 && md_keys.include?("label") && md_keys.include?("value")
               m = "metadata members must be a Hash of keys 'label' and 'value'"
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
           end
         end
         # Thumbnail is Array; each entry is a Hash or ImageResource containing (at least) 'id' and 'type' keys
-        if self.has_key?('thumbnail') && self['thumbnail']
-          unless self['thumbnail'].all? { |entry| entry.kind_of?(IIIF::V3::Presentation::ImageResource) || entry.kind_of?(Hash) }
-            m = 'thumbnail must be an Array with Hash or ImageResource members'
+        if has_key?("thumbnail") && self["thumbnail"]
+          unless self["thumbnail"].all? { |entry| entry.is_a?(IIIF::V3::Presentation::ImageResource) || entry.is_a?(Hash) }
+            m = "thumbnail must be an Array with Hash or ImageResource members"
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
-          self['thumbnail'].each do |entry|
+          self["thumbnail"].each do |entry|
             thumb_keys = entry.keys
-            unless thumb_keys.include?('id') && thumb_keys.include?('type')
+            unless thumb_keys.include?("id") && thumb_keys.include?("type")
               m = 'thumbnail members must include keys "id" and "type"'
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
           end
         end
         # NavDate (navigation date)
-        if self.has_key?('nav_date')
+        if has_key?("nav_date")
           begin
-            Date.strptime(self['nav_date'], '%Y-%m-%dT%H:%M:%SZ')
+            Date.strptime(self["nav_date"], "%Y-%m-%dT%H:%M:%SZ")
           rescue ArgumentError
             m = "nav_date must be of form YYYY-MM-DDThh:mm:ssZ"
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
         end
 
-        if key?('rights') && !self['rights'].kind_of?(String)
-          m = 'rights must be a String'
+        if key?("rights") && !self["rights"].is_a?(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) }
-            m = 'rendering must be an Array with Hash members'
+        if has_key?("rendering") && self["rendering"]
+          unless self["rendering"].all? { |entry| entry.is_a?(Hash) }
+            m = "rendering must be an Array with Hash members"
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
-          self['rendering'].each do |entry|
+          self["rendering"].each do |entry|
             rendering_keys = entry.keys
-            unless rendering_keys.include?('label') && rendering_keys.include?('format')
+            unless rendering_keys.include?("label") && rendering_keys.include?("format")
               m = 'rendering members must be a Hash including keys "label" and "format"'
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
           end
         end
         # startCanvas is a String with a URI value
-        if self.has_key?('start_canvas') && self['start_canvas'].kind_of?(String)
-          validate_uri(self['start_canvas'], 'startCanvas') # raises IllegalValueError
+        if has_key?("start_canvas") && self["start_canvas"].is_a?(String)
+          validate_uri(self["start_canvas"], "startCanvas") # raises IllegalValueError
         end
       end
 
       # Options
       #  * pretty: (true|false). Should the JSON be pretty-printed? (default: false)
       #  * All options available in #to_ordered_hash
-      def to_json(opts={})
-        hsh = self.to_ordered_hash(opts)
+      def to_json(opts = {})
+        hsh = to_ordered_hash(opts)
         if opts.fetch(:pretty, false)
           JSON.pretty_generate(hsh)
         else
@@ -230,23 +231,23 @@ module IIIF
       #      document if it doesn't exist. Default: true.
       #  * sort_json_ld_keys: (true|false). Brings all properties starting with
       #      '@'. Default: true. to the top of the document and sorts them.
-      def to_ordered_hash(opts={})
+      def to_ordered_hash(opts = {})
         include_context = opts.fetch(:include_context, true)
-        if include_context && !self.has_key?('@context')
-          self['@context'] = IIIF::V3::Presentation::CONTEXT
+        if include_context && !has_key?("@context")
+          self["@context"] = IIIF::V3::Presentation::CONTEXT
         end
         force = opts.fetch(:force, false)
         sort_json_ld_keys = opts.fetch(:sort_json_ld_keys, true)
 
         unless force
-          self.validate
+          validate
         end
 
         export_hash = IIIF::OrderedHash.new
 
         if sort_json_ld_keys
-          self.keys.select { |k| k.start_with?('@') }.sort!.each do |k|
-            export_hash[k] = self.data[k]
+          keys.select { |k| k.start_with?("@") }.sort!.each do |k|
+            export_hash[k] = data[k]
           end
         end
 
@@ -255,25 +256,24 @@ module IIIF
           sort_json_ld_keys: sort_json_ld_keys,
           force: force
         }
-        self.keys.each do |k|
-          unless sort_json_ld_keys && k.start_with?('@')
-            if self.data[k].respond_to?(:to_ordered_hash) #.respond_to?(:to_ordered_hash)
-              export_hash[k] = self.data[k].to_ordered_hash(sub_opts)
+        keys.each do |k|
+          unless sort_json_ld_keys && k.start_with?("@")
+            if data[k].respond_to?(:to_ordered_hash) # .respond_to?(:to_ordered_hash)
+              export_hash[k] = data[k].to_ordered_hash(sub_opts)
 
-            elsif self.data[k].kind_of?(Hash)
+            elsif data[k].is_a?(Hash)
               export_hash[k] = IIIF::OrderedHash.new
-              self.data[k].each do |sub_k, v|
-
+              data[k].each do |sub_k, v|
                 if v.respond_to?(:to_ordered_hash)
                   export_hash[k][sub_k] = v.to_ordered_hash(sub_opts)
 
-                elsif v.kind_of?(Array)
+                elsif v.is_a?(Array)
                   export_hash[k][sub_k] = []
                   v.each do |member|
-                    if member.respond_to?(:to_ordered_hash)
-                      export_hash[k][sub_k] << member.to_ordered_hash(sub_opts)
+                    export_hash[k][sub_k] << if member.respond_to?(:to_ordered_hash)
+                      member.to_ordered_hash(sub_opts)
                     else
-                      export_hash[k][sub_k] << member
+                      member
                     end
                   end
                 else
@@ -281,29 +281,28 @@ module IIIF
                 end
               end
 
-            elsif self.data[k].kind_of?(Array)
+            elsif data[k].is_a?(Array)
               export_hash[k] = []
 
-              self.data[k].each do |member|
+              data[k].each do |member|
                 if member.respond_to?(:to_ordered_hash)
                   export_hash[k] << member.to_ordered_hash(sub_opts)
 
-                elsif member.kind_of?(Hash)
+                elsif member.is_a?(Hash)
                   hsh = IIIF::OrderedHash.new
                   export_hash[k] << hsh
-                  member.each do |sub_k,v|
-
+                  member.each do |sub_k, v|
                     if v.respond_to?(:to_ordered_hash)
                       hsh[sub_k] = v.to_ordered_hash(sub_opts)
 
-                    elsif v.kind_of?(Array)
+                    elsif v.is_a?(Array)
                       hsh[sub_k] = []
 
                       v.each do |sub_member|
-                        if sub_member.respond_to?(:to_ordered_hash)
-                          hsh[sub_k] << sub_member.to_ordered_hash(sub_opts)
+                        hsh[sub_k] << if sub_member.respond_to?(:to_ordered_hash)
+                          sub_member.to_ordered_hash(sub_opts)
                         else
-                          hsh[sub_k] << sub_member
+                          sub_member
                         end
                       end
                     else
@@ -317,7 +316,7 @@ module IIIF
                 end
               end
             else
-              export_hash[k] = self.data[k]
+              export_hash[k] = data[k]
             end
 
           end
@@ -327,33 +326,33 @@ module IIIF
         export_hash
       end
 
-      def self.from_ordered_hash(hsh, default_klass=IIIF::OrderedHash)
+      def self.from_ordered_hash(hsh, default_klass = IIIF::OrderedHash)
         # Create a new object (new_object)
         type = nil
-        if hsh.has_key?('type')
-          type = IIIF::V3::AbstractResource.get_descendant_class_by_jld_type(hsh['type'])
+        if hsh.has_key?("type")
+          type = IIIF::V3::AbstractResource.get_descendant_class_by_jld_type(hsh["type"])
         end
         new_object = type.nil? ? default_klass.new : type.new
 
         hsh.keys.each do |key|
-          new_key = key.underscore == key ? key : key.underscore
-          if new_key == 'service'
+          new_key = (key.underscore == key) ? key : key.underscore
+          if new_key == "service"
             new_object[new_key] = hsh[key].map do |entry|
               IIIF::V3::AbstractResource.from_ordered_hash(entry, IIIF::V3::Presentation::Service)
             end
-          elsif new_key == 'body'
+          elsif new_key == "body"
             new_object[new_key] = IIIF::V3::AbstractResource.from_ordered_hash(hsh[key], IIIF::V3::Presentation::Resource)
-          elsif hsh[key].kind_of?(Hash)
+          elsif hsh[key].is_a?(Hash)
             new_object[new_key] = IIIF::V3::AbstractResource.from_ordered_hash(hsh[key])
-          elsif hsh[key].kind_of?(Array)
+          elsif hsh[key].is_a?(Array)
             new_object[new_key] = []
             hsh[key].each do |member|
-              if new_key == 'service'
-                new_object[new_key] << IIIF::V3::AbstractResource.from_ordered_hash(member, IIIF::V3::Presentation::Service)
-              elsif member.kind_of?(Hash)
-                new_object[new_key] << IIIF::V3::AbstractResource.from_ordered_hash(member)
+              new_object[new_key] << if new_key == "service"
+                IIIF::V3::AbstractResource.from_ordered_hash(member, IIIF::V3::Presentation::Service)
+              elsif member.is_a?(Hash)
+                IIIF::V3::AbstractResource.from_ordered_hash(member)
               else
-                new_object[new_key] << member
+                member
                 # Again, no nested arrays, right?
               end
             end
@@ -364,8 +363,6 @@ module IIIF
         new_object
       end
 
-      protected
-
       def self.get_descendant_class_by_jld_type(type)
         IIIF::V3::AbstractResource.all_known_subclasses.find do |klass|
           klass.const_defined?(:TYPE) && klass.const_get(:TYPE) == type
@@ -376,13 +373,11 @@ module IIIF
         @all_known_subclasses ||= IIIF::V3::AbstractResource.descendants.reject(&:singleton_class?)
       end
 
-      def data=(hsh)
-        @data = hsh
-      end
+      protected
 
-      def data
-        @data
-      end
+      attr_writer :data
+
+      attr_reader :data
 
       def define_methods_for_any_type_keys
         define_accessor_methods(*any_type_keys)
@@ -391,14 +386,14 @@ module IIIF
         # an array for empty values.
         any_type_keys.each do |key|
           define_singleton_method(key) do
-            self.send('[]', key)
+            send(:[], key)
           end
         end
       end
 
       def define_methods_for_array_only_keys
         define_accessor_methods(*array_only_keys) do |key, val|
-          unless val.kind_of?(Array)
+          unless val.is_a?(Array)
             m = "#{key} must be an Array."
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
@@ -407,7 +402,7 @@ module IIIF
 
       def define_methods_for_hash_only_keys
         define_accessor_methods(*hash_only_keys) do |key, val|
-          unless val.kind_of?(Hash)
+          unless val.is_a?(Hash)
             m = "#{key} must be a Hash."
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
@@ -416,7 +411,7 @@ module IIIF
 
       def define_methods_for_string_only_keys
         define_accessor_methods(*string_only_keys) do |key, val|
-          unless val.kind_of?(String)
+          unless val.is_a?(String)
             m = "#{key} must be a String."
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
@@ -425,7 +420,7 @@ module IIIF
 
       def define_methods_for_int_only_keys
         define_accessor_methods(*int_only_keys) do |key, val|
-          unless val.kind_of?(Integer) && val > 0
+          unless val.is_a?(Integer) && val > 0
             m = "#{key} must be a positive Integer."
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
@@ -434,7 +429,7 @@ module IIIF
 
       def define_methods_for_numeric_only_keys
         define_accessor_methods(*numeric_only_keys) do |key, val|
-          unless val.kind_of?(Numeric) && val > 0
+          unless val.is_a?(Numeric) && val > 0
             m = "#{key} must be a positive Integer or Float."
             raise IIIF::V3::Presentation::IllegalValueError, m
           end
@@ -447,15 +442,17 @@ module IIIF
 
       def define_accessor_methods(*keys, &validation)
         keys.each do |key|
+          camelized_key = key.camelize(:lower)
+
           # Setter
           define_singleton_method("#{key}=") do |val|
             validation.call(key, val) if block_given?
-            self.send('[]=', key, val)
+            send(:[]=, key, val)
           end
-          if key.camelize(:lower) != key
-            define_singleton_method("#{key.camelize(:lower)}=") do |val|
+          if camelized_key != key
+            define_singleton_method("#{camelized_key}=") do |val|
               validation.call(key, val) if block_given?
-              self.send('[]=', key, val)
+              send(:[]=, key, val)
             end
           end
           # Getter
@@ -463,22 +460,22 @@ module IIIF
             self[key] ||= []
             self[key]
           end
-          if key.camelize(:lower) != key
-            define_singleton_method(key.camelize(:lower)) do
-              self.send('[]', key)
+          if camelized_key != key
+            define_singleton_method(camelized_key) do
+              send(:[], key)
             end
           end
         end
       end
 
       private
+
       def validate_uri(val, key)
-        unless val.kind_of?(String) && val =~ /\A#{URI::regexp}\z/
-          m = "#{key} value must be a String containing a URI for #{self.class}"
-          raise IIIF::V3::Presentation::IllegalValueError, m
-        end
+        raise ArgumentError if URI(val).scheme.nil?
+      rescue URI::Error, ArgumentError
+        m = "#{key} value must be a String containing a URI for #{self.class}"
+        raise IIIF::V3::Presentation::IllegalValueError, m
       end
-
     end
   end
 end

data/lib/iiif/v3/presentation/annotation.rb

@@ -2,68 +2,67 @@ module IIIF
   module V3
     module Presentation
       class Annotation < IIIF::V3::AbstractResource
-
-        TYPE = 'Annotation'.freeze
+        TYPE = "Annotation".freeze
 
         def required_keys
-          super + %w{ id motivation target }
+          super + %w[id motivation target]
         end
 
         def prohibited_keys
           super + CONTENT_RESOURCE_PROPERTIES + PAGING_PROPERTIES +
-          %w{ nav_date viewing_direction start_canvas content_annotations }
+            %w[nav_date viewing_direction start_canvas content_annotations]
         end
 
         def any_type_keys
-          super + %w{ body target }
+          super + %w[body target]
         end
 
         def uri_only_keys
-          super + %w{ id }
+          super + %w[id]
         end
 
         def string_only_keys
-          super + %w{ motivation time_mode }
+          super + %w[motivation time_mode]
         end
 
         def legal_time_mode_values
-          %w{ trim scale loop }.freeze
+          %w[trim scale loop].freeze
         end
 
         def legal_viewing_hint_values
-          super + %w{ none }
+          super + %w[none]
         end
 
-        def initialize(hsh={})
-          hsh['type'] = TYPE unless hsh.has_key? 'type'
-          hsh['motivation'] = 'painting' unless hsh.has_key? 'motivation'
-          super(hsh)
+        def initialize(hsh = {})
+          hsh["type"] = TYPE unless hsh.has_key? "type"
+          hsh["motivation"] = "painting" unless hsh.has_key? "motivation"
+          super
         end
 
         def validate
           super
 
-          if self.has_key?('body') && self['body'].kind_of?(IIIF::V3::Presentation::ImageResource)
+          if has_key?("body") && self["body"].is_a?(IIIF::V3::Presentation::ImageResource)
             img_res_class_str = "IIIF::V3::Presentation::ImageResource"
 
-            unless self.motivation == 'painting'
+            unless motivation == "painting"
               m = "#{self.class} motivation must be 'painting' when body is a kind of #{img_res_class_str}"
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
 
-            body_resource = self['body']
-            body_id = body_resource['id']
+            body_resource = self["body"]
+            body_id = body_resource["id"]
             if body_id && body_id =~ /^https?:/
-              validate_uri(body_id, 'anno body ImageResource id') # can raise IllegalValueError
+              validate_uri(body_id, "anno body ImageResource id") # can raise IllegalValueError
             else
               m = "when #{self.class} body is a kind of #{img_res_class_str}, ImageResource id must be an http(s) URI"
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
           end
 
-          if self.has_key?('time_mode')
-            unless self.legal_time_mode_values.include?(self['time_mode'])
-              m = "timeMode for #{self.class} must be one of #{self.legal_time_mode_values}."
+          if has_key?("time_mode")
+            unless legal_time_mode_values.include?(self["time_mode"])
+              m = "timeMode for #{self.class} must be one of #{legal_time_mode_values}."
               raise IIIF::V3::Presentation::IllegalValueError, m
             end
           end