riiif 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0af476f4ae806dfd50b80d55822b1b4e737bca3
-  data.tar.gz: a19cc06b6257e2e8bfc20e10ebca47d842b71521
+  metadata.gz: 9ad33e2e0d258079efa25eef4e206dd4099996dd
+  data.tar.gz: 960a01a9a73dcf961ce4c945f6a2fcd64adca6ad
 SHA512:
-  metadata.gz: bcfa15704d359abae49010c15e118f24a4107c56d0f5839a5cb8494216dabf7e6b8207338988b13f54b4ed39d37fa8857e6426a5974d376011d5bcdc1a1036f9
-  data.tar.gz: 521ca263dd137a5a96e9d816f84576f04b3e175e0fc7c9382fdc33a88be375ff39a23b288645054f3c64142c9921fbd4c188ad8f0d57bccbf97ab7003ac96a60
+  metadata.gz: 4d6ead011f1e16fd7559fd67df911a1e964a4a8f17c73a549e4f9473b511021b675bbbe6b731cb86528a899138445a27427aab42e1a264ffb8e5b7d1869ba10d
+  data.tar.gz: 58eea4d035b7ac49adb4fa8fc91537e76114ee76d025fde5538502e0bfb9c5e672cae5b109a9a63ad0ddbd853652820b9612b7ac2297c7055eb40ac29865cd47

data/.rubocop.yml

@@ -1,4 +1,12 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 2.1
+  DisplayCopNames: true
+
 Style/IndentationConsistency:
   EnforcedStyle: rails
+
+Metrics/BlockLength:
+  Exclude:
+    - spec/**/*

data/.rubocop_todo.yml

@@ -28,11 +28,6 @@ Lint/UselessAssignment:
 Metrics/AbcSize:
   Max: 38
 
-# Offense count: 12
-# Configuration parameters: CountComments, ExcludedMethods.
-Metrics/BlockLength:
-  Max: 143
-
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
@@ -46,17 +41,13 @@ Metrics/CyclomaticComplexity:
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
-  Max: 160
+  Max: 120
 
 # Offense count: 7
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 21
 
-# Offense count: 2
-Metrics/PerceivedComplexity:
-  Max: 9
-
 # Offense count: 1
 # Cop supports --auto-correct.
 Performance/RedundantMatch:

data/app/controllers/riiif/images_controller.rb

@@ -59,7 +59,9 @@ module Riiif
       ##
       # @return [ActiveSupport::HashWithIndifferentAccess]
       def image_request_params
-        params.permit(:region, :size, :rotation, :quality, :format).to_h
+        result = params.permit(:region, :size, :rotation, :quality, :format).to_h
+        return result.with_indifferent_access if Rails.version < '5'
+        result
       end
 
       def authorization_service

data/app/models/riiif/file.rb

@@ -1,12 +1,9 @@
-require 'open3'
 module Riiif
   class File
-    include Open3
-    include ActiveSupport::Benchmarkable
-
     attr_reader :path
 
-    delegate :logger, to: :Rails
+    class_attribute :info_extractor_class
+    self.info_extractor_class = ImageMagickInfoExtractor
 
     # @param input_path [String] The location of an image file
     def initialize(input_path, tempfile = nil)
@@ -34,48 +31,31 @@ module Riiif
 
     end
 
-    def extract(options)
-
+    # @param [Transformation] transformation
+    def extract(transformation)
       command = 'convert'
-      command << " -crop #{options[:crop]}" if options[:crop]
-      command << " -resize #{options[:size]}" if options[:size]
-      if options[:rotation]
-        command << " -virtual-pixel white +distort srt #{options[:rotation]}"
+      command << " -crop #{transformation.crop}" if transformation.crop
+      command << " -resize #{transformation.size}" if transformation.size
+      if transformation.rotation
+        command << " -virtual-pixel white +distort srt #{transformation.rotation}"
       end
 
-      case options[:quality]
+      case transformation.quality
       when 'grey'
         command << ' -colorspace Gray'
       when 'bitonal'
         command << ' -colorspace Gray'
         command << ' -type Bilevel'
       end
-      command << " #{path} #{options[:format]}:-"
+      command << " #{path} #{transformation.format}:-"
       execute(command)
     end
 
     def info
-      return @info if @info
-      height, width = execute("identify -format %hx%w #{path}").split('x')
-      @info = { height: Integer(height), width: Integer(width) }
+      @info ||= info_extractor_class.new(path).extract
     end
 
-    private
-
-      def execute(command)
-        out = nil
-        benchmark("Riiif executed #{command}") do
-          stdin, stdout, stderr, wait_thr = popen3(command)
-          stdin.close
-          stdout.binmode
-          out = stdout.read
-          stdout.close
-          err = stderr.read
-          stderr.close
-          raise "Unable to execute command \"#{command}\"\n#{err}" unless wait_thr.value.success?
-        end
-        out
-      end
-
+    delegate :execute, to: Riiif::CommandRunner
+    private :execute
   end
 end

data/app/models/riiif/image.rb

@@ -42,7 +42,10 @@ module Riiif
     end
 
     def info
-      info_service.call(id, image)
+      @info ||= begin
+                  result = info_service.call(id, image)
+                  ImageInformation.new(result[:width], result[:height])
+                end
     end
 
     class << self
@@ -52,7 +55,7 @@ module Riiif
 
 
       def cache_key(id, options)
-        str = options.merge(id: id).delete_if { |_, v| v.nil? }.to_s
+        str = options.to_h.merge(id: id).delete_if { |_, v| v.nil? }.to_s
         # Use a MD5 digest to ensure the keys aren't too long.
         Digest::MD5.hexdigest(str)
       end
@@ -62,14 +65,15 @@ module Riiif
 
       ##
       # @param [ActiveSupport::HashWithIndifferentAccess] options
+      # @return [Transformation]
       def decode_options!(options)
         raise ArgumentError, "You must provide a format. You provided #{options}" unless options[:format]
-        options[:crop] = decode_region(options.delete(:region))
-        options[:size] = decode_size(options.delete(:size))
-        options[:quality] = decode_quality(options[:quality])
-        options[:rotation] = decode_rotation(options[:rotation])
         validate_format!(options[:format])
-        options
+        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)
@@ -94,47 +98,37 @@ module Riiif
 
       def decode_region(region)
         if region.nil? || region == 'full'
-          nil
+          Riiif::Region::Imagemagick::FullDecoder.new.decode
         elsif md = /^pct:(\d+),(\d+),(\d+),(\d+)$/.match(region)
-          # Image magic can't do percentage offsets, so we have to calculate it
-          offset_x = (info[:width] * Integer(md[1]).to_f / 100).round
-          offset_y = (info[:height] * Integer(md[2]).to_f / 100).round
-          "#{md[3]}%x#{md[4]}+#{offset_x}+#{offset_y}"
+          Riiif::Region::Imagemagick::PercentageDecoder
+            .new(info, md[1], md[2], md[3], md[4]).decode
         elsif md = /^(\d+),(\d+),(\d+),(\d+)$/.match(region)
-          "#{md[3]}x#{md[4]}+#{md[1]}+#{md[2]}"
+          Riiif::Region::Imagemagick::AbsoluteDecoder.new(md[1], md[2], md[3], md[4]).decode
         elsif region == 'square'
-          w = info[:width]
-          h = info[:height]
-          min, max = [w, h].minmax
-
-          offset = (max - min) / 2
-          if h >= w
-            "#{min}x#{min}+0+#{offset}"
-          else
-            "#{min}x#{min}+#{offset}+0"
-          end
+          Riiif::Region::Imagemagick::SquareDecoder.new(info).decode
         else
           raise InvalidAttributeError, "Invalid region: #{region}"
         end
       end
 
+      # rubocop:disable Metrics/PerceivedComplexity
       def decode_size(size)
         if size.nil? || size == 'full'
