imogen 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032e49d9a8602410ab24b57efc8bd3de1cd523ad41e217bd76affcca385a08aa
-  data.tar.gz: 2ae67a08b37695662dd21af0eedc7c7449423fde11ca20cd02c2f66e00ade5f4
+  metadata.gz: '09c425bd9ab585fa2587f09034d1fde353bf0ba992681d5ebe0631faff1b6f6d'
+  data.tar.gz: 828b3d38469483aa9224c2fb2268eb9dfd2bec04e42a40c577f252b01f288d6f
 SHA512:
-  metadata.gz: 9a5499840827444cea022ef95ca205f52131084938a6417441eb73898961b726b02229d6f2e14964a77bf4fa24a537ae7b5c582fec1d7bcaf72f556e789dbd23
-  data.tar.gz: 6f53cf3ee9a63cd4906f2f09ede862f31440e573ea0d7033ce37c50d0d661d733dc7cb355e2a137e94f6a3eeb5e91904d2c37c7059039d145722a0b976b656cd
+  metadata.gz: 0eff43035b35e4ecb31cb341ef8152df76b1840c43fd042fc984b6786f2bc0c9b66e64d5801f65eba0da2dd903bc28fe7506cb027f0fb27701323a6e590ff42c
+  data.tar.gz: e649f55749ff213fad130d66a8429340d6268d83e10a26d49d3bdfbdf08fc7c9f1894b8e9cf5422408caf1657b48c6cab12dbdc3a68b0e65ce2168277c1190cd

data/lib/imogen/iiif/size.rb

@@ -9,8 +9,12 @@ class Size < Transform
       w = md[1] ? min(Integer(md[1]), @width) : nil
       h = md[2] ? min(Integer(md[2]), @height) : nil
       raise BadRequest.new("bad scale #{scale}") unless w or h
-      w ||= (@width * (h.to_f / @height)).round
-      h ||= (@height * (w.to_f / @width)).round
+      w ||= (@width * (h.to_f / @height))
+      h ||= (@height * (w.to_f / @width))
+      w = 1 if w > 0 && w < 1 # Avoid rounding very small numbers to zero
+      h = 1 if h > 0 && h < 1 # Avoid rounding very small numbers to zero
+      w = w.round
+      h = h.round
       e = [w,h]
     elsif md = /^pct:(\d+(\.\d+)?)/.match(scale)
       p = Float(md[1])
@@ -42,4 +46,4 @@ class Size < Transform
   end
 end
 end
-end
+end

data/lib/imogen/iiif/tiles.rb

@@ -43,7 +43,8 @@ module Imogen
             raster_opts[:rotation].to_s,
             "#{raster_opts[:quality]}.#{Imogen::Iiif::FORMATS[raster_opts[:format]]}"
           )
-          yield(img, dest_path, raster_opts['format'], Imogen::Iiif.path_to_opts(dest_path, dest_dir))
+
+          yield(img, dest_path, raster_opts[:format], Imogen::Iiif.path_to_opts(dest_path, dest_dir))
         end
 
 
@@ -114,7 +115,7 @@ module Imogen
                 raster_opts[:rotation].to_s,
                 "#{raster_opts[:quality]}.#{Imogen::Iiif::FORMATS[raster_opts[:format]]}"
               )
-              yield(img, dest_path, raster_opts['format'], Imogen::Iiif.path_to_opts(dest_path, dest_dir))
+              yield(img, dest_path, raster_opts[:format], Imogen::Iiif.path_to_opts(dest_path, dest_dir))
 
               row += 1
               y += tile_height

data/lib/imogen.rb

@@ -6,7 +6,7 @@ module Imogen
   extend FFI::Library
 
   # Note: library_name function comes from `require 'vips'`
-  ffi_lib library_name("vips", 42)
+  ffi_lib FFI.library_name("vips", 42)
 
   attach_function :vips_cache_get_max_mem, [], :int
   attach_function :vips_cache_set_max_mem, [:int], :void

data/spec/unit/imogen_iiif_size_spec.rb

@@ -1,10 +1,11 @@
 require 'imogen/iiif'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe Imogen::Iiif::Size, type: :unit do
-  before(:all) do
-    @test_image = ImageStub.new(175,131)
-  end
-  subject {Imogen::Iiif::Size.new(@test_image)}
+  let(:test_image_width) { 175 }
+  let(:test_image_height) { 131 }
+  let(:test_image) { ImageStub.new(test_image_width, test_image_height) }
+  subject {Imogen::Iiif::Size.new(test_image)}
+
   describe "#get" do
     describe "with scaling width" do
       it "should calculate for a good value" do
@@ -17,6 +18,14 @@ describe Imogen::Iiif::Size, type: :unit do
         expect{subject.get("0,")}.to raise_error Imogen::Iiif::BadRequest
         expect{subject.get("-2,")}.to raise_error Imogen::Iiif::BadRequest
       end
+
+      context "when the scaled width is a near-zero number before rounding is applied" do
+        let(:test_image_width) { 4096 }
+        let(:test_image_height) { 3 }
+        it "should round very small values to 1 (not 0)" do
+          expect(subject.get("512,")).to eql([512, 1])
+        end
+      end
     end
     describe "with scaling height" do
       it "should calculate for a good value" do
@@ -30,6 +39,14 @@ describe Imogen::Iiif::Size, type: :unit do
         expect{subject.get(",0")}.to raise_error Imogen::Iiif::BadRequest
         expect{subject.get(",-2")}.to raise_error Imogen::Iiif::BadRequest
       end
+
+      context "when the scaled height is a near-zero number before rounding is applied" do
+        let(:test_image_width) { 3 }
+        let(:test_image_height) { 4096 }
+        it "should round very small values to 1 (not 0)" do
+          expect(subject.get(",512")).to eql([1, 512])
+        end
+      end
     end
     describe "with scaling width and height" do
       it "should calculate for a good value" do
@@ -62,4 +79,4 @@ describe Imogen::Iiif::Size, type: :unit do
       end
     end
   end
-end
+end

data/spec/unit/imogen_iiif_tiles_spec.rb

@@ -70,7 +70,7 @@ describe Imogen::Iiif::Tiles, type: :unit do
         64 => tile64
       }.each do |tile_size, expected_tiles|
         actual = []
-        described_class.for(@test_image, '', :jpeg, tile_size) do |img, dest_path, format, opts|
+        described_class.for(@test_image, '', :jpg, tile_size) do |img, dest_path, format, opts|
           actual << dest_path
         end
         expect(actual).to eql(expected_tiles)
@@ -82,6 +82,17 @@ describe Imogen::Iiif::Tiles, type: :unit do
       actual = []
       described_class.for(@test_image, '', :png, 256) do |img, dest_path, format, opts|
         actual << dest_path
+        expect(format).to eq(:png)
+      end
+      expect(actual).to eql(expected)
+    end
+    it 'should produce jpg when requested' do
+      expected = tile256
+      expected.uniq!
+      actual = []
+      described_class.for(@test_image, '', :jpg, 256) do |img, dest_path, format, opts|
+        actual << dest_path
+        expect(format).to eq(:jpg)
       end
       expect(actual).to eql(expected)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imogen
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Ben Armintor
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2026-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement