jekyll-flickr 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 881a1741332d21f044fadeecdb3fa58dab7e1ab16f9e6479de353543deca1014
-  data.tar.gz: a4db748b22cd0a44aa7e649dca5b518aac1fd3e5b53dc4cb0cc9f5d54d729326
+  metadata.gz: d94b1b8306a77dc6119b4ab96551a1fbdd974c29d38315440199133a49033e86
+  data.tar.gz: 27437b172e95945596f9961f7f28bc53cc7e14ae9469bd4fc98ed9a3962a7adb
 SHA512:
-  metadata.gz: 9c1fe75600c0451107d435ee325889ef0317935329652d1e38e35993270bb1dc9afee2364feef7383ff3b865e052044e183b4a9ffd7c0ad11baf9ba0a50645f7
-  data.tar.gz: f24e90e92c7c4cda30a8d1ad83d7d34d5fb8b63df36058402c8eee799571b6155c7c5a71d4ffae560e7045163a78e200654b969b768f7b77ae0639dfd570ee7f
+  metadata.gz: 6e6b34b03b0416f5f93ccc45f832ac218f630304ac49e0830243b445072ab2a12c89b7b00de2e2a90004af14fd60291ec5e96adafe36af14967e1286b8cdd206
+  data.tar.gz: 7bdc1f8170ac75289b147f38b60f02b3982f2659f40a2dbf41bff91f10a2f57aea67e389d0b0269bfa5800341321aa8654b29bb1d2d6b232166f0e84549e523e

data/CHANGELOG.md

@@ -1,6 +1,15 @@
 ## HEAD
 
-## master 0.2.0 / 2021-02-25
+## 0.2.2 / 2025-08-01
+
+  * fix: load licenses dynamically from flickr after the script broke due to outdated hardcoded licenses
+
+## 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 = {
@@ -16,54 +17,6 @@ module Jekyll
         'width_viewport' => '100vw'
       }
 
-      # Flickr licenses from (added CC myself)
-      # https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html
-      LICENSES = [
-        {
-          name: "All Rights Reserved", url: ""
-        },
-        {
-          name: "CC Attribution-NonCommercial-ShareAlike License",
-          url: "https://creativecommons.org/licenses/by-nc-sa/2.0/"
-        },
-        {
-          name: "CC Attribution-NonCommercial License",
-          url: "https://creativecommons.org/licenses/by-nc/2.0/"
-        },
-        {
-          name: "CC Attribution-NonCommercial-NoDerivs License",
-          url: "https://creativecommons.org/licenses/by-nc-nd/2.0/"
-        },
-        {
-          name: "CC Attribution License",
-          url: "https://creativecommons.org/licenses/by/2.0/"
-        },
-        {
-          name: "CC Attribution-ShareAlike License",
-          url: "https://creativecommons.org/licenses/by-sa/2.0/"
-        },
-        {
-          name: "CC Attribution-NoDerivs License",
-          url: "https://creativecommons.org/licenses/by-nd/2.0/",
-        },
-        {
-          name: "No known copyright restrictions",
-          url: "https://www.flickr.com/commons/usage/"
-        },
-        {
-          name: "United States Government Work",
-          url: "http://www.usa.gov/copyright.shtml"
-        },
-        {
-          name: "Public Domain Dedication (CC0)",
-          url: "https://creativecommons.org/publicdomain/zero/1.0/"
-        },
-        {
-          name: "Public Domain Mark",
-          url: "https://creativecommons.org/publicdomain/mark/1.0/"
-        }
-      ]
-
       def initialize(tag_name, text, tokens)
         super
 
@@ -78,7 +31,14 @@ module Jekyll
       end
 
       def cache
-        @@cache ||= Jekyll::Cache.new("flickr")
+        @@cache ||= Jekyll::Cache.new(CACHE_NAME)
+      end
+
+      def licenses
+        @@licenses ||= begin
+          # https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html
+          @@licenses = flickr.photos.licenses.getInfo.sort_by{ |license| license.id.to_i }
+        end
       end
 
       def config
@@ -87,7 +47,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 +64,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,10 +97,10 @@ 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]
+          license = licenses[photo_data[:info].license.to_i]
 
           owner_link = "&copy; Flickr/<a href=\"#{photo_data[:info]['urls'].first['_content']}\">#{photo_data[:info]['owner']['username']}</a>"
 
@@ -141,12 +120,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.2".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.2
 platform: ruby
 authors:
 - Robert Riemann
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2025-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flickr
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Liquid tag for responsive Flickr images using HTML5 srcset.