jekyll-imgflow 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8400a4bc3d213b557802452b3af0816098443aa5542f27e81bf690dd2ee3f7a8
-  data.tar.gz: 1f8562de9d69d7451603623ab2e63741f4889a4d04d35d9ae01a561878e8d539
+  metadata.gz: e314c5d37485b9d821e58bd4614798c9e61e3b944c60f6bbb948fb50a6fe9c2b
+  data.tar.gz: f9b64d4bc5119727cda256d7e1b1fb77e9ee6c9a1b19e97175290cf8f23df1c9
 SHA512:
-  metadata.gz: cbd0f3c0d194bd7acfdc199c9c1eb78dcb69d09c4cc9f213ceb48d1c1c5cb4402518a87a14f44f234df1487ae6eba4495f92aae2b31bb602b199bcaaab4438ef
-  data.tar.gz: 7c07124101bf734ebedce868d1329900c79acde6d90463d5fbd680fe49f02517e743ba4d7d37ebf3e26454e3e9dd4df80ada8265874bb96b1659767a33a8306f
+  metadata.gz: 9102a522a856e6fe440eb207b31c18d350e81a68055b13745ef835e51d257920e115b0054af3494534f9116e89616b13d99fd57c9aed132250bce6e98f280497
+  data.tar.gz: e6039b8fe325d7604fea5267c2f9fdfa40b8990647a8e0dfa936c7c2add4376b66cca4a28d8f548f6c0799321660f076902a27cba4dc3e734c424a683b7c0fdd

data/README.md

