hyde-page-js 0.2.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867063daf19d510599c6474020f8f133c2564628a1eeb72b02a4aeb23a33d4ed
-  data.tar.gz: ba3b8d908e8e3af80e8d31757bc9a39d28e10fb2408de974ca0fd31978197fad
+  metadata.gz: 71202952cbb7a6f848efb35f52b2567e0f5e71ff4c2bd03cb7900b646f76baf4
+  data.tar.gz: 89a466f9500aab52b11934ba3a7d4983727b8932322bb26142dd36e18c981188
 SHA512:
-  metadata.gz: e8b40488499185989b1155c71c37e18bbb418f9b5017e2dd8b55e0b96600148bb86eab059d6289aaf93ec1eaab0a91052606194c4314f71a0b03b779f8a9d421
-  data.tar.gz: d716cd8a8d0fb70ec94e3dec9cf4cbf12e66e6fda60f4338967fe52f8834e3d75ae1fd10feb1dbe3e0d3f97c6bdc672bd8194e7e91eae7ebb6088da329288a58
+  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.2.0"
+      VERSION = "0.3.2"
     end
 
     class GeneratedJsFile < Jekyll::StaticFile
@@ -55,6 +55,7 @@ module Hyde
         @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)
@@ -64,34 +65,53 @@ module Hyde
       def run
         js = fetch_js(@page)
         layout = fetch_layout(fetch_layout_name(@page))
-        results = parent_layout_js(layout, js).reverse
+        js_groups = parent_layout_js(layout, js).reverse
+        return if js_groups.empty?
 
-        data = concatenate_files(results)
-        return if data == ""
+        for group in js_groups
+          lookup_name = names_to_key(group)
+          cache_entry = @site.data['_hyde_pages_cache'].fetch(lookup_name, nil)
 
-        data = minify(data)
-        return if data == ""
+          if cache_entry.nil?
+            data = concatenate_files(group)
+            return if data == ""
 
-        generated_file = generate_file(results, data)
+            data = minify(data)
+            return if 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?
+            generated_file = generate_file(group, data)
 
-        # place file data into the new file
-        generated_file.file_contents = 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?
 
-        # assign static file to list for jekyll to render
-        @site.static_files << generated_file
+            # place file data into the new file
+            generated_file.file_contents = data
 
-        # assign to site.data.js_files for liquid output
-        add_to_urls(generated_file.url)
+            # 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 site.data.js_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)
-        @site.data['js_files'] ||= []
-        @site.data['js_files'].push(url)
+        @page.data['js_files'] ||= []
+        @page.data['js_files'].push(url)
       end
 
       def fetch_config
@@ -127,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)
@@ -144,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)
@@ -172,6 +192,8 @@ module Hyde
       end
 
       def minify(data)
+        return data unless minify?
+
         converter_config = {mangle: mangle?, output: {comments: :copyright}}
         js_converter = Terser.new(converter_config)
         js_converter.compile(data)

metadata

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