jekyll-plugin-gkpicturetag 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c81181f28c5ba12656d64e3d2edd58adf28d59753fbea66703a51c379ff408b
-  data.tar.gz: b409f81aa6f71719d5b94ffb8bea0547d034a46c9136a97b53868aeab98b56d1
+  metadata.gz: 6456d425d3a46b6a0318141fe1dc6a0feb5765c636726b418f75e9af6a14ccbc
+  data.tar.gz: 1be4f0d907512fd5bea95ce947188fd7844e737bcd207e3b091a0875c3d18c6a
 SHA512:
-  metadata.gz: aebed9e5423e534e17a654a79176767b2441a93ce5fbe288211d658f89a3b8418ba65397d84208e041afa8fbe11b73747f68035a59431c3339f4e4aed4fe641e
-  data.tar.gz: 56fc255a4581b2e29207ecfbf92e9736bcf3787d54229defb4968e2215176e2d24e762622d95e2e0da5d047fe75c27fc204235c7f83e92c350f49e9c369ba658
+  metadata.gz: 99ba2898d00e080a5047c643ab8305f668a67c83241dca10914685455a1f309cdaa472562cba4d019e21082e3c5bd61b9d8f6525dd4e919983a18d8e793e17c0
+  data.tar.gz: 25c6cfed8bd2747b671dfb568e154df6e36a7d9e4cc7465f7d0b1237a5d261f67018d22905d66aefb748c3a4892852cca66a788b92fb982b81f4a96cbf91081b

data/jekyll-plugin-gkpicturetag.gemspec

@@ -5,7 +5,7 @@ require 'jekyll-plugin-gkpicturetag/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-plugin-gkpicturetag"
-  spec.version       = Jekyll::Xtube::VERSION
+  spec.version       = Jekyll::Picture::VERSION
   spec.authors       = ["@glueckkanja"]
   spec.email         = ["info@glueckkanja.com"]
 
@@ -17,8 +17,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency  'jekyll', '~> 3.7'
-  spec.add_dependency  'fastimage'
-  spec.add_dependency  'mini_magick'
+  spec.add_dependency  'fastimage', '~> 2.1'
+  spec.add_dependency  'mini_magick', '~> 4.8'
 
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/jekyll-plugin-gkpicturetag.rb

@@ -1,31 +1,321 @@
-require "jekyll"
-require "jekyll-plugin-gkpicturetag/version"
-class XTubeEmbed < Liquid::Tag
+# Title: Jekyll Picture Tag // changed by GK
+# Downloaded 2018-01-18 last changed btobolaski committed on Oct 30, 2015
+# Original Authors: Rob Wierzbowski : @robwierzbowski
+#                   Justin Reese    : @justinxreese
+#                   Welch Canavan   : @xiwcx
+#
+# Description: Easy responsive images for Jekyll.
+#
+# Download: https://github.com/robwierzbowski/jekyll-picture-tag
+# Documentation: https://github.com/robwierzbowski/jekyll-picture-tag/readme.md
+# Issues: https://github.com/robwierzbowski/jekyll-picture-tag/issues
+#
+# Syntax:  {% picture [preset] path/to/img.jpg [source_key: path/to/alt-img.jpg] [attr="value"] %}
+# Example: {% picture poster.jpg alt="The strange case of responsive images" %}
+#          {% picture gallery poster.jpg source_small: poster_closeup.jpg
+#             alt="The strange case of responsive images" class="gal-img" data-selected %}
+#
+# See the documentation for full configuration and usage instructions.
 
-  def initialize(tagName, content, tokens)
-    super
-    @content = content
-  end
+require 'fileutils'
+require 'pathname'
+require 'digest/md5'
+require 'mini_magick'
+require 'fastimage'
+
+module Jekyll
 
-  def render(context)
-    youtube_url = "#{context[@content.strip]}"
-    if youtube_url[/youtu\.be\/([^\?]*)/]
-      @youtube_id = $1
-    else
-      # Regex from # http://stackoverflow.com/questions/3452546/javascript-regex-how-to-get-youtube-video-id-from-url/4811367#4811367
-      youtube_url[/^.*((v\/)|(embed\/)|(watch\?))\??v?=?([^\&\?]*).*/]
-      @youtube_id = $5
+  class Picture < Liquid::Tag
+
+    def initialize(tag_name, markup, tokens)
+      @markup = markup
+      super
     end