@@ -8,6 +8,7 @@ A [Jekyll](https://jekyllrb.com/) plugin for automatic image optimization with m
 [![Status](https://img.shields.io/badge/status-active-success)](https://github.com/gundestrup/jekyll-imgflow)
 [![Semgrep](https://img.shields.io/badge/Semgrep-scanned-1B2B34?logo=semgrep&logoColor=white)](https://semgrep.dev/)
 [![CodeFactor](https://www.codefactor.io/repository/github/gundestrup/jekyll-imgflow/badge)](https://www.codefactor.io/repository/github/gundestrup/jekyll-imgflow)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=gundestrup_jekyll-imgflow&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=gundestrup_jekyll-imgflow)
 [![codecov](https://codecov.io/gh/gundestrup/jekyll-imgflow/branch/main/graph/badge.svg)](https://codecov.io/gh/gundestrup/jekyll-imgflow)
 [![VS Code Extension](https://img.shields.io/badge/VS%20Code%20Companion-jekyll--imgflow-blue?logo=visual-studio-code)](https://github.com/gundestrup/jekyll-imgflow-vscode)
 [![License](https://img.shields.io/github/license/gundestrup/jekyll-imgflow)](LICENSE)

data/lib/jekyll-imgflow/build_time_processor.rb

@@ -44,35 +44,11 @@ module JekyllImgFlow
       original_paths = find_original_images
       Jekyll.logger.info "📸 Found #{original_paths.length} original images"
 
-      originals_dir = File.join(@site.source, @config.originals)
-
       # Clean up manifest entries for deleted originals
-      current_originals = original_paths.map { |path| path.sub("#{originals_dir}/", "") }
-      @manifest.cleanup_deleted_originals(current_originals)
-      @manifest.cleanup_obsolete_defaults(expected_default_operations)
-      @manifest.reset_page_usage unless incremental_build?
+      prepare_manifest(original_paths)
 
       # Build tasks for each original image
-      original_paths.reject { |path| AnimatedGifDetector.animated?(path) }.each do |path|
-        original_name = path.sub("#{originals_dir}/", "")
-        file_digest = @filename_generator.file_digest(path)
-
-        # Check if needs processing (file changed or provider changed)
-        if needs_processing?(original_name, path, file_digest)
-          Jekyll.logger.info "🔧 Queuing default versions for: #{original_name}"
-
-          # Build default tasks
-          tasks = BatchManager.build_default_tasks(
-            original_name, path, @config, @site, file_digest: file_digest
-          )
-          force_processing = source_digest_changed?(original_name, file_digest)
-          tasks.each { |task| task[:force_processing] = force_processing }
-          @batch_manager.add_tasks(tasks)
-        else
-          expected_default_operations.length.times { @operation_processor.stats.record_cache_hit }
-          Jekyll.logger.debug "⏭️  Skipping #{original_name} - already up-to-date"
-        end
-      end
+      queue_default_tasks(original_paths)
 
       # Process all queued tasks
       results = @batch_manager.process_all
@@ -89,6 +65,39 @@ module JekyllImgFlow
 
     private
 
+    def prepare_manifest(original_paths)
+      originals_dir = File.join(@site.source, @config.originals)
+      current_originals = original_paths.map { |path| path.sub("#{originals_dir}/", "") }
+      @manifest.cleanup_deleted_originals(current_originals)
+      @manifest.cleanup_obsolete_defaults(expected_default_operations)
+      @manifest.reset_page_usage unless incremental_build?
+    end
+
+    def queue_default_tasks(original_paths)
+      originals_dir = File.join(@site.source, @config.originals)
+      original_paths.reject { |path| AnimatedGifDetector.animated?(path) }.each do |path|
+        queue_tasks_for(path, path.sub("#{originals_dir}/", ""))
+      end
+    end
+
+    def queue_tasks_for(path, original_name)
+      file_digest = @filename_generator.file_digest(path)
+      unless needs_processing?(original_name, path, file_digest)
+        expected_default_operations.length.times { @operation_processor.stats.record_cache_hit }
+        Jekyll.logger.debug "⏭️  Skipping #{original_name} - already up-to-date"
+        return
+      end
+
+      Jekyll.logger.info "🔧 Queuing default versions for: #{original_name}"
+
+      tasks = BatchManager.build_default_tasks(
+        original_name, path, @config, @site, file_digest: file_digest
+      )
+      force_processing = source_digest_changed?(original_name, file_digest)
+      tasks.each { |task| task[:force_processing] = force_processing }
+      @batch_manager.add_tasks(tasks)
+    end
+
     def register_skipped_tasks(completed_tasks)
       provider_name = @registry.current_provider&.class&.provider_name || "unknown"
       completed_tasks.each do |completed|
@@ -127,13 +136,17 @@ module JekyllImgFlow
       current_provider = @registry.current_provider&.class&.provider_name || "unknown"
 
       expected_default_operations.any? do |operations|
-        version = default_versions.find do |candidate|
-          @manifest.same_operations?(candidate["operations"], operations)
-        end
+        version = find_default_version(default_versions, operations)
         !current_default_version?(version, current_provider, file_digest)
       end
     end
 
+    def find_default_version(default_versions, operations)
+      default_versions.find do |candidate|
+        @manifest.same_operations?(candidate["operations"], operations)
+      end
+    end
+
     def expected_default_operations
       @config.sizes.each_value.flat_map do |width|
         @config.formats.map do |format|

data/lib/jekyll-imgflow/config.rb

@@ -22,6 +22,18 @@ module JekyllImgFlow
     DEFAULT_FALLBACK_FORMAT = "jpg"
     DEFAULT_IMAGE_MODAL = true
 
+    # Core config keys mapped to their defaults (assigned as @ivar per key).
+    CORE_CONFIG_DEFAULTS = {
+      "originals" => DEFAULT_ORIGINALS,
+      "output" => DEFAULT_OUTPUT,
+      "input_formats" => DEFAULT_INPUT_FORMATS,
+      "sizes" => DEFAULT_SIZES,
+      "formats" => DEFAULT_FORMATS,
+      "quality" => DEFAULT_QUALITY,
+      "backend_priority" => DEFAULT_BACKEND_PRIORITY,
+      "fallback_format" => DEFAULT_FALLBACK_FORMAT
+    }.freeze
+
     attr_reader :site, :originals, :output, :input_formats, :sizes, :formats,
                 :quality, :backend_priority, :imgproxy_url,
                 :weserv_url, :flyimg_url,
@@ -37,14 +49,9 @@ module JekyllImgFlow
     end
 
     def assign_core_config(cfg)
-      @originals = cfg["originals"] || DEFAULT_ORIGINALS
-      @output = cfg["output"] || DEFAULT_OUTPUT
-      @input_formats = cfg["input_formats"] || DEFAULT_INPUT_FORMATS
-      @sizes = cfg["sizes"] || DEFAULT_SIZES
-      @formats = cfg["formats"] || DEFAULT_FORMATS
-      @quality = cfg["quality"] || DEFAULT_QUALITY
-      @backend_priority = cfg["backend_priority"] || DEFAULT_BACKEND_PRIORITY
-      @fallback_format = cfg["fallback_format"] || DEFAULT_FALLBACK_FORMAT
+      CORE_CONFIG_DEFAULTS.each do |key, default|
+        instance_variable_set("@#{key}", cfg[key] || default)
+      end
       @image_modal = cfg.fetch("image_modal", DEFAULT_IMAGE_MODAL)
     end
 

data/lib/jekyll-imgflow/modal_assets.rb

@@ -135,17 +135,23 @@ module JekyllImgFlow
 
       max_width = @config.sizes.values.max
       Dir.children(directory).filter_map do |filename|
-        candidate = JekyllImgFlow::FilenameGenerator.new.parse_filename(filename)
-        next unless candidate[:base_name] == parsed[:base_name]
-        next unless candidate[:hash] == parsed[:hash]
-        next if max_width && candidate[:width] > max_width
-
-        File.join(File.dirname(result), filename)
+        matching_variant_path(filename, parsed, max_width, result)
       end
     rescue Errno::ENOENT
       []
     end
 
+    # Return the output path for +filename+ when it is a variant of the same
+    # image (same base name and content hash) within the max configured width.
+    def matching_variant_path(filename, parsed, max_width, result)
+      candidate = JekyllImgFlow::FilenameGenerator.new.parse_filename(filename)
+      return unless candidate[:base_name] == parsed[:base_name]
+      return unless candidate[:hash] == parsed[:hash]
+      return if max_width && candidate[:width] > max_width
+
+      File.join(File.dirname(result), filename)
+    end
+
     def modal_width(result)
       JekyllImgFlow::FilenameGenerator.new.parse_filename(File.basename(result))[:width] || 0
     end

data/lib/jekyll-imgflow/preset_manager.rb

@@ -147,28 +147,34 @@ module JekyllImgFlow
 
     def merge_operation_tags(tags, op_type, params)
       case op_type
-      when "resize"
-        tags[:width] = params["width"] if params["width"]
-        tags[:height] = params["height"] if params["height"]
-      when "crop"
-        tags[:ratio] = params["ratio"] if params["ratio"]
-        tags[:aspect_ratio] = params["aspect_ratio"] if params["aspect_ratio"]
-        tags[:width] = params["width"] if params["width"] && !tags[:width]
-        tags[:height] = params["height"] if params["height"] && !tags[:height]
-      when "format"
-        merge_format_tag(tags, params)
-      when "quality"
-        tags[:quality] = params["quality"] if params["quality"]
-      when "optimize"
-        tags[:optimize] = true
-        tags[:level] = params["level"] if params["level"]
-      when "opacity"
-        tags[:opacity] = params["opacity"] if params["opacity"]
+      when "resize" then merge_resize_tags(tags, params)
+      when "crop" then merge_crop_tags(tags, params)
+      when "format" then merge_format_tag(tags, params)
+      when "quality" then tags[:quality] = params["quality"] if params["quality"]
+      when "optimize" then merge_optimize_tags(tags, params)
+      when "opacity" then tags[:opacity] = params["opacity"] if params["opacity"]
       else
         merge_generic_tags(tags, params)
       end
     end
 
+    def merge_resize_tags(tags, params)
+      tags[:width] = params["width"] if params["width"]
+      tags[:height] = params["height"] if params["height"]
+    end
+
+    def merge_crop_tags(tags, params)
+      tags[:ratio] = params["ratio"] if params["ratio"]
+      tags[:aspect_ratio] = params["aspect_ratio"] if params["aspect_ratio"]
+      tags[:width] = params["width"] if params["width"] && !tags[:width]
+      tags[:height] = params["height"] if params["height"] && !tags[:height]
+    end
+
+    def merge_optimize_tags(tags, params)
+      tags[:optimize] = true
+      tags[:level] = params["level"] if params["level"]
+    end
+
     def merge_format_tag(tags, params)
       if params["formats"]
         tag_value = params["formats"].is_a?(Array) ? params["formats"].join(",") : params["formats"]

data/lib/jekyll-imgflow/providers/base_provider.rb

@@ -45,14 +45,19 @@ module JekyllImgFlow
         params = operation[:params] || {}
         keep = opts[:keep] || params[:keep] || params[:position]
         smartcrop = operation[:ratio] && keep && SMARTCROP_POSITIONS.include?(keep.to_s)
-        coords = if operation[:ratio]
-                   { x: opts[:calculated_x], y: opts[:calculated_y],
-                     width: opts[:calculated_width], height: opts[:calculated_height] }
-                 else
-                   { x: opts[:x] || 0, y: opts[:y] || 0,
-                     width: opts[:width], height: opts[:height] }
-                 end
-        coords.merge(smartcrop: smartcrop, keep: keep)
+        crop_coords(operation, opts).merge(smartcrop: smartcrop, keep: keep)
+      end
+
+      # Coordinates for a crop operation: ratio crops use calculated values,
+      # explicit crops use x/y/width/height options (defaulting x/y to 0).
+      def crop_coords(operation, opts)
+        if operation[:ratio]
+          { x: opts[:calculated_x], y: opts[:calculated_y],
+            width: opts[:calculated_width], height: opts[:calculated_height] }
+        else
+          { x: opts[:x] || 0, y: opts[:y] || 0,
+            width: opts[:width], height: opts[:height] }
+        end
       end
 
       # Extract watermark operation parts into a hash.
@@ -145,17 +150,7 @@ module JekyllImgFlow
 
         # For HTTP providers, construct proper HTTP URL
         site = @config.site
-
-        # Get the relative path from site source using Pathname
-        source_path = Pathname.new(site.source)
-        file_pathname = Pathname.new(file_path)
-        relative_path = if file_pathname.absolute? && file_path.to_s.start_with?(site.source)
-                          file_pathname.relative_path_from(source_path).to_s
-                        elsif file_path.start_with?("/")
-                          file_path[1..]
-                        else
-                          file_path
-                        end
+        relative_path = relative_file_path(file_path, site)
 
         # URL-encode each path segment to handle spaces and special characters
         encoded_path = relative_path.split("/").map do |segment|
@@ -171,6 +166,18 @@ module JekyllImgFlow
         "#{base_url}#{baseurl}/#{encoded_path}"
       end
 
+      # Get the relative path from site source using Pathname
+      def relative_file_path(file_path, site)
+        file_pathname = Pathname.new(file_path)
+        if file_pathname.absolute? && file_path.to_s.start_with?(site.source)
+          file_pathname.relative_path_from(Pathname.new(site.source)).to_s
+        elsif file_path.start_with?("/")
+          file_path[1..]
+        else
+          file_path
+        end
+      end
+
       # Operation collection methods - these should NOT execute immediately
       def resize(width, height, options = {})
         @operations << { type: :resize, width: width, height: height,

data/lib/jekyll-imgflow/tags/resize_tag.rb

@@ -21,19 +21,8 @@ module JekyllImgFlow
         # Calculate missing dimension to maintain aspect ratio ONLY when one dimension is missing
         width, height = calculate_missing_dimension(width, height, original_width, original_height)
 
-        # Calculate scale factors for provider
-        scale_x = width && original_width ? width.to_f / original_width : nil
-        scale_y = height && original_height ? height.to_f / original_height : nil
-
         # Provider receives ALL data - provider chooses what to use
-        resize_data = {
-          original_width: original_width,
-          original_height: original_height,
-          target_width: width,
-          target_height: height,
-          scale_x: scale_x,
-          scale_y: scale_y
-        }
+        resize_data = build_resize_data(width, height, original_width, original_height)
 
         Jekyll.logger.debug "🔍 ResizeTag: About to execute provider - input: #{input_path}, output: #{output_path}"
         @provider.resize(width, height, resize_data)
@@ -46,6 +35,17 @@ module JekyllImgFlow
 
       private
 
+      def build_resize_data(width, height, original_width, original_height)
+        {
+          original_width: original_width,
+          original_height: original_height,
+          target_width: width,
+          target_height: height,
+          scale_x: width && original_width ? width.to_f / original_width : nil,
+          scale_y: height && original_height ? height.to_f / original_height : nil
+        }
+      end
+
       def calculate_missing_dimension(width, height, original_width, original_height)
         if width.nil? && height
           # Only height provided - calculate width to maintain aspect ratio

data/lib/jekyll-imgflow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllImgFlow
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-imgflow
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Svend Gundestrup