hyde-page-css 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc880fee97ad3433edc18d4b84618e59b02dc1962081092bb3651b790dc22d6d
-  data.tar.gz: 1387955f0999508ce4b6ae49c5f2b93fd5b9140e0154722cd68e0dd323b8345e
+  metadata.gz: e927303ceea0050e958533c739ba9f55da9ec08aa0db9e3a143a7200648623fa
+  data.tar.gz: 9f96e19e799c785588b7b3a68640a96d53bbd002de25c5a91efff3b9a881fe56
 SHA512:
-  metadata.gz: 82f6f01f1b2bf89a25c0ba414e2af744d6818e720ad69479180766380573b83cfd433f6062537657ec181135c5b6c42ca34f0d3a1bbb115454fff3f5016f2c68
-  data.tar.gz: 00a05f045fc9aefe54d1d1f18cccc7d33aeee6fa4a266c1956176cdd1d845b1ac7f4a63ad8a2cc45826b09a37f1f7cbdfd3614b753bbff2ac1920cc7cb6c9415
+  metadata.gz: 05e6b17f54ea95b8d6abac50fdd4b08b11eadabd7b729319f88bebbac1d8699e155845a021734f2f3d64a273caacc2fd7bdf82896779a86bae6b1abca93a2f3c
+  data.tar.gz: 23ec990caafcf17c7c664060a9944a9f1e9486f5cbd44994ac28baf1212c4b13939d98c2d6218cc6d0ef46cd5da204d225cd584ba563a5bbbbd9c65b85bcc886

data/lib/hyde-page-css.rb

@@ -1,14 +1,14 @@
-require 'jekyll'
-require 'digest'
+require "jekyll"
+require "digest"
 
-Jekyll::Hooks.register :pages, :pre_render do |page, payload|
-  Hyde::Page::Css.new(page).run
+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.4.0"
+      VERSION = "0.4.2"
     end
 
     class GeneratedCssFile < Jekyll::StaticFile
@@ -54,7 +54,7 @@ module Hyde
         @page = page
         @site = page.site
         @config = fetch_config
-        @site.data['_hyde_pages_cache'] ||= {}
+        @site.data["_hyde_pages_cache"] ||= {}
 
         if keep_files? && !dev_mode?
           @site.config.fetch("keep_files").push(destination)
@@ -64,45 +64,53 @@ module Hyde
       def run
         css = fetch_css(@page)
         layout = fetch_layout(fetch_layout_name(@page))
-        results = parent_layout_css(layout, css).reverse
-        return if results.empty?
+        css_groups = parent_layout_css(layout, css).reverse
+        return if css_groups.empty?
 
-        lookup_name = names_to_key(results)
-        return unless @site.data['_hyde_pages_cache'].fetch(lookup_name, nil).nil?
+        for group in css_groups
+          lookup_name = names_to_key(group)
+          cache_entry = @site.data["_hyde_pages_cache"].fetch(lookup_name, nil)
 
-        data = concatenate_files(results)
-        return if data == ""
+          if cache_entry.nil?
+            data = concatenate_files(group)
+            return if data == ""
 
-        data = minify(data)
-        return if data == ""
+            data = minify(data)
+            return if data == ""
 
-        generated_file = generate_file(results, 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?
+            # 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
+            # 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
+            # assign static file to list for jekyll to render
+            @site.static_files << generated_file
 
-        # assign to site.data.css_files for liquid output
-        add_to_urls(generated_file.url)
+            # add to cache
+            cache_entry = {
+              url: generated_file.url,
+              data: data
+            }
+            @site.data["_hyde_pages_cache"][lookup_name] = cache_entry
+          end
 
-        # add to cache
-        @site.data['_hyde_pages_cache'][lookup_name] = data
+          # 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('-')
+        names.join("-")
       end
 
       def add_to_urls(url)
-        @site.data['css_files'] ||= []
-        @site.data['css_files'].push(url)
+        @page.data["css_files"] ||= []
+        @page.data["css_files"].push(url)
       end
 
       def fetch_config
@@ -134,11 +142,11 @@ module Hyde
       end
 
       def fetch_layout_name(obj_with_data, default = nil)
-        obj_with_data.data.fetch('layout', default)
+        obj_with_data.data.fetch("layout", default)
       end
 
       def fetch_css(obj_with_data, default = [])
-        obj_with_data.data.fetch('css', []).reverse
+        [obj_with_data.data.fetch("css", [])]
       end
 
       def fetch_layout(layout_name, default = nil)
@@ -147,7 +155,7 @@ module Hyde
 
       def parent_layout_css(layout, css)
         if layout.nil?
-          return css.uniq.compact
+          return css
         end
 
         layout_name = fetch_layout_name(layout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyde-page-css
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Gregory Daynes