jekyll-imgflow 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07f3c2dfe3416810827699ab3b82a29012283ad308ad215f034f1bb86d8d8a79
-  data.tar.gz: 6ee5f237e22490069f7b3dc6ef0d8ba63a2ad8ecd1fe8a90754034a03192b11f
+  metadata.gz: 031d0986b4c5e0b451cc3d404eb7bc251e5ee61791fa19a9ae71ad5dc2a2e46b
+  data.tar.gz: 658faf7858443964c239ebbab8a343e51430c1c5043cf6e413c3c2463d4b68a8
 SHA512:
-  metadata.gz: e8da1e7ca9f599f6e1dcfbe5b2a44277ec53edd42b57e34159af1090e0fafcf068b361ac0713ba8932e4acb213f3569a268ffc1471c43c21ffd5845734769315
-  data.tar.gz: 4c7014c3888b5d4a2c94022f89eab3a383edf315fe34b556f3b727d7483f883b0b40ac772ab05fd51d37ab5d900122385d0887052bc6508085a2513dce339d0d
+  metadata.gz: 349afebeceaea49781508b0156177cc07eb1cf0d440ef3fe9754cfec279428b76d9ca2716b991744d66523c16a42102c8a31055864612bcb921b313a69d0c900
+  data.tar.gz: aef1c22691523d287e2aebb7c4e12f8247f7e2cb9b9999ee0368373141c3eddb88c02c96198bf97364a8e04565d09063f447c33d2cdc89af3b5826f40bedcc15

data/README.md

@@ -5,6 +5,7 @@ A [Jekyll](https://jekyllrb.com/) plugin for automatic image optimization with m
 [![DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/gundestrup/jekyll-imgflow)
 [![Status](https://img.shields.io/badge/status-active-success)](https://github.com/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)
 
 ## 🚀 Quick Start
@@ -32,9 +33,11 @@ imgflow:
 > and [Configuration Reference](docs/ARCHITECTURE.md).
 
 > **Note:** Image references require exact filenames (or paths relative to
-> `originals`). There is no fuzzy matching or autocomplete yet — if you type
+> `originals`). There is no fuzzy matching during the build yet — if you type
 > `photo.jpg` but the file is `photo.jpeg`, the build will fail with an error.
-> Future versions may add "did you mean" suggestions.
+>
+> For editor autocomplete while writing `{% imgflow %}` tags, install the
+> [VS Code companion extension](https://github.com/gundestrup/jekyll-imgflow-vscode).
 
 ## ✨ Key Features
 

data/lib/jekyll-imgflow/batch_manager.rb

@@ -213,8 +213,13 @@ module JekyllImgFlow
           # Use FilenameGenerator to generate proper filename
           operations = { width: width, format: format, quality: config.quality }
           filename = filename_generator.generate_filename(original_name, operations)
+
+          # Preserve original directory structure under output
+          subdir = File.dirname(original_name)
+          subdir = nil if subdir == "."
+
           # Write to source directory so Jekyll copies files to _site during write phase
-          output_path = path_resolver.resolve_source_output_path(filename)
+          output_path = path_resolver.resolve_source_output_path(filename, subdir)
 
           tasks << {
             original_name: original_name,

data/lib/jekyll-imgflow/build_time_processor.rb

@@ -42,12 +42,14 @@ module JekyllImgFlow
       original_paths = find_original_images
       Jekyll.logger.info "📸 Found #{original_paths.length} original images"
 
+      originals_dir = File.join(@site.source, @config.originals)
+
       # Build tasks for each original image
       original_paths.each do |path|
-        original_name = File.basename(path)
+        original_name = path.sub("#{originals_dir}/", "")
 
         # Check if needs processing (file changed or provider changed)
-        if needs_processing?(path)
+        if needs_processing?(original_name, path)
           Jekyll.logger.info "🔧 Queuing default versions for: #{original_name}"
 
           # Build default tasks
@@ -84,8 +86,10 @@ module JekyllImgFlow
         provider_name = @registry.current_provider.class.name.split("::").last.downcase
 
         # Convert absolute path to relative for manifest storage
+        # Default versions are written to the source directory so Jekyll can
+        # copy them to _site during the write phase.
         absolute_path = task[:result]
-        relative_path = absolute_path.sub(@site.dest, "")
+        relative_path = absolute_path.sub(@site.source, "")
 
         # Register the version in manifest
         @manifest.register_version(
@@ -113,10 +117,13 @@ module JekyllImgFlow
     end
 
     # Check if image needs processing
-    # @param path [String] Path to original image
+    # @param original_name [String] Path to original image relative to originals directory
+    # @param path [String, nil] Full path to original image (defaults to original_name)
     # @return [Boolean] True if processing needed
-    def needs_processing?(path)
-      original_name = File.basename(path)
+    def needs_processing?(original_name, path = nil)
+      path ||= original_name
+      # For single-argument calls, derive a flat original_name from the full path
+      original_name = File.basename(original_name) if original_name == path
 
       # If no versions exist, needs processing
       return true unless @manifest.versions?(original_name)

data/lib/jekyll-imgflow/imgflow_tag.rb

@@ -64,7 +64,15 @@ module Jekyll
 
       site = context.registers[:site]
       page = context.registers[:page]
-      original_name = File.basename(parsed[:image_path])
+
+      # Resolve input path
+      input_path = resolve_image_path(parsed[:image_path], site, components[:config])
+      raise ArgumentError, "Input image file not found: #{input_path}" unless File.file?(input_path)
+
+      # Store original name relative to the configured originals directory
+      # so output can mirror the original directory structure
+      originals_dir = File.join(site.source, components[:config].originals)
+      original_name = input_path.sub("#{originals_dir}/", "")
 
       # Get page path for manifest tracking
       # Try multiple attributes to get the page identifier
@@ -74,10 +82,6 @@ module Jekyll
                     "unknown"
                   end
 
-      # Resolve input path
-      input_path = resolve_image_path(parsed[:image_path], site, components[:config])
-      raise ArgumentError, "Input image file not found: #{input_path}" unless File.file?(input_path)
-
       # Process operations using clean architecture
       operations = parsed[:operations]
 
@@ -96,8 +100,12 @@ module Jekyll
                    params[:quality] ||= components[:config].quality       # Use default quality
                  end
 
+                 # Preserve original directory structure under output
+                 subdir = File.dirname(original_name)
+                 subdir = nil if subdir == "."
+
                  filename = components[:filename_generator].generate_filename(input_path, params)
-                 output_path = components[:path_resolver].resolve_source_output_path(filename)
+                 output_path = components[:path_resolver].resolve_source_output_path(filename, subdir)
 
                  # Determine version type
                  version_type = determine_version_type(params, components[:config])
@@ -199,12 +207,16 @@ module Jekyll
       path_resolver = JekyllImgFlow::PathResolver.new(config)
 
       # Handle different path formats
-      if image_path.start_with?("/") || image_path.include?("/")
-        # Absolute or relative path
-        File.join(site.source, image_path)
+      normalized_path = image_path.delete_prefix("/")
+      originals_prefix = "#{config.originals.chomp('/')}/"
+
+      if image_path.start_with?("/") || normalized_path.start_with?(originals_prefix)
+        # Site-root path, with or without a leading slash:
+        # /assets/images/originals/valdemar/photo.jpg
+        File.join(site.source, normalized_path)
       else
-        # Use PathResolver to get CLI path (full filesystem path)
-        path_resolver.cli_path(image_path)
+        # Originals-relative path: photo.jpg or valdemar/photo.jpg
+        path_resolver.cli_path(normalized_path)
       end
     end
 

data/lib/jekyll-imgflow/operation_processor.rb

@@ -42,13 +42,18 @@ module JekyllImgFlow
       type = operation[:type]
       params = operation[:params]
 
+      # Determine version type
+      version_type = determine_version_type(params)
+
+      # Preserve original directory structure under output
+      subdir = File.dirname(original_name)
+      subdir = nil if subdir == "."
+
       # Generate filename using FilenameGenerator (JPT compatible)
       filename = @filename_generator.generate_filename(input_path, params)
-      # Write to source directory so Jekyll copies files to _site during write phase
-      actual_output_path = @path_resolver.resolve_source_output_path(filename)
 
-      # Determine version type
-      version_type = determine_version_type(params)
+      # Write to source directory so Jekyll copies files to _site during the write phase
+      actual_output_path = @path_resolver.resolve_source_output_path(filename, subdir)
 
       # Ensure output directory exists before processing
       FileUtils.mkdir_p(File.dirname(actual_output_path))
@@ -69,7 +74,7 @@ module JekyllImgFlow
       # Register in manifest
       if @manifest
         # Store relative path (with leading /) for manifest storage
-        relative_path = "/#{@path_resolver.resolve_relative_output_path(filename)}"
+        relative_path = "/#{@path_resolver.resolve_relative_output_path(filename, subdir)}"
 
         provider_name = @provider.class.provider_name
         @manifest.register_version(

data/lib/jekyll-imgflow/path_resolver.rb

@@ -61,26 +61,29 @@ module JekyllImgFlow
 
     # Resolve output path for generated filename
     # @param filename [String] Generated filename
+    # @param subdir [String, nil] Optional subdirectory under output
     # @return [String] Full path to output file in _site (for specialized versions during rendering)
-    def resolve_output_path(filename)
+    def resolve_output_path(filename, subdir = nil)
       # Resolve output path relative to site destination
-      File.join(@config.site.dest, @config.output, filename)
+      File.join([@config.site.dest, @config.output, subdir, filename].compact)
     end
 
     # Resolve output path to source directory for default images
     # @param filename [String] Generated filename
+    # @param subdir [String, nil] Optional subdirectory under output
     # @return [String] Full path to output file in source (for default versions during pre_render)
-    def resolve_source_output_path(filename)
+    def resolve_source_output_path(filename, subdir = nil)
       # Default images go to source directory so Jekyll can copy them to _site
-      File.join(@config.site.source, @config.output, filename)
+      File.join([@config.site.source, @config.output, subdir, filename].compact)
     end
 
     # Resolve relative output path for manifest storage
     # @param filename [String] Generated filename
+    # @param subdir [String, nil] Optional subdirectory under output
     # @return [String] Relative path from site root
-    def resolve_relative_output_path(filename)
+    def resolve_relative_output_path(filename, subdir = nil)
       # Return path relative to site root (without leading /)
-      File.join(@config.output, filename)
+      File.join([@config.output, subdir, filename].compact)
     end
 
     # Get site destination directory

data/lib/jekyll-imgflow/version.rb

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

metadata

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