jekyll-og-image 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e246a8f729a0d3597ecdbb0b9b1b15083c6e23121d2f670c9b0911a16e0465eb
-  data.tar.gz: 203d4fa8e80623c91072f9eb5b02468085cca2a8cde171d325c1068eb7ccc2a9
+  metadata.gz: 260918d98e574361037584e4d0d4097dd41fdcd3526386d3abfde00e2dc4b0f6
+  data.tar.gz: e0c75eec8ddb3f3911aac2ef2b45687ecc1bb036057ed183802570a82f1a4922
 SHA512:
-  metadata.gz: 1074de3a876df6c1856e4162aa260424b2972f9ae238bbc1060a36ce73f4cc82490e1ccf6d295e25f4a5e2719e54dae7ff199d779430856515e069a336a6909b
-  data.tar.gz: d9472379c623f304ab3a0ab95fd83a79a2ba9ccdc559319d747cec9d19432d7456e6a9bd036c13fab2f76fd8c12c2624ccefa5b647e99f6bbf18faa6127254fc
+  metadata.gz: 16f6da984ff3821513fdfd51eb9beb06e45bfb76c4530464ebc2f7d9164985a4583ec894258580ea125aed96b9ea489acc55332adc920cfda64e7f9f4c7ec3ee
+  data.tar.gz: eb147ebfeb11d50a80370ced4b82b33c1b33730c6b087c3eddc2871b6aed570dac8014cd01f687711b4f316cdf51bb9cf37cbb8eb82b58e048bafa8f3a21bcac

data/README.md

@@ -11,7 +11,7 @@ A Jekyll plugin to automatically generate open graph images for posts.
 Add this line to your site's Gemfile:
 
 ```ruby
-  gem 'jekyll-feed'
+  gem 'jekyll-og-image'
 ```
 
 And then add this line to your site's `_config.yml`:
@@ -32,10 +32,11 @@ The plugin can be configured in the `_config.yml` file or in the post's front ma
 
 The following configuration options are available:
 
-* `output_dir` – The directory where the generated images will be saved. Default: `assets/images/og`
+* `collections` - An array specifying which types of collections to generate images for. Supports `"posts"`, `"pages"`, and the names of any custom collections. Default: `["posts"]`
 
-* `force` – If set to `true`, the plugin will generate an image for every post, even if the post already has an image. Default: `false`
+* `output_dir` – The directory where the generated images will be saved. Images will be placed in subdirectories named after their collection type (e.g., `assets/images/og/posts`, `assets/images/og/pages`). Default: `assets/images/og`
 
+* `force` – If set to `true`, the plugin will generate an image for every document, even if the document already has an image. Default: `false`
 * `verbose`  – If set to `true`, the plugin will output additional information about the image generation process. Default: `false`
 
 * `skip_drafts` – If set to `true`, the plugin will skip post drafts when generating images. Default: `true`
@@ -71,6 +72,7 @@ For a side wide level configuration, edit your `_config.yml`, for a post level c
 ```yaml
 # _config.yml
 og_image:
+  collections: ["posts", "pages"]
   output_dir: "assets/images/og"
   domain: "igor.works"
   border_bottom:

data/lib/jekyll_og_image/configuration.rb

@@ -49,6 +49,10 @@ class JekyllOgImage::Configuration
     to_h == other.to_h
   end
 
+  def collections
+    @raw_config["collections"] || [ "posts" ]
+  end
+
   def output_dir
     @raw_config["output_dir"] || "assets/images/og"
   end

data/lib/jekyll_og_image/generator.rb

@@ -4,50 +4,93 @@ class JekyllOgImage::Generator < Jekyll::Generator
   safe true
 
   def generate(site)
-    base_path = File.join(JekyllOgImage.config.output_dir, "posts")
+    config = JekyllOgImage.config
 
-    FileUtils.mkdir_p File.join(site.config["source"], base_path)
+    config.collections.each do |type|
+      process_collection(site, type, config)
+    end
+  end
+
+  private
+
+  def process_collection(site, type, config)
+    Jekyll.logger.info "Jekyll Og Image:", "Processing type: #{type}" if config.verbose?
 
-    site.posts.docs.each do |post|
-      next if post.draft? && JekyllOgImage.config.skip_drafts?
+    items = get_items_for_collection(site, type)
+    return if items.empty?
 
-      path = File.join(site.config["source"], base_path, "#{post.data['slug']}.png")
+    base_output_dir = File.join(config.output_dir, type)
+    absolute_output_dir = File.join(site.config["source"], base_output_dir)
+    FileUtils.mkdir_p absolute_output_dir
 
-      if !File.exist?(path) || JekyllOgImage.config.force?
-        Jekyll.logger.info "Jekyll Og Image:", "Generating image #{path}" if JekyllOgImage.config.verbose?
-        generate_image_for_post(site, post, path)
+    items.each do |item|
+      if item.respond_to?(:draft?) && item.draft? && config.skip_drafts?
+        Jekyll.logger.info "Jekyll Og Image:", "Skipping draft: #{item.data['title']}" if config.verbose?
+        next
+      end
+
+      fallback_basename = if item.respond_to?(:basename_without_ext)
+                            item.basename_without_ext
+                            # rubocop:disable Layout/ElseAlignment # Disabled due to RuboCop error in v3.3.0
+                          else
+                            # rubocop:enable Layout/ElseAlignment
+                            File.basename(item.name, File.extname(item.name))
+      end
+      slug = item.data["slug"] || Jekyll::Utils.slugify(item.data["title"] || fallback_basename)
+      image_filename = "#{slug}.png"
+      absolute_image_path = File.join(absolute_output_dir, image_filename)
+      relative_image_path = File.join("/", base_output_dir, image_filename) # Use leading slash for URL
+
+      if !File.exist?(absolute_image_path) || config.force?
+        Jekyll.logger.info "Jekyll Og Image:", "Generating image #{absolute_image_path}" if config.verbose?
+        generate_image_for_document(site, item, absolute_image_path, config)
       else
-        Jekyll.logger.info "Jekyll Og Image:", "Skipping image generation #{path} as it already exists." if JekyllOgImage.config.verbose?
+        Jekyll.logger.info "Jekyll Og Image:", "Skipping image generation for #{relative_image_path} as it already exists." if config.verbose?
       end
 
-      post.data["image"] ||= {
-        "path" => File.join(base_path, "#{post.data['slug']}.png"),
+      item.data["image"] ||= {
+        "path" => relative_image_path,
         "width" => 1200,
         "height" => 600,
-        "alt" => post.data["title"]
+        "alt" => item.data["title"]
       }
     end
   end
 
-  private
+  def get_items_for_collection(site, type)
+    case type
+    when "posts"
+      site.posts.docs
+    when "pages"
+      site.pages.reject { |page| !page.html? }
+    else
+      if site.collections.key?(type)
+        site.collections[type].docs
+      else
+        Jekyll.logger.warn "Jekyll Og Image:", "Unknown collection type \"#{type}\" configured. Skipping."
+        []
+      end
+    end
+  end
 
-  def generate_image_for_post(site, post, path)
-    config = JekyllOgImage.config.merge!(post.data["og_image"])
+  def generate_image_for_document(site, item, path, base_config)
+    config = base_config.merge!(item.data["og_image"] || {})
 
     canvas = generate_canvas(site, config)
     canvas = add_border_bottom(canvas, config) if config.border_bottom
     canvas = add_image(canvas, File.read(File.join(site.config["source"], config.image))) if config.image
-    canvas = add_header(canvas, post, config)
-    canvas = add_publish_date(canvas, post, config)
-    canvas = add_tags(canvas, post, config) if post.data["tags"].any?
-    canvas = add_domain(canvas, post, config) if config.domain
+    canvas = add_header(canvas, item, config)
+    canvas = add_publish_date(canvas, item, config)
+    canvas = add_tags(canvas, item, config) if item.data["tags"]&.any?
+    canvas = add_domain(canvas, item, config) if config.domain
 
     canvas.save(path)
   end
 
   def generate_canvas(site, config)
     background_image = if config.canvas.background_image
-      File.read(File.join(site.config["source"], config.canvas.background_image))
+      bg_path = File.join(site.config["source"], config.canvas.background_image.gsub(/^\//, ""))
+      File.exist?(bg_path) ? File.read(bg_path) : nil
     end
 
     JekyllOgImage::Element::Canvas.new(1200, 600,
@@ -72,8 +115,9 @@ class JekyllOgImage::Generator < Jekyll::Generator
     ) { |_canvas, _text| { x: 80, y: 100 } }
   end
 
-  def add_header(canvas, post, config)
-    canvas.text(post.data["title"],
+  def add_header(canvas, item, config)
+    title = item.data["title"] || "Untitled"
+    canvas.text(title,
       width: config.image ? 870 : 1040,
       color: config.header.color,
       dpi: 400,
@@ -81,19 +125,25 @@ class JekyllOgImage::Generator < Jekyll::Generator
     ) { |_canvas, _text| { x: 80, y: 100 } }
   end
 
-  def add_publish_date(canvas, post, config)
-    date = post.date.strftime("%B %d, %Y")
+  def add_publish_date(canvas, item, config)
+    return canvas unless item.respond_to?(:date) && item.date
+
+    date = item.date.strftime("%B %d, %Y")
+    y_pos = (item.data["tags"]&.any? ? config.margin_bottom + 50 : config.margin_bottom)
 
     canvas.text(date,
       gravity: :sw,
       color: config.content.color,
       dpi: 150,
       font: config.content.font_family
-    ) { |_canvas, _text| { x: 80, y: post.data["tags"].any? ? config.margin_bottom + 50 : config.margin_bottom } }
+    ) { |_canvas, _text| { x: 80, y: y_pos } }
   end
 
-  def add_tags(canvas, post, config)
-    tags = post.data["tags"].map { |tag| "##{tag}" }.join(" ")
+  def add_tags(canvas, item, config)
+    tags_list = item.data["tags"]
+    return canvas unless tags_list.is_a?(Array) && tags_list.any?
+
+    tags = tags_list.map { |tag| "##{tag}" }.join(" ")
 
     canvas.text(tags,
       gravity: :sw,
@@ -103,17 +153,20 @@ class JekyllOgImage::Generator < Jekyll::Generator
     ) { |_canvas, _text| { x: 80, y: config.margin_bottom } }
   end
 
-  def add_domain(canvas, post, config)
+  def add_domain(canvas, item, config)
+    y_pos = if item.data["tags"]&.any?
+              config.margin_bottom + 50
+              # rubocop:disable Layout/ElseAlignment # Disabled due to RuboCop error in v3.3.0
+            else
+              # rubocop:enable Layout/ElseAlignment
+              config.margin_bottom
+    end
+
     canvas.text(config.domain,
       gravity: :se,
       color: config.content.color,
       dpi: 150,
       font: config.content.font_family
-    ) do |_canvas, _text|
-      {
-        x: 80,
-        y: post.data["tags"].any? ? config.margin_bottom + 50 : config.margin_bottom
-      }
-    end
+    ) { |_canvas, _text| { x: 80, y: y_pos } }
   end
 end

data/lib/jekyll_og_image/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JekyllOgImage
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-og-image
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Igor Alexandrov
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-24 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-seo-tag
@@ -72,7 +71,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-description: 
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 email:
 - igor.alexandrov@gmail.com
 executables: []
@@ -104,7 +116,6 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/igor-alexandrov/jekyll-og-image
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Jekyll plugin to generate GitHub-style open graph images
 test_files: []