jekyll-flickr 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 881a1741332d21f044fadeecdb3fa58dab7e1ab16f9e6479de353543deca1014
-  data.tar.gz: a4db748b22cd0a44aa7e649dca5b518aac1fd3e5b53dc4cb0cc9f5d54d729326
+  metadata.gz: eb2f0ca419b0edf09cc93e3c122d8bf8c9325c9619951d3be4b35c5f18a0fd39
+  data.tar.gz: 78b24210551fd30062797d42460f94abc1a876c90731fe1dca938db93d2f8975
 SHA512:
-  metadata.gz: 9c1fe75600c0451107d435ee325889ef0317935329652d1e38e35993270bb1dc9afee2364feef7383ff3b865e052044e183b4a9ffd7c0ad11baf9ba0a50645f7
-  data.tar.gz: f24e90e92c7c4cda30a8d1ad83d7d34d5fb8b63df36058402c8eee799571b6155c7c5a71d4ffae560e7045163a78e200654b969b768f7b77ae0639dfd570ee7f
+  metadata.gz: d681c5b700606cf9547bd8215387f76cdc0cd65c7d51357d313eb474551e69c5e6f850e4807fa94f179aff18d98ecd8c50c0673f5cb6cfacb2641aacfe166b0d
+  data.tar.gz: 0f00350dabab634676e742fb53380565a882fbe0e920f4359b4091b40729c13c3fa384d3a84658e9295792ba70596a2790481525778ca168a05457d0028bc95d

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 ## HEAD
 
-## master 0.2.0 / 2021-02-25
+## 0.2.1 / 2024-01-01
+
+  * fix: change cache name according to recommendation from <https://jekyllrb.com/tutorials/cache-api/>
+  * feature: Add flexibility to searching for the right picture width and some minor issues (courtesy of <akarwande@coredigital.com>)
+
+## 0.2.0 / 2021-02-25
 
   * dependencies: require Jekyll 4.x and use gem flickr instead of flickraw
   * use native Jekyll cache API (<https://jekyllrb.com/tutorials/cache-api/>) instead of jekyll-cache

data/lib/jekyll-flickr/flickr_tag.rb

@@ -5,6 +5,7 @@ require 'flickr'
 module Jekyll
   module Flickr
     class FlickrTag < Liquid::Tag
+      CACHE_NAME = "Jekyll::Flickr::FlickrTag"
 
       # selection of sizes from those offered by Flickr API
       DEFAULT_CONFIG = {
@@ -78,7 +79,7 @@ module Jekyll
       end
 
       def cache
-        @@cache ||= Jekyll::Cache.new("flickr")
+        @@cache ||= Jekyll::Cache.new(CACHE_NAME)
       end
 
       def config
@@ -87,7 +88,7 @@ module Jekyll
 
       def render(context)
 
-        match = /(?<photo_id>\d+)(\s(\"(?<caption>[^"]+)\"))?(?<attr>.*)/.match @text
+        match = /(?<photo_id>\d+)(\s(\"(?<caption>[^"]*)\"))?(?<attr>.*)/.match @text
 
         photo_id = match.named_captures['photo_id']
         photo_caption = match.named_captures['caption']
@@ -104,6 +105,25 @@ module Jekyll
         photo_sizes = photo_data[:sizes].select{ |photo| widths.include?(photo['width'].to_i) }
         photo_legacy = photo_data[:sizes].find{ |photo| photo['width'].to_i == config['width_legacy']} || photo_data[:sizes].find{ |photo| photo['label'] == 'Original'}
 
+        # if these sizes are not found, pick the one closes to width_legacy
+        unless photo_legacy
+          candidate = nil
+          smallest_delta = nil
+          photo_data[:sizes].each do |photo|
+            current_delta = (photo['width'].to_i - config['width_legacy']).abs
+            if !smallest_delta || (current_delta < smallest_delta) 
+              candidate = photo
+              smallest_delta = current_delta
+            end
+          end
+          photo_legacy = candidate
+        end
+
+        # if no photo is found return
+        unless photo_legacy
+          return ""
+        end
+
         srcset = photo_sizes.map{|photo| "#{photo['source']} #{photo['width']}w"}.join(", ")
 
         sizes = unless photo_attr.include?('sizes=') then
@@ -118,7 +138,7 @@ module Jekyll
 
         img_tag = "<img class=\"flickr\" src=\"#{photo_legacy.source}\" srcset=\"#{srcset}\" sizes=\"#{sizes}\" #{photo_attr}>"
 
-        return img_tag if not config['figcaption']
+        return compute_html_tag(img_tag) if not config['figcaption']
 
         photo_license = if config['license'] then
           license = LICENSES[photo_data[:info].license.to_i]
@@ -141,12 +161,24 @@ module Jekyll
           ""
         end
 
-        return img_tag if photo_license.empty? and photo_caption.empty?
+        return compute_html_tag(img_tag) if photo_license.empty? and photo_caption.empty?
 
         return <<-HTML
 <figure class="flickr">
   #{img_tag}
   <figcaption>#{photo_caption}#{photo_license}</figcaption>
+</figure>
+        HTML
+      end
+
+      #######
+      private
+      #######
+
+      def compute_html_tag(img_tag)
+        return <<-HTML
+<figure class="flickr">
+  #{img_tag}
 </figure>
         HTML
       end

data/lib/jekyll-flickr/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module Flickr
-    VERSION = "0.2.0".freeze
+    VERSION = "0.2.1".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-flickr
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Riemann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2024-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flickr