imogen 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b9d709cf8f472296f8feafaf8d54a14201fd86b25fb2dfee1f20e0e0994fdaa
-  data.tar.gz: 8ec9471abc118d5d13e661a86ab403695285cb4996b4f2cd47849cd9830a5e19
+  metadata.gz: 92c92a32465d8ae59f5e40a31c0ffd3cc2de271a3593db0dac7da1bd2954dd31
+  data.tar.gz: 044b86d16c8c028d36864e3aa550b6aa871d9075c5d4223b198ca1ac59b511f2
 SHA512:
-  metadata.gz: 5f9a648001fda8a468914b787eb04218bbc2b6c96f4e0ef3bb5331b0e76e2b4285eb9df76c7c66d47151f38a4064676a84ceada530c445b48343d92701aab809
-  data.tar.gz: c35f17d9c6e90732c721fff635684103e5779c0b313f1e9186ecb0dd677b960de4aa7d03daa33b537453e0290788cb9bf6ca332166b792724e139633a91cb8e9
+  metadata.gz: dc4ae61808bb12ad97f4f3a279aa81fd048b20626422358ccfc64ed1c5706d221a97195a0807dcd882c32dbfbd8ced6fba06bfe9e361ae61abfd6a1a38aed5a2
+  data.tar.gz: d416dd8390d144135bf5d1e4d9dc5445d0f137a6e64ce097aef8fe2e5f895214a18a4f5fd064f874ead2928db969b5dbc92fbe5a86ac20c244e199c6bca93757

data/lib/imogen/iiif/rotation.rb

@@ -1,23 +1,27 @@
 module Imogen
-module Iiif
-class Rotation < Transform
-  RIGHT_ANGLES = [0,90,180,270]
-  def get(rotate)
-    return nil if [nil, 0, '0'].include?(rotate)
-    raise BadRequest.new("bad rotate #{rotate}") unless rotate.to_s =~ /^-?\d+$/
-    # libvips and IIIF spec counts clockwise
-    r = rotate.to_i % 360
-    raise BadRequest.new("bad rotate #{rotate}") unless RIGHT_ANGLES.include? r
-    return r > 0 ? r : nil
-  end
-  def self.convert(img, rotate)
-    rotation = Rotation.new(img).get(rotate)
-    if rotation
-      yield img.rot("d#{rotation}")
-    else
-      yield img
+  module Iiif
+    class Rotation < Transform
+      RIGHT_ANGLES = [0,90,180,270]
+      def get(rotate)
+        return [0, false] if rotate.nil?
+        original_rotate_value = rotate
+        rotate = rotate.to_s
+        raise BadRequest.new("bad rotate #{original_rotate_value}") unless rotate =~ /^!?-?\d+$/
+        flip = rotate.to_s.start_with?('!')
+        # libvips and IIIF spec counts clockwise
+        angle = rotate.sub(/^!/, '').to_i % 360
+        raise BadRequest.new("bad rotate #{original_rotate_value}") unless RIGHT_ANGLES.include?(angle)
+        return angle, flip
+      end
+
+      def self.convert(img, rotate)
+        angle, flip = Rotation.new(img).get(rotate)
+        # IIIF spec applies horizontal flip ("mirrored by reflection on the vertical axis") before rotation
+        img = img.fliphor if flip
+        # No need to rotate if angle is zero
+        img = img.rot("d#{angle}") unless angle.zero?
+        yield img
+      end
     end
   end
 end
-end
-end

data/spec/integration/imogen_iiif_spec.rb

@@ -6,7 +6,7 @@ describe Imogen::AutoCrop, vips: true do
     let(:output_file) { Dir.tmpdir + '/test-imogen-convert.jpg' }
     it "should successfully convert the image" do
       Imogen.with_image(fixture('sample.jpg').path) do |img|
-        Imogen::Iiif.convert(img, output_file, 'jpg', region: '50,60,500,800', size: '!100,100', quality: 'color', rotation: 90)
+        Imogen::Iiif.convert(img, output_file, 'jpg', region: '50,60,500,800', size: '!100,100', quality: 'color', rotation: '!90')
       end
       expect(File.exist?(output_file)).to be true
       expect(File.size?(output_file)).to be > 0

data/spec/spec_helper.rb

@@ -47,13 +47,6 @@ RSpec.configure do |config|
 # The settings below are suggested to provide a good initial experience
 # with RSpec, but feel free to customize to your heart's content.
 =begin
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-  config.filter_run_when_matching :focus
-
   # Allows RSpec to persist some state between runs in order to support
   # the `--only-failures` and `--next-failure` CLI options. We recommend
   # you configure your source control system to ignore this file.
@@ -97,6 +90,13 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 =end
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
 end
 
 class ImageStub

data/spec/unit/imogen_iiif_rotate_spec.rb