-          nil
+          Riiif::Size::Imagemagick::FullDecoder.new.decode
         elsif md = /^,(\d+)$/.match(size)
-          "x#{md[1]}"
+          Riiif::Size::Imagemagick::HeightDecoder.new(md[1]).decode
         elsif md = /^(\d+),$/.match(size)
-          (md[1]).to_s
+          Riiif::Size::Imagemagick::WidthDecoder.new(md[1]).decode
         elsif md = /^pct:(\d+(.\d+)?)$/.match(size)
-          "#{md[1]}%"
+          Riiif::Size::Imagemagick::PercentDecoder.new(md[1]).decode
         elsif md = /^(\d+),(\d+)$/.match(size)
-          "#{md[1]}x#{md[2]}!"
+          Riiif::Size::Imagemagick::AbsoluteDecoder.new(md[1], md[2]).decode
         elsif md = /^!(\d+),(\d+)$/.match(size)
-          "#{md[1]}x#{md[2]}"
+          Riiif::Size::Imagemagick::BestFitDecoder.new(md[1], md[2]).decode
         else
           raise InvalidAttributeError, "Invalid size: #{size}"
         end
       end
-
+    # rubocop:enable Metrics/PerceivedComplexity
   end
 end

data/app/services/riiif/command_runner.rb

@@ -0,0 +1,28 @@
+require 'open3'
+module Riiif
+  # Runs shell commands under benchmark and saves the output
+  class CommandRunner
+    include Open3
+    include ActiveSupport::Benchmarkable
+    delegate :logger, to: :Rails
+
+    def execute(command)
+      out = nil
+      benchmark("Riiif executed #{command}") do
+        stdin, stdout, stderr, wait_thr = popen3(command)
+        stdin.close
+        stdout.binmode
+        out = stdout.read
+        stdout.close
+        err = stderr.read
+        stderr.close
+        raise "Unable to execute command \"#{command}\"\n#{err}" unless wait_thr.value.success?
+      end
+      out
+    end
+
+    def self.execute(command)
+      new.execute(command)
+    end
+  end
+end

data/app/services/riiif/image_magick_info_extractor.rb

@@ -0,0 +1,13 @@
+module Riiif
+  # Get height and width information using imagemagick to interrogate the file
+  class ImageMagickInfoExtractor
+    def initialize(path)
+      @path = path
+    end
+
+    def extract
+      height, width = Riiif::CommandRunner.execute("identify -format %hx%w #{@path}").split('x')
+      { height: Integer(height), width: Integer(width) }
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,33 @@
+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

@@ -0,0 +1,25 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,14 @@
+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

@@ -0,0 +1,19 @@
+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

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

@@ -0,0 +1,19 @@
+module Riiif
+  module Size
+    module Imagemagick
+      # The width and height of the returned image is scaled to n% of the width and height
+      # of the extracted region. The aspect ratio of the returned image is the same as that
+      # of the extracted region.
+      class PercentDecoder
+        def initialize(n)
+          @n = n
+        end
+
+        # @return [String] a resize directive for imagemagick to use
+        def decode
+          "#{@n}%"
+        end
+      end
+    end
+  end
+end

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

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

data/lib/riiif/routes.rb

@@ -22,7 +22,9 @@ module Riiif
           defaults: { format: 'jpg', rotation: '0', region: 'full', quality: 'default', model: resource },
           as: options[:as] || 'image'
 
-        get "#{route_prefix}/:id/info.json" => 'riiif/images#info', defaults: { format: 'json', model: resource  }, as: [options[:as], 'info'].compact.join('_')
+        get "#{route_prefix}/:id/info.json" => 'riiif/images#info',
+            defaults: { format: 'json', model: resource  },
+            as: [options[:as], 'info'].compact.join('_')
 
         # This doesn't work presently
         # get "#{route_prefix}/:id", to: redirect("#{route_prefix}/%{id}/info.json")

data/lib/riiif/version.rb

@@ -1,3 +1,3 @@
 module Riiif
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.1.2'.freeze
 end

