jekyll-imgwh 1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ffd44d7ca00b66da675ce9f136af19dabf345fd9c6f0b5504a7d228ca38ee1
-  data.tar.gz: d1e4fb2243f60657f07e70dcbe92ecf930be8f15011996eabd46a2fa42c56bf5
+  metadata.gz: 9d6e9502b9771b8cde54d20f222edbe9a3cd3882d275dda10b75c9d208e9fe7a
+  data.tar.gz: 7faf66b11788dacee656ce7ba690e303b2abf72117e5b13b39d11a2323907cf0
 SHA512:
-  metadata.gz: cf960c6b1726bf31cf2eb79278f78485901aa3de3732faf8ec11c6bc832162c751730dba8e256150c41a7022406c29bff6d820a350deac560dac410b07bea1c1
-  data.tar.gz: a34dc356c0051b9760fad109095e61b63064a39f4f135a39ec772c8dca26cf177f1572bda52412795fc4d7f4621321acc9596bf5960ea5d8a3cf2d78f451fe42
+  metadata.gz: a442ba4d09a91ab85d776e7b64820eeb46de0dfbc8415c7f3617db6cf7b9f4871496549825abed99c385a1a5867f820216fc1ef25063d52df6961ffd881e51ca
+  data.tar.gz: 1b5c3871cd747afa49319b50f85ddf3eb16615b9b08e69c54208bc51cc2a9391ef3e0452a906bd94fff7f35734a216895bf4d01301010d10fca5bbcda40bdca2

data/lib/jekyll-imgwh/version.rb

@@ -3,6 +3,6 @@
 module Jekyll
   module Imgwh
     NAME = "jekyll-imgwh"
-    VERSION = "1.0"
+    VERSION = "1.1.1"
   end
 end

data/lib/jekyll-imgwh.rb

@@ -4,6 +4,7 @@ require "cgi"
 require "fastimage"
 require "jekyll"
 require "jekyll-imgwh/version"
+require "uri"
 
 module Jekyll
   module Imgwh
@@ -31,32 +32,52 @@ module Jekyll
       end
 
       def render(context)
-        debug "---"
-        debug "content: '#{@content}'"
-        debug "src: '#{@src}'"
-        debug "rest: '#{@rest}'"
+        ["---", "content: '#{@content}'", "src: '#{@src}'", "rest: '#{@rest}'"].map { |x| debug x }
 
         src = Liquid::Template.parse(@src).render(context)
         debug "src rendered: '#{src}'"
-        img = "<img src=#{@quote}#{src}#{@quote}"
-
-        path = resolve_path(src, context)
-        size = FastImage.size(path)
-        raise LoadError, "#{NAME}: could not get size of image '#{path}'" unless size
+        img = "<img src=#{quoted src}"
 
+        size = image_size(src, context)
         debug "image size: #{size}"
-        img << " width=#{@quote}#{size[0]}#{@quote} height=#{@quote}#{size[1]}#{@quote}"
+        img << " width=#{quoted size[0]} height=#{quoted size[1]}" << render_rest(context) << ">"
+      end
+
+      private
 
-        rest = Liquid::Template.parse(@rest).render(context)
-        debug "rest rendered: '#{rest}'"
-        img << " #{rest}" unless rest.empty?
+      def quoted(value)
+        "#{@quote}#{value}#{@quote}"
+      end
+
+      def image_size(src, context)
+        uri = URI(src)
 
-        img << ">"
+        if uri.scheme.nil?
+          path = resolve_path(CGI.unescape(uri.path), context)
+          FastImage.size(path) or raise LoadError, "#{NAME}: could not get size of image '#{path}'"
+        else
+          raise ArgumentError, "#{NAME}: URIs with '#{uri.scheme}' scheme are not allowed"
+        end
       end
 
-      def resolve_path(src, context)
-        path = CGI.unescape(src.sub(%r!\?.*!, ""))
+      def render_rest(context)
+        rest = +""
+
+        extra_rest = context.registers[:site].config.dig(NAME, "extra_rest")
+        unless extra_rest.nil?
+          extra_rest = Liquid::Template.parse(extra_rest).render(context)
+          debug "extra_rest rendered: '#{extra_rest}'"
+          rest << " #{extra_rest}" unless extra_rest.empty?
+        end
+
+        tag_rest = Liquid::Template.parse(@rest).render(context)
+        debug "rest rendered: '#{tag_rest}'"
+        rest << " #{tag_rest}" unless tag_rest.empty?
+
+        rest
+      end
 
+      def resolve_path(path, context)
         local_path = resolve_local_path(path, context)
         return local_path if File.file?(local_path)
 
@@ -83,7 +104,7 @@ module Jekyll
         themed_path
       end
 
-      Liquid::Template.register_tag Jekyll.configuration.dig(NAME, "tag_name") || "img", self
+      Liquid::Template.register_tag "imgwh", self
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-imgwh
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.1.1
 platform: ruby
 authors:
 - Mikalai Ananenka
 bindir: bin
 cert_chain: []
-date: 2025-04-22 00:00:00.000000000 Z
+date: 2025-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage