shi-jekyll-images 0.1.0.9 → 0.1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46efb41167a462a3dbdbb688427e3fce17d24c050185a064834547cf2299932
-  data.tar.gz: cb8c641d7a054a509a6d4dee65cb831dd9c860bf52ee1e894df3dd3420937fb3
+  metadata.gz: eac0cef4a9dcd2d9f3d8fdffdc0b5b9335f14a77eb9d0b56e87c19e814d398f7
+  data.tar.gz: 73afca035a829bcc8ad48b8911df13f842e5a4d2d8deb24be0f67b74ecc4ea97
 SHA512:
-  metadata.gz: '001189f90de0599f61f721252f4838491459c7a21ae07b8cc8db62b3fe57b29310d78aa76279eda0bb740574d73da7a98c130899a4f044775b0ee60f1648fea9'
-  data.tar.gz: c712f7009557cf0d3c687d345d800c75c264177a085d09ccd200d46d43258871788eb49e0408d35460c44a5f6a2030d6b19dd08697827a301dae44a742c458b2
+  metadata.gz: e0e9e45b08f9f187e9b7aee1789cbf694f226d622c0aaec610ae96835f519b2a732340f2d617151fe2c6159faf9c049000d73c235ae9c695aedf3396c59ddf86
+  data.tar.gz: 24f498b6fd1ca1c903f8091d8b6b54d6c630e5dff54eae437d3118b140f3d325765e38620ea21a703c04646664e5e215d33bd48d3cf1d63a45cd4e79922fd522

data/Gemfile

@@ -2,5 +2,7 @@
 
 source "https://rubygems.org"
 
+gem 'liquid', '~> 4.0'
+
 # Specify your gem's dependencies in shi-jekyll-images.gemspec
 gemspec

data/Gemfile.lock

@@ -1,84 +1,176 @@
 PATH
   remote: .
   specs:
-    shi-jekyll-images (0.1.0)
+    shi-jekyll-images (0.1.0.9)
       jekyll (>= 4.0, < 5.0)
       liquid (~> 4.0)
-      shi-args (~> 0.3.3.5)
-      shi-tools (~> 0.1.0)
+      shi-args (~> 0.3.4.2)
+      shi-tools (~> 0.2.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
+    base64 (0.3.0)
+    bigdecimal (3.2.3)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.3.5)
+    csv (3.3.5)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
     eventmachine (1.2.7)
-    ffi (1.15.5)
+    ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86-linux-gnu)
+    ffi (1.17.2-x86-linux-musl)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     forwardable-extended (2.6.0)
-    google-protobuf (3.21.12-x86_64-linux)
+    google-protobuf (4.32.0)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-aarch64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-aarch64-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-musl)
+      bigdecimal
+      rake (>= 13)
     http_parser.rb (0.8.0)
-    i18n (1.12.0)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    jekyll (4.3.1)
+    jekyll (4.4.1)
       addressable (~> 2.4)
+      base64 (~> 0.2)
       colorator (~> 1.0)
+      csv (~> 3.0)
       em-websocket (~> 0.5)
       i18n (~> 1.0)
       jekyll-sass-converter (>= 2.0, < 4.0)
       jekyll-watch (~> 2.0)
+      json (~> 2.6)
       kramdown (~> 2.3, >= 2.3.1)
       kramdown-parser-gfm (~> 1.0)
       liquid (~> 4.0)
-      mercenary (>= 0.3.6, < 0.5)
+      mercenary (~> 0.3, >= 0.3.6)
       pathutil (~> 0.9)
       rouge (>= 3.0, < 5.0)
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-sass-converter (3.0.0)
-      sass-embedded (~> 1.54)
+    jekyll-sass-converter (3.1.0)
+      sass-embedded (~> 1.75)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.4.0)
-      rexml
+    json (2.13.2)
+    kramdown (2.5.1)
+      rexml (>= 3.3.9)
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (5.0.1)
+    public_suffix (6.0.2)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
-    rb-inotify (0.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (4.0.1)
+    rexml (3.4.4)
+    rouge (4.6.0)
     safe_yaml (1.0.5)
-    sass-embedded (1.57.1-x86_64-linux-gnu)
-      google-protobuf (~> 3.21)
-    shi-args (0.3.3.5)
+    sass-embedded (1.92.1)
+      google-protobuf (~> 4.31)
+      rake (>= 13)
+    sass-embedded (1.92.1-aarch64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-aarch64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-aarch64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-arm-linux-androideabi)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-arm-linux-gnueabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-arm-linux-musleabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-riscv64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-riscv64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-riscv64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-x86_64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-x86_64-linux-android)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.92.1-x86_64-linux-musl)
+      google-protobuf (~> 4.31)
+    shi-args (0.3.4.2)
       jekyll (>= 4.0, < 5.0)
       liquid (~> 4.0)
-      shi-tools (~> 0.1.0)
-    shi-tools (0.1.0)
+      shi-tools (~> 0.2.0)
+    shi-tools (0.2.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    unicode-display_width (2.4.2)
-    webrick (1.7.0)
+    unicode-display_width (2.6.0)
+    webrick (1.9.1)
 
 PLATFORMS
-  x86_64-linux
+  aarch64-linux-android
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-androideabi
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
+  riscv64-linux-android
+  riscv64-linux-gnu
+  riscv64-linux-musl
+  ruby
+  x86-linux-gnu
+  x86-linux-musl
+  x86_64-darwin
+  x86_64-linux-android
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
+  liquid (~> 4.0)
   shi-jekyll-images!
 
 BUNDLED WITH
-   2.4.1
+   2.7.1

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

@@ -1,5 +1,18 @@
 # frozen_string_literal: true
 
+require 'warning'
+
+gem_paths = Gem.path.flat_map do |path|
+  Dir.glob("#{path}/gems/*").select do |gem_path|
+    !gem_path.include?("shi-")
+  end
+end
+
+gem_paths.each do |path|
+  Warning.ignore(//, path)
+end
+
+
 module Shi::Jekyll::Images::Config
   def site_config
     @@site_config ||= Jekyll::configuration || {}
@@ -26,7 +39,7 @@ module Shi::Jekyll::Images::Config
       result = config[name]
     end
     result
-end
+  end
 
   def site
     Jekyll::sites.first

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,13 +153,17 @@ 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}'"
-    system(cmd, exception: true)
+    system(cmd, exception: true, err: '/dev/null')
 
     true
   end
@@ -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/image.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
 require_relative 'version'
+require 'fileutils'
+require 'liquid'
+require 'jekyll'
+require 'shi/tools'
+require 'shi/args'
 require_relative 'files'
 
 class Shi::Jekyll::ImageTag < Liquid::Tag

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

@@ -1,17 +1,17 @@
 # frozen_string_literal: true
 
-require 'pp'   # TODO: remove for release
+# require 'pp'   # TODO: remove for release
 
-require 'fileutils'
-require 'liquid'
-require 'jekyll'
-require 'shi/tools'
-require 'shi/args'
+# require 'fileutils'
+# require 'liquid'
+# require 'jekyll'
+# require 'shi/tools'
+# require 'shi/args'
 
 module Shi
   module Jekyll
     module Images
-      VERSION = '0.1.0.9'
+      VERSION = '0.1.0.14'
     end
   end
 end

metadata

@@ -1,15 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: shi-jekyll-images
 version: !ruby/object:Gem::Version
-  version: 0.1.0.9
+  version: 0.1.0.14
 platform: ruby
 authors:
 - Ivan Shikhalev
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +85,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.4.2
-description:
 email:
 - shikhalev@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".rufo"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -99,7 +110,6 @@ licenses:
 metadata:
   homepage_uri: https://github.com/shikhalev/shi-jekyll-images
   source_code_uri: https://github.com/shikhalev/shi-jekyll-images
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,8 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
-signing_key:
+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