hyde-page-css 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47a306a1505adce319c2e7e2c872029f0ae792feab9d164163a74b5933166267
-  data.tar.gz: 84b56ab510348dd9b2c0401e9cb3f0d6c332cec97f5d4ca5aa78222412b7c5f2
+  metadata.gz: d6ec003b0a85dea4cbf951dbd077514f5db76261f41e65958b3275a5eba2368c
+  data.tar.gz: c9b997562983ef4957bfaa13dde64c034ec60df290252244773e645b802b8ed4
 SHA512:
-  metadata.gz: 4c3da3407955bd07c45d39f2e1b0c033a2e25b6812d4e7f95ae590e45cb4baeb7d5447720355b1cc230ed078542b3990e4a5dbe45f2ff5af1afe564543e5b812
-  data.tar.gz: 80ceca52abdde3699e55e025cdc39350ed0f7ce84aa96417614ac512b659857709ddf5f315b5f0d429712425250175646b47af851fa70cd0871811b4e61d0e06
+  metadata.gz: 4fd1e02c5900318abe34d80f696a00c02072962086ed5110edcfed657946f7d98b855ac618c0101dc2a2f45988c9f0f7be978d3bfffe46d11bae44b7fc2c761c
+  data.tar.gz: 485f1c4392783641de2a3f3dee6d63d3c364e4c5e99f240a4d470058336916032366e3c104404a0b859beba7977e015dd77178022d6be8fb238b009d823d0843

data/lib/hyde-page-css.rb

@@ -1,11 +1,220 @@
+require "jekyll"
+require "digest"
+
+Jekyll::Hooks.register :pages, :post_init do |page|
+  Hyde::Page::Css.new(page).run if page.instance_of? Jekyll::Page
+end
+
 module Hyde
   module Page
     class Css
-      VERSION = "0.3.0"
+      VERSION = "0.4.1"
+    end
+
+    class GeneratedCssFile < Jekyll::StaticFile
+      attr_accessor :file_contents
+      attr_reader :generator
+
+      def initialize(site, dir, name)
+        @site = site
+        @dir = dir
+        @name = name
+        @relative_path = File.join(*[@dir, @name].compact)
+        @extname = File.extname(@name)
+        @type = @collection&.label&.to_sym
+        @generator = "hyde-page-css"
+      end
+
+      def write(dest)
+        dest_path = destination(dest)
+        return false if File.exist?(dest_path)
+
+        FileUtils.mkdir_p(File.dirname(dest_path))
+        FileUtils.rm(dest_path) if File.exist?(dest_path)
+
+        File.open(dest_path, "w") do |output_file|
+          output_file << file_contents
+        end
+
+        true
+      end
+    end
+
+    class Css
+      @@config = {
+        "source" => "assets/css",
+        "destination" => "assets/css",
+        "minify" => true,
+        "enable" => true,
+        "keep_files" => true,
+        "dev_mode" => false
+      }
+
+      def initialize(page)
+        @page = page
+        @site = page.site
+        @config = fetch_config
+        @site.data["_hyde_pages_cache"] ||= {}
+
+        if keep_files? && !dev_mode?
+          @site.config.fetch("keep_files").push(destination)
+        end
+      end
+
+      def run
+        css = fetch_css(@page)
+        layout = fetch_layout(fetch_layout_name(@page))
+        css_groups = parent_layout_css(layout, css).reverse
+        return if css_groups.empty?
+
+        for group in css_groups
+          lookup_name = names_to_key(group)
+          cache_entry = @site.data["_hyde_pages_cache"].fetch(lookup_name, nil)
+
+          if cache_entry.nil?
+            data = concatenate_files(group)
+            return if data == ""
+
+            data = minify(data)
+            return if data == ""
+
+            generated_file = generate_file(group, data)
+
+            # file already exists, so skip writing out the data to disk
+            return unless @site.static_files.find { |static_file| static_file.name == generated_file.name }.nil?
+
+            # place file data into the new file
+            generated_file.file_contents = data
+
+            # assign static file to list for jekyll to render
+            @site.static_files << generated_file
+
+            # add to cache
+            cache_entry = {
+              url: generated_file.url,
+              data: data
+            }
+            @site.data["_hyde_pages_cache"][lookup_name] = cache_entry
+          end
+
+          # assign to page.data.css_files for liquid output
+          add_to_urls(cache_entry.fetch(:url, nil)).compact
+        end
+      end
+
+      private
+
+      def names_to_key(names)
+        names.join("-")
+      end
+
+      def add_to_urls(url)
+        @page.data["css_files"] ||= []
+        @page.data["css_files"].push(url)
+      end
+
+      def fetch_config
+        @@config.merge(@site.config.fetch("hyde_page_css", {}))
+      end
+
+      def keep_files?
+        @config.fetch("keep_files") == true
+      end
+
+      def dev_mode?
+        @config.fetch("dev_mode") == true
+      end
+
+      def minify?
+        @config.fetch("minify") == true
+      end
+
+      def destination
+        @config.fetch("destination")
+      end
+
+      def source
+        @config.fetch("source")
+      end
+
+      def qualified_source
+        File.join(*[@site.source, source].compact)
+      end
+
+      def fetch_layout_name(obj_with_data, default = nil)
+        obj_with_data.data.fetch("layout", default)
+      end
+
+      def fetch_css(obj_with_data, default = [])
+        [obj_with_data.data.fetch("css", []).reverse]
+      end
+
+      def fetch_layout(layout_name, default = nil)
+        @site.layouts.fetch(layout_name, default)
+      end
+
+      def parent_layout_css(layout, css)
+        if layout.nil?
+          return css
+        end
+
+        layout_name = fetch_layout_name(layout)
+        parent_layout = fetch_layout(layout_name)
+        css = css.concat(fetch_css(layout))
+
+        parent_layout_css(parent_layout, css)
+      end
+
+      def concatenate_files(files, data = [])
+        files.each do |file_name|
+          # tmp page required to handle anything with frontmatter/yaml header
+          tmp_page = Jekyll::PageWithoutAFile.new(@site, nil, source, file_name)
+          path = File.join([qualified_source, file_name])
+
+          begin
+            tmp_page.content = File.read(path)
+            data.push(Jekyll::Renderer.new(@site, tmp_page).run)
+          rescue
+            Jekyll.logger.warn("Page CSS Warning:", "Unable to find #{path}")
+          end
+        end
+
+        data.join("\n")
+      end
+
+      def style
+        if dev_mode?
+          "expanded"
+        elsif !minify?
+          "expanded"
+        else
+          "compressed"
+        end
+      end
+
+      def minify(data)
+        return data unless minify?
+
+        converter_config = {"sass" => {"style" => style}}
+        Jekyll::Converters::Scss.new(converter_config).convert(data)
+      end
+
+      def generate_file(files, data)
+        file_name = generate_file_name(files, data)
+        Hyde::Page::GeneratedCssFile.new(@site, source, file_name)
+      end
+
+      def generate_file_name(files, data, prefix: nil)
+        file_names = [prefix]
+
+        if dev_mode?
+          files.each { |file| file_names.push(file.gsub(".css", "")) }
+        end
+
+        file_names.push(Digest::MD5.hexdigest(data)[0, 6])
+
+        file_names.compact.join("-") + ".css"
+      end
     end
   end
 end
-
-require_relative "hyde/renderer.rb"
-require_relative "hyde/page/css.rb"
-require_relative "hyde/page/generated_page_css_file.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde-page-css
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Gregory Daynes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-24 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -38,9 +38,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/hyde-page-css.rb
-- lib/hyde/page/css.rb
-- lib/hyde/page/generated_page_css_file.rb
-- lib/hyde/renderer.rb
 homepage: https://github.com/gregdaynes/hyde-page-css
 licenses:
 - MIT
@@ -60,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Plugin for jekyll to enable per page css files

data/lib/hyde/page/css.rb

@@ -1,130 +0,0 @@
-require 'jekyll'
-require_relative "generated_page_css_file"
-
-module Hyde
-  module Page
-    class Css
-      @@config = {
-        "asset_path" => "assets/css",
-        "file_output_path" => "assets/css",
-        "css_minify" => true,
-        "enable" => true,
-        "keep_files" => true,
-        "dev_mode" => false
-      }
-
-      def initialize(layout, info)
-        @site = info[:registers][:site]
-        @page = info[:registers][:page]
-        @data = layout.data
-        @config = @@config.merge(@site.config.dig("hyde_page_css") || {})
-
-        @qualified_asset_path = File.join(*[@site.source, @config["asset_path"]].compact)
-
-        if config("keep_files") == true && config("dev_mode") == false
-          @site.config["keep_files"].push(config("file_output_path"))
-        end
-
-        @page["css"] = if @page["css"].nil?
-          []
-        else
-          [@page["css"]]
-        end
-      end
-
-      def generate
-        return unless config("enable") == true
-        @page["css"].unshift(@data["css"])
-
-        file_groups = flatten_group(@page["css"])
-
-        css_files = []
-
-        for files in file_groups do
-          break if !files&.length
-
-          data = concatenate_files(files.compact)
-          data = minify(data)
-          next if data == ""
-
-          file = generate_file(files, data)
-          css_files << file.url
-
-          # file already exists, so skip writing out the data to disk
-          next if @site.static_files.find { |x| x.name == file.name }
-
-          # place file data into the new file
-          file.file_contents = data
-
-          # assign static file to list for jekyll to render
-          @site.static_files << file
-        end
-
-        # the recursive nature of this will sometimes have duplicate css files
-        @page["css_files"] = css_files.uniq
-      end
-
-      private
-
-      def config(*)
-        @config.dig(*)
-      end
-
-      def flatten_group(arr, acc = [])
-        return [arr] if !arr.last.is_a?(Array)
-
-        acc += [arr.first]
-        acc += flatten_group(arr.last)
-      end
-
-      def concatenate_files(files, data = "")
-        for file in files do
-          # tmp page required to handle anything with frontmatter/yaml header
-          tmp_page = Jekyll::PageWithoutAFile.new(@site, nil, config("asset_path"), file)
-          path = File.join([@qualified_asset_path, file])
-
-          begin
-            file_contents = File.read(path)
-            tmp_page.content = file_contents
-            data << Jekyll::Renderer.new(@site, tmp_page).run
-          rescue
-            Jekyll.logger.warn("Page CSS Warning:", "Unable to find #{path}")
-          end
-        end
-
-        data
-      end
-
-      def minify(data)
-        style = if config("dev_mode") == true
-          "expanded"
-        elsif config("css_minify") == false
-          "expanded"
-        else
-          "compressed"
-        end
-
-        converter_config = {"sass" => {"style" => style}}
-        Jekyll::Converters::Scss.new(converter_config).convert(data)
-      end
-
-      def generate_file(files, data)
-        file_name = generate_file_name(files, data)
-
-        Hyde::Page::GeneratedPageCssFile.new(@site, config("asset_path"), file_name)
-      end
-
-      def generate_file_name(files, data, prefix: nil)
-        file_names = [prefix]
-
-        if config("dev_mode")
-          files.each { |file| file_names.push(file.gsub(".css", "")) }
-        end
-
-        file_names.push(Digest::MD5.hexdigest(data)[0, 6])
-
-        file_names.compact.join("-") + ".css"
-      end
-    end
-  end
-end

data/lib/hyde/page/generated_page_css_file.rb

@@ -1,35 +0,0 @@
-module Hyde
-  module Page
-    # Alternative class for jekyll's static files
-    # this allows the creation of files without a source file
-
-    class GeneratedPageCssFile < Jekyll::StaticFile
-      attr_accessor :file_contents
-      attr_reader :generator
-
-      def initialize(site, dir, name)
-        @site = site
-        @dir = dir
-        @name = name
-        @relative_path = File.join(*[@dir, @name].compact)
-        @extname = File.extname(@name)
-        @type = @collection&.label&.to_sym
-        @generator = "hyde-page-css"
-      end
-
-      def write(dest)
-        dest_path = destination(dest)
-        return false if File.exist?(dest_path)
-
-        FileUtils.mkdir_p(File.dirname(dest_path))
-        FileUtils.rm(dest_path) if File.exist?(dest_path)
-
-        File.open(dest_path, "w") do |output_file|
-          output_file << file_contents
-        end
-
-        true
-      end
-    end
-  end
-end

data/lib/hyde/renderer.rb

@@ -1,18 +0,0 @@
-module Jekyll
-  class Renderer
-    def render_layout(output, layout, info)
-      Hyde::Page::Css.new(layout, info).generate
-
-      # TODO Would be nice to call super here instead of cloned logic from Jekyll internals
-      payload["content"] = output
-      payload["layout"] = Utils.deep_merge_hashes(layout.data, payload["layout"] || {})
-
-      render_liquid(
-        layout.content,
-        payload,
-        info,
-        layout.path
-      )
-    end
-  end
-end