hyde-page-css 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc33815d451e8177e2b8be5e82eaa13a76b405e2b57c0bb5df63ed568c2a8e89
-  data.tar.gz: 2e3dde94fe8e4ea48e2868d3c2465fbb81e881d7be52e44ce1e1624ae53836b7
+  metadata.gz: 47a306a1505adce319c2e7e2c872029f0ae792feab9d164163a74b5933166267
+  data.tar.gz: 84b56ab510348dd9b2c0401e9cb3f0d6c332cec97f5d4ca5aa78222412b7c5f2
 SHA512:
-  metadata.gz: b20f69f05bd932e365ebeec48e8d5b817c3a29e458ebe03bd1cba596cd38466b832a4f286c3bf03ef80e2675bb3ba1d7d336af9ad447be8c5c70b84b8d2b2d8d
-  data.tar.gz: 607fe14b78a338540bdf729881e9956b6357b1da77b62ea996bbf6448d89959529415b4dd6b6878474a3eb0bc3ee372966b77c7adaa3bf8aa8591623d7a2d9a3
+  metadata.gz: 4c3da3407955bd07c45d39f2e1b0c033a2e25b6812d4e7f95ae590e45cb4baeb7d5447720355b1cc230ed078542b3990e4a5dbe45f2ff5af1afe564543e5b812
+  data.tar.gz: 80ceca52abdde3699e55e025cdc39350ed0f7ce84aa96417614ac512b659857709ddf5f315b5f0d429712425250175646b47af851fa70cd0871811b4e61d0e06

data/lib/{hyde_page_css/hyde_page_css.rb → hyde/page/css.rb}

@@ -1,31 +1,12 @@
 require 'jekyll'
-require_relative 'generated_page_css_file.rb'
-
-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
+require_relative "generated_page_css_file"
 
 module Hyde
   module Page
     class Css
       @@config = {
-        "asset_path" => 'assets/css',
-        "file_output_path" => 'assets/css',
+        "asset_path" => "assets/css",
+        "file_output_path" => "assets/css",
         "css_minify" => true,
         "enable" => true,
         "keep_files" => true,
@@ -36,24 +17,24 @@ module Hyde
         @site = info[:registers][:site]
         @page = info[:registers][:page]
         @data = layout.data
-        @config = @@config.merge(@site.config.dig('hyde_page_css') || {})
+        @config = @@config.merge(@site.config.dig("hyde_page_css") || {})
 
-        @qualified_asset_path = File.join(*[@site.source, @config['asset_path']].compact)
+        @qualified_asset_path = File.join(*[@site.source, @config["asset_path"]].compact)
 
-        if config('keep_files') == true
-          @site.config['keep_files'].push(config('file_output_path'))
+        if config("keep_files") == true && config("dev_mode") == false
+          @site.config["keep_files"].push(config("file_output_path"))
         end
 
-        if @page["css"].nil?
-          @page["css"] = []
+        @page["css"] = if @page["css"].nil?
+          []
         else
-          @page["css"] = [@page["css"]]
+          [@page["css"]]
         end
       end
 
       def generate
-        return unless config('enable') == true
-        @page["css"].unshift(@data['css'])
+        return unless config("enable") == true
+        @page["css"].unshift(@data["css"])
 
         file_groups = flatten_group(@page["css"])
 
@@ -80,13 +61,13 @@ module Hyde
         end
 
         # the recursive nature of this will sometimes have duplicate css files
-        @page['css_files'] = css_files.uniq
+        @page["css_files"] = css_files.uniq
       end
 
-    private
+      private
 
-      def config(*keys)
-        @config.dig(*keys)
+      def config(*)
+        @config.dig(*)
       end
 
       def flatten_group(arr, acc = [])
@@ -96,18 +77,18 @@ module Hyde
         acc += flatten_group(arr.last)
       end
 
-      def concatenate_files(files, data = '')
+      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)
+          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()
+            data << Jekyll::Renderer.new(@site, tmp_page).run
           rescue
-            Jekyll.logger.warn('Page CSS Warning:', "Unable to find #{path}")
+            Jekyll.logger.warn("Page CSS Warning:", "Unable to find #{path}")
           end
         end
 
@@ -115,25 +96,34 @@ module Hyde
       end
 
       def minify(data)
-        return data if config('minify') == false
-        return data if config('dev_mode') == true
+        style = if config("dev_mode") == true
+          "expanded"
+        elsif config("css_minify") == false
+          "expanded"
+        else
+          "compressed"
+        end
 
-        converter_config = { 'sass' => { 'style' => 'compressed' } }
+        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)
+        Hyde::Page::GeneratedPageCssFile.new(@site, config("asset_path"), file_name)
       end
 
-      def generate_file_name(files, data)
-        if config('dev_mode')
-          file_name = files.map { |file| file.gsub('.css', '') }.join('-') + '.css'
-        else
-          file_name = Digest::MD5.hexdigest(data) + '.css'
+      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

data/lib/{hyde_page_css → hyde/page}/generated_page_css_file.rb

@@ -9,12 +9,12 @@ module Hyde
 
       def initialize(site, dir, name)
         @site = site
-        @dir  = dir
+        @dir = dir
         @name = name
         @relative_path = File.join(*[@dir, @name].compact)
         @extname = File.extname(@name)
         @type = @collection&.label&.to_sym
-        @generator = 'hyde_page_css'
+        @generator = "hyde-page-css"
       end
 
       def write(dest)
@@ -24,7 +24,7 @@ module Hyde
         FileUtils.mkdir_p(File.dirname(dest_path))
         FileUtils.rm(dest_path) if File.exist?(dest_path)
 
-        File.open(dest_path, 'w') do |output_file|
+        File.open(dest_path, "w") do |output_file|
           output_file << file_contents
         end
 

data/lib/hyde/renderer.rb

@@ -0,0 +1,18 @@
+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

data/lib/hyde-page-css.rb

@@ -0,0 +1,11 @@
+module Hyde
+  module Page
+    class Css
+      VERSION = "0.3.0"
+    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.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Gregory Daynes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-17 00:00:00.000000000 Z
+date: 2023-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -37,9 +37,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/hyde_page_css.rb
-- lib/hyde_page_css/generated_page_css_file.rb
-- lib/hyde_page_css/hyde_page_css.rb
+- 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
@@ -59,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Plugin for jekyll to enable per page css files

data/lib/hyde_page_css.rb

@@ -1,10 +0,0 @@
-module Hyde
-  module Page
-    class Css
-      VERSION = "0.2.2"
-    end
-  end
-end
-
-require_relative './hyde_page_css/hyde_page_css.rb'
-