distorted-jekyll 0.5.7 → 0.6.0

data/lib/distorted-jekyll/molecule/font.rb

@@ -1,28 +1,61 @@
 require 'set'
 
-require 'distorted-jekyll/molecule/text'
-require 'distorted-jekyll/static/font'
+require 'distorted/molecule/font'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module Font
 
-        include Text
-
-        DRIVER = Cooltrainer::DistorteD::Font
-
-        MEDIA_TYPE = DRIVER::MEDIA_TYPE
-        MIME_TYPES = DRIVER::MIME_TYPES
-
-        ATTRS = DRIVER::ATTRS
-        ATTRS_DEFAULT = DRIVER::ATTRS_DEFAULT
-        ATTRS_VALUES = DRIVER::ATTRS_VALUES
-
+        include Cooltrainer::DistorteD::Font
+
+        def render_to_output_buffer(context, output)
+          super
+          begin
+            filez = files.keep_if{ |f|
+              # Strip out all non-displayable media-types, e.g. the actual text/whatever.
+              f.key?(:type) && f&.dig(:type)&.media_type == 'image'.freeze
+            }.keep_if{ |f|
+              # Strip out full-size images (will have `nil`) — only display thumbnail vers
+              f.key?(:width) or f.key?(:height)
+            }.map{ |f|
+              # Stringify to make Liquid happy
+              f.transform_values(&:to_s).transform_keys(&:to_s)
+            }
+            output << parse_template.render({
+              'name' => @name,
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
+              'sources' => filez,
+              'fallback_img' => fallback_img,
+            })
+          rescue Liquid::SyntaxError => l
+            unless Jekyll.env == 'production'.freeze
+              output << parse_template(name: 'error_code'.freeze).render({
+                'message' => l.message,
+              })
+            end
+          end
+          output
+        end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::Font.new(*args)
+        # Return the filename of the most-compatible output image
+        # for use as the fallback <img> tag inside our <picture>.
+        def fallback_img
+          best_ver = nil
+          files.keep_if{|f| f.key?(:type) && f&.dig(:type)&.media_type == 'image'.freeze}.each{ |f|
+            # PNG > WebP
+            if f&.dig(:type)&.sub_type == 'png'.freeze || best_ver.nil?
+              best_ver = f
+            end
+          }
+          # Return the filename of the biggest matched variation,
+          # otherwise use the original filename.
+          best_ver&.dig(:name) || @name
         end
+
       end  # Font
     end  # Molecule
   end  # DistorteD

data/lib/distorted-jekyll/molecule/image.rb

@@ -1,21 +1,14 @@
 require 'set'
 
-require 'distorted/image'
-require 'distorted-jekyll/static/image'
+require 'distorted/molecule/image'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module Image
 
-        # Reference these instead of reassigning them. Consistency is mandatory.
-        MEDIA_TYPE = Cooltrainer::DistorteD::Image::MEDIA_TYPE
-        MIME_TYPES = Cooltrainer::DistorteD::Image::MIME_TYPES
-
-        ATTRS = Cooltrainer::DistorteD::Image::ATTRS
-        ATTRS_DEFAULT = Cooltrainer::DistorteD::Image::ATTRS_DEFAULT
-        ATTRS_VALUES = Cooltrainer::DistorteD::Image::ATTRS_VALUES
-
+        include Cooltrainer::DistorteD::Image
 
         # Returns the filename we should use in the oldschool <img> tag
         # as a fallback for <picture> sources. This file should be a cropped
@@ -30,8 +23,8 @@ module Jekyll
 
           # Computes a Set of non-nil MIME::Type.sub_types for all MIME::Types
           # detected for the original media file.
-          sub_types = @mime.keep_if{ |m|
-            m.media_type == self.singleton_class.const_get(:MEDIA_TYPE)
+          sub_types = type_mars.keep_if{ |m|
+            m.media_type == 'image'.freeze
           }.map { |m|
             m.sub_type
           }.compact.to_set
@@ -76,12 +69,12 @@ module Jekyll
 
             output << parse_template.render({
               'name' => @name,
-              'path' => @dd_dest,
-              'alt' => attr_value(:alt),
-              'title' => attr_value(:title),
-              'href' => attr_value(:href),
-              'caption' => attr_value(:caption),
-              'loading' => attr_value(:loading),
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
+              'href' => abstract(:href),
+              'caption' => abstract(:caption),
+              'loading' => abstract(:loading),
               'sources' => filez,
               'fallback_img' => fallback_img,
             })
@@ -95,10 +88,6 @@ module Jekyll
           output
         end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::Image.new(*args)
-        end
-
       end
     end
   end

data/lib/distorted-jekyll/molecule/lastresort.rb

@@ -0,0 +1,51 @@
+require 'set'
+
+require 'distorted/checking_you_out'
+require 'distorted/injection_of_love'
+
+module Jekyll
+  module DistorteD
+    module Molecule
+      module LastResort
+
+
+        LOWER_WORLD = CHECKING::YOU::IN('application/x.distorted.last-resort')
+
+        ATTRIBUTES = Set[:alt, :title, :href, :caption]
+        ATTRIBUTES_DEFAULT = {}
+        ATTRIBUTES_VALUES = {}
+
+        # This is one of the few render methods that will be defined in JekyllLand.
+        define_method(CHECKING::YOU::IN('application/x.distorted.last-resort').first.distorted_method) { |*a, **k, &b|
+          copy_file(*a, **k, &b)
+        }
+
+        include Cooltrainer::DistorteD::InjectionOfLove
+
+
+        def render_to_output_buffer(context, output)
+          super
+          begin
+            output << parse_template.render({
+              'name' => @name,
+              'basename' => File.basename(@name, '.*'),
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
+              'href' => abstract(:href),
+              'caption' => abstract(:caption),
+            })
+          rescue Liquid::SyntaxError => l
+            unless Jekyll.env == 'production'.freeze
+              output << parse_template(name: 'error_code'.freeze).render({
+                'message' => l.message,
+              })
+            end
+          end
+          output
+        end
+
+      end
+    end
+  end
+end

data/lib/distorted-jekyll/molecule/pdf.rb

@@ -1,23 +1,49 @@
 require 'set'
 
-require 'distorted/pdf'
-require 'distorted-jekyll/static/pdf'
+require 'distorted/molecule/pdf'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module PDF
 
-        # Reference these instead of reassigning them. Consistency is mandatory.
-        MEDIA_TYPE = Cooltrainer::DistorteD::PDF::MEDIA_TYPE
-        SUB_TYPE = Cooltrainer::DistorteD::PDF::SUB_TYPE
-        MIME_TYPES = Cooltrainer::DistorteD::PDF::MIME_TYPES
+        include Cooltrainer::DistorteD::PDF
 
-        PDF_OPEN_PARAMS = Cooltrainer::DistorteD::PDF::PDF_OPEN_PARAMS
-        ATTRS = Cooltrainer::DistorteD::PDF::ATTRS
-        ATTRS_DEFAULT = Cooltrainer::DistorteD::PDF::ATTRS_DEFAULT
-        ATTRS_VALUES = Cooltrainer::DistorteD::PDF::ATTRS_VALUES
 
+        # Generate a Hash of our PDF Open Params based on any given to the Liquid tag
+        # and any loaded from the defaults.
+        # https://www.adobe.com/content/dam/acom/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf
+        def pdf_open_params
+          PDF_OPEN_PARAMS.map{ |p|
+            if ATTRIBUTES_VALUES.dig(p) == BOOLEAN_ATTR_VALUES
+              # Support multiple ways people might want to express a boolean
+              if Set[0, '0'.freeze, false, 'false'.freeze].include?(abstract(p))
+                [p, '0'.freeze]
+              elsif Set[1, '1'.freeze, true, 'true'.freeze].include?(abstract(p))
+                [p, '1'.freeze]
+              end
+            else
+              [p, abstract(p)]
+            end
+          }.to_h
+        end
+
+        # Generate the URL fragment version of the PDF Open Params.
+        # This would be difficult / impossible to construct within Liquid
+        # from the individual variables, so let's just do it out here.
+        def pdf_open_params_url
+            pdf_open_params.keep_if{ |p,v|
+            v != nil && v != ""
+          }.map{ |k,v|
+            # The PDF Open Params docs specify `search` should be quoted.
+            if k == :search
+              "#{k}=\"#{v}\""
+            else
+              "#{k}=#{v}"
+            end
+          }.join('&')
+        end
 
         def render_to_output_buffer(context, output)
           super
@@ -27,45 +53,14 @@ module Jekyll
             # size of the container element.
             # We will need something like PDF.js in an <iframe> to handle this.
 
-            # Generate a Hash of our PDF Open Params based on any given to the Liquid tag
-            # and any loaded from the defaults.
-            # https://www.adobe.com/content/dam/acom/en/devnet/acrobat/pdfs/pdf_open_parameters.pdf
-            pdf_open_params = PDF_OPEN_PARAMS.map{ |p|
-              if ATTRS_VALUES.dig(p) == Cooltrainer::DistorteD::PDF::BOOLEAN_SET
-                # Support multiple ways people might want to express a boolean
-                if Set[0, '0'.freeze, false, 'false'.freeze].include?(attr_value(p))
-                  [p, '0'.freeze]
-                elsif Set[1, '1'.freeze, true, 'true'.freeze].include?(attr_value(p))
-                  [p, '1'.freeze]
-                end
-              else
-                [p, attr_value(p)]
-              end
-            }.to_h
-
-            # Generate the URL fragment version of the PDF Open Params.
-            # This would be difficult / impossible to construct within Liquid
-            # from the individual variables, so let's just do it out here.
-            pdf_open_params_url = pdf_open_params.keep_if{ |p,v|
-              v != nil && v != ""
-            }.map{ |k,v|
-              # The PDF Open Params docs specify `search` should be quoted.
-              if k == :search
-                "#{k}=\"#{v}\""
-              else
-                "#{k}=#{v}"
-              end
-            }.join('&')
-            Jekyll.logger.debug("#{@name} PDF Open Params:", "#{pdf_open_params} #{"\u21e8".encode('utf-8').freeze} #{pdf_open_params_url}")
-
             output << parse_template.render({
               'name' => @name,
-              'path' => @dd_dest,
-              'alt' => attr_value(:alt),
-              'title' => attr_value(:title),
-              'height' => attr_value(:height),
-              'width' => attr_value(:width),
-              'caption' => attr_value(:caption),
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
+              'height' => abstract(:height),
+              'width' => abstract(:width),
+              'caption' => abstract(:caption),
               'pdf_open_params' => pdf_open_params_url,
             })
           rescue Liquid::SyntaxError => l
@@ -78,10 +73,6 @@ module Jekyll
           output
         end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::PDF.new(*args)
-        end
-
       end  # PDF
     end  # Molecule
   end  # DistorteD

data/lib/distorted-jekyll/molecule/svg.rb

@@ -1,22 +1,14 @@
 require 'set'
 
-require 'distorted/svg'
-require 'distorted-jekyll/static/svg'
+require 'distorted/molecule/svg'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module SVG
 
-        # Reference these instead of reassigning them. Consistency is mandatory.
-        MEDIA_TYPE = Cooltrainer::DistorteD::SVG::MEDIA_TYPE
-        SUB_TYPE = Cooltrainer::DistorteD::SVG::SUB_TYPE
-        MIME_TYPES = Cooltrainer::DistorteD::SVG::MIME_TYPES
-
-        ATTRS = Cooltrainer::DistorteD::SVG::ATTRS
-        ATTRS_DEFAULT = Cooltrainer::DistorteD::SVG::ATTRS_DEFAULT
-        ATTRS_VALUES = Cooltrainer::DistorteD::SVG::ATTRS_VALUES
-
+        include Cooltrainer::DistorteD::SVG
 
         def render_to_output_buffer(context, output)
           super
@@ -30,12 +22,12 @@ module Jekyll
             }
             output << parse_template.render({
               'name' => @name,
-              'path' => @dd_dest,
-              'alt' => attr_value(:alt),
-              'title' => attr_value(:title),
-              'href' => attr_value(:href),
-              'caption' => attr_value(:caption),
-              'loading' => attr_value(:loading),
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
+              'href' => abstract(:href),
+              'caption' => abstract(:caption),
+              'loading' => abstract(:loading),
               'sources' => filez,
               'fallback_img' => @name,
             })
@@ -49,10 +41,6 @@ module Jekyll
           output
         end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::SVG.new(*args)
-        end
-
       end
     end
   end

data/lib/distorted-jekyll/molecule/text.rb

@@ -1,22 +1,14 @@
 require 'set'
 
-require 'distorted/text'
-require 'distorted-jekyll/static/text'
+require 'distorted/molecule/text'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module Text
 
-        DRIVER = Cooltrainer::DistorteD::Text
-
-        MEDIA_TYPE = DRIVER::MEDIA_TYPE
-        MIME_TYPES = DRIVER::MIME_TYPES
-
-        ATTRS = DRIVER::ATTRS
-        ATTRS_DEFAULT = DRIVER::ATTRS_DEFAULT
-        ATTRS_VALUES = DRIVER::ATTRS_VALUES
-
+        include Cooltrainer::DistorteD::Text
 
         def render_to_output_buffer(context, output)
           super
@@ -33,9 +25,9 @@ module Jekyll
             }
             output << parse_template.render({
               'name' => @name,
-              'path' => @dd_dest,
-              'alt' => attr_value(:alt),
-              'title' => attr_value(:title),
+              'path' => @relative_dest,
+              'alt' => abstract(:alt),
+              'title' => abstract(:title),
               'sources' => filez,
               'fallback_img' => fallback_img,
             })
@@ -64,10 +56,6 @@ module Jekyll
           best_ver&.dig(:name) || @name
         end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::Text.new(*args)
-        end
-
       end  # Text
     end  # Molecule
   end  # DistorteD

data/lib/distorted-jekyll/molecule/video.rb

@@ -1,18 +1,12 @@
-require 'distorted/video'
-require 'distorted-jekyll/static/video'
+require 'distorted/molecule/video'
+
 
 module Jekyll
   module DistorteD
     module Molecule
       module Video
 
-        # Reference these instead of reassigning them. Consistency is mandatory.
-        MEDIA_TYPE = Cooltrainer::DistorteD::Video::MEDIA_TYPE
-        MIME_TYPES = Cooltrainer::DistorteD::Video::MIME_TYPES
-
-        ATTRS = Cooltrainer::DistorteD::Video::ATTRS
-        ATTRS_DEFAULT = Cooltrainer::DistorteD::Video::ATTRS_DEFAULT
-        ATTRS_VALUES = Cooltrainer::DistorteD::Video::ATTRS_VALUES
+        include Cooltrainer::DistorteD::Video
 
         def render_to_output_buffer(context, output)
           super
@@ -21,7 +15,7 @@ module Jekyll
               'name' => @name,
               'basename' => File.basename(@name, '.*'),
               'path' => @url,
-              'caption' => attr_value(:caption),
+              'caption' => abstract(:caption),
             })
           rescue Liquid::SyntaxError => l
             unless Jekyll.env == 'production'.freeze
@@ -33,8 +27,56 @@ module Jekyll
           output
         end
 
-        def static_file(*args)
-          Jekyll::DistorteD::Static::Video.new(*args)
+        # Return a Set of extant video variations due to inability/unwillingness
+        # to exactly predict GStreamer's HLS/DASH segment output naming
+        # even if we are controlling all variables like segment length etc.
+        # This implementation may give stale segments but will at least speed
+        # up site generation by not having to regenerate the video every time.
+        def destinations(dest)
+          wanted = Set[]
+          if Dir.exist?(File.join(dest, @relative_dest))
+            hls_dir = File.join(dest, @relative_dest, "#{basename}.hls")
+            if Dir.exist?(hls_dir)
+              wanted.merge(Dir.entries(hls_dir).to_set.map{|f| File.join(hls_dir, f)})
+            end
+          end
+          wanted
+        end
+
+        def modified?
+          # We can't use the standard Static::State#modified? here until
+          # I figure out how to cleanly get a duplicate of what would be
+          # the generated filenames from GStreamer's sink.
+          #
+          # For now for the sake of speeding up my site generation
+          # I'll assume not-modified that if the output variant (e.g. DASH/HLS)
+          # container dir exists and contains at least two files:
+          # the playlist and at least one segment.
+          #
+          # Hacky HLS-only right now until dashsink2 lands in upstream Gst.
+          #
+          # Assume modified for the sake of freshness :)
+          modified = true
+
+          site_dest = Jekyll::DistorteD::Floor::config(:destination).to_s
+          if Dir.exist?(site_dest)
+
+            dd_dest = File.join(site_dest, @relative_dest)
+            if Dir.exist?(dd_dest)
+
+              hls_dir = File.join(dd_dest, "#{basename}.hls")
+              if Dir.exist?(hls_dir)
+                need_filez = Set["#{basename}.m3u8"]
+                var_filez = Dir.entries(hls_dir).to_set
+                if need_filez.subset?(var_filez) and var_filez.count > 2
+                  modified = false
+                end
+              end
+
+            end
+          end
+          Jekyll.logger.debug("#{@name} modified?",  modified)
+          modified
         end
 
       end