morandi 0.100.0 → 0.102.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ca1f4a637e59ee90de4f309dfecc40eae27b103f416ea301af36e8bd04c555f
-  data.tar.gz: 8ebeda3024e6275ea7e8b75c8357339523a59a24987e1ebd07142cba445edce7
+  metadata.gz: c3e931b14e93f648cfbd847e686181be4d0f40add004ff52c31b126063fc46c6
+  data.tar.gz: 53f1e57062bcf23d20649ee8c2abb59d8050e21be64f125e54c77f40e0f35e7f
 SHA512:
-  metadata.gz: 55308d1a2ae4626a81bf1faa9a6ae0535f816d777e31d25266e36e563bdc1dc60c55ef588ade477ce113a13bd20f80aefd046a52c1e4aaccffdc103e48d75cac
-  data.tar.gz: c10ab8cbe21121d50a2c0a10cdb6c0fefe595962d11cf936adeaef78e8291bd4688b37bb464577c7f455d8aa02e04def65d46930a86fb3cbf9c1aed4e9abf972
+  metadata.gz: 3271063861dccf057107b0abbfe915318d9f09ddf887f70a24082979a459d33203b0b8ed80e770552e41d1f46e94f7255d437ffac404aa48ecabc886448e7838
+  data.tar.gz: abe64371cc9809ebab22d421a8c92d82fb5d29c2733b872388885409b578daeeaa1efc5ef58e91d18bcb26a605feb828ab32c170a0d88aad0c81269baff677d2

data/CHANGELOG.md

@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.102.0] 07.09.2026
+### Fixed
+- Unnecessary `.so` files are no longer shipped with the gem
+- Rubocop on CI
+
+### Removed
+- Obsolete dependency on colorscore
+
+## [0.101.0] 28.01.2026
+### Added
+- [BREAKING] introduced automated cleanup of srgb files after processing
+
+### Removed
+- [BREAKING] support for custom srgb file path
+
 ## [0.100.0] 17.01.2024
 ### Added
 - Vips image processor (resizing)

data/README.md

@@ -4,7 +4,7 @@ Library of simple image manipulations - replicating the behaviour of morandi-js.
 
 ## Installation
 
-Install `liblcms2-utils` to provide the `jpgicc` command used by `Morandi::ProfiledPixbuf`. Also ensure that your host system has `imagemagick` installed, which is required by the `colorscore` gem.
+Install `liblcms2-utils` to provide the `jpgicc` command used by `Morandi::ProfiledPixbuf`.
 
 Add this line to your application's Gemfile:
 
@@ -36,4 +36,34 @@ For the detailed documentation of options see `lib/morandi.rb`
 
 ### Development
 
-Since this gem depends on the `liblcms2-utils` library, which can be awkward to install on some operating systems, we also provide a development docker image. A Makefile is also provided as a simple CLI. To build the image and run the container, type `make` from the project root. The container itself runs `guard` as its main process. Running the container via `make` will drop you into the guard prompt, which will run the test suite whenever any of the source code or tests are changed. The tests can be kicked-off manually via the `all` command at the guard prompt. Individual test can be run using the `focus: true` annotation on an example or describe block. If you need to access a bash shell in the container (for example, to run rubocop), use the command `make shell`.
+Development happens inside a docker image, with a Makefile provided as a simple CLI.
+
+#### Build the image and run the container
+
+```bash
+make
+```
+
+Above launches `guard`, which automatically runs tests when any file changes.
+
+#### Run the full test suite manually from the guard prompt
+```bash
+all
+```
+
+#### Run an individual test
+
+Add the `focus: true` annotation to an example or describe block.
+
+#### Open a bash shell in the container
+
+Useful, for example, to run rubocop:
+
+```bash
+make shell
+```
+
+> [!NOTE]
+> The image builds and the gem works on ARM platform, but a few specs fail with tiny rendering output mismatches.
+>
+> CI uses AMD64 and is a source of truth for the specs

data/lib/morandi/image_processor.rb

@@ -126,7 +126,7 @@ module Morandi
         @pb = MorandiNative::PixbufUtils.brightness(@pb, brighten)
       end
 
-      if options['gamma'] && not_equal_to_one(options['gamma'])
+      if options['gamma'] && not_equal_to_one?(options['gamma'])
         @pb = MorandiNative::PixbufUtils.gamma(@pb,
                                                options['gamma'])
       end