@@ -1,35 +1,41 @@
 require 'imogen/iiif'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Imogen::Iiif::Rotation, type: :unit do
-  before(:all) do
-    @test_image = ImageStub.new(175,131)
-  end
-  subject {Imogen::Iiif::Rotation.new(@test_image)}
+  let(:image) { double("image", width: 175, height: 131) }
   describe "#get" do
+    subject { Imogen::Iiif::Rotation.new(image) }
     describe "with values mod 360 in 90 degree rotations" do
-      it "should nil for 0 or '0' or nil" do
-        expect(subject.get(0)).to be_nil
-        expect(subject.get(360)).to be_nil
-        expect(subject.get("360")).to be_nil
-        expect(subject.get("-360")).to be_nil
-        expect(subject.get("0")).to be_nil
-        expect(subject.get(nil)).to be_nil
+      it "should return [0, false] angle and flip for 0 or '0' or nil" do
+        expect(subject.get(0)).to eq([0, false])
+        expect(subject.get(360)).to eq([0, false])
+        expect(subject.get("360")).to eq([0, false])
+        expect(subject.get("-360")).to eq([0, false])
+        expect(subject.get("0")).to eq([0, false])
+        expect(subject.get(nil)).to eq([0, false])
+      end
+      it "should return the expected angle and flip for positive values" do
+        expect(subject.get(90)).to eql([90, false])
+        expect(subject.get("90")).to eql([90, false])
+        expect(subject.get("180")).to eql([180, false])
+        expect(subject.get("270")).to eql([270, false])
+        expect(subject.get("450")).to eql([90, false])
       end
-      # IIIF rotation is opposite FreeImage
-      it "should calculate for positive values" do
-        expect(subject.get(90)).to eql(90)
-        expect(subject.get("90")).to eql(90)
-        expect(subject.get("180")).to eql(180)
-        expect(subject.get("270")).to eql(270)
-        expect(subject.get("450")).to eql(90)
+      it "should return the expected angle and flip for negative values" do
+        expect(subject.get(-90)).to eql([270, false])
+        expect(subject.get("-90")).to eql([270, false])
+        expect(subject.get("-180")).to eql([180, false])
+        expect(subject.get("-270")).to eql([90, false])
+        expect(subject.get("-450")).to eql([270, false])
       end
-      # IIIF rotation is opposite FreeImage
-      it "should calculate for negative values" do
-        expect(subject.get(-90)).to eql(270)
-        expect(subject.get("-90")).to eql(270)
-        expect(subject.get("-180")).to eql(180)
-        expect(subject.get("-270")).to eql(90)
-        expect(subject.get("-450")).to eql(270)
+      it "should return the expected angle and flip for string values that start with an exclamation point" do
+        expect(subject.get("!0")).to eql([0, true])
+        expect(subject.get("!90")).to eql([90, true])
+        expect(subject.get("!180")).to eql([180, true])
+        expect(subject.get("!270")).to eql([270, true])
+        expect(subject.get("!-90")).to eql([270, true])
+        expect(subject.get("!-180")).to eql([180, true])
+        expect(subject.get("!-270")).to eql([90, true])
+        expect(subject.get("!-450")).to eql([270, true])
       end
     end
     it "should reject arbitrary integer and float values" do
@@ -41,4 +47,31 @@ describe Imogen::Iiif::Rotation, type: :unit do
       expect{subject.get("-2,")}.to raise_error Imogen::Iiif::BadRequest
     end
   end
+  describe '.convert' do
+    let(:no_op) { Proc.new {|x| x} }
+    context 'at multiple of 360' do
+      it "does not rotate" do
+        expect(image).not_to receive(:rot)
+        expect(image).not_to receive(:fliphor)
+        (-2..2).each { |x| described_class.convert(image, (x*360).to_s, &no_op) }
+      end
+    end
+    context 'at right angle rotations not multiple of 360' do
+      it "does rotate" do
+        expect(image).not_to receive(:fliphor)
+        [-3, -2, -1, 1, 2, 3].each do |x|
+          tuple = Imogen::Iiif::Rotation.new(image).get((90*x).to_s)
+          param = "d#{tuple[0]}"
+          expect(image).to receive(:rot).with(param)
+          described_class.convert(image, (x*90).to_s, &no_op)
+        end
+      end
+    end
+    context 'with a bang param' do
+      it "flips horizontal" do
+        expect(image).to receive(:fliphor)
+        described_class.convert(image, "!0", &no_op)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ben Armintor
-autorequire: 
+- Eric O'Hanlon
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips
@@ -52,7 +53,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
-description: 
+description:
 email: armintor@gmail.com
 executables: []
 extensions: []
@@ -80,7 +81,7 @@ files:
 homepage: https://github.com/cul/imogen
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: IIIF image derivative generation helpers for Vips
 test_files: []