hyde-page-js 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a523c022d3eb4883130d9b143285e028f4f83fcfe3011f614ab0ec25a05aef
-  data.tar.gz: b9b674f5042f528004838ab8e73a6f8840e70ae0bdb675f7991de420d715ff6f
+  metadata.gz: 71202952cbb7a6f848efb35f52b2567e0f5e71ff4c2bd03cb7900b646f76baf4
+  data.tar.gz: 89a466f9500aab52b11934ba3a7d4983727b8932322bb26142dd36e18c981188
 SHA512:
-  metadata.gz: 2e5799de5113ea965a1d638bf7a69eba7946fc7133d5f5d8cf4d37a13090902d7b97a703f226c749c2c44f3bb78f578cc1a514c8e11d31ceecf2dabc08bd041f
-  data.tar.gz: 203b8c566d58cebc526c8627425d6638b722003a4022b3af4d91126f64eba90696d289e808d3913fd7212f5fdb9e4c285a20131b2b313cb5166e8d2b12b4b7a1
+  metadata.gz: 15e8b455e09fc47ed4c174588c2bd53b3fd38eb83a79fdc94515f7af6737292f3d7be05349e8010cb312243fb76d309e62bdcfe5905265b796c1571f278eaa01
+  data.tar.gz: 3692c60d4d2a9b2511e19db565fc411281bf265465e1c5be0fd0c28d6a37ea2a64ccf61430ee455c47453b253307040cbec83687c2dbb2b80d0bc462bce11964

data/lib/hyde-page-js.rb

@@ -2,14 +2,14 @@ require 'terser'
 require 'digest'
 require 'jekyll'
 
-Jekyll::Hooks.register :pages, :pre_render do |page, payload|
-  Hyde::Page::Js.new(page).run
+Jekyll::Hooks.register :pages, :post_init do |page, payload|
+  Hyde::Page::Js.new(page).run if page.instance_of? Jekyll::Page
 end
 
 module Hyde
   module Page
     class Js
-      VERSION = "0.3.0"
+      VERSION = "0.3.2"
     end
 
     class GeneratedJsFile < Jekyll::StaticFile
@@ -65,34 +65,42 @@ module Hyde
       def run
         js = fetch_js(@page)
         layout = fetch_layout(fetch_layout_name(@page))
-        results = parent_layout_js(layout, js).reverse
-        return if results.empty?
+        js_groups = parent_layout_js(layout, js).reverse
+        return if js_groups.empty?
 
-        lookup_name = names_to_key(results)
-        return unless @site.data['_hyde_pages_cache'].fetch(lookup_name, nil).nil?
+        for group in js_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.js_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 site.data.js_files for liquid output
+          add_to_urls(cache_entry.fetch(:url, nil)).compact
+        end
       end
 
       private
@@ -102,8 +110,8 @@ module Hyde
       end
 
       def add_to_urls(url)
-        @site.data['js_files'] ||= []
-        @site.data['js_files'].push(url)
+        @page.data['js_files'] ||= []
+        @page.data['js_files'].push(url)
       end
 
       def fetch_config
@@ -139,7 +147,7 @@ module Hyde
       end
 
       def fetch_js(obj_with_data, default = [])
-        obj_with_data.data.fetch('js', []).reverse
+        [obj_with_data.data.fetch('js', [])]
       end
 
       def fetch_layout(layout_name, default = nil)
@@ -156,7 +164,7 @@ module Hyde
 
       def parent_layout_js(layout, js)
         if layout.nil?
-          return js.uniq.compact
+          return js
         end
 
         layout_name = fetch_layout_name(layout)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyde-page-js
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Gregory Daynes