@@ -197,7 +197,7 @@ module Morandi
       # can't crop, won't crop
       return if @width.nil? && @height.nil? && crop.nil?
 
-      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one(@scale)
+      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one?(@scale)
 
       crop ||= Morandi::CropUtils.autocrop_coords(@pb.width, @pb.height, @width, @height)
 
@@ -226,7 +226,7 @@ module Morandi
       colour ||= 'black'
 
       crop = options['crop']
-      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one(@scale)
+      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one?(@scale)
 
       op = Morandi::Operation::ImageBorder.new_from_hash(
         'style' => style,
@@ -243,7 +243,7 @@ module Morandi
 
     private
 
-    def not_equal_to_one(float)
+    def not_equal_to_one?(float)
       (float - 1.0).abs >= Float::EPSILON
     end
   end

data/lib/morandi/operation/image_border.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'colorscore'
 require 'morandi/image_operation'
 
 module Morandi
@@ -16,7 +15,7 @@ module Morandi
         return pixbuf unless %w[square retro].include? @style
 
         create_pixbuf_from_image_surface(:rgb24, pixbuf.width, pixbuf.height) do |cr|
-          if @crop && ((@crop[0]).negative? || (@crop[1]).negative?)
+          if @crop && (@crop[0].negative? || @crop[1].negative?)
             img_width = size[0]
             img_height = size[1]
           else
@@ -38,7 +37,7 @@ module Morandi
           # Should be less than 1
           pb_scale = (longest_side - (border_width * 2)) / longest_side
 
-          if @crop && ((@crop[0]).negative? || (@crop[1]).negative?)
+          if @crop && (@crop[0].negative? || @crop[1].negative?)
             x -= @crop[0]
             y -= @crop[1]
           end
@@ -77,7 +76,7 @@ module Morandi
 
       def draw_background(cr, img_height, img_width)
         cr.save do
-          cr.translate(-@crop[0], -@crop[1]) if @crop && ((@crop[0]).negative? || (@crop[1]).negative?)
+          cr.translate(-@crop[0], -@crop[1]) if @crop && (@crop[0].negative? || @crop[1].negative?)
 
           cr.save do
             cr.set_operator :source

data/lib/morandi/profiled_pixbuf.rb

@@ -8,22 +8,23 @@ module Morandi
   # It attempts to load an image using jpegicc/littlecms to ensure that it is sRGB.
   # NOTE: pixbuf supports colour profiles, but it requires an explicit icc-profile option to embed it when saving file
   class ProfiledPixbuf < GdkPixbuf::Pixbuf
-    def initialize(path, local_options, max_size_px = nil)
-      @local_options = local_options
-
-      path = srgb_path(path) || path
+    def initialize(path, _local_options, max_size_px = nil)
+      srgb_converted_file_path = srgb_path(path)
+      path = srgb_converted_file_path || path
 
       if max_size_px
         super(file: path, width: max_size_px, height: max_size_px)
       else
         super(file: path)
       end
+    ensure
+      FileUtils.rm_f(srgb_converted_file_path) if srgb_converted_file_path
     end
 
     private
 
     def srgb_path(original_path)
-      Morandi::SrgbConversion.perform(original_path, target_path: @local_options['path.icc'])
+      Morandi::SrgbConversion.perform(original_path)
     end
   end
 end

data/lib/morandi/srgb_conversion.rb

@@ -7,15 +7,16 @@ module Morandi
   class SrgbConversion
     # Performs a conversion to srgb colour space if possible
     # Returns a path to converted file on success or nil on failure
-    def self.perform(path, target_path: nil)
+    def self.perform(path)
       return unless suitable_for_jpegicc?(path)
 
-      icc_file_path = target_path || default_icc_path(path)
-      return icc_file_path if valid_jpeg?(icc_file_path)
-
+      icc_file_path = default_icc_path(path)
       system('jpgicc', '-q97', path, icc_file_path, out: '/dev/null', err: '/dev/null')
 
-      return unless valid_jpeg?(icc_file_path)
+      unless valid_jpeg?(icc_file_path)
+        FileUtils.rm_f(icc_file_path) # jpgicc likes to leave an empty file after failing
+        return
+      end
 
       icc_file_path
     end

data/lib/morandi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Morandi
-  VERSION = '0.100.0'
+  VERSION = '0.102.0'
 end

data/lib/morandi/vips_image_processor.rb

@@ -55,7 +55,7 @@ module Morandi
     end
 
     def process!
-      source_file_path = Morandi::SrgbConversion.perform(@path) || @path
+      source_file_path = @path
       begin
         @img = Vips::Image.new_from_file(source_file_path)
       rescue Vips::Error => e
@@ -68,7 +68,7 @@ module Morandi
       end
       if @size_limit_on_load_px
         @scale = @size_limit_on_load_px.to_f / [@img.width, @img.height].max
-        @img = @img.resize(@scale) if not_equal_to_one(@scale)
+        @img = @img.resize(@scale) if not_equal_to_one?(@scale)
       else
         @scale = 1.0
       end
@@ -113,7 +113,7 @@ module Morandi
     end
 
     def apply_gamma!
-      return unless @options['gamma'] && not_equal_to_one(@options['gamma'])
+      return unless @options['gamma'] && not_equal_to_one?(@options['gamma'])
 
       @img = @img.gamma(exponent: @options['gamma'])
     end
@@ -152,7 +152,7 @@ module Morandi
       # can't crop, won't crop
       return if @output_width.nil? && @output_height.nil? && crop.nil?
 
-      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one(@scale)
+      crop = crop.map { |s| (s.to_f * @scale).floor } if crop && not_equal_to_one?(@scale)
       crop ||= Morandi::CropUtils.autocrop_coords(@img.width, @img.height, @output_width, @output_height)
       @img = Morandi::CropUtils.apply_crop_vips(@img, crop[0], crop[1], crop[2], crop[3])
     end
@@ -183,7 +183,7 @@ module Morandi
       @img = @img.linear(1.0, colour_filter_modifier)
     end
 
-    def not_equal_to_one(float)
+    def not_equal_to_one?(float)
       (float - 1.0).abs >= Float::EPSILON
     end
 

data/lib/morandi.rb

@@ -43,7 +43,6 @@ module Morandi
   #                                                              size of the longer edge (ignoring shorter dimension!)
   # @param target_path [String] target location for image
   # @param local_options [Hash] Hash of options other than desired transformations
-  # @option local_options [String] 'path.icc' A path to store the input after converting to sRGB colour space
   # @option local_options [String] 'processor' ('pixbuf') Name of the image processing library ('pixbuf', 'vips')
   #                                                       NOTE: vips processor only handles subset of operations,
   #                                                       see `Morandi::VipsImageProcessor.supports?` for details
@@ -58,7 +57,10 @@ module Morandi
       cache_max = 0
       concurrency = 2 # Hardcoding to 2 for now to maintain some balance between resource usage and performance
       VipsImageProcessor.with_global_options(cache_max: cache_max, concurrency: concurrency) do
-        VipsImageProcessor.new(source, options).write_to_jpeg(target_path)
+        srgb_converted_file_path = Morandi::SrgbConversion.perform(source)
+        VipsImageProcessor.new(srgb_converted_file_path || source, options).write_to_jpeg(target_path)
+      ensure
+        FileUtils.rm_f(srgb_converted_file_path) if srgb_converted_file_path
       end
     else
       ImageProcessor.new(source, options, local_options).tap(&:result).write_to_jpeg(target_path)

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: morandi
 version: !ruby/object:Gem::Version
-  version: 0.100.0
+  version: 0.102.0
 platform: ruby
 authors:
 - |+
   Geoff Youngs
 
 
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: atk
@@ -41,20 +40,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: colorscore
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: gdk_pixbuf2
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +101,8 @@ email:
 - git@intersect-uk.co.uk
 executables: []
 extensions:
-- ext/morandi_native/extconf.rb
 - ext/gdk_pixbuf_cairo/extconf.rb
+- ext/morandi_native/extconf.rb
 extra_rdoc_files: []
 files:
 - CHANGELOG.md
@@ -132,7 +117,6 @@ files:
 - ext/morandi_native/morandi_native.c
 - ext/morandi_native/rotate.h
 - ext/morandi_native/tint.h
-- lib/gdk_pixbuf_cairo.so
 - lib/morandi.rb
 - lib/morandi/cairo_ext.rb
 - lib/morandi/crop_utils.rb
@@ -149,14 +133,12 @@ files:
 - lib/morandi/srgb_conversion.rb
 - lib/morandi/version.rb
 - lib/morandi/vips_image_processor.rb
-- lib/morandi_native.so
 homepage: https://github.com/livelink/morandi-rb
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/livelink/morandi-rb
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,8 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 4.0.4
 specification_version: 4
 summary: Simple Image Edits
 test_files: []