riiif 1.7.1 → 2.0.0.beta1

data/spec/transformers/riiif/kakadu_transformer_spec.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Riiif::KakaduTransformer do
+  subject(:instance) { described_class.new(path, image_info, transformation) }
+
+  let(:image_info) { Riiif::ImageInformation.new(6501, 4381) }
+  let(:path) { 'baseball.jp2' }
+  let(:region) { Riiif::Region::Full.new(image_info) }
+  let(:size) { Riiif::Size::Full.new }
+  let(:quality) { nil }
+  let(:rotation) { nil }
+  let(:fmt) { 'jpg' }
+
+  let(:transformation) do
+    Riiif::Transformation.new(region,
+                              size,
+                              quality,
+                              rotation,
+                              fmt)
+  end
+
+  describe '#transform' do
+    let(:image_data) { double }
+
+    subject(:transform) { instance.transform }
+
+    before do
+      allow(instance).to receive(:with_tempfile).and_yield('/tmp/foo.bmp')
+    end
+
+    context 'resize and region' do
+      # This is the validator test for size_region
+      let(:size) { Riiif::Size::Absolute.new(image_info, 38, 38) }
+      let(:region) { Riiif::Region::Absolute.new(image_info, 200, 100, 100, 100) }
+
+      let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+
+      it 'calls the Imagemagick transform' do
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 ' \
+                '-region "{0.1,0.2},{0.1,0.1}" -reduce 4 -o /tmp/foo.bmp')
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with('convert -resize 38x38! -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+        transform
+      end
+    end
+
+    context 'when reduction_factor is 0' do
+      let(:reduction_factor) { 0 }
+      context 'and the size is full' do
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+
+      context 'and size is a width' do
+        let(:size) { Riiif::Size::Width.new(image_info, 651) }
+        let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -resize 651 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+
+      context 'and size is a height' do
+        let(:size) { Riiif::Size::Height.new(image_info, 581) }
+        let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -resize x581 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+    end
+
+    context 'when reduction_factor is 1' do
+      let(:reduction_factor) { 1 }
+
+      context 'and size is a Percent' do
+        let(:size) { Riiif::Size::Percent.new(image_info, 30) }
+
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -resize 60.0% -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+
+      context 'and size is a width' do
+        let(:size) { Riiif::Size::Width.new(image_info, 408) }
+        let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -resize 408 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+
+      context 'and size is a height' do
+        let(:size) { Riiif::Size::Height.new(image_info, 481) }
+        let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+
+        it 'calls the Imagemagick transform' do
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 1 -o /tmp/foo.bmp')
+          expect(Riiif::CommandRunner).to receive(:execute)
+            .with('convert -resize x481 -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+          transform
+        end
+      end
+    end
+
+    context 'when reduction_factor is 2' do
+      let(:size) { Riiif::Size::Percent.new(image_info, 20) }
+      let(:reduction_factor) { 2 }
+      it 'calls the Imagemagick transform' do
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with('kdu_expand -quiet -i baseball.jp2 -num_threads 4 -reduce 2 -o /tmp/foo.bmp')
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with('convert -resize 80.0% -quality 85 -sampling-factor 4:2:0 -strip /tmp/foo.bmp jpg:-')
+        transform
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -177,28 +177,37 @@ files:
 - app/models/riiif/file.rb
 - app/models/riiif/image.rb
 - app/models/riiif/image_information.rb
+- app/models/riiif/transformation.rb
+- app/resolvers/riiif/abstract_file_system_resolver.rb
+- app/resolvers/riiif/akubra_system_file_resolver.rb
+- app/resolvers/riiif/file_system_file_resolver.rb
+- app/resolvers/riiif/http_file_resolver.rb
 - app/services/riiif/command_runner.rb
+- app/services/riiif/crop.rb
 - app/services/riiif/image_magick_info_extractor.rb
 - app/services/riiif/imagemagick_command_factory.rb
+- app/services/riiif/imagemagick_transformer.rb
+- app/services/riiif/kakadu_command_factory.rb
+- app/services/riiif/link_name_service.rb
+- app/services/riiif/nil_authorization_service.rb
 - app/services/riiif/option_decoder.rb
-- app/services/riiif/region/imagemagick/absolute_decoder.rb
-- app/services/riiif/region/imagemagick/full_decoder.rb
-- app/services/riiif/region/imagemagick/percentage_decoder.rb
-- app/services/riiif/region/imagemagick/square_decoder.rb
-- app/services/riiif/size/imagemagick/absolute_decoder.rb
-- app/services/riiif/size/imagemagick/best_fit_decoder.rb
-- app/services/riiif/size/imagemagick/full_decoder.rb
-- app/services/riiif/size/imagemagick/height_decoder.rb
-- app/services/riiif/size/imagemagick/percent_decoder.rb
-- app/services/riiif/size/imagemagick/width_decoder.rb
+- app/services/riiif/region/absolute.rb
+- app/services/riiif/region/full.rb
+- app/services/riiif/region/percentage.rb
+- app/services/riiif/region/square.rb
+- app/services/riiif/resize.rb
+- app/services/riiif/size/absolute.rb
+- app/services/riiif/size/best_fit.rb
+- app/services/riiif/size/full.rb
+- app/services/riiif/size/height.rb
+- app/services/riiif/size/percent.rb
+- app/services/riiif/size/width.rb
+- app/transformers/riiif/abstract_transformer.rb
+- app/transformers/riiif/imagemagick_transformer.rb
+- app/transformers/riiif/kakadu_transformer.rb
 - config/routes.rb
 - lib/riiif.rb
-- lib/riiif/abstract_file_system_resolver.rb
-- lib/riiif/akubra_system_file_resolver.rb
 - lib/riiif/engine.rb
-- lib/riiif/file_system_file_resolver.rb
-- lib/riiif/http_file_resolver.rb
-- lib/riiif/nil_authorization_service.rb
 - lib/riiif/rails/routes.rb
 - lib/riiif/routes.rb
 - lib/riiif/version.rb
@@ -209,12 +218,19 @@ files:
 - spec/models/riiif/http_file_resolver_spec.rb
 - spec/models/riiif/image_information_spec.rb
 - spec/models/riiif/image_spec.rb
+- spec/models/riiif/transformation_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb
 - spec/services/riiif/imagemagick_command_factory_spec.rb
+- spec/services/riiif/kakadu_command_factory_spec.rb
+- spec/services/riiif/region/absolute_spec.rb
+- spec/services/riiif/size/absolute_spec.rb
+- spec/services/riiif/size/height_spec.rb
+- spec/services/riiif/size/width_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/transformers/riiif/kakadu_transformer_spec.rb
 homepage: https://github.com/curationexperts/riiif
 licenses:
 - APACHE2
@@ -230,12 +246,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests
@@ -246,9 +262,16 @@ test_files:
 - spec/models/riiif/http_file_resolver_spec.rb
 - spec/models/riiif/image_information_spec.rb
 - spec/models/riiif/image_spec.rb
+- spec/models/riiif/transformation_spec.rb
 - spec/routing/redirect_spec.rb
 - spec/routing/resize_routes_spec.rb
 - spec/services/riiif/imagemagick_command_factory_spec.rb
+- spec/services/riiif/kakadu_command_factory_spec.rb
+- spec/services/riiif/region/absolute_spec.rb
+- spec/services/riiif/size/absolute_spec.rb
+- spec/services/riiif/size/height_spec.rb
+- spec/services/riiif/size/width_spec.rb
 - spec/spec_helper.rb
 - spec/test_app_templates/Gemfile.extra
 - spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/transformers/riiif/kakadu_transformer_spec.rb

data/app/services/riiif/region/imagemagick/absolute_decoder.rb

@@ -1,21 +0,0 @@
-module Riiif
-  module Region
-    module Imagemagick
-      # decodes requested cooridnates into an imagemagick crop directive
-      class AbsoluteDecoder
-        def initialize(x, y, width, height)
-          @x = x
-          @y = y
-          @width = width
-          @height = height
-        end
-
-        # @return [String] a region for imagemagick to decode
-        #                  (appropriate for passing to the -crop parameter)
-        def decode
-          "#{@width}x#{@height}+#{@x}+#{@y}"
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/region/imagemagick/full_decoder.rb

@@ -1,14 +0,0 @@
-module Riiif
-  module Region
-    module Imagemagick
-      # The image or region is not scaled, and is returned at its full size.
-      class FullDecoder
-        # @return [NilClass] a region for imagemagick to decode
-        #                    the nil implies no cropping needed
-        def decode
-          nil
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/region/imagemagick/percentage_decoder.rb

@@ -1,33 +0,0 @@
-module Riiif
-  module Region
-    module Imagemagick
-      # decodes requested cooridnates into an imagemagick crop directive
-      class PercentageDecoder
-        def initialize(image_info, x, y, width, height)
-          @image_info = image_info
-          @x = x
-          @y = y
-          @width = width
-          @height = height
-        end
-
-        # Imagemagick can't do percentage offsets, so we have to calculate it
-        # @return [String] a region for imagemagick to decode
-        #                  (appropriate for passing to the -crop parameter)
-        def decode
-          "#{@width}%x#{@height}+#{offset_x}+#{offset_y}"
-        end
-
-        private
-
-          def offset_x
-            (@image_info.width * Integer(@x).to_f / 100).round
-          end
-
-          def offset_y
-            (@image_info.height * Integer(@y).to_f / 100).round
-          end
-      end
-    end
-  end
-end

data/app/services/riiif/region/imagemagick/square_decoder.rb

@@ -1,25 +0,0 @@
-module Riiif
-  module Region
-    module Imagemagick
-      # decodes requested cooridnates into an imagemagick crop directive
-      class SquareDecoder
-        def initialize(image_info)
-          @image_info = image_info
-        end
-
-        # @return [String] a square region for imagemagick to decode
-        #                  (appropriate for passing to the -crop parameter)
-        def decode
-          min, max = [@image_info.width, @image_info.height].minmax
-
-          offset = (max - min) / 2
-          if @image_info.height >= @image_info.width
-            "#{min}x#{min}+0+#{offset}"
-          else
-            "#{min}x#{min}+#{offset}+0"
-          end
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/size/imagemagick/absolute_decoder.rb

@@ -1,20 +0,0 @@
-module Riiif
-  module Size
-    module Imagemagick
-      # The width and height of the returned image are exactly w and h.
-      # The aspect ratio of the returned image may be different than the extracted
-      # region, resulting in a distorted image.
-      class AbsoluteDecoder
-        def initialize(width, height)
-          @width = width
-          @height = height
-        end
-
-        # @return [String] a resize directive for imagemagick to use
-        def decode
-          "#{@width}x#{@height}!"
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/size/imagemagick/best_fit_decoder.rb

@@ -1,19 +0,0 @@
-module Riiif
-  module Size
-    module Imagemagick
-      # The image content is scaled for the best fit such that the resulting width and
-      # height are less than or equal to the requested width and height.
-      class BestFitDecoder
-        def initialize(width, height)
-          @width = width
-          @height = height
-        end
-
-        # @return [String] a resize directive for imagemagick to use
-        def decode
-          "#{@width}x#{@height}"
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/size/imagemagick/full_decoder.rb

@@ -1,14 +0,0 @@
-module Riiif
-  module Size
-    module Imagemagick
-      # decodes requested size into an imagemagick resize directive
-      class FullDecoder
-        # @return [NilClass] a size for imagemagick to decode
-        #                    the nil implies no resizing needed
-        def decode
-          nil
-        end
-      end
-    end
-  end
-end

data/app/services/riiif/size/imagemagick/height_decoder.rb

@@ -1,19 +0,0 @@
-module Riiif
-  module Size
-    module Imagemagick
-      # The image or region should be scaled so that its height is exactly equal
-      # to the provided parameter, and the width will be a calculated value that
-      # maintains the aspect ratio of the extracted region
-      class HeightDecoder
-        def initialize(height)
-          @height = height
-        end
-
-        # @return [String] a resize directive for imagemagick to use
-        def decode
-          "x#{@height}"
-        end
-      end
-    end
-  end
-end