jekyll-og-image 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b61ed8f290ff7d539d5797f7e176821c7467cf1e5c2405e54960909663271ef5
-  data.tar.gz: 300123301cf7fc2dc403cc8254181772983f036cb8a06e7e23374fda7861d62c
+  metadata.gz: 3d7ab3e37756339d3435bb110e3e612476888bea4ba020115ebc25e45708e9d5
+  data.tar.gz: 2940f89d8f183a158d8cb4da4a0ee5859ae1f414acf272ad5928c7302ad2f494
 SHA512:
-  metadata.gz: 6a29185631359c3b89faddc2b54187bbfd663b762c6533eb5909270e78320c04f313193ddd4c3e33652946865ef486b7bfaefbb941637a965d8fc02f8f6560b4
-  data.tar.gz: 83fa74112ac6747aa11a402913b6cd736c828f318b8a08ddf342d7aac8212a367b9c7028378fe681dbb8725dd44a6fcfe3ec379beb9e999e9e105cc6d52adb61
+  metadata.gz: 163fc1a8a585391ab60f6e233291497275b2902a0d13e397211af6a610606ad510e33e8d98fbb153ad1ee943cd86d00e5bcf359527a52c51c05bd51b97774a4e
+  data.tar.gz: 946b88643e7b584ab44114e7fc6e94578b53ccfe156c5758b93ae93099b2e442f13edc10c23c5541215ba229fa2b76fa69af8dcb186ef777e5745fb5c48b0573

data/.rspec_status

@@ -1,5 +1,7 @@
-example_id                          | status | run_time        |
------------------------------------ | ------ | --------------- |
-./spec/jekyll_og_image_spec.rb[1:1] | passed | 0.01708 seconds |
-./spec/jekyll_og_image_spec.rb[1:2] | passed | 0.27293 seconds |
-./spec/jekyll_og_image_spec.rb[1:3] | passed | 0.06846 seconds |
+example_id                                     | status | run_time        |
+---------------------------------------------- | ------ | --------------- |
+./spec/jekyll_og_image/config_spec.rb[1:1:1:1] | passed | 0.00069 seconds |
+./spec/jekyll_og_image/config_spec.rb[1:1:2:1] | passed | 0.00014 seconds |
+./spec/jekyll_og_image/version_spec.rb[1:1]    | passed | 0.00031 seconds |
+./spec/jekyll_og_image_spec.rb[1:1]            | passed | 0.26017 seconds |
+./spec/jekyll_og_image_spec.rb[1:2]            | passed | 0.04281 seconds |

data/README.md

@@ -61,7 +61,7 @@ og_image:
 
 ![Example 1](examples/1.png)
 
-### Background Color and Text Colors
+### Background Color and Text Color
 
 ```yaml
 og_image:
@@ -78,7 +78,7 @@ og_image:
   force: false
   domain: "igor.works"
   border_bottom:
-    width: 20
+    width: 50
     fill:
       - "#002B7F"
       - "#FCD116"
@@ -87,6 +87,26 @@ og_image:
 
 ![Example 3](examples/3.png)
 
+### Background Image
+
+```yaml
+og_image:
+  output_dir: "/assets/og"
+  image: "/assets/images/igor.jpeg"
+  canvas:
+    background_image: "/assets/images/bc_3.jpg"
+  header:
+    font_family: "Roboto, Bold"
+    color: "#333333"
+  content:
+    font_family: "Roboto, Bold"
+    color: "#333333"
+  force: false
+  domain: "igor.works"
+```
+
+![Example 4](examples/4.png)
+
 
 ## Contributing
 

data/lib/jekyll_og_image/config.rb

@@ -7,7 +7,8 @@ class JekyllOgImage::Config < Anyway::Config
   attr_config force: false
   attr_config verbose: false
   attr_config canvas: {
-    background_color: "#FFFFFF"
+    background_color: "#FFFFFF",
+    background_image: nil
   }
   attr_config header: {
     font_family: "Helvetica, Bold",
@@ -19,13 +20,11 @@ class JekyllOgImage::Config < Anyway::Config
   }
   attr_config :image
   attr_config :domain
-  attr_config border_bottom: {
-    width: 20,
-    fill: [ "#211F1F", "#F4CBB2", "#AD5C51", "#9CDAF1", "#7DBBE6" ]
-  }
+  attr_config :border_bottom
 
   coerce_types canvas: {
-    background_color: { type: :string }
+    background_color: { type: :string },
+    background_image: { type: :string }
   }
 
   coerce_types header: {
@@ -44,4 +43,8 @@ class JekyllOgImage::Config < Anyway::Config
     width: { type: :integer },
     fill: { type: :string, array: true }
   }
+
+  def margin_bottom
+    80 + (border_bottom&.fetch("width", 0) || 0)
+  end
 end

data/lib/jekyll_og_image/element/base.rb

@@ -22,6 +22,14 @@ class JekyllOgImage::Element::Base
     end
   end
 
+  def calculate_ratio(image, width, height, mode)
+    if mode == :min
+      [ width.to_f / image.width, height.to_f / image.height ].min
+    else
+      [ width.to_f / image.width, height.to_f / image.height ].max
+    end
+  end
+
   def composite_with_gravity(canvas, overlay, x, y)
     if gravity_nw?
       canvas.composite(overlay, :over, x: [ x ], y: [ y ]).flatten

data/lib/jekyll_og_image/element/canvas.rb

@@ -3,8 +3,19 @@
 require "vips"
 
 class JekyllOgImage::Element::Canvas < JekyllOgImage::Element::Base
-  def initialize(width, height, color: "#ffffff")
-    @canvas = Vips::Image.black(width, height).ifthenelse([ 0, 0, 0 ], hex_to_rgb(color))
+  def initialize(width, height, background_color: "#ffffff", background_image: nil)
+    @canvas = Vips::Image.black(width, height).ifthenelse([ 0, 0, 0 ], hex_to_rgb(background_color))
+
+    if background_image
+      overlay = Vips::Image.new_from_buffer(background_image, "")
+
+      ratio = calculate_ratio(overlay, width, height, :max)
+      overlay = overlay.resize(ratio)
+
+      @canvas = @canvas.composite(overlay, :over, x: [ 0 ], y: [ 0 ]).flatten
+    end
+
+    @canvas
   end
 
   def image(source, **opts, &block)

data/lib/jekyll_og_image/element/image.rb

@@ -15,13 +15,13 @@ class JekyllOgImage::Element::Image < JekyllOgImage::Element::Base
     image = Vips::Image.new_from_buffer(@source, "")
     image = round_corners(image) if @radius
 
-    result = block.call(canvas, image) if block_given?
-
     if @width && @height
       ratio = calculate_ratio(image, @width, @height, :min)
       image = image.resize(ratio)
     end
 
+    result = block.call(canvas, image) if block_given?
+
     x, y = result ? [ result.fetch(:x, 0), result.fetch(:y, 0) ] : [ 0, 0 ]
 
     composite_with_gravity(canvas, image, x, y)
@@ -53,12 +53,4 @@ class JekyllOgImage::Element::Image < JekyllOgImage::Element::Base
     mask = Vips::Image.new_from_buffer(mask, "")
     image.bandjoin mask[3]
   end
-
-  def calculate_ratio(image, width, height, mode)
-    if mode == :min
-      [ width.to_f / image.width, height.to_f / image.height ].min
-    else
-      [ width.to_f / image.width, height.to_f / image.height ].max
-    end
-  end
 end

data/lib/jekyll_og_image/generator.rb

@@ -35,13 +35,21 @@ class JekyllOgImage::Generator < Jekyll::Generator
   def generate_image_for_post(site, post, path)
     date = post.date.strftime("%B %d, %Y")
 
+    background_image = if JekyllOgImage.config.canvas["background_image"]
+      File.read(File.join(site.config["source"], JekyllOgImage.config.canvas["background_image"]))
+    end
+
     canvas = JekyllOgImage::Element::Canvas.new(1200, 600,
-        color: JekyllOgImage.config.canvas["background_color"]
-      )
-      .border(JekyllOgImage.config.border_bottom["width"],
+      background_color: JekyllOgImage.config.canvas["background_color"],
+      background_image: background_image
+    )
+
+    if JekyllOgImage.config.border_bottom
+      canvas = canvas.border(JekyllOgImage.config.border_bottom["width"],
         position: :bottom,
         fill: JekyllOgImage.config.border_bottom["fill"]
       )
+    end
 
     if JekyllOgImage.config.image
       canvas = canvas.image(
@@ -65,7 +73,7 @@ class JekyllOgImage::Generator < Jekyll::Generator
       color: JekyllOgImage.config.content["color"],
       dpi: 150,
       font: JekyllOgImage.config.content["font_family"]
-    ) { |_canvas, _text| { x: 80, y: post.data["tags"].any? ? 150 : 100 } }
+    ) { |_canvas, _text| { x: 80, y: post.data["tags"].any? ? JekyllOgImage.config.margin_bottom + 50 : JekyllOgImage.config.margin_bottom } }
 
     if post.data["tags"].any?
       tags = post.data["tags"].map { |tag| "##{tag}" }.join(" ")
@@ -75,7 +83,7 @@ class JekyllOgImage::Generator < Jekyll::Generator
         color: JekyllOgImage.config.content["color"],
         dpi: 150,
         font: JekyllOgImage.config.content["font_family"]
-      ) { |_canvas, _text| { x: 80, y: 100 } }
+      ) { |_canvas, _text| { x: 80, y: JekyllOgImage.config.margin_bottom } }
     end
 
     if JekyllOgImage.config.domain
@@ -87,7 +95,7 @@ class JekyllOgImage::Generator < Jekyll::Generator
       ) do |_canvas, _text|
         {
           x: 80,
-          y: post.data["tags"].any? ? 150 : 100
+          y: post.data["tags"].any? ? JekyllOgImage.config.margin_bottom + 50 : JekyllOgImage.config.margin_bottom
         }
       end
     end

data/lib/jekyll_og_image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-og-image
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-seo-tag
@@ -103,6 +103,7 @@ files:
 - examples/1.png
 - examples/2.png
 - examples/3.png
+- examples/4.png
 - lib/jekyll-og-image.rb
 - lib/jekyll_og_image.rb
 - lib/jekyll_og_image/config.rb