shrine-blurhash 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39c6d8fd3e19a78ac91d21d5adebb1a834fafcb80c1493b281a132f6d9880201
-  data.tar.gz: e4e7faea183a676725b610353fc8d052417fdf1bdd58544ed73647b87e9f777c
+  metadata.gz: 1775a3abaa4ff444b6320adc7d3eb5125d2dbd20d32756166397667486ef8070
+  data.tar.gz: fa63be0fc7a4b6dc69074578762859d337e8b2f476c2e06603261b5831ae44a1
 SHA512:
-  metadata.gz: 11e4c2bf34926fc35e6bc18b75c6642eeda93ecda13e3c8a767ce0e776a428e4a6d2fb05833f7e9e42701941dc5dc8c9acf34adf933c4afa05b5979e6aaa75f7
-  data.tar.gz: 595c3ae789fd7267d195bec699893cb7b56972607b301a3a9da6d5abb566fadad0cc8447b78323324b0e970d33314b81e1f0f92392b1c4d288a76be0e79117fa
+  metadata.gz: 8c443841b6c082c801ac10a5b32484cd51023e8516e3c4cfceedb8e0c1383a72517e992ed673d8325a52282065ebd9c9c8c7407f53a51c15662b278393b21530
+  data.tar.gz: 267ab27ff58d5c7e9ff3948dfa0d165d39fb6ec12da8dae17500ef22ecf22964ba7db32596fe69d1197dc93d56df0742e5ff03ea47e9695ed4387547df2cf16b

data/lib/shrine/plugins/blurhash.rb

@@ -53,6 +53,9 @@ class Shrine
           io.rewind
 
           blurhash
+        rescue StandardError => e
+          opts[:blurhash][:on_error].call(e)
+          nil
         end
 
         # Returns a hash of built-in pixels extractors, where keys are
@@ -66,9 +69,7 @@ class Shrine
 
         # Returns callable pixels extractor object.
         def pixels_extractor(name)
-          on_error = opts[:blurhash][:on_error]
-
-          PixelsExtractor.new(name, on_error: on_error).method(:call)
+          PixelsExtractor.new(name).method(:call)
         end
 
         private
@@ -106,13 +107,12 @@ class Shrine
       class PixelsExtractor
         SUPPORTED_EXTRACTORS = [:ruby_vips].freeze
 
-        def initialize(tool, on_error: method(:fail))
+        def initialize(tool)
           unless SUPPORTED_EXTRACTORS.include?(tool)
             raise Error, "unknown pixel extractor #{tool.inspect}, supported extractors are: #{SUPPORTED_EXTRACTORS.join(',')}"
           end
 
           @tool     = tool
-          @on_error = on_error
         end
 
         def call(io, resize_to)
@@ -126,26 +126,31 @@ class Shrine
         def extract_with_ruby_vips(io, resize_to)
           require "vips"
 
-          begin
-            Shrine.with_file(io) do |file|
-              image = Vips::Image.new_from_file(file.path, access: :sequential)
-              image = image.resize(resize_to.fdiv(image.width), vscale: resize_to.fdiv(image.height)) if resize_to
-              image = image.flatten if image.has_alpha?
-
-              {
-                width: image.width,
-                height: image.height,
-                pixels: image.to_a.flatten,
-              }
+          Shrine.with_file(io) do |file|
+            image = Vips::Image.new_from_file(file.path, access: :sequential).colourspace(:srgb)
+            image = image.resize(resize_to.fdiv(image.width), vscale: resize_to.fdiv(image.height)) if resize_to
+            image = image.flatten if image.has_alpha?
+            # Blurhash requires exactly 3 bands
+            case image.bands
+            when 1
+              # Duplicate the only band into 2 new bands
+              image = image.bandjoin(Array.new(3 - image.bands, image))
+            when 2
+              # Duplicate the first band into a third band
+              image = image.bandjoin(image.extract_band(0))
+            when 3
+              # Do nothing, band count is already correct
+            else
+              # Only keep the first 3 bands
+              image = image.extract_band(0, n: 3)
             end
-          rescue Vips::Error => e
-            on_error(e)
-          end
-        end
 
-        def on_error(error)
-          @on_error.call(error)
-          nil
+            {
+              width: image.width,
+              height: image.height,
+              pixels: image.to_a.flatten,
+            }
+          end
         end
       end
     end

data/shrine-blurhash.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "shrine-blurhash"
-  gem.version       = "0.2.1"
+  gem.version       = "0.2.3"
 
   gem.required_ruby_version = ">= 3.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shrine-blurhash
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Renaud Chaput
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-25 00:00:00.000000000 Z
+date: 2025-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blurhash