jekyll-og-image 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eeccdc0ae99d37ef260733506fbad4ebf5c60f925cdb2514acb91dcb346d1673
-  data.tar.gz: b8b291f97eddc6a0be9dc080d2f999be0bb027224bf5bf2953f941a89491b63a
+  metadata.gz: 9fc4622681cf9b4953d6cbd7de3b661ebd217de44c08205656e395386b14e4c9
+  data.tar.gz: 26b864c6981a1b353de1e8e97de690870e2f2d9c531d56dac1bf97bc2efc0cde
 SHA512:
-  metadata.gz: b15a8205247be628cf982c6efb8f9127cd0ba2eb1d2421e7f7f702802e4960a14317612cfffa010d41972e1b2ba2671eae82f19092552f93b71003995096a21a
-  data.tar.gz: 47b2a2845a7e6bd2a25ef2f249af3fcd1e78adf9179366680e173fc0228aaa5e564be2f5935a0752b3c2c5dd8061b6b17959d7f592fa50ca08d54006baca272c
+  metadata.gz: 7285bbd3562d0e2fa67a1f92c639d2ffa505e73d0d6b58c705217e8e7eefbb5930b9c01fec2c5d267f3448cd012e76ed5f2748b639d62bde290d796ab87d31d8
+  data.tar.gz: beb92471fe217bc7c105fb3924940fee58031306cf628aac36ff8a4b61841ebaee406c8a85ce6aa903563fe3ca8dd489d68d0b3018f9797e77cb76da209d08ef

data/lib/jekyll_og_image/element/base.rb

@@ -21,4 +21,20 @@ class JekyllOgImage::Element::Base
       raise ArgumentError, "Invalid gravity: #{@gravity.inspect}"
     end
   end
+
+  def composite_with_gravity(canvas, overlay, x, y)
+    if gravity_nw?
+      canvas.composite(overlay, :over, x: [ x ], y: [ y ]).flatten
+    elsif gravity_ne?
+      x = canvas.width - overlay.width - x
+      canvas.composite(overlay, :over, x: [ x ], y: [ y ]).flatten
+    elsif gravity_sw?
+      y = canvas.height - overlay.height - y
+      canvas.composite(overlay, :over, x: [ x ], y: [ y ]).flatten
+    elsif gravity_se?
+      x = canvas.width - overlay.width - x
+      y = canvas.height - overlay.height - y
+      canvas.composite(overlay, :over, x: [ x ], y: [ y ]).flatten
+    end
+  end
 end

data/lib/jekyll_og_image/element/border.rb

@@ -4,43 +4,57 @@ class JekyllOgImage::Element::Border < JekyllOgImage::Element::Base
   class Part < Data.define(:rgb, :width, :height, :offset)
   end
 
-  def initialize(canvas, size, position: :bottom, fill: "#000000")
-    @canvas = canvas
+  def initialize(size, position: :bottom, fill: "#000000")
     @size = size
     @position = position
     @fill = fill
 
     validate_position!
+  end
 
-    @border = Vips::Image.black(*dimensions)
+  def apply_to(canvas, &block)
+    border = Vips::Image.black(*dimensions(canvas))
 
-    parts.each.with_index do |part, index|
-      border = Vips::Image.black(part.width, part.height).ifthenelse([ 0, 0, 0 ], part.rgb)
+    parts(canvas).each.with_index do |part, index|
+      image = Vips::Image.black(part.width, part.height).ifthenelse([ 0, 0, 0 ], part.rgb)
 
       if vertical?
-        @border = @border.composite(border, :over, x: [ 0 ], y: [ part.offset ]).flatten
+        border = border.composite(image, :over, x: [ 0 ], y: [ part.offset ]).flatten
       else
-        @border = @border.composite(border, :over, x: [ part.offset ], y: [ 0 ]).flatten
+        border = border.composite(image, :over, x: [ part.offset ], y: [ 0 ]).flatten
       end
     end
-  end
 
-  def apply(&block)
-    result = block.call(@canvas, @border) if block_given?
+    result = block.call(canvas, border) if block_given?
+
     x, y = result ? [ result.fetch(:x, 0), result.fetch(:y, 0) ] : [ 0, 0 ]
 
     if vertical?
-      x = @position == :left ? x : @canvas.width - @size - x
-      @canvas.composite(@border, :over, x: [ x ], y: [ 0 ]).flatten
+      x = @position == :left ? x : canvas.width - @size - x
+      canvas.composite(border, :over, x: [ x ], y: [ 0 ]).flatten
     else
-      y = @position == :top ? y : @canvas.height - @size - y
-      @canvas.composite(@border, :over, x: [ 0 ], y: [ y ]).flatten
+      y = @position == :top ? y : canvas.height - @size - y
+      canvas.composite(border, :over, x: [ 0 ], y: [ y ]).flatten
     end
   end
 
-  def parts
+  private
+
+  def hex_to_rgb(hex)
+    hex.match(/#(..)(..)(..)/)[1..3].map { |x| x.hex }
+  end
+
+  def dimensions(canvas)
+    if vertical?
+      [ @size, canvas.height ]
+    else
+      [ canvas.width, @size ]
+    end
+  end
+
+  def parts(canvas)
     if @fill.is_a?(Array)
-      width, height = vertical? ? [ @size, (@canvas.height / @fill.size) ] : [ (@canvas.width / @fill.size), @size ]
+      width, height = vertical? ? [ @size, (canvas.height / @fill.size) ] : [ (canvas.width / @fill.size), @size ]
 
       @fill.map.with_index do |item, index|
         Part.new(
@@ -51,26 +65,12 @@ class JekyllOgImage::Element::Border < JekyllOgImage::Element::Base
         )
       end
     else
-      length = vertical? ? @canvas.height : @canvas.width
+      length = vertical? ? canvas.height : canvas.width
 
       [ Part.new(rgb: hex_to_rgb(@fill), length: length, offset: 0) ]
     end
   end
 
-  private
-
-  def hex_to_rgb(hex)
-    hex.match(/#(..)(..)(..)/)[1..3].map { |x| x.hex }
-  end
-
-  def dimensions
-    if vertical?
-      [ @size, @canvas.height ]
-    else
-      [ @canvas.width, @size ]
-    end
-  end
-
   def vertical?
     @position == :left || @position == :right
   end

data/lib/jekyll_og_image/element/canvas.rb

@@ -8,31 +8,22 @@ class JekyllOgImage::Element::Canvas < JekyllOgImage::Element::Base
   end
 
   def image(source, **opts, &block)
-    image = JekyllOgImage::Element::Image.new(
-      @canvas, source, **opts
-    )
-
-    @canvas = image.apply(&block)
+    image = JekyllOgImage::Element::Image.new(source, **opts)
+    @canvas = image.apply_to(@canvas, &block)
 
     self
   end
 
   def text(message, **opts, &block)
-    text = JekyllOgImage::Element::Text.new(
-      @canvas, message, **opts
-    )
-
-    @canvas = text.apply(&block)
+    text = JekyllOgImage::Element::Text.new(message, **opts)
+    @canvas = text.apply_to(@canvas, &block)
 
     self
   end
 
-  def border(width, position: :bottom, fill: "#000000")
-    @canvas = JekyllOgImage::Element::Border.new(
-      @canvas, width,
-      position: position,
-      fill: fill
-    ).apply
+  def border(width, **opts, &block)
+    border = JekyllOgImage::Element::Border.new(width, **opts)
+    @canvas = border.apply_to(@canvas, &block)
 
     self
   end

data/lib/jekyll_og_image/element/image.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 class JekyllOgImage::Element::Image < JekyllOgImage::Element::Base
-  def initialize(canvas, source, gravity: :nw, width:, height:)
-    @canvas = canvas
+  def initialize(source, gravity: :nw, width:, height:, radius:)
     @gravity = gravity
     @source = source
     @width = width
     @height = height
+    @radius = radius
 
     validate_gravity!
   end
 
-  def apply(&block)
+  def apply_to(canvas, &block)
     image = Vips::Image.new_from_buffer(@source, "")
-    result = block.call(@canvas, image) if block_given?
+    image = round_corners(image) if @radius
+
+    result = block.call(canvas, image) if block_given?
 
     if @width && @height
       ratio = calculate_ratio(image, @width, @height, :min)
@@ -22,19 +24,7 @@ class JekyllOgImage::Element::Image < JekyllOgImage::Element::Base
 
     x, y = result ? [ result.fetch(:x, 0), result.fetch(:y, 0) ] : [ 0, 0 ]
 
-    if gravity_nw?
-      @canvas.composite(image, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_ne?
-      x = @canvas.width - image.width - x
-      @canvas.composite(image, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_sw?
-      y = @canvas.height - image.height - y
-      @canvas.composite(image, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_se?
-      x = @canvas.width - image.width - x
-      y = @canvas.height - image.height - y
-      @canvas.composite(image, :over, x: [ x ], y: [ y ]).flatten
-    end
+    composite_with_gravity(canvas, image, x, y)
   end
 
   private
@@ -45,6 +35,25 @@ class JekyllOgImage::Element::Image < JekyllOgImage::Element::Base
     end
   end
 
+  def round_corners(image)
+    mask = %(
+      <svg viewBox="0 0 #{image.width} #{image.height}">
+        <rect
+          rx="#{@radius}"
+          ry="#{@radius}"
+          x="0"
+          y="0"
+          width="#{image.width}"
+          height="#{image.height}"
+          fill="#fff"
+        />
+      </svg>
+    )
+
+    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

data/lib/jekyll_og_image/element/text.rb

@@ -1,43 +1,36 @@
 # frozen_string_literal: true
 
 class JekyllOgImage::Element::Text < JekyllOgImage::Element::Base
-  def initialize(canvas, message, gravity: :nw, width: nil, dpi: nil, color: "#000000", font: nil)
-    @canvas = canvas
+  def initialize(message, gravity: :nw, width: nil, dpi: nil, color: "#000000", font: nil)
+    @message = message
     @gravity = gravity
+    @width = width
+    @dpi = dpi
+    @color = color
+    @font = font
 
     validate_gravity!
+  end
 
-    text = Vips::Image.text(message,
-      font: font,
-      width: width,
-      dpi: dpi,
+  def apply_to(canvas, &block)
+    text = Vips::Image.text(@message,
+      font: @font,
+      width: @width,
+      dpi: @dpi,
       wrap: :word,
       align: :low
     )
 
-    @text = text
-      .new_from_image(hex_to_rgb(color))
+    text = text
+      .new_from_image(hex_to_rgb(@color))
       .copy(interpretation: :srgb)
       .bandjoin(text)
-  end
 
-  def apply(&block)
-    result = block.call(@canvas, @text) if block_given?
+    result = block.call(canvas, text) if block_given?
+
     x, y = result ? [ result.fetch(:x, 0), result.fetch(:y, 0) ] : [ 0, 0 ]
 
-    if gravity_nw?
-      @canvas.composite(@text, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_ne?
-      x = @canvas.width - @text.width - x
-      @canvas.composite(@text, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_sw?
-      y = @canvas.height - @text.height - y
-      @canvas.composite(@text, :over, x: [ x ], y: [ y ]).flatten
-    elsif gravity_se?
-      x = @canvas.width - @text.width - x
-      y = @canvas.height - @text.height - y
-      @canvas.composite(@text, :over, x: [ x ], y: [ y ]).flatten
-    end
+    composite_with_gravity(canvas, text, x, y)
   end
 
   private

data/lib/jekyll_og_image/generator.rb

@@ -46,7 +46,8 @@ class JekyllOgImage::Generator < Jekyll::Generator
         File.read(File.join(site.config["source"], JekyllOgImage.config.image)),
         gravity: :ne,
         width: 150,
-        height: 150
+        height: 150,
+        radius: 50
       ) { |_canvas, _text| { x: 80, y: 100 } }
     end
 

data/lib/jekyll_og_image/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-og-image
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Igor Alexandrov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll-seo-tag