-    
-    tmpl_path = File.join Dir.pwd, "_includes", "youtube.html"
-    if File.exist?(tmpl_path)
-      tmpl = File.read tmpl_path
+
+    def render(context)
+
+      # Render any liquid variables in tag arguments and unescape template code
+      render_markup = Liquid::Template.parse(@markup).render(context).gsub(/\\\{\\\{|\\\{\\%/, '\{\{' => '{{', '\{\%' => '{%')
+
+      # Gather settings
       site = context.registers[:site]
-      tmpl = (Liquid::Template.parse tmpl).render site.site_payload.merge!({"youtube_id" => @youtube_id})
-    else
-      %Q{<style>.embed-container { position: relative; padding-bottom: 56.25%; height: 0; overflow: hidden; max-width: 100%; } .embed-container iframe, .embed-container object, .embed-container embed { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }</style><div class='embed-container'>    <iframe title="YouTube video player" width="640" height="390" src="//www.youtube.com/embed/#{ @youtube_id }" frameborder="0" allowfullscreen></iframe></div>}
+      debug = site.config['debug']      
+      settings = site.config['picture']
+      url = site.config['url']
+      markup = /^(?:(?<preset>[^\s.:\/]+)\s+)?(?<image_src>[^\s]+\.[a-zA-Z0-9]{3,4})\s*(?<source_src>(?:(source_[^\s.:\/]+:\s+[^\s]+\.[a-zA-Z0-9]{3,4})\s*)+)?(?<html_attr>[\s\S]+)?$/.match(render_markup)
+      preset = settings['presets'][ markup[:preset] ] || settings['presets']['default']
+
+      raise "Picture Tag can't read this tag. Try {% picture [preset] path/to/img.jpg [source_key: path/to/alt-img.jpg] [attr=\"value\"] %}." unless markup
+
+      # Assign defaults
+      settings['source'] ||= '.'
+      settings['output'] ||= 'generated'
+      settings['markup'] ||= 'picture'
+
+      # Prevent Jekyll from erasing our generated files
+      site.config['keep_files'] << settings['output'] unless site.config['keep_files'].include?(settings['output'])
+
+      # Deep copy preset for single instance manipulation
+      instance = Marshal.load(Marshal.dump(preset))
+
+      # Process alternate source images
+      source_src = if markup[:source_src]
+                     Hash[ *markup[:source_src].gsub(/:/, '').split ]
+                   else
+                     {}
+                   end
+
+      # Process html attributes
+      html_attr = if markup[:html_attr]
+                    Hash[ *markup[:html_attr].scan(/(?<attr>[^\s="]+)(?:="(?<value>[^"]+)")?\s?/).flatten ]
+                  else
+                    {}
+                  end
+
+      if instance['attr']
+        html_attr = instance.delete('attr').merge(html_attr)
+      end
+
+      html_attr_string = html_attr.inject('') { |string, attrs|
+        if attrs[1]
+          string << "#{attrs[0]}=\"#{attrs[1]}\" "
+        else
+          string << "#{attrs[0]} "
+        end
+      }
+
+      # Prepare ppi variables
+      ppi = if instance['ppi'] then instance.delete('ppi').sort.reverse else nil end
+      # this might work??? ppi = instance.delete('ppi'){ |ppi|  [nil] }.sort.reverse
+      ppi_sources = {}
+
+      # Switch width and height keys to the symbols that generate_image() expects
+      begin
+        instance.each { |key, source|
+          # raise "Preset #{key} is missing a width or a height" if !source['width'] and !source['height']
+          instance[key][:width] = instance[key].delete('width') / 2 if source['width']
+          instance[key][:height] = instance[key].delete('height') / 2 if source['height']
+        }
+      rescue
+        # warn "Info (Picture-Tag): ".yellow + "No width and height. Take original size."
+      end
+
+      # Store keys in an array for ordering the instance sources
+      source_keys = instance.keys
+      # used to escape markdown parsing rendering below
+      markdown_escape = "\ "
+
+      # Raise some exceptions before we start expensive processing
+      raise "Picture Tag can't find the \"#{markup[:preset]}\" preset. Check picture: presets in _config.yml for a list of presets." unless preset
+      raise "Picture Tag can't find this preset source. Check picture: presets: #{markup[:preset]} in _config.yml for a list of sources." unless (source_src.keys - source_keys).empty?
+
+      # Process instance
+      # Add image paths for each source
+      instance.each_key { |key|
+        instance[key][:src] = source_src[key] || markup[:image_src]
+      }
+
+      # Construct ppi sources
+      # Generates -webkit-device-ratio and resolution: dpi media value for cross browser support
+      # Reference: http://www.brettjankord.com/2012/11/28/cross-browser-retinahigh-resolution-media-queries/
+      if ppi
+        instance.each { |key, source|
+          ppi.each { |p|
+            if p != 1
+              ppi_key = "#{key}-x#{p}"
+
+              ppi_sources[ppi_key] = {
+                  :width => if source[:width] then (source[:width].to_f * p).round else nil end,
+                  :height => if source[:height] then (source[:height].to_f * p).round else nil end,
+                  'media' => if source['media']
+                               "#{source['media']} and (-webkit-min-device-pixel-ratio: #{p}), #{source['media']} and (min-resolution: #{(p * 96).round}dpi)"
+                             else
+                               "(-webkit-min-device-pixel-ratio: #{p}), (min-resolution: #{(p * 96).to_i}dpi)"
+                             end,
+                  :src => source[:src]
+              }
+
+              # Add ppi_key to the source keys order
+              source_keys.insert(source_keys.index(key), ppi_key)
+            end
+          }
+        }
+        instance.merge!(ppi_sources)
+      end
+
+      # Generate resized images
+      instance.each { |key, source|
+        instance[key][:generated_src] = generate_image(source, site.source, site.dest, settings['source'], settings['output'], site.config["baseurl"], debug)
+        instance[key][:generated2x_src] = generate_image2x(source, site.source, site.dest, settings['source'], settings['output'], site.config["baseurl"], debug)
+      }
+
+      # Construct and return tag
+      source_tags = ''
+      source_keys.each do |source|
+        warn "Info (Picture-Tag): ".yellow + "" + instance[source][:generated_src].to_s.green + "\n                  | ".yellow + instance[source][:generated2x_src].to_s.blue if debug
+        media = " media=\"#{instance[source]['media']}\"" unless source == 'source_default'
+        source_tags += "#{markdown_escape * 4}<source srcset=\"#{instance[source][:generated_src]}, #{instance[source][:generated2x_src]} 2x\"#{media}>\n"
+      end
+
+      # Note: we can't indent html output because markdown parsers will turn 4 spaces into code blocks
+      # Note: Added backslash+space escapes to bypass markdown parsing of indented code below -WD
+      picture_tag = "<picture>\n"\
+                    "#{source_tags}"\
+                    "#{markdown_escape * 4}<img src=\"#{instance['source_default'][:generated_src]}\" #{html_attr_string}>\n"\
+                    "#{markdown_escape * 2}</picture>\n"
+
+      # Return the markup!
+      picture_tag
+    end
+
+#    <picture class="img-responsive">	
+#       <source srcset="/img/illus/home-future-workplace.jpg, /img/illus/home-future-workplace@2x.jpg 2x">	
+#       <img class="img-responsive" src="/img/illus/home-future-workplace.jpg" alt="Future Workplace">
+#    </picture>    
+
+    def generate_image(instance, site_source, site_dest, image_source, image_dest, baseurl, debug)
+      begin
+        digest = Digest::MD5.hexdigest(File.read(File.join(site_source, image_source, instance[:src]))).slice!(0..5)
+      rescue Errno::ENOENT
+        warn "Warning:".yellow + " source image #{instance[:src]} is missing."
+        return ""
+      end
+
+      image_dir = File.dirname(instance[:src])
+      ext = File.extname(instance[:src])
+      basename = File.basename(instance[:src], ext)
+
+      size = FastImage.size(File.join(site_source, image_source, instance[:src]))
+      orig_width = size[0]
+      orig_height = size[1]
+      orig_ratio = orig_width*1.0/orig_height
+
+      gen_width = if instance[:width]
+                    instance[:width].to_f
+                  elsif instance[:height]
+                    orig_ratio * instance[:height].to_f
+                  else
+                    orig_width
+                  end
+      gen_height = if instance[:height]
+                     instance[:height].to_f
+                   elsif instance[:width]
+                     instance[:width].to_f / orig_ratio
+                   else
+                     orig_height
+                   end
+      gen_ratio = gen_width/gen_height
+
+      # Don't allow upscaling. If the image is smaller than the requested dimensions, recalculate.
+      if orig_width < gen_width || orig_height < gen_height
+        undersize = true
+        gen_width = if orig_ratio < gen_ratio then orig_width else orig_height * gen_ratio end
+        gen_height = if orig_ratio > gen_ratio then orig_height else orig_width/gen_ratio end
+      end
+
+      gen_width = gen_width / 2
+      gen_height = gen_height / 2
+
+      gen_name = "#{basename}-#{gen_width.round}by#{gen_height.round}-#{digest}#{ext}"
+      gen_dest_dir = File.join(site_dest, image_dest, image_dir)
+      gen_dest_file = File.join(gen_dest_dir, gen_name)
+
+      # Generate resized files
+      unless File.exists?(gen_dest_file)
+
+        warn "Warning:".yellow + " #{instance[:src]} is smaller than the requested output file. It will be resized without upscaling." if undersize
+
+        #  If the destination directory doesn't exist, create it
+        FileUtils.mkdir_p(gen_dest_dir) unless File.exist?(gen_dest_dir)
+
+        # Let people know their images are being generated
+        puts "Generating #{gen_name}" if !debug
+
+        image = MiniMagick::Image.open(File.join(site_source, image_source, instance[:src]))
+        # Scale and crop
+        image.combine_options do |i|
+          i.resize "#{gen_width}x#{gen_height}^"
+          i.gravity "center"
+          i.crop "#{gen_width}x#{gen_height}+0+0"
+        end
+
+        image.write gen_dest_file
+      end
+
+      # Return path relative to the site root for html
+      Pathname.new(File.join(baseurl, image_dest, image_dir, gen_name)).cleanpath
+    end
+
+    def generate_image2x(instance, site_source, site_dest, image_source, image_dest, baseurl, debug)
+      begin
+        digest = Digest::MD5.hexdigest(File.read(File.join(site_source, image_source, instance[:src]))).slice!(0..5)
+      rescue Errno::ENOENT
+        warn "Warning:".yellow + " source image #{instance[:src]} is missing."
+        return ""
+      end
+
+      image_dir = File.dirname(instance[:src])
+      ext = File.extname(instance[:src])
+      basename = File.basename(instance[:src], ext)
+
+      size = FastImage.size(File.join(site_source, image_source, instance[:src]))
+      orig_width = size[0]
+      orig_height = size[1]
+      orig_ratio = orig_width*1.0/orig_height
+
+      gen_width = if instance[:width]
+                    instance[:width].to_f
+                  elsif instance[:height]
+                    orig_ratio * instance[:height].to_f
+                  else
+                    orig_width
+                  end
+      gen_height = if instance[:height]
+                     instance[:height].to_f
+                   elsif instance[:width]
+                     instance[:width].to_f / orig_ratio
+                   else
+                     orig_height
+                   end
+      gen_ratio = gen_width/gen_height
+
+      # Don't allow upscaling. If the image is smaller than the requested dimensions, recalculate.
+      if orig_width < gen_width || orig_height < gen_height
+        undersize = true
+        gen_width = if orig_ratio < gen_ratio then orig_width else orig_height * gen_ratio end
+        gen_height = if orig_ratio > gen_ratio then orig_height else orig_width/gen_ratio end
+      end
+
+      gen_name = "#{basename}-#{gen_width.round}by#{gen_height.round}-#{digest}#{ext}"
+      gen_dest_dir = File.join(site_dest, image_dest, image_dir)
+      gen_dest_file = File.join(gen_dest_dir, gen_name)
+
+      # Generate resized files
+      unless File.exists?(gen_dest_file)
+
+        warn "Warning:".yellow + " #{instance[:src]} is smaller than the requested output file. It will be resized without upscaling." if undersize
+
+        #  If the destination directory doesn't exist, create it
+        FileUtils.mkdir_p(gen_dest_dir) unless File.exist?(gen_dest_dir)
+
+        # Let people know their images are being generated
+        puts "Generating #{gen_name}" if !debug
+
+        image = MiniMagick::Image.open(File.join(site_source, image_source, instance[:src]))
+        # Scale and crop
+        image.combine_options do |i|
+          i.resize "#{gen_width}x#{gen_height}^"
+          i.gravity "center"
+          i.crop "#{gen_width}x#{gen_height}+0+0"
+        end
+
+        image.write gen_dest_file
+      end
+
+      # Return path relative to the site root for html
+      Pathname.new(File.join(baseurl, image_dest, image_dir, gen_name)).cleanpath
     end
   end
+end
 
-  Liquid::Template.register_tag "xtube", self
-end
+Liquid::Template.register_tag('picture', Jekyll::Picture)

data/lib/jekyll-plugin-gkpicturetag/version.rb

@@ -1,6 +1,6 @@
 module Jekyll
-    module Xtube
-      VERSION = "0.4.0"
+    module Picture
+      VERSION = "0.5.0"
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-plugin-gkpicturetag
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - "@glueckkanja"
@@ -28,30 +28,30 @@ dependencies:
   name: fastimage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement