jekyll-cloudinary 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b39a1223962dd9160274863110e7e2ee8ea81612
-  data.tar.gz: 7018c136e38e0fb420e6a030966cc716d326ad71
+  metadata.gz: dcb506d3d31f2cbb0c1e42c71b777040d36d2e87
+  data.tar.gz: 13f1c330a526d3b0473d696f0e1702fdaeaf6cb2
 SHA512:
-  metadata.gz: 4ff002140b00a547835571eb2b23e092082c697b569fb739ab04b6031e45f5659f1bba7a682833f11c94313f8807f1515edb59a736877aa2149607d0794a5cd7
-  data.tar.gz: 6affb3055b891807a74ea205c37b7a9d07e87630ad2d5fbe38064800c0a3b3fd295f1b1fe6f41580555e0ee72ae32bf2d0fb460a2618f3b0e13fefae8bf9c246
+  metadata.gz: 56796326a51cb7b5f018388528a95a73ab2ba7b0caeba093408936e358f8abb653d8a703fae160ee618a694f09535bc2ed3f2b0a71d92301fe717a7d06dc4235
+  data.tar.gz: bfa956919aa696576e0fb49743159dcac92f2e8f6ce3808b09d6f1a1bda979e31e4ae67b44c4197c7131027804f23fa916f6b505583c93b7b15b2d3fa3eba5ac

data/lib/jekyll/cloudinary.rb

@@ -2,8 +2,7 @@ module Jekyll
   module Cloudinary
 
     class CloudinaryTag < Liquid::Tag
-      require "RMagick"
-      require "open-uri"
+      require "fastimage"
 
       def initialize(tag_name, markup, tokens)
         @markup = markup
@@ -218,41 +217,19 @@ module Jekyll
         end
 
         # Get source image natural width
-        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
+        if File.exist?(image_path)
+          natural_width, natural_height = FastImage.size(image_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}"
+        else
+          natural_width = 100_000
           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 = []

data/lib/jekyll/cloudinary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-cloudinary
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Nicolas Hoizey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -31,7 +31,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="