jekyll-cloudinary 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f72e7653facaf897ebb3b54dfbebbb08dd7382e7
-  data.tar.gz: 5f826cac5b07094b25965c88a3a9cacb98dfc6b8
+  metadata.gz: b39a1223962dd9160274863110e7e2ee8ea81612
+  data.tar.gz: 7018c136e38e0fb420e6a030966cc716d326ad71
 SHA512:
-  metadata.gz: b4bb1dd01c1efe5efd65ffab49da2e514cbb1956507433d8cccc7a149f4869d89c369c2b79b047fe7e86abb47d4eb5ccd0b97c8c9b2fc4e77e5872faf24a990b
-  data.tar.gz: a0522ff16af54368f09b8e1ec44454ab5b6ca5c45b1afebe5912b06bd9f846e2b6eab53f4699a66e540c28585a44b81a80217cb0274e9a749a627cb703ff7261
+  metadata.gz: 4ff002140b00a547835571eb2b23e092082c697b569fb739ab04b6031e45f5659f1bba7a682833f11c94313f8807f1515edb59a736877aa2149607d0794a5cd7
+  data.tar.gz: 6affb3055b891807a74ea205c37b7a9d07e87630ad2d5fbe38064800c0a3b3fd295f1b1fe6f41580555e0ee72ae32bf2d0fb460a2618f3b0e13fefae8bf9c246

data/lib/jekyll/cloudinary/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Cloudinary
-    VERSION = "1.6.0".freeze
+    VERSION = "1.7.0".freeze
   end
 end

data/lib/jekyll/cloudinary.rb

@@ -3,6 +3,7 @@ module Jekyll
 
     class CloudinaryTag < Liquid::Tag
       require "RMagick"
+      require "open-uri"
 
       def initialize(tag_name, markup, tokens)
         @markup = markup
@@ -19,7 +20,66 @@ module Jekyll
           "sizes"              => "100vw",
           "figure"             => "auto",
           "attributes"         => {},
-          "verbose"            => false
+          "verbose"            => false,
+          "width_height"       => true,
+          # Cloudinary transformations
+          "height"             => false,
+          "crop"               => "limit",
+          "aspect_ratio"       => false,
+          "gravity"            => false,
+          "zoom"               => false,
+          "x"                  => false,
+          "y"                  => false,
+          "format"             => false,
+          "fetch_format"       => "auto",
+          "quality"            => "auto",
+          "radius"             => false,
+          "angle"              => false,
+          "effect"             => false,
+          "opacity"            => false,
+          "border"             => false,
+          "background"         => false,
+          "overlay"            => false,
+          "underlay"           => false,
+          "default_image"      => false,
+          "delay"              => false,
+          "color"              => false,
+          "color_space"        => false,
+          "dpr"                => false,
+          "page"               => false,
+          "density"            => false,
+          "flags"              => false,
+          "transformation"     => false
+        }
+
+        # TODO: Add validation for this parameters
+        transformation_options = {
+          "height"             => "h",
+          "crop"               => "c", # can include add-on: imagga_scale
+          "aspect_ratio"       => "ar",
+          "gravity"            => "g",
+          "zoom"               => "z",
+          "x"                  => "x",
+          "y"                  => "y",
+          "fetch_format"       => "f",
+          "quality"            => "q", # can include add-on: jpegmini
+          "radius"             => "r",
+          "angle"              => "a",
+          "effect"             => "e", # can include add-on: viesus_correct
+          "opacity"            => "o",
+          "border"             => "bo",
+          "background"         => "b",
+          "overlay"            => "l",
+          "underlay"           => "u",
+          "default_image"      => "d",
+          "delay"              => "dl",
+          "color"              => "co",
+          "color_space"        => "cs",
+          "dpr"                => "dpr",
+          "page"               => "pg",
+          "density"            => "dn",
+          "flags"              => "fl",
+          "transformation"     => "t"
         }
 
         # Settings
@@ -56,24 +116,40 @@ module Jekyll
         end
 
         image_src = markup[:image_src]
-
+        
+        # Dynamic image type
+        type = "fetch"
+        # TODO: URL2PNG requires signed URLs… need to investigate more
+        # if /^url2png\:/.match(image_src)
+        #   type = "url2png"
+        #   image_src.gsub! "url2png:", ""
+        # end
+        
         # Build source image URL
-        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)
+        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
-          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
-          )
+          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]
@@ -129,22 +205,54 @@ module Jekyll
 
         attr_string = html_attr.map { |a, v| "#{a}=\"#{v}\"" }.join(" ")
 
+        # Figure out the Cloudinary transformations
+        transformations = []
+        transformations_string = ""
+        transformation_options.each do | key, shortcode |
+          if preset[key]
+            transformations << "#{shortcode}_#{preset[key]}"
+          end
+        end
+        if transformations.length > 0
+          transformations_string = transformations.compact.reject(&:empty?).join(',') + ","
+        end
+
         # Get source image natural width
-        if File.exist?(image_path)
-          image = Magick::Image::read(image_path).first
-          natural_width = image.columns
-          natural_height = image.rows
-          width_height = "width=\"#{natural_width}\" height=\"#{natural_height}\""
-          fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/fetch/c_limit,w_#{preset["fallback_max_width"]},q_auto,f_auto/#{image_url}"
-        else
-          natural_width = 100_000
+        image = false
+        fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_url}"
+        natural_width = 100_000
+        width_height = ""
+        # Standard fetch
+        if type == "fetch"
+          # Trap format support issues from ImageMagick
+          begin
+            if is_image_remote
+              image = Magick::ImageList.new
+              urlimage = open(image_url) # Image Remote URL 
+              image.from_blob(urlimage.read)
+            elsif File.exist?(image_path)
+              image = Magick::Image::read(image_path).first
+            end
+          rescue
+            image = false
+          end
+          if image
+            natural_width = image.columns
+            natural_height = image.rows
+            width_height = "width=\"#{natural_width}\" height=\"#{natural_height}\""
+          else
+            fallback_url = image_url
+            Jekyll.logger.warn(
+              "[Cloudinary]",
+              "Couldn't find this image to check its width: #{image_path}. \
+              Try to run Jekyll build a second time. If it still doesn’t work \
+              it could be that your ImageMagick install doesn’t support this format."
+            )
+          end
+        end
+
+        if preset["width_height"] == false
           width_height = ""
-          Jekyll.logger.warn(
-            "[Cloudinary]",
-            "Couldn't find this image to check its width: #{image_path}. \
-            Try to run Jekyll build a second time."
-          )
-          fallback_url = image_url
         end
 
         srcset = []
@@ -159,27 +267,27 @@ module Jekyll
             Jekyll.logger.warn(
               "[Cloudinary]",
               "Width of source image '#{File.basename(image_src)}' (#{natural_width}px) \
-              in #{context["page"].path} not enough for ANY srcset version"
+              in #{context["page"]["path"]} not enough for ANY srcset version"
             )
           end
-          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/fetch/c_limit,w_#{natural_width},q_auto,f_auto/#{image_url} #{natural_width}w"
+          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_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/fetch/c_limit,w_#{width},q_auto,f_auto/#{image_url} #{width}w"
+              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{width}/#{image_url} #{width}w"
             else
               missed_sizes.push(width)
             end
           end
           unless missed_sizes.empty?
-            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/fetch/c_limit,w_#{natural_width},q_auto,f_auto/#{image_url} #{natural_width}w"
+            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_url} #{natural_width}w"
             if settings["verbose"]
               Jekyll.logger.warn(
                 "[Cloudinary]",
                 "Width of source image '#{File.basename(image_src)}' (#{natural_width}px) \
-                in #{context["page"].path} not enough for #{missed_sizes.join("px, ")}px \
+                in #{context["page"]["path"]} not enough for #{missed_sizes.join("px, ")}px \
                 version#{missed_sizes.length > 1 ? "s" : ""}"
               )
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Nicolas Hoizey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Liquid tag for Jekyll with Cloudinary