kt-paperclip-vips 1.2.2 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4aa0400c5db1aca28cf71692d749f5693bccfa4ac56d5cbd6599d10060423c3
-  data.tar.gz: 99c3a302cae0af2f37c24918b6bfbfffca917cde6640fa18e013e6dd934bfc6e
+  metadata.gz: 5866bf3ce6a2d903bea4a6e68d37aa39c1ac780552d438691245b6768773730e
+  data.tar.gz: 9742d4563d322772ec01b0ff52ffeb95872387af8d6fa7aeb8fa95279d441c19
 SHA512:
-  metadata.gz: aa8aee51bc040cd4a3bcb5ee2d2a90dffde49d602db8def2b42a50a284998cb310d49f2eabf7e109b16c5a8c2444f8a37728074372d581e1d6987ec06a2bc3c1
-  data.tar.gz: 7a538b91a744206fe7dfa52eb80c8cb9d21085d2bb4fb23ed0f84498d70459149a36f2665a8f8fc27c033a638adc9007c9cd46dc360174508998d1ecc241c7f5
+  metadata.gz: 5ff964be47f1259e59d506a867b46deaf5c100d2a072623399ff75198294342e9818859118cd1b6de0be42bbe7b544d127ed6825a0c4866ba16c792536b6d393
+  data.tar.gz: 0c24ca2b9bdc655f62d90784386b5216beff0a7e0a077b5b8d310d58dc357e4cb7b61e521e5198ed577e0d158466e08bb5f97f3235cb77ba42c2e22bd445ff8f

data/.gitignore

@@ -13,3 +13,4 @@
 *.gem
 mise.toml
 Gemfile.lock
+.DS_Store

data/.rubocop.yml

@@ -0,0 +1,135 @@
+plugins:
+  - rubocop-performance
+  - rubocop-rake
+  - rubocop-rspec
+
+AllCops:
+  TargetRubyVersion: 3.2
+  DisabledByDefault: false
+  DisplayCopNames: true
+  NewCops: enable
+  Exclude:
+    - "**/bin/*"
+    - "**/config.ru"
+    - "**/db/**/*"
+    - "**/schema.rb"
+    - "**/node_modules/**/*"
+    - "**/vendor/**/*"
+    - "**/vendor/**/*.txt"
+    - "**/test/**/*"
+    - "**/tmp/**/*"
+
+# Dim down rubocop's annoyance level below:
+
+Layout/ArgumentAlignment:
+  Enabled: true
+  EnforcedStyle: with_fixed_indentation
+
+Layout/CaseIndentation:
+  Enabled: true
+  EnforcedStyle: end
+
+Layout/EndAlignment:
+  Enabled: true
+  EnforcedStyleAlignWith: variable
+  AutoCorrect: true
+
+Layout/LineLength:
+  Exclude:
+    - app/views/**/*.rb
+    - app/components/**/*.rb
+    - lib/generators/**/*.rb
+  Max: 125
+
+Layout/SpaceInsideBlockBraces:
+  Enabled: true
+  EnforcedStyleForEmptyBraces: space
+
+Layout/SpaceInsideArrayLiteralBrackets:
+  EnforcedStyle: no_space
+
+Layout/SpaceInsideHashLiteralBraces:
+  Enabled: true
+  EnforcedStyle: space
+  EnforcedStyleForEmptyBraces: no_space
+
+Lint/MissingSuper:
+  Enabled: false
+
+Metrics:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - lib/paperclip-vips.rb
+
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/IndexedLet:
+  Enabled: false
+
+RSpec/AlignLeftLetBrace:
+  Enabled: true
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
+RSpec/MultipleMemoizedHelpers:
+  Max: 10
+
+RSpec/NestedGroups:
+  Max: 4
+
+RSpec/PendingWithoutReason:
+  Enabled: false
+
+RSpec/PredicateMatcher:
+  Enabled: false
+
+RSpec/SpecFilePathFormat:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  EnforcedStyle: nested
+  Exclude:
+    - app/events/**/*.rb
+    # - app/views/**/*.rb
+
+Style/CommentedKeyword:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/EmptyMethod:
+  Enabled: false
+
+Style/FormatStringToken:
+  EnforcedStyle: template
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  EnforcedStyle: never
+
+Style/HashSyntax:
+  Enabled: true
+  EnforcedShorthandSyntax: always
+
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    default: "()"
+    "%i": "[]"
+    "%I": "[]"
+    "%r": "{}"
+    "%w": "[]"
+    "%W": "[]"
+
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: comma
+
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: comma

data/Gemfile

@@ -4,7 +4,11 @@ source "https://rubygems.org"
 gemspec
 
 gem "bundler"
+gem "byebug"
+gem "gem-release"
 gem "rake"
 gem "rspec"
-gem "byebug"
-gem "gem-release"
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rake"
+gem "rubocop-rspec"

data/README.md

@@ -7,7 +7,7 @@ A custom paperclip processor that uses the [libvips image processing library](ht
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'paperclip-vips'
+gem 'kt-paperclip-vips'
 ```
 
 And then execute:
@@ -16,7 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install paperclip-vips
+    $ gem install kt-paperclip-vips
 
 Note: You will need to have libvips installed on your machine for this processor to work correctly.
 

data/Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
-require "bundler/setup"
-require "paperclip/vips"
+require 'bundler/setup'
+require 'paperclip/vips'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +11,5 @@ require "paperclip/vips"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/lib/paperclip/vips.rb

@@ -0,0 +1,151 @@
+module Paperclip
+  class Vips < Processor
+    attr_accessor :auto_orient, :convert_options, :current_geometry, :format, :source_file_options,
+      :target_geometry, :whiny
+
+    def initialize(file, options = {}, attachment = nil)
+      super
+
+      geometry = options[:geometry].to_s
+      @should_crop = geometry[-1, 1] == "#"
+      @target_geometry = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
+      @current_geometry = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
+      @whiny = options.fetch(:whiny, true)
+
+      @auto_orient = options.fetch(:auto_orient, true)
+      @convert_options = options[:convert_options]
+
+      @current_format = current_format(file).downcase
+      @format = options[:format] || @current_format
+
+      @basename = File.basename(@file.path, @current_format)
+    end
+
+    def make
+      source = @file
+      filename = [@basename, @format ? ".#{@format}" : ""].join
+      destination = TempfileFactory.new.generate(filename)
+
+      begin
+        if @target_geometry.present?
+          target_width = @target_geometry.width
+          target_height = @target_geometry.height
+          modifier = @target_geometry.modifier # e.g., ">", "#", etc.
+
+          # Use thumbnail for efficient resizing and cropping
+          crop = (modifier == "#")
+          thumbnail = ::Vips::Image.thumbnail(
+            source.path,
+            target_width,
+            height: crop ? target_height : nil,
+            size: (modifier == ">" ? :down : :both), # ">" means shrink only
+            crop: crop ? :centre : :none
+          )
+
+          # Additional cropping for exact "#" dimensions if needed
+          if crop && (thumbnail.width != target_width || thumbnail.height != target_height)
+            left = [0, (thumbnail.width - target_width) / 2].max
+            top = [0, (thumbnail.height - target_height) / 2].max
+            crop_width = [target_width, thumbnail.width - left].min
+            crop_height = [target_height, thumbnail.height - top].min
+            if crop_width.positive? && crop_height.positive?
+              thumbnail = thumbnail.crop(left, top, crop_width,
+                crop_height)
+            end
+          end
+        end
+
+        # Fallback to original image if no geometry
+        thumbnail = ::Vips::Image.new_from_file(source.path) unless defined?(thumbnail) && thumbnail
+
+        # Apply convert options
+        thumbnail = process_convert_options(thumbnail)
+
+        # Save the processed image
+        save_thumbnail(thumbnail, destination.path)
+      rescue StandardError => e
+        puts e.message, e.backtrace
+        if @whiny
+          message = "There was an error processing the thumbnail for #{@basename}:\n#{e.message}"
+          raise Paperclip::Error, message
+        end
+      end
+
+      destination # Return the Tempfile object
+    end
+
+    private
+
+    def crop
+      return @options[:crop] || :centre if @should_crop
+
+      nil
+    end
+
+    def current_format(file)
+      extension = File.extname(file.path)
+      return extension if extension.present?
+
+      extension = File.extname(file.original_filename)
+      return extension if extension.present?
+
+      ""
+    end
+
+    def width
+      @target_geometry&.width || @current_geometry.width
+    end
+
+    def height
+      @target_geometry&.height || @current_geometry.height
+    end
+
+    def process_convert_options(image)
+      if image && @convert_options.present?
+        # Handle string-based convert_options (e.g., "-quality 80 -strip")
+        quality = @convert_options[/quality (\d+)/, 1]&.to_i
+        strip = @convert_options.include?("-strip")
+
+        # Apply options via instance variables for save_thumbnail
+        @processed_quality = quality if quality
+        @processed_strip = strip if strip
+
+        # Handle JSON-based commands if present
+        commands = parsed_convert_commands(@convert_options)
+        commands.each do |cmd|
+          image = ::Vips::Operation.call(cmd[:cmd], [image, *cmd[:args]], cmd[:optional] || {})
+        end
+      end
+      image
+    end
+
+    def parsed_convert_commands(convert_options)
+      begin
+        commands = JSON.parse(convert_options, symbolize_names: true)
+      rescue StandardError
+        commands = []
+      end
+
+      commands.unshift({ cmd: "autorot" }) if @auto_orient && commands.none? { |cmd| cmd[:cmd] == "autorot" }
+
+      commands
+    end
+
+    def save_thumbnail(thumbnail, path)
+      quality = @processed_quality || 75
+      strip = @processed_strip || false
+
+      case @format.to_s.downcase
+      when ".jpeg", ".jpg", "jpeg", "jpg", "webp"
+        thumbnail.jpegsave(path, Q: quality, strip:)
+      when ".gif", "gif"
+        thumbnail.magicksave(path, strip:) # No quality for GIF
+      when ".png", "png"
+        compression = 9 - (quality / 11.1).floor # Map 0-100 to 9-0
+        thumbnail.pngsave(path, compression:, strip:)
+      else
+        thumbnail.write_to_file(path) # Fallback
+      end
+    end
+  end
+end

data/lib/paperclip-vips/version.rb

@@ -1,3 +1,3 @@
 module PaperclipVips
-  VERSION = "1.2.2"
+  VERSION = "1.2.5".freeze
 end

data/lib/paperclip-vips.rb

@@ -1,10 +1,10 @@
 require "ruby-vips"
 require "paperclip"
 require "paperclip-vips/version"
-require "paperclip-vips/paperclip/vips"
+require "paperclip/vips"
 
 module PaperclipVips
   def self.root
-    Gem::Specification.find_by_name('paperclip-vips').gem_dir
+    Gem::Specification.find_by_name("kt-paperclip-vips").gem_dir
   end
 end

data/paperclip-vips.gemspec

@@ -1,5 +1,4 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "paperclip-vips/version"
 
@@ -9,19 +8,22 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ken Greeff", "Mikael Henriksson"]
   spec.email         = ["ken@kengreeff.com", "mikael@mhenrixon.com"]
 
-  spec.summary       = %q{Uses Ruby Vips to when creating thumbnails for faster generation.}
+  spec.summary       = "Uses Ruby Vips to when creating thumbnails for faster generation."
   spec.homepage      = "https://github.com/realhub/paperclip-vips"
   spec.license       = "MIT"
 
+  spec.required_ruby_version = ">= 3.2.0"
+
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|Gemfile|mise.toml/bin)/}) }
   end
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'kt-paperclip', ">= 5.0.0"
-  spec.add_runtime_dependency "ruby-vips", ">= 2.1"
+  spec.add_dependency "kt-paperclip", ">= 5.0.0"
+  spec.add_dependency "ruby-vips", ">= 2.1"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kt-paperclip-vips
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.5
 platform: ruby
 authors:
 - Ken Greeff
 - Mikael Henriksson
 bindir: exe
 cert_chain: []
-date: 2025-02-20 00:00:00.000000000 Z
+date: 2025-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kt-paperclip
@@ -47,6 +47,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -57,13 +58,14 @@ files:
 - bin/console
 - bin/setup
 - lib/paperclip-vips.rb
-- lib/paperclip-vips/paperclip/vips.rb
 - lib/paperclip-vips/version.rb
+- lib/paperclip/vips.rb
 - paperclip-vips.gemspec
 homepage: https://github.com/realhub/paperclip-vips
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -71,14 +73,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.6
 specification_version: 4
 summary: Uses Ruby Vips to when creating thumbnails for faster generation.
 test_files: []

data/lib/paperclip-vips/paperclip/vips.rb

@@ -1,122 +0,0 @@
-module Paperclip
-  class Vips < Processor
-    attr_accessor :auto_orient, :convert_options, :current_geometry, :format, :source_file_options,
-                  :target_geometry, :whiny
-
-    def initialize(file, options = {}, attachment = nil)
-      super
-
-      geometry = options[:geometry].to_s
-      @should_crop = geometry[-1,1] == '#'
-      @target_geometry = options.fetch(:string_geometry_parser, Geometry).parse(geometry)
-      @current_geometry = options.fetch(:file_geometry_parser, Geometry).from_file(@file)
-      @whiny = options.fetch(:whiny, true)
-
-      @auto_orient = options.fetch(:auto_orient, true)
-      @convert_options = options[:convert_options]
-
-      @current_format = current_format(file).downcase
-      @format = options[:format] || @current_format
-
-      @basename = File.basename(@file.path, @current_format)
-    end
-
-    def make
-      source = @file
-      filename = [@basename, @format ? ".#{@format}" : ""].join
-      destination = TempfileFactory.new.generate(filename)
-
-      begin
-        thumbnail = ::Vips::Image.thumbnail(source.path, width, height: crop ? height : nil, crop: crop) if @target_geometry
-        thumbnail = ::Vips::Image.new_from_file(source.path) if !defined?(thumbnail) || thumbnail.nil?
-        thumbnail = process_convert_options(thumbnail)
-        save_thumbnail(thumbnail, destination.path)
-        
-      rescue => e
-        p e.message, e.backtrace
-
-        if @whiny
-          message = "There was an error processing the thumbnail for #{@basename}:\n" + e.message
-          raise Paperclip::Error, message
-        end
-      end
-
-      return destination
-    end
-
-    private
-      def crop
-        if @should_crop
-          return @options[:crop] || :centre
-        end
-
-        nil
-      end
-
-      def current_format(file)
-        extension = File.extname(file.path)
-        return extension if extension.present?
-
-        extension = File.extname(file.original_filename)
-        return extension if extension.present?
-
-        return ""
-      end
-
-      def width
-        @target_geometry&.width || @current_geometry.width
-      end
-
-      def height
-        @target_geometry&.height || @current_geometry.height
-      end
-      
-      def process_convert_options(image)
-        if image
-          commands = parsed_convert_commands(@convert_options)
-          commands.each do |cmd|
-            image = ::Vips::Operation.call(cmd[:cmd], [image, *cmd[:args]], cmd[:optional] || {})
-          end
-        end
-
-        return image
-      end
-
-      def parsed_convert_commands(convert_options)
-        begin
-          commands = JSON.parse(convert_options, symbolize_names: true)
-        rescue
-          commands = []
-        end
-
-        if @auto_orient && commands.none? { _1[:cmd] == "autorot" }
-          commands.unshift({ cmd: "autorot" })
-        end
-
-        return commands
-      end
-
-      def save_thumbnail(thumbnail, path)
-        case @current_format
-        when ".jpeg", ".jpg"
-          save_jpg(thumbnail, path)
-        when ".gif"
-          save_gif(thumbnail, path)
-        when ".png"
-          save_png(thumbnail, path)
-        end
-      end
-
-      def save_jpg(thumbnail, path)
-        thumbnail.jpegsave(path)
-      end
-
-      def save_gif(thumbnail, path)
-        thumbnail.magicksave(path)
-      end
-
-      def save_png(thumbnail, path)
-        thumbnail.pngsave(path)
-      end
-  end
-end