shi-jekyll-images 0.1.0.10 → 0.1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c77523027f7e9294ce8bc1fc00d49d0f6755c187b11ff1246c437733862c89c
-  data.tar.gz: ff6c2ea236e24512af52445686fbabae4c97a29b88a312b35c09f4f7c76b4e72
+  metadata.gz: eac0cef4a9dcd2d9f3d8fdffdc0b5b9335f14a77eb9d0b56e87c19e814d398f7
+  data.tar.gz: 73afca035a829bcc8ad48b8911df13f842e5a4d2d8deb24be0f67b74ecc4ea97
 SHA512:
-  metadata.gz: 7154cca878a8f39286d49ee5ae258792ce11dae99fdf89f8f17a23498226d0898147389a9bba4d9811fdeba54c2d8e4c9432be6fd4234b2a5faa919a6e2f67b5
-  data.tar.gz: e99623acc24dfe627f10c4b199ed750d4668bc1c4ca5567bb293df2c3e54b8438c45be03a4a7c9a97478813d0f14791a7f4b469c944c27aadf878adc53a775fc
+  metadata.gz: e0e9e45b08f9f187e9b7aee1789cbf694f226d622c0aaec610ae96835f519b2a732340f2d617151fe2c6159faf9c049000d73c235ae9c695aedf3396c59ddf86
+  data.tar.gz: 24f498b6fd1ca1c903f8091d8b6b54d6c630e5dff54eae437d3118b140f3d325765e38620ea21a703c04646664e5e215d33bd48d3cf1d63a45cd4e79922fd522

data/lib/shi/jekyll/images/files.rb

@@ -13,7 +13,38 @@ module Shi::Jekyll::Images::File
         Shi::Jekyll::Images::WebPFile::create page, source, bounds, crop
       end
     end
+
+    # Восстанавливаем ранее сгенерированные файлы в site.static_files
+    def restore_generated_files(site)
+      target_root = site.config['shi_images']&.[]('target_root') || 'img'
+      generated_files_dir = File.join(site.dest, target_root)
+      return unless File.directory?(generated_files_dir)
+
+      Dir.glob(File.join(generated_files_dir, '**', '*.{webp,svg}')).each do |file_path|
+        relative_path = file_path.sub(/^#{site.dest}\//, '')
+        unless site.static_files.any? { |f| f.relative_path == relative_path }
+          # Создаём фиктивный StaticFile, чтобы Jekyll не удалял файл
+          source_file = site.static_files.find { |f| f.relative_path == File.basename(relative_path).sub(/\.webp$/, '') }
+          source_file ||= Jekyll::StaticFile.new(site, site.source, File.dirname(relative_path), File.basename(relative_path))
+          
+          if File.extname(file_path).downcase == '.svg'
+            static_file = Shi::Jekyll::Images::SVGFile.new(relative_path, source_file)
+          else
+            # Для WebP используем dummy bounds/crop, так как точные значения неизвестны
+            static_file = Shi::Jekyll::Images::WebPFile.new(relative_path, source_file, nil, nil)
+          end
+          site.static_files << static_file unless site.static_files.include?(static_file)
+        end
+      end
+    end
+
   end
+
+  # Регистрируем хук для восстановления файлов после чтения сайта
+  Jekyll::Hooks.register :site, :post_read do |site|
+    Shi::Jekyll::Images::File.restore_generated_files(site)
+  end
+
 end
 
 class Shi::Jekyll::Images::WebPFile < Jekyll::StaticFile
@@ -62,7 +93,7 @@ class Shi::Jekyll::Images::WebPFile < Jekyll::StaticFile
       result
     end
 
-    private :new
+    # private :new
     private :name_by_source, :path, :make_key, :default_bounds
   end
 
@@ -75,11 +106,14 @@ class Shi::Jekyll::Images::WebPFile < Jekyll::StaticFile
   end
 
   def modified?
-    true
+    src_path = File.join(site.source, @wp_source.relative_path)
+    tgt_path = destination site.dest
+    return true unless File.exist?(tgt_path) && File.exist?(src_path)
+    File.mtime(src_path) > File.mtime(tgt_path)
   end
 
   def write?
-    true
+    modified?
   end
 
   def cropping crop
@@ -119,9 +153,13 @@ class Shi::Jekyll::Images::WebPFile < Jekyll::StaticFile
   end
 
   def write dest
+    return true if !write?
+
     tgt_path = destination dest
     src_path = File::join site.source, @wp_source.relative_path
 
+    return false unless File.exist?(src_path)
+
     FileUtils::mkdir_p(File.dirname(tgt_path))
     FileUtils::rm(tgt_path) if File.exist?(tgt_path)
     cmd = "convert '#{src_path}' #{cropping(@wp_crop)} #{resizing(@wp_bounds)} #{qualiting} '#{tgt_path}'"
@@ -163,7 +201,7 @@ class Shi::Jekyll::Images::SVGFile < Jekyll::StaticFile
       result
     end
 
-    private :new
+    # private :new
     private :path, :make_key
   end
 
@@ -174,17 +212,24 @@ class Shi::Jekyll::Images::SVGFile < Jekyll::StaticFile
   end
 
   def modified?
-    true
+    src_path = File.join(site.source, @wp_source.relative_path)
+    tgt_path = destination site.dest
+    return true unless File.exist?(tgt_path) && File.exist?(src_path)
+    File.mtime(src_path) > File.mtime(tgt_path)
   end
 
   def write?
-    true
+    modified?
   end
 
   def write dest
+    return true if !write?
+
     tgt_path = destination dest
     src_path = File::join site.source, @wp_source.relative_path
 
+    return false unless File.exist?(src_path)
+
     FileUtils::mkdir_p(File.dirname(tgt_path))
     FileUtils::rm(tgt_path) if File.exist?(tgt_path)
     FileUtils::cp(src_path, tgt_path)

data/lib/shi/jekyll/images/version.rb

@@ -11,7 +11,7 @@
 module Shi
   module Jekyll
     module Images
-      VERSION = '0.1.0.10'
+      VERSION = '0.1.0.14'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shi-jekyll-images
 version: !ruby/object:Gem::Version
-  version: 0.1.0.10
+  version: 0.1.0.14
 platform: ruby
 authors:
 - Ivan Shikhalev
@@ -91,7 +91,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rufo"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -125,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Jekyll plugin for image manipulation
 test_files: []

data/.rufo

@@ -1,6 +0,0 @@
-
-align_case_when true
-parens_in_def :dynamic
-align_chained_calls true
-trailing_commas false
-quote_style :single