jekyll-cloudinary 1.8.1 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b863e9b4acab51ae62dbf96d68b43d059b6aab3
-  data.tar.gz: 2f6cdda99017506fb2146f67b046ef099e85a040
+  metadata.gz: d92d55d6589b7b6b1caec3d8e8e51739d7cec495
+  data.tar.gz: 732cc0bbdfc9e8537b82b5e6c76e7a55da7255ec
 SHA512:
-  metadata.gz: 7786281d3a9a2cbdc88e092edc8a528aeec9b22cec26394a0e86da19aa1f4845eab5db53265ef1f9c2fe51edcc9f35bf9680a528fba11bdbc502d24b8061c508
-  data.tar.gz: 760d8da6e314764339e04d2261f0ed9077499d3356a26c477f7f3ae3febf3da2fb62ad8f0e6e3d65976e1ea738fa2d00de469b427638500c0715cd8c4d6dfd90
+  metadata.gz: bb0272e18e7afccab31bb8241901416b376712f620d136a5b7671469cbe829e90c2e0bf32f713764b7ecbf14cea301990c946bc829d470870c58685e396b21e4
+  data.tar.gz: a506fad8cca0ed024d510808dcecfb0ce086b43bbe38a3a3736f3e6d5a81985417cd90fcec8b571fe2d3f098505b1ad229fb4952fabf60452b15211d53141e7b

data/lib/jekyll/cloudinary/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Cloudinary
-    VERSION = "1.8.1".freeze
+    VERSION = "1.9.0".freeze
   end
 end

data/lib/jekyll/cloudinary.rb

@@ -124,33 +124,6 @@ module Jekyll
         #   image_src.gsub! "url2png:", ""
         # end
 
-        # Build source image URL
-        is_image_remote = /^https?/.match(image_src)
-        # It’s remote
-        if is_image_remote
-          image_path = image_src
-          image_url = image_src
-        # It’s local
-        else
-          is_image_path_absolute = %r!^/.*$!.match(image_src)
-          if is_image_path_absolute
-            image_path = File.join(site.config["destination"], image_src)
-            image_url = File.join(url, baseurl, image_src)
-          else
-            image_path = File.join(
-              site.config["destination"],
-              File.dirname(context["page"]["url"]),
-              image_src
-            )
-            image_url = File.join(
-              url,
-              baseurl,
-              File.dirname(context["page"]["url"]),
-              image_src
-            )
-          end
-        end
-
         if markup[:preset]
           if settings["presets"][markup[:preset]]
             preset = preset.merge(settings["presets"][markup[:preset]])
@@ -216,25 +189,63 @@ module Jekyll
           transformations_string = transformations.compact.reject(&:empty?).join(',') + ","
         end
 
-        # Get source image natural width
+        # Build source image URL
+        is_image_remote = /^https?/.match(image_src)
         if is_image_remote
-          natural_width, natural_height = FastImage.size(image_url)
+          # It’s remote
+          image_dest_path = image_src
+          image_dest_url = image_src
+          natural_width, natural_height = FastImage.size(image_dest_url)
           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_url}"
+          fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_dest_url}"
         else
-          if File.exist?(image_path)
-            natural_width, natural_height = FastImage.size(image_path)
+          # 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,
+              baseurl,
+              image_src
+            )
+          else
+            image_src_path = File.join(
+              site.config["source"],
+              File.dirname(context["page"]["path"]),
+              image_src
+            )
+            image_dest_path = File.join(
+              site.config["destination"],
+              File.dirname(context["page"]["url"]),
+              image_src
+            )
+            image_dest_url = File.join(
+              url,
+              baseurl,
+              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_url}"
+            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_path}. \
+              "Couldn't find this image to check its width: #{image_src_path}. \
               Try to run Jekyll build a second time."
             )
-            fallback_url = image_url
+            fallback_url = image_dest_url
           end
         end
 
@@ -253,19 +264,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_url} #{natural_width}w"
+          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_dest_url} #{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_url} #{width}w"
+              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{width}/#{image_dest_url} #{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_url} #{natural_width}w"
+            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_dest_url} #{natural_width}w"
             if settings["verbose"]
               Jekyll.logger.warn(
                 "[Cloudinary]",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.9.0
 platform: ruby
 authors:
 - Nicolas Hoizey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll