hyde-page-css 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be290973e52833cc36b718536cb674c5b3fe7d3b0c47ab79ee5ad29f5ab10e3e
-  data.tar.gz: 60b2961c7302731e123f67f4dfc63beb9a04afa145a118247f5eca744d2e4764
+  metadata.gz: 470018e2aede9ba46a35ad49efd9b9dbeff4c280d74efc0f6e971706ed035a8f
+  data.tar.gz: e1349c35ab84347d34baa52b4d67609d1beff5dc6b6d6677a506be32b0bb9448
 SHA512:
-  metadata.gz: e91ee4e141c0c747828ef7e867ffd6e1b54a9ee01d82fa54c7ad15fb58d3e7e3c2ad527aebdb476f86219aee82ab77418fbc927f97fd3411b7bb813ac21d771e
-  data.tar.gz: 4dcada5efd5b800398dfd3643ce8050cc21426372c623f0dfd1f73b9dc7ba1f9d7d874e2624b98aea0565c4e889ce39662dfefa01f4a0b83790ee59a3d75b2f3
+  metadata.gz: a9969c00d880d243958253f7725737c5013bd4010147194808fa52d2c3e1b18cf7557a8055af01907f98b12fd50f52478095a21a91da61d2f6d7687b4886549e
+  data.tar.gz: 83e8c2c2437f607c468b03204edc2de65e4159fef23472d6f2b2ef91a70a1de1481687ee1fb55aa8a451e9d04c94b3d457b7945232d57f90a3011d14a4a76b7d

data/lib/hyde-page-css.rb

@@ -12,7 +12,7 @@ end
 module Hyde
   module Page
     class Css
-      VERSION = "0.6.0"
+      VERSION = "0.7.0"
     end
 
     class GeneratedCssFile < Jekyll::StaticFile
@@ -50,7 +50,6 @@ module Hyde
         "minify" => true,
         "enable" => true,
         "keep_files" => true,
-        "dev_mode" => false,
         "livereload" => false,
         "automatic_inline_threshold" => 4096
       }
@@ -59,13 +58,17 @@ module Hyde
         @page = page
         @site = page.site
         @config = fetch_config
-        @site.data["_hyde_pages_cache"] ||= {}
+        @site.data["_hyde_pages_css_cache"] ||= Jekyll::Cache.new("hyde_pages_css")
 
-        if keep_files? && !dev_mode?
+        if keep_files?
           @site.config.fetch("keep_files").push(destination)
         end
       end
 
+      def cache
+        @site.data["_hyde_pages_css_cache"]
+      end
+
       def run
         css = fetch_css(@page)
         layout = fetch_layout(fetch_layout_name(@page))
@@ -77,9 +80,8 @@ module Hyde
           next if group.empty?
 
           lookup_name = names_to_key(group)
-          cache_entry = @site.data["_hyde_pages_cache"].fetch(lookup_name, nil)
 
-          if cache_entry.nil?
+          cache_entry = cache.getset(lookup_name) do
             data = concatenate_files(group)
             break if data == ""
 
@@ -96,12 +98,10 @@ module Hyde
               @site.static_files << generated_file
             end
 
-            # 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
@@ -119,12 +119,12 @@ module Hyde
         @page.data["css_files"] ||= []
         @page.data["css_files"].push({ "path" => url, "content" => data })
 
-        if (dev_mode? || livereload?)
+        if (livereload?)
           @page.data["automatic_styles"] ||= []
-          @page.data["automatic_styles"].push("<link rel=\"stylesheet\" href=\"#{url}\">")
+          @page.data["automatic_styles"].push("<link rel=\"stylesheet\" href=\"/#{url}\">")
         elsif data.size > @config.fetch("automatic_inline_threshold")
           @page.data["automatic_styles"] ||= []
-          @page.data["automatic_styles"].push("<link rel=\"stylesheet\" href=\"#{url}\">")
+          @page.data["automatic_styles"].push("<link rel=\"stylesheet\" href=\"/#{url}\">")
         else
           @page.data["automatic_styles"] ||= []
           @page.data["automatic_styles"].push("<style>#{data}</style>")
@@ -139,10 +139,6 @@ module Hyde
         @config.fetch("keep_files") == true
       end
 
-      def dev_mode?
-        @config.fetch("dev_mode") == true
-      end
-
       def livereload?
         @config.fetch("livereload") == true
       end
@@ -205,12 +201,10 @@ module Hyde
       end
 
       def style
-        if dev_mode?
-          "expanded"
-        elsif !minify?
-          "expanded"
-        else
+        if minify?
           "compressed"
+        else
+          "expanded"
         end
       end
 
@@ -229,11 +223,9 @@ module Hyde
       def generate_file_name(files, data, prefix: nil)
         file_names = [prefix]
 
-        if dev_mode?
-          files.each { |file| file_names.push(file.gsub(".css", "")) }
-        end
+        files.each { |file| file_names.push(file.gsub(".css", "")) }
 
-        if @site.config["livereload"].nil?
+        unless livereload?
           file_names.push(Digest::MD5.hexdigest(data)[0, 6])
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyde-page-css
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Gregory Daynes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2024-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll