jekyll-plugin-cloudinary 1.14.3 → 1.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bbeeb0360e827069b6757f2072800c1b27c76b70d8b739f35f4c8e5eb765d87
-  data.tar.gz: ed9a6c144944747216fad276b73eea031f1b8d2aedde07a7abe22867da904f79
+  metadata.gz: 5152243b460bfb13890cf66737ec1704050f4b3fc0c7868e2344d6b4778cc904
+  data.tar.gz: f0cf14009788f1b27edef724687063d5f33346d4707c13186faab0d06f6a5f5f
 SHA512:
-  metadata.gz: 1aae7da8b9b2704625e23e154f2708d8f73f66d6639bc4eeaca86d89ecb64b3c650c8642a00c4a6cc247d19b00663c29eea065a6d143f760e6e6cdf553b254a9
-  data.tar.gz: ec46383dfac0efb558a31a6849529ee1149e2eb4b2f1d73e613ad1084a7d2768a9f1e7cc1ea16494ef8408844c80ac907b1d4fdd5cb11429718058406094f3e5
+  metadata.gz: ed624e392464332a228027f318f1c8f5a4e1c5a58f6f8ceb73ca6c9cc4956189af2b50c750b6a26679290721b25437013d0a67b0e5e490ed06aedf973d783de8
+  data.tar.gz: cf6287a77c0e8a02c7a8eaf99f566c028493d8125dbc5644f61215b335be3e1bac2255f861c3e51115bbaa0d8882a9881e1c2c307779aec7c23a12dd383b8d22

data/lib/jekyll/cloudinary.rb

@@ -127,15 +127,16 @@ module Jekyll
           Jekyll.logger.abort_with("[Cloudinary]", "Can't read this tag: #{@markup}")
         end
 
-        image_src = markup[:image_src]
-
         # Dynamic image type
-        type = "fetch"
+        type = "upload"
         # TODO: URL2PNG requires signed URLs... need to investigate more
         # if /^url2png\:/.match(image_src)
         #   type = "url2png"
         #   image_src.gsub! "url2png:", ""
         # end
+        # More TODO: GK changed from fetch
+
+        image_src = markup[:image_src]
 
         if markup[:preset]
           if settings["presets"][markup[:preset]]
@@ -207,11 +208,13 @@ module Jekyll
         end
 
         # Build source image URL
-        is_image_remote = %r!^https?!.match(image_src)
+        is_image_remote = true #%r!^https?!.match(image_src)
         if is_image_remote
           # It's remote
           image_dest_path = image_src
-          image_dest_url = image_src
+          #image_dest_url = image_src
+          image_dest_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/q_auto:best/#{image_src}"
+
           if ENV["JEKYLL_ENV"] != "production"
     	      natural_width, natural_height = nil
           else
@@ -221,62 +224,16 @@ module Jekyll
             if ENV["JEKYLL_ENV"] == "production"
             	Jekyll.logger.warn("remote url doesn't exists " + image_dest_url)
             end
-            return "<img src=\"#{image_dest_url}\" />"
+	        return "<img src=\"#{image_dest_url}\" />"
           end
           width_height = "width=\"#{natural_width}\" height=\"#{natural_height}\""
-          fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_dest_url}"
-        else
-          # It's a local image
-          is_image_src_absolute = %r!^/.*$!.match(image_src)
-          if is_image_src_absolute
-            image_src_path = File.join(
-              site.config["source"],
-              image_src
-            )
-            image_dest_path = File.join(
-              site.config["destination"],
-              image_src
-            )
-            image_dest_url = File.join(
-              url,
-              image_src
-            )
-          else
-            image_src_path = File.join(
-              site.config["source"],
-              File.dirname(context["page"]["path"].chomp("/#excerpt")),
-              image_src
-            )
-            image_dest_path = File.join(
-              site.config["destination"],
-              File.dirname(context["page"]["url"]),
-              image_src
-            )
-            image_dest_url = File.join(
-              url,
-              File.dirname(context["page"]["url"]),
-              image_src
-            )
-          end
-          if File.exist?(image_src_path)
-            natural_width, natural_height = FastImage.size(image_src_path)
-            width_height = "width=\"#{natural_width}\" height=\"#{natural_height}\""
-            fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_dest_url}"
-          else
-            natural_width = 100_000
-            width_height = ""
-            Jekyll.logger.warn(
-              "[Cloudinary]",
-              "Couldn't find this image to check its width: #{image_src_path}."
-            )
-            fallback_url = image_dest_url
-          end
+          fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_src}"
         end
 
-        # Don't generate responsive image HTML and Cloudinary URLs for local development
-        if settings["only_prod"] && ENV["JEKYLL_ENV"] != "production"
-          return "<img src=\"#{image_dest_url}\" #{attr_string} #{img_attr} #{width_height} crossorigin=\"anonymous\" />"
-        end
+        ## Don't generate responsive image HTML and Cloudinary URLs for local development
+        #if settings["only_prod"] && ENV["JEKYLL_ENV"] != "production"
+        #  return "<img src=\"#{image_dest_url}\" #{attr_string} #{img_attr} #{width_height} crossorigin=\"anonymous\" />"
+        #end
 
         srcset = []
         steps = preset["steps"].to_i
@@ -293,19 +250,19 @@ module Jekyll
               in #{context["page"]["path"]} not enough for ANY srcset version"
             )
           end
-          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_dest_url} #{natural_width}w"
+          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_src} #{natural_width}w"
         else
           missed_sizes = []
           (1..steps).each do |factor|
             width = min_width + (factor - 1) * step_width
             if width <= natural_width
-              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{width}/#{image_dest_url} #{width}w"
+              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{width}/#{image_src} #{width}w"
             else
               missed_sizes.push(width)
             end
           end
           unless missed_sizes.empty?
-            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_dest_url} #{natural_width}w"
+            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_src} #{natural_width}w"
             if settings["verbose"]
               Jekyll.logger.warn(
                 "[Cloudinary]",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-plugin-cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.14.3
+  version: 1.14.4
 platform: ruby
 authors:
 - "@glueckkanja"