riiif 2.0.0.beta2 → 2.0.0

data/spec/services/riiif/imagemagick_command_factory_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 RSpec.describe Riiif::ImagemagickCommandFactory do
   let(:path) { 'foo.tiff' }
-  let(:info) { double('foo') }
+  let(:info) { double(height: 100, width: 100, format: 'JPEG') }
 
   describe '.command' do
     subject { instance.command }
     let(:instance) { described_class.new(path, info, transformation) }
 
     let(:transformation) do
-      Riiif::Transformation.new(Riiif::Region::Full.new(info),
-                                Riiif::Size::Full.new,
-                                'quality',
-                                'rotation',
-                                format)
+      IIIF::Image::Transformation.new(region: IIIF::Image::Region::Full.new,
+                                      size: IIIF::Image::Size::Full.new,
+                                      quality: 'quality',
+                                      rotation: 15.2,
+                                      format: format)
     end
 
     context "when it's a jpeg" do

data/spec/services/riiif/kakadu_command_factory_spec.rb

@@ -7,18 +7,18 @@ RSpec.describe Riiif::KakaduCommandFactory do
 
   let(:info) { double(:info) }
   let(:path) { 'foo.jp2' }
-  let(:region) { Riiif::Region::Full.new(info) }
-  let(:size) { Riiif::Size::Full.new }
+  let(:region) { IIIF::Image::Region::Full.new }
+  let(:size) { IIIF::Image::Size::Full.new }
   let(:quality) { nil }
   let(:rotation) { nil }
   let(:fmt) { nil }
 
   let(:transformation) do
-    Riiif::Transformation.new(region,
-                              size,
-                              quality,
-                              rotation,
-                              fmt)
+    IIIF::Image::Transformation.new(region: region,
+                                    size: size,
+                                    quality: quality,
+                                    rotation: rotation,
+                                    format: fmt)
   end
 
   describe '#command' do
@@ -38,17 +38,17 @@ RSpec.describe Riiif::KakaduCommandFactory do
     end
 
     context 'with absolute' do
-      let(:region) { Riiif::Region::Absolute.new(info, 25, 75, 150, 100) }
+      let(:region) { IIIF::Image::Region::Absolute.new(25, 75, 150, 100) }
       it { is_expected.to eq ' -region "{0.25,0.08333333333333333},{0.3333333333333333,0.5}"' }
     end
 
     context 'with a square' do
-      let(:region) { Riiif::Region::Square.new(info) }
+      let(:region) { IIIF::Image::Region::Square.new }
       it { is_expected.to eq ' -region "{0.0,0},{1.0,1.0}"' }
     end
 
     context 'with a percentage' do
-      let(:region) { Riiif::Region::Percentage.new(info, 20, 30, 40, 50) }
+      let(:region) { IIIF::Image::Region::Percent.new(20.0, 30.0, 40.0, 50.0) }
       it { is_expected.to eq ' -region "{0.3,0.2},{0.5,0.4}"' }
     end
   end
@@ -56,29 +56,29 @@ RSpec.describe Riiif::KakaduCommandFactory do
   describe '#reduction_factor' do
     subject { instance.send(:reduction_factor) }
 
-    let(:info) { Riiif::ImageInformation.new(300, 300) }
+    let(:info) { Riiif::ImageInformation.new(width: 300, height: 300) }
 
     context 'for a full size image' do
       it { is_expected.to eq nil }
     end
 
     context 'when the aspect ratio is maintined for absolute' do
-      let(:size) { Riiif::Size::Absolute.new(info, 145, 145) }
+      let(:size) { IIIF::Image::Size::Absolute.new(145, 145) }
       it { is_expected.to eq 1 }
     end
 
     context 'when the aspect ratio is not-maintined' do
-      let(:size) { Riiif::Size::Absolute.new(info, 100, 145) }
+      let(:size) { IIIF::Image::Size::Absolute.new(100, 145) }
       it { is_expected.to eq nil }
     end
 
     context 'when aspect ratio is maintained for 45 pct' do
-      let(:size) { Riiif::Size::Percent.new(info, 45) }
+      let(:size) { IIIF::Image::Size::Percent.new(45.0) }
       it { is_expected.to eq 1 }
     end
 
     context 'when aspect ratio is maintained for 20 pct' do
-      let(:size) { Riiif::Size::Percent.new(info, 20) }
+      let(:size) { IIIF::Image::Size::Percent.new(20.0) }
       it { is_expected.to eq 2 }
     end
   end

data/spec/transformers/riiif/kakadu_transformer_spec.rb

@@ -5,20 +5,20 @@ 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(:image_info) { Riiif::ImageInformation.new(width: 6501, height: 4381) }
   let(:path) { 'baseball.jp2' }
-  let(:region) { Riiif::Region::Full.new(image_info) }
-  let(:size) { Riiif::Size::Full.new }
+  let(:region) { IIIF::Image::Region::Full.new }
+  let(:size) { IIIF::Image::Size::Full.new }
   let(:quality) { nil }
-  let(:rotation) { nil }
+  let(:rotation) { 0 }
   let(:fmt) { 'jpg' }
 
   let(:transformation) do
-    Riiif::Transformation.new(region,
-                              size,
-                              quality,
-                              rotation,
-                              fmt)
+    IIIF::Image::Transformation.new(region: region,
+                                    size: size,
+                                    quality: quality,
+                                    rotation: rotation,
+                                    format: fmt)
   end
 
   describe '#transform' do
@@ -32,10 +32,10 @@ RSpec.describe Riiif::KakaduTransformer do
 
     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(:size) { IIIF::Image::Size::Absolute.new(38, 38) }
+      let(:region) { IIIF::Image::Region::Absolute.new(200, 100, 100, 100) }
 
-      let(:image_info) { Riiif::ImageInformation.new(1000, 1000) }
+      let(:image_info) { Riiif::ImageInformation.new(width: 1000, height: 1000) }
 
       it 'calls the Imagemagick transform' do
         expect(Riiif::CommandRunner).to receive(:execute)
@@ -60,8 +60,8 @@ RSpec.describe Riiif::KakaduTransformer do
       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) }
+        let(:size) { IIIF::Image::Size::Width.new(651) }
+        let(:image_info) { Riiif::ImageInformation.new(width: 1000, height: 1000) }
 
         it 'calls the Imagemagick transform' do
           expect(Riiif::CommandRunner).to receive(:execute)
@@ -73,8 +73,8 @@ RSpec.describe Riiif::KakaduTransformer do
       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) }
+        let(:size) { IIIF::Image::Size::Height.new(581) }
+        let(:image_info) { Riiif::ImageInformation.new(width: 1000, height: 1000) }
 
         it 'calls the Imagemagick transform' do
           expect(Riiif::CommandRunner).to receive(:execute)
@@ -90,7 +90,7 @@ RSpec.describe Riiif::KakaduTransformer do
       let(:reduction_factor) { 1 }
 
       context 'and size is a Percent' do
-        let(:size) { Riiif::Size::Percent.new(image_info, 30) }
+        let(:size) { IIIF::Image::Size::Percent.new(30.0) }
 
         it 'calls the Imagemagick transform' do
           expect(Riiif::CommandRunner).to receive(:execute)
@@ -102,8 +102,8 @@ RSpec.describe Riiif::KakaduTransformer do
       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) }
+        let(:size) { IIIF::Image::Size::Width.new(408) }
+        let(:image_info) { Riiif::ImageInformation.new(width: 1000, height: 1000) }
 
         it 'calls the Imagemagick transform' do
           expect(Riiif::CommandRunner).to receive(:execute)
@@ -115,8 +115,8 @@ RSpec.describe Riiif::KakaduTransformer do
       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) }
+        let(:size) { IIIF::Image::Size::Height.new(481) }
+        let(:image_info) { Riiif::ImageInformation.new(width: 1000, height: 1000) }
 
         it 'calls the Imagemagick transform' do
           expect(Riiif::CommandRunner).to receive(:execute)
@@ -129,7 +129,7 @@ RSpec.describe Riiif::KakaduTransformer do
     end
 
     context 'when reduction_factor is 2' do
-      let(:size) { Riiif::Size::Percent.new(image_info, 20) }
+      let(:size) { IIIF::Image::Size::Percent.new(20.0) }
       let(:reduction_factor) { 2 }
       it 'calls the Imagemagick transform' do
         expect(Riiif::CommandRunner).to receive(:execute)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta2
+  version: 2.0.0
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-09 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: iiif-image-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -115,33 +129,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.47.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.47.1
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
+  name: bixby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ dependencies:
         version: '0'
 description: A IIIF image server
 email:
-- justin@curationexperts.com
+- administrator@curationexperts.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -177,7 +177,6 @@ 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
@@ -186,26 +185,15 @@ files:
 - 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/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
+- docs/benchmark.md
 - lib/riiif.rb
 - lib/riiif/engine.rb
 - lib/riiif/rails/routes.rb
@@ -218,15 +206,10 @@ 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
@@ -246,12 +229,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests
@@ -262,15 +245,10 @@ 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

data/app/models/riiif/transformation.rb

@@ -1,35 +0,0 @@
-module Riiif
-  # Represents a IIIF request
-  class Transformation
-    attr_reader :crop, :size, :quality, :rotation, :format
-    def initialize(crop, size, quality, rotation, format)
-      @crop = crop
-      @size = size
-      @quality = quality
-      @rotation = rotation
-      @format = format
-    end
-
-    # Create a clone of this Transformation, scaled by the factor
-    # @param [Integer] factor the scale for the new transformation
-    # @return [Transformation] a new transformation, scaled by factor
-    def reduce(factor)
-      Transformation.new(crop.dup,
-                         size.reduce(factor),
-                         quality,
-                         rotation,
-                         format)
-    end
-
-    # Create a clone of this Transformation, without the crop
-    # @return [Transformation] a new transformation
-    # TODO: it would be nice if we didn't need image_info
-    def without_crop(image_info)
-      Transformation.new(Region::Full.new(image_info),
-                         size.dup,
-                         quality,
-                         rotation,
-                         format)
-    end
-  end
-end

data/app/services/riiif/imagemagick_transformer.rb

@@ -1,8 +0,0 @@
-module Riiif
-  # Transforms an image using Imagemagick
-  class ImagemagickTransformer < AbstractTransformer
-    def command_factory
-      ImagemagickCommandFactory
-    end
-  end
-end

data/app/services/riiif/option_decoder.rb

@@ -1,88 +0,0 @@
-module Riiif
-  # Decodes the URL parameters into a Transformation object
-  class OptionDecoder
-    OUTPUT_FORMATS = %w(jpg png).freeze
-
-    # a helper method for instantiating the OptionDecoder
-    # @param [ActiveSupport::HashWithIndifferentAccess] options
-    # @param [ImageInformation] image_info
-    def self.decode(options, image_info)
-      new(options, image_info).decode
-    end
-
-    # @param [ActiveSupport::HashWithIndifferentAccess] options
-    # @param [ImageInformation] image_info
-    def initialize(options, image_info)
-      @options = options
-      @image_info = image_info
-    end
-
-    attr_reader :image_info
-
-    ##
-    # @return [Transformation]
-    def decode
-      raise ArgumentError, "You must provide a format. You provided #{@options}" unless @options[:format]
-      validate_format!(@options[:format])
-      Riiif::Transformation.new(decode_region(@options.delete(:region)),
-                                decode_size(@options.delete(:size)),
-                                decode_quality(@options[:quality]),
-                                decode_rotation(@options[:rotation]),
-                                @options[:format])
-    end
-
-    def decode_quality(quality)
-      return if quality.nil? || %w(default color).include?(quality)
-      return quality if %w(bitonal grey).include?(quality)
-      raise InvalidAttributeError, "Unsupported quality: #{quality}"
-    end
-
-    def decode_rotation(rotation)
-      return if rotation.nil? || rotation == '0'
-      begin
-        Float(rotation)
-      rescue ArgumentError
-        raise InvalidAttributeError, "Unsupported rotation: #{rotation}"
-      end
-    end
-
-    def validate_format!(format)
-      raise InvalidAttributeError, "Unsupported format: #{format}" unless OUTPUT_FORMATS.include?(format)
-    end
-
-    def decode_region(region)
-      if region.nil? || region == 'full'
-        Riiif::Region::Full.new(image_info)
-      elsif md = /^pct:(\d+),(\d+),(\d+),(\d+)$/.match(region)
-        Riiif::Region::Percentage
-          .new(image_info, md[1], md[2], md[3], md[4])
-      elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
-        Riiif::Region::Absolute.new(image_info, md[1], md[2], md[3], md[4])
-      elsif region == 'square'
-        Riiif::Region::Square.new(image_info)
-      else
-        raise InvalidAttributeError, "Invalid region: #{region}"
-      end
-    end
-
-    # rubocop:disable Metrics/PerceivedComplexity
-    def decode_size(size)
-      if size.nil? || size == 'full'
-        Riiif::Size::Full.new
-      elsif md = /^,(\d+)$/.match(size)
-        Riiif::Size::Height.new(image_info, md[1])
-      elsif md = /^(\d+),$/.match(size)
-        Riiif::Size::Width.new(image_info, md[1])
-      elsif md = /^pct:(\d+(.\d+)?)$/.match(size)
-        Riiif::Size::Percent.new(image_info, md[1])
-      elsif md = /^(\d+),(\d+)$/.match(size)
-        Riiif::Size::Absolute.new(image_info, md[1], md[2])
-      elsif md = /^!(\d+),(\d+)$/.match(size)
-        Riiif::Size::BestFit.new(image_info, md[1], md[2])
-      else
-        raise InvalidAttributeError, "Invalid size: #{size}"
-      end
-    end
-    # rubocop:enable Metrics/PerceivedComplexity
-  end
-end