data/lib/riiif.rb

@@ -20,5 +20,7 @@ module Riiif
     end
   end
 
+  Transformation = Struct.new(:crop, :size, :quality, :rotation, :format)
+  ImageInformation = Struct.new(:width, :height)
   mattr_accessor :not_found_image # the image to use when a lookup fails
 end

data/riiif.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'engine_cart', '~> 0.8'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'rubocop', '~> 0.41.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.5'
+  spec.add_development_dependency 'rubocop', '~> 0.47.1'
+  spec.add_development_dependency 'rubocop-rspec', '~> 1.13'
 end

data/spec/models/riiif/akubra_system_file_resolver_spec.rb

@@ -7,6 +7,7 @@ describe Riiif::AkubraSystemFileResolver do
   end
 
   it 'gets the jpeg2000 file' do
-    expect(subject.find('demo:1').path).to eq Riiif::File.new(Dir.glob(subject.pathroot + '22/7e/9/info%3Afedora%2Fdemo%3A1%2Fjp2%2Fjp2.0').first).path
+    file = Dir.glob(subject.pathroot + '22/7e/9/info%3Afedora%2Fdemo%3A1%2Fjp2%2Fjp2.0').first
+    expect(subject.find('demo:1').path).to eq Riiif::File.new(file).path
   end
 end

data/spec/models/riiif/image_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Riiif::Image do
+RSpec.describe Riiif::Image do
   before { Rails.cache.clear }
   let(:filename) { File.expand_path('spec/samples/world.jp2') }
   subject { described_class.new('world') }
@@ -16,7 +16,7 @@ describe Riiif::Image do
   it 'is able to override the file used for the Image' do
     img = described_class.new('some_id', Riiif::File.new(filename))
     expect(img.id).to eq 'some_id'
-    expect(img.info).to eq height: 400, width: 800
+    expect(img.info).to eq Riiif::ImageInformation.new(800, 400)
   end
 
   describe 'without a format' do
@@ -27,7 +27,7 @@ describe Riiif::Image do
 
   describe 'info' do
     it 'returns the data' do
-      expect(subject.info).to eq height: 400, width: 800
+      expect(subject.info).to eq Riiif::ImageInformation.new(800, 400)
     end
   end
 
@@ -45,7 +45,7 @@ describe Riiif::Image do
     describe 'get info' do
       subject { described_class.new('Cave_26,_Ajanta') }
       it 'is easy' do
-        expect(subject.info).to eq height: 390, width: 600
+        expect(subject.info).to eq Riiif::ImageInformation.new(600, 390)
       end
     end
 
@@ -63,21 +63,25 @@ describe Riiif::Image do
   describe 'mogrify' do
     describe 'region' do
       it 'returns the original when specifing full size' do
-        expect(subject.image).to receive(:execute).with("convert #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert #{filename} png:-")
         subject.render(region: 'full', format: 'png')
       end
       it 'handles absolute geometry' do
-        expect(subject.image).to receive(:execute).with("convert -crop 60x75+80+15 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -crop 60x75+80+15 #{filename} png:-")
         subject.render(region: '80,15,60,75', format: 'png')
       end
+
       it 'handles percent geometry' do
