ruby-vips 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13cfcbea0e56ad3823bf1da4e035884d934253c729d74da5f54c77e87e949c5a
-  data.tar.gz: ebd97fa16da17c0f932bccb49d21d5b1dcaa024e32ace5c3335f093b2043efea
+  metadata.gz: f57995edbbad929820ab97faae77cefac5596a6c4e440abfd86dc67a1a3ef6e3
+  data.tar.gz: 2cf84c9faced0678582b7858a1eac8c870e800bbf275c54427cf6f9564a76c13
 SHA512:
-  metadata.gz: a7ff0c920fa2ccfe60e9b1762fce6efaa94413f5a68453156eaa7cad6a63cdbab3639ecc525c52cb11578684bc02e9868b7643ab4bc89a8f23905c7dae0b06c1
-  data.tar.gz: c258fc41dca1d105aa4617bac9a3092a8ea3ce7a2bf41f0ad37aac1baa3ebcdce9a3353a4be014b9748e8e141ca15916b67f789cb1fab76c8a5647832aa2efd0
+  metadata.gz: 48a29e47be77eca5d376af0f52969b7cf051eced8467c10206ae7ab10d8e48a25482a9c4402116ceb5dbc6fbc034fcc6aa340324bd77330d191d8920af1efb8b
+  data.tar.gz: e3ee97a320b95e9d897cd79754e1db0124c32c2f751e170896e70deecf72bddefa21f1dfda5ea5966846dccbbc95544e5e4ecffc0ebeb0d9f429802c8c62a6a3

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -38,9 +38,6 @@ jobs:
       matrix:
         os-version: [ 'ubuntu-20.04' ]
         ruby-version:
-          - '2.0'
-          - '2.1'
-          - '2.2'
           - '2.3'
           - '2.4'
           - '2.5'
@@ -49,6 +46,7 @@ jobs:
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
           - jruby
       fail-fast: true
 
@@ -56,7 +54,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
@@ -75,7 +73,7 @@ jobs:
           DEBIAN_FRONTEND: noninteractive
         run:
           # we only need the library
-          sudo apt-get install --fix-missing -qq -o Acquire::Retries=3
+          sudo apt-get install --no-install-recommends --fix-missing -qq -o Acquire::Retries=3
             libvips 
 
       - name: Run Tests

data/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 ## master
 
+## Version 2.2.2 (2024-07-17)
+
+* fix compat with unified (semistatic) libvips binaries [kleisauke]
+
+## Version 2.2.1 (2024-02-21)
+
+* add `Vips.block_untrusted` method to block all untrusted operations. Only for libvips >= 8.13. [Docs](https://www.libvips.org/API/current/libvips-vips.html#vips-block-untrusted-set). [#382](https://github.com/libvips/ruby-vips/pull/382) [aglushkov](https://github.com/aglushkov)
+* add `Vips.block` method to block specific operation. Only for libvips >= 8.13. [Docs](https://www.libvips.org/API/current/VipsOperation.html#vips-operation-block-set). [#382](https://github.com/libvips/ruby-vips/pull/382) [aglushkov](https://github.com/aglushkov)
+* `new_from_source` keeps a ref to the source object [taylorthurlow]
+* some fixes to object references system
+
 ## Version 2.2.0 (2023-10-18)
 
 * add `draw_point!` [jcupitt]

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.2.2

data/lib/vips/image.rb

@@ -458,7 +458,14 @@ module Vips
       loader = Vips.vips_foreign_find_load_source source
       raise Vips::Error if loader.nil?
 
-      Vips::Operation.call loader, [source], opts, option_string
+      result = Vips::Operation.call loader, [source], opts, option_string
+
+      # keep a secret ref to the source object ... the libvips loader will
+      # keep a ref to the C source object, but we need the ruby wrapper object
+      # to stay alive too
+      result.references << source
+
+      result
     end
 
     def self.matrix_from_array width, height, array

data/lib/vips/interpolate.rb

@@ -49,10 +49,10 @@ module Vips
 
     def initialize name
       name = name.to_s if name.is_a? Symbol
-      ptr = Vips.vips_interpolate_new name
-      raise Vips::Error if ptr.nil?
+      pointer = Vips.vips_interpolate_new name
+      raise Vips::Error if pointer.nil?
 
-      super ptr
+      super(pointer)
     end
   end
 end

data/lib/vips/mutableimage.rb

@@ -58,7 +58,7 @@ module Vips
       # See also the comment on set_type! before changing this.
       pointer = copy_image.ptr
       ::GObject.g_object_ref pointer
-      super pointer
+      super(pointer)
 
       # and save the copy ready for when we finish mutating
       @image = copy_image

data/lib/vips/object.rb

@@ -9,9 +9,6 @@ require "ffi"
 module Vips
   private
 
-  # debugging support
-  attach_function :vips_object_print_all, [], :void
-
   # we must init these by hand, since they are usually made on first image
   # create
   attach_function :vips_band_format_get_type, [], :GType
@@ -337,6 +334,7 @@ module Vips
       ArgumentClassPtr.ptr, ArgumentInstancePtr.ptr],
     :int
 
+  # debugging support
   attach_function :vips_object_print_all, [], :void
 
   attach_function :vips_object_set_from_string, [:pointer, :string], :int

data/lib/vips/operation.rb

@@ -218,7 +218,7 @@ module Vips
         raise Vips::Error if value.null?
       end
 
-      super value
+      super(value)
     end
 
     def build
@@ -283,7 +283,7 @@ module Vips
         value = value.map { |x| Operation.imageize match_image, x }
       end
 
-      super name, value
+      super(name, value)
     end
 
     public
@@ -440,14 +440,12 @@ module Vips
         end
       end
 
-      # collect a list of all input references here
-      references = Set.new
+      # dedupe all input references here
+      deduped_references = Set.new
 
       add_reference = lambda do |x|
         if x.is_a?(Vips::Image)
-          x.references.each do |i|
-            references << i
-          end
+          deduped_references.merge x.references
         end
         false
       end
@@ -482,20 +480,27 @@ module Vips
 
       op = op.build
 
+      # we need an array of references for output objects
+      references = deduped_references.to_a
+
       # attach all input refs to output x
       set_reference = lambda do |x|
+        # stop early if there are no refs to attach
+        return true if references == []
+
         if x.is_a? Vips::Image
-          x.references += references
+          references.each { |i| x.references << i }
         end
+
         false
       end
 
       # get all required results
       result = []
       required_output.each do |details|
-        value = details[:arg_name]
+        value = op.get(details[:arg_name])
         flat_find value, &set_reference
-        result << op.get(value)
+        result << value
       end
 
       # fetch all optional ones

data/lib/vips/region.rb

@@ -44,10 +44,10 @@ module Vips
     end
 
     def initialize(name)
-      ptr = Vips.vips_region_new name
-      raise Vips::Error if ptr.null?
+      pointer = Vips.vips_region_new name
+      raise Vips::Error if pointer.null?
 
-      super ptr
+      super(pointer)
     end
 
     def width

data/lib/vips/sourcecustom.rb

@@ -47,7 +47,7 @@ module Vips
       pointer = Vips.vips_source_custom_new
       raise Vips::Error if pointer.null?
 
-      super pointer
+      super(pointer)
     end
 
     # The block is executed to read data from the source. The interface is

data/lib/vips/targetcustom.rb

@@ -47,7 +47,7 @@ module Vips
       pointer = Vips.vips_target_custom_new
       raise Vips::Error if pointer.null?
 
-      super pointer
+      super(pointer)
     end
 
     # The block is executed to write data to the source. The interface is

data/lib/vips/version.rb

@@ -1,3 +1,3 @@
 module Vips
-  VERSION = "2.2.0"
+  VERSION = "2.2.2"
 end

data/lib/vips.rb

@@ -33,6 +33,30 @@ def library_name(name, abi_number)
   end
 end
 
+# we can sometimes get dependent libraries from libvips -- either the platform
+# will open dependencies for us automatically, or the libvips binary has been
+# built to includes all main dependencies (common on windows, can happen
+# elsewhere)
+#
+# we must get glib functions from libvips if we can, since it will be the
+# one that libvips itself is using, and they will share runtime types
+module Vips
+  extend FFI::Library
+
+  ffi_lib library_name("vips", 42)
+
+  begin
+    attach_function :g_malloc, [:size_t], :pointer
+    @@is_unified = true
+  rescue FFI::NotFoundError
+    @@is_unified = false
+  end
+
+  def self.unified?
+    @@is_unified
+  end
+end
+
 module GLib
   class << self
     attr_accessor :logger
@@ -42,7 +66,11 @@ module GLib
 
   extend FFI::Library
 
-  ffi_lib library_name("glib-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("glib-2.0", 0)
+  end
 
   attach_function :g_malloc, [:size_t], :pointer
 
@@ -134,7 +162,11 @@ end
 module GObject
   extend FFI::Library
 
-  ffi_lib library_name("gobject-2.0", 0)
+  if Vips.unified?
+    ffi_lib library_name("vips", 42)
+  else
+    ffi_lib library_name("gobject-2.0", 0)
+  end
 
   # we can't just use ulong, windows has different int sizing rules
   if FFI::Platform::ADDRESS_SIZE == 64
@@ -568,9 +600,7 @@ require "vips/gvalue"
 # {Image#median}.
 
 module Vips
-  extend FFI::Library
-
-  ffi_lib library_name("vips", 42)
+  # we've already opened the libvips library
 
   LOG_DOMAIN = "VIPS"
   GLib.set_log_domain LOG_DOMAIN
@@ -779,6 +809,31 @@ module Vips
     major > x || (major == x && minor >= y)
   end
 
+  if at_least_libvips?(8, 13)
+    attach_function :vips_block_untrusted_set, [:bool], :void
+    attach_function :vips_operation_block_set, %i[string bool], :void
+
+    # Block/unblock all untrusted operations from running.
+    # Use `vips -l` at the command-line to see the class hierarchy and which operations are marked as untrusted.
+    def self.block_untrusted(enabled)
+      vips_block_untrusted_set(enabled)
+    end
+
+    # Block/unblock all operations in the libvips class hierarchy at specified *operation_name* and below.
+    #
+    # For example this will block all loaders except JPEG
+    #
+    #   Vips.block("VipsForeignLoad", true);
+    #   Vips.block("VipsForeignLoadJpeg", false)
+    #
+    # Use `vips -l` at the command-line to see the class hierarchy.
+    # This call does nothing if the named operation is not found.
+    #
+    def self.block(operation_name, enabled)
+      vips_operation_block_set(operation_name, enabled)
+    end
+  end
+
   # Get a list of all supported file suffixes.
   #
   # @return [[String]] array of supported suffixes

data/ruby-vips.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = ">= 2.0.0"
 
   spec.add_runtime_dependency "ffi", ["~> 1.12"]
+  spec.add_runtime_dependency "logger"
 
   spec.add_development_dependency "rake", ["~> 12.0"]
   spec.add_development_dependency "rspec", ["~> 3.3"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-vips
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 platform: ruby
 authors:
 - John Cupitt
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-18 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -113,6 +127,7 @@ extra_rdoc_files:
 - TODO
 files:
 - ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - ".standard.yml"
@@ -205,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.15
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: A fast image processing library with low memory needs