iiif_manifest 1.0.1 → 1.1.0

data/iiif_manifest.gemspec

@@ -19,12 +19,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activesupport', '>= 4'
 
-  spec.add_development_dependency 'bixby', '~> 1.0'
+  spec.add_development_dependency 'bixby', '~> 3.0'
   spec.add_development_dependency 'coveralls'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 12.3.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/iiif_manifest/manifest_builder.rb

@@ -35,12 +35,12 @@ module IIIFManifest
 
     private
 
-      def manifest
-        @manifest ||= manifest_builder_class
-      end
+    def manifest
+      @manifest ||= manifest_builder_class
+    end
 
-      def top_record
-        top_record_factory.new
-      end
+    def top_record
+      top_record_factory.new
+    end
   end
 end

data/lib/iiif_manifest/manifest_builder/canvas_builder.rb

@@ -28,18 +28,18 @@ module IIIFManifest
 
       private
 
-        def display_image
-          record.display_image if record.respond_to?(:display_image)
-        end
-
-        def apply_record_properties
-          canvas['@id'] = path
-          canvas.label = record.to_s
-        end
-
-        def attach_image
-          image_builder.new(display_image).apply(canvas)
-        end
+      def display_image
+        record.display_image if record.respond_to?(:display_image)
+      end
+
+      def apply_record_properties
+        canvas['@id'] = path
+        canvas.label = record.to_s
+      end
+
+      def attach_image
+        image_builder.new(display_image).apply(canvas)
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/canvas_builder_factory.rb

@@ -17,9 +17,9 @@ module IIIFManifest
 
       private
 
-        def file_set_presenters(work)
-          work.file_set_presenters
-        end
+      def file_set_presenters(work)
+        work.file_set_presenters
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/deep_canvas_builder_factory.rb

@@ -3,9 +3,9 @@ module IIIFManifest
     class DeepCanvasBuilderFactory < CanvasBuilderFactory
       private
 
-        def file_set_presenters(work)
-          DeepFileSetEnumerator.new(work).to_a
-        end
+      def file_set_presenters(work)
+        DeepFileSetEnumerator.new(work).to_a
+      end
     end
 
     class DeepFileSetEnumerator
@@ -26,13 +26,13 @@ module IIIFManifest
 
       private
 
-        def file_set_presenters
-          work.try(:file_set_presenters) || []
-        end
+      def file_set_presenters
+        work.try(:file_set_presenters) || []
+      end
 
-        def work_presenters
-          work.try(:work_presenters) || []
-        end
+      def work_presenters
+        work.try(:work_presenters) || []
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/image_builder.rb

@@ -18,17 +18,17 @@ module IIIFManifest
 
       private
 
-        def build_resource
-          resource_builder.apply(annotation)
-        end
+      def build_resource
+        resource_builder.apply(annotation)
+      end
 
-        def resource_builder
-          resource_builder_factory.new(display_image)
-        end
+      def resource_builder
+        resource_builder_factory.new(display_image)
+      end
 
-        def annotation
-          @annotation ||= iiif_annotation_factory.new
-        end
+      def annotation
+        @annotation ||= iiif_annotation_factory.new
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/image_service_builder.rb

@@ -16,9 +16,9 @@ module IIIFManifest
 
       private
 
-        def service
-          @service ||= iiif_service_factory.new
-        end
+      def service
+        @service ||= iiif_service_factory.new
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/record_property_builder.rb

@@ -22,65 +22,65 @@ module IIIFManifest
 
       private
 
-        def viewing_hint
-          (record.respond_to?(:viewing_hint) && record.send(:viewing_hint))
-        end
+      def viewing_hint
+        (record.respond_to?(:viewing_hint) && record.send(:viewing_hint))
+      end
 
-        def viewing_direction
-          (record.respond_to?(:viewing_direction) && record.send(:viewing_direction))
-        end
+      def viewing_direction
+        (record.respond_to?(:viewing_direction) && record.send(:viewing_direction))
+      end
 
-        def autocomplete_service
-          (record.respond_to?(:autocomplete_service) && record.send(:autocomplete_service))
-        end
+      def autocomplete_service
+        (record.respond_to?(:autocomplete_service) && record.send(:autocomplete_service))
+      end
 
-        def search_service
-          (record.respond_to?(:search_service) && record.send(:search_service))
-        end
+      def search_service
+        (record.respond_to?(:search_service) && record.send(:search_service))
+      end
 
-        def iiif_search_service
-          @iiif_search_service ||= iiif_search_service_factory.new
-        end
+      def iiif_search_service
+        @iiif_search_service ||= iiif_search_service_factory.new
+      end
 
-        def iiif_autocomplete_service
-          @iiif_autocomplete_service ||= iiif_autocomplete_service_factory.new
-        end
+      def iiif_autocomplete_service
+        @iiif_autocomplete_service ||= iiif_autocomplete_service_factory.new
+      end
 
         # Build services. Currently supported:
         #   search_service, with (optional) embedded autocomplete service
         #
         # @return [Array] array of services
-        def services
-          iiif_search_service.search_service = search_service
-          iiif_autocomplete_service.autocomplete_service = autocomplete_service
-          iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
-          [iiif_search_service]
-        end
+      def services
+        iiif_search_service.search_service = search_service
+        iiif_autocomplete_service.autocomplete_service = autocomplete_service
+        iiif_search_service.service = iiif_autocomplete_service if autocomplete_service.present?
+        [iiif_search_service]
+      end
 
         # Validate manifest_metadata against the IIIF spec format for metadata
         #
         # @return [Boolean]
-        def valid_metadata?
-          return false unless record.respond_to?(:manifest_metadata)
-          metadata = record.manifest_metadata
-          valid_metadata_structure?(metadata) && valid_metadata_content?(metadata)
-        end
+      def valid_metadata?
+        return false unless record.respond_to?(:manifest_metadata)
+        metadata = record.manifest_metadata
+        valid_metadata_structure?(metadata) && valid_metadata_content?(metadata)
+      end
 
         # Manifest metadata must be an array containing hashes
         #
         # @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
         # @return [Boolean]
-        def valid_metadata_structure?(metadata)
-          metadata.is_a?(Array) && metadata.all? { |v| v.is_a?(Hash) }
-        end
+      def valid_metadata_structure?(metadata)
+        metadata.is_a?(Array) && metadata.all? { |v| v.is_a?(Hash) }
+      end
 
         # Manifest Metadata Hashes must contain 'label' and 'value' keys
         #
         # @param metadata [Array<Hash>] a list of metadata with label and value as required keys for each entry
         # @return [Boolean]
-        def valid_metadata_content?(metadata)
-          metadata.all? { |v| v['label'].present? && v['value'].present? }
-        end
+      def valid_metadata_content?(metadata)
+        metadata.all? { |v| v['label'].present? && v['value'].present? }
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/resource_builder.rb

@@ -20,17 +20,17 @@ module IIIFManifest
 
       private
 
-        def resource
-          @resource ||= iiif_resource_factory.new
-        end
+      def resource
+        @resource ||= iiif_resource_factory.new
+      end
 
-        def iiif_endpoint
-          display_image.try(:iiif_endpoint)
-        end
+      def iiif_endpoint
+        display_image.try(:iiif_endpoint)
+      end
 
-        def image_service_builder
-          image_service_builder_factory.new(iiif_endpoint)
-        end
+      def image_service_builder
+        image_service_builder_factory.new(iiif_endpoint)
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_builder/sequence_builder.rb

@@ -20,28 +20,28 @@ module IIIFManifest
 
       private
 
-        def canvas_builder
-          canvas_builder_factory.from(work)
-        end
-
-        def sequence
-          @sequence ||=
-            begin
-              sequence = sequence_factory.new
-              sequence['@id'] ||= work.manifest_url + '/sequence/normal'
-              sequence['rendering'] ||= populate_sequence_rendering
-              canvas_builder.apply(sequence)
-              sequence
-            end
-        end
+      def canvas_builder
+        canvas_builder_factory.from(work)
+      end
 
-        def populate_sequence_rendering
-          if work.respond_to?(:sequence_rendering)
-            work.sequence_rendering.each(&:to_h)
-          else
-            []
+      def sequence
+        @sequence ||=
+          begin
+            sequence = sequence_factory.new
+            sequence['@id'] ||= work.manifest_url + '/sequence/normal'
+            sequence['rendering'] ||= populate_sequence_rendering
+            canvas_builder.apply(sequence)
+            sequence
           end
+      end
+
+      def populate_sequence_rendering
+        if work.respond_to?(:sequence_rendering)
+          work.sequence_rendering.each(&:to_h)
+        else
+          []
         end
+      end
     end
   end
 end

data/lib/iiif_manifest/manifest_factory.rb

@@ -29,8 +29,8 @@ module IIIFManifest
 
     private
 
-      def sammelband?(work)
-        work.respond_to?(:sammelband?) && work.sammelband?
-      end
+    def sammelband?(work)
+      work.respond_to?(:sammelband?) && work.sammelband?
+    end
   end
 end

data/lib/iiif_manifest/manifest_service_locator.rb

@@ -195,13 +195,13 @@ module IIIFManifest
 
     class InjectedFactory
       attr_reader :factory, :hash_args
-      def initialize(factory, hash_args)
+      def initialize(factory, **hash_args)
         @hash_args = hash_args
         @factory = factory
       end
 
       def new(*args)
-        factory.new(*args, hash_args)
+        factory.new(*args, **hash_args)
       end
     end
   end

data/lib/iiif_manifest/v3/manifest_builder.rb

@@ -26,10 +26,10 @@ module IIIFManifest
 
         private
 
-          def obj_to_language_map(obj)
-            return nil unless obj.is_a?(String) || (obj.is_a?(Array) && obj.all? { |o| o.is_a?(String) })
-            { '@none' => Array(obj) }
-          end
+        def obj_to_language_map(obj)
+          return nil unless obj.is_a?(String) || (obj.is_a?(Array) && obj.all? { |o| o.is_a?(String) })
+          { '@none' => Array(obj) }
+        end
       end
 
       attr_reader :work,
@@ -53,9 +53,9 @@ module IIIFManifest
 
      private
 
-       def top_record
-         top_record_factory.new
-       end
+      def top_record
+        top_record_factory.new
+      end
     end
   end
 end

data/lib/iiif_manifest/v3/manifest_builder/body_builder.rb

@@ -18,43 +18,43 @@ module IIIFManifest
 
         private
 
-          def build_body
-            body['id'] = display_content.url
-            body['type'] = body_type
-            body['height'] = display_content.height if display_content.try(:height).present?
-            body['width'] = display_content.width if display_content.try(:width).present?
-            body['duration'] = display_content.duration if display_content.try(:duration).present?
-            body['format'] = display_content.format if display_content.try(:format).present?
-            body['label'] = ManifestBuilder.language_map(display_content.label) if display_content.try(:label).present?
-          end
-
-          def body
-            @body ||= iiif_body_factory.new
-          end
-
-          def body_type
-            display_content.try(:type) || 'Image'
-          end
-
-          def iiif_endpoint
-            display_content.try(:iiif_endpoint)
-          end
-
-          def image_service_builder
-            image_service_builder_factory.new(iiif_endpoint)
-          end
-
-          def auth_service
-            display_content.try(:auth_service)
-          end
-
-          def apply_auth_service
-            body.service = if body['service'].blank?
-                             [auth_service]
-                           else
-                             body['service'] + [auth_service]
-                           end
-          end
+        def build_body
+          body['id'] = display_content.url
+          body['type'] = body_type
+          body['height'] = display_content.height if display_content.try(:height).present?
+          body['width'] = display_content.width if display_content.try(:width).present?
+          body['duration'] = display_content.duration if display_content.try(:duration).present?
+          body['format'] = display_content.format if display_content.try(:format).present?
+          body['label'] = ManifestBuilder.language_map(display_content.label) if display_content.try(:label).present?
+        end
+
+        def body
+          @body ||= iiif_body_factory.new
+        end
+
+        def body_type
+          display_content.try(:type) || 'Image'
+        end
+
+        def iiif_endpoint
+          display_content.try(:iiif_endpoint)
+        end
+
+        def image_service_builder
+          image_service_builder_factory.new(iiif_endpoint)
+        end
+
+        def auth_service
+          display_content.try(:auth_service)
+        end
+
+        def apply_auth_service
+          body.service = if body['service'].blank?
+                           [auth_service]
+                         else
+                           body['service'] + [auth_service]
+                         end
+        end
       end
     end
   end