-        expect(subject.image).to receive(:execute).with("identify -format %hx%w #{filename}").and_return('131x175')
-        expect(subject.image).to receive(:execute).with("convert -crop 80%x70+18+13 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with("identify -format %hx%w #{filename}").and_return('131x175')
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -crop 80%x70+18+13 #{filename} png:-")
         subject.render(region: 'pct:10,10,80,70', format: 'png')
       end
+
       it 'handles square geometry' do
-        expect(subject.image).to receive(:execute).with("identify -format %hx%w #{filename}").and_return('131x175')
-        expect(subject.image).to receive(:execute).with("convert -crop 131x131+22+0 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with("identify -format %hx%w #{filename}").and_return('131x175')
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -crop 131x131+22+0 #{filename} png:-")
         subject.render(region: 'square', format: 'png')
       end
       it 'raises an error for invalid geometry' do
@@ -87,31 +91,31 @@ describe Riiif::Image do
 
     describe 'resize' do
       it 'returns the original when specifing full size' do
-        expect(subject.image).to receive(:execute).with("convert #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert #{filename} png:-")
         subject.render(size: 'full', format: 'png')
       end
       it 'handles integer percent sizes' do
-        expect(subject.image).to receive(:execute).with("convert -resize 50% #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize 50% #{filename} png:-")
         subject.render(size: 'pct:50', format: 'png')
       end
       it 'handles float percent sizes' do
-        expect(subject.image).to receive(:execute).with("convert -resize 12.5% #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize 12.5% #{filename} png:-")
         subject.render(size: 'pct:12.5', format: 'png')
       end
       it 'handles w,' do
-        expect(subject.image).to receive(:execute).with("convert -resize 50 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize 50 #{filename} png:-")
         subject.render(size: '50,', format: 'png')
       end
       it 'handles ,h' do
-        expect(subject.image).to receive(:execute).with("convert -resize x50 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize x50 #{filename} png:-")
         subject.render(size: ',50', format: 'png')
       end
       it 'handles w,h' do
-        expect(subject.image).to receive(:execute).with("convert -resize 150x75! #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize 150x75! #{filename} png:-")
         subject.render(size: '150,75', format: 'png')
       end
       it 'handles bestfit (!w,h)' do
-        expect(subject.image).to receive(:execute).with("convert -resize 150x75 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -resize 150x75 #{filename} png:-")
         subject.render(size: '!150,75', format: 'png')
       end
       it 'raises an error for invalid size' do
@@ -121,11 +125,12 @@ describe Riiif::Image do
 
     describe 'rotate' do
       it 'returns the original when specifing full size' do
-        expect(subject.image).to receive(:execute).with("convert #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert #{filename} png:-")
         subject.render(rotation: '0', format: 'png')
       end
       it 'handles floats' do
-        expect(subject.image).to receive(:execute).with("convert -virtual-pixel white +distort srt 22.5 #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with("convert -virtual-pixel white +distort srt 22.5 #{filename} png:-")
         subject.render(rotation: '22.5', format: 'png')
       end
       it 'raises an error for invalid angle' do
@@ -135,19 +140,20 @@ describe Riiif::Image do
 
     describe 'quality' do
       it 'returns the original when specifing default' do
-        expect(subject.image).to receive(:execute).with("convert #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert #{filename} png:-")
         subject.render(quality: 'default', format: 'png')
       end
       it 'returns the original when specifing color' do
-        expect(subject.image).to receive(:execute).with("convert #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert #{filename} png:-")
         subject.render(quality: 'color', format: 'png')
       end
       it 'converts to grayscale' do
-        expect(subject.image).to receive(:execute).with("convert -colorspace Gray #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute).with("convert -colorspace Gray #{filename} png:-")
         subject.render(quality: 'grey', format: 'png')
       end
       it 'converts to bitonal' do
-        expect(subject.image).to receive(:execute).with("convert -colorspace Gray -type Bilevel #{filename} png:-")
+        expect(Riiif::CommandRunner).to receive(:execute)
+          .with("convert -colorspace Gray -type Bilevel #{filename} png:-")
         subject.render(quality: 'bitonal', format: 'png')
       end
       it 'raises an error for invalid angle' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riiif
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Justin Coyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -106,28 +106,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.41.2
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.13'
 description: A IIIF image server
 email:
 - justin@curationexperts.com
@@ -148,6 +148,18 @@ files:
 - app/controllers/riiif/images_controller.rb
 - app/models/riiif/file.rb
 - app/models/riiif/image.rb
+- app/services/riiif/command_runner.rb
+- app/services/riiif/image_magick_info_extractor.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
 - config/routes.rb
 - lib/riiif.rb
 - lib/riiif/abstract_file_system_resolver.rb
@@ -190,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A rails engine that support IIIF requests