jekyll-plugin-cloudinary 1.2 → 1.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e547561350adf47a94f2f97d017cd3de3e92c453d31dc60890f9bba047993af
-  data.tar.gz: a414adbdccefbf0ad76dcbdd2ab77f4aaaf46792f1769b92ef67ced139e24e5c
+  metadata.gz: 6b6f3aca92e577298f2a52f8720597a74985c28d4509580cf9bc98ab897d5d11
+  data.tar.gz: 0a797cce469179e29dda21a4e9c2e540b28a13568272f1be56317941396de3a5
 SHA512:
-  metadata.gz: 7858c1a3e4a6aa41204a053a822c97183a2818657ae5272376cfdeca01b9054fa6c18fef80aa483e6cc2321fe0c7966f3547b58d3b7135ffb2bb615784e96cea
-  data.tar.gz: '08b547e5b2be54a64f3464f002b74ed334398fb343f19c66995f885a220bddc71578e15e9367f6ccbfcf93b4834d1495b201962ada2f1e1006dce6545b09338d'
+  metadata.gz: 6ed3ff84c6a4ef9015ae4b50f2a63833285f2ef7aba0d578347fb6985a5c146b7f2c692ef6d1f941fb5228391a62c9e7239f118399a3ac25c4ca3294eb84dc91
+  data.tar.gz: 58e726fae19e6be6803307c4ebb07aa39a0910f17161b1592ee6160e71ae2a0e0dbaf77f47f5d421651119148d3eb96cf1d55ae8b605403861f15a392c487257

data/lib/jekyll/cloudinary.rb

@@ -50,7 +50,7 @@ module Jekyll
           "delay"              => false,
           "color"              => false,
           "color_space"        => false,
-          "dpr"                => "auto",
+          "dpr"                => false,
           "page"               => false,
           "density"            => false,
           "flags"              => false,
@@ -127,16 +127,15 @@ module Jekyll
           Jekyll.logger.abort_with("[Cloudinary]", "Can't read this tag: #{@markup}")
         end
 
+        image_src = markup[:image_src]
+
         # Dynamic image type
-        type = "upload"
+        type = "fetch"
         # 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]]
@@ -172,15 +171,6 @@ module Jekyll
         end
         html_attr = attributes.merge(html_attr)
 
-        # SPECIAL
-
-        # Deal with "special transformation" 
-        if html_attr["transform"]
-          trnsfm = html_attr["transform"]
-          Jekyll.logger.warn("There is a transformatio @" + image_src + " ->" + trnsfm)
-          html_attr.delete("transform")
-        end
-
         # Deal with the "caption" attribute as a true <figcaption>
         if html_attr["caption"]
           caption = markdown_converter.convert(html_attr["caption"])
@@ -217,41 +207,70 @@ module Jekyll
         end
 
         # Build source image URL
-        is_image_remote = true #%r!^https?!.match(image_src)
+        is_image_remote = %r!^https?!.match(image_src)
         if is_image_remote
           # It's remote
           image_dest_path = image_src
-          #image_dest_url = image_src
-          if trnsfm.nil?
-          	image_dest_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/q_auto:best/#{image_src}"
-          else
-          	image_dest_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{trnsfm}/#{image_src}"
-          end
-          
-
-          if ENV["JEKYLL_ENV"] != "production"
-    	      natural_width, natural_height = nil
-          else
-	          natural_width, natural_height = FastImage.size(image_dest_url)
-          end
+          image_dest_url = image_src
+          natural_width, natural_height = FastImage.size(image_dest_url)
           if natural_width.nil?
-            if ENV["JEKYLL_ENV"] == "production"
-            	Jekyll.logger.warn("remote url doesn't exists " + image_dest_url)
-            end
-	        return "<img src=\"#{image_dest_url}\" />"
+            Jekyll.logger.warn("remote url doesn't exists " + image_dest_url)
+            return "<img src=\"#{image_dest_url}\" />"
           end
           width_height = "width=\"#{natural_width}\" height=\"#{natural_height}\""
-          if trnsfm.nil?
-          	fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{preset["fallback_max_width"]}/#{image_src}"
+          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
-          	fallback_url = "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{trnsfm}/#{image_src}"
+            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
         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
@@ -268,31 +287,19 @@ module Jekyll
               in #{context["page"]["path"]} not enough for ANY srcset version"
             )
           end
-          if trnsfm.nil?
-	          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_src} #{natural_width}w"
-          else
-	          srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{trnsfm}/#{image_src} #{natural_width}w"
-          end          
+          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
-	          if trnsfm.nil?
-	              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{width}/#{image_src} #{width}w"
-	          else
-	              srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{trnsfm}/#{image_src} #{width}w"
-	          end          
+              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?
-            if trnsfm.nil?
-	            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{transformations_string}w_#{natural_width}/#{image_src} #{natural_width}w"
-            else
-	            srcset << "https://res.cloudinary.com/#{settings["cloud_name"]}/image/#{type}/#{trnsfm}/#{image_src} #{natural_width}w"
-            end          
+            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]",

data/lib/jekyll/cloudinary/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Cloudinary
-    VERSION = "1.14.3"
+    VERSION = "1.14.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-plugin-cloudinary
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: 1.14.1
 platform: ruby
 authors:
 - "@glueckkanja"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -28,22 +28,16 @@ dependencies:
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.55.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.74.0
+        version: 0.55.0
 description: 
 email:
 - info@glueckkanja.com
@@ -98,7 +92,7 @@ files:
 - README.md
 - RELEASES.md
 - Rakefile
-- lib/jekyll-plugin-cloudinary.rb
+- lib/jekyll-cloudinary.rb
 - lib/jekyll/cloudinary.rb
 - lib/jekyll/cloudinary/version.rb
 homepage: https://glueckkanja.com
@@ -120,7 +114,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: GK Jekyll Cloudinary Tag (derived from nhoizey)