gryphon_nest 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d12483d4aed715c91f61d5a9979563fca19c11816367ed746688dd574f2389a
-  data.tar.gz: bb86f4d32b8fc8508e76df99d7da05da883ab2c8abcb8cff6ddfd0742a513d09
+  metadata.gz: 7dd5e55ab64ee1c053587293099a0423628f1d9075e4c73e6257fc029feefd47
+  data.tar.gz: b151fc9e7d09114ea9d47c1118f6b275658296f970cd0982a6145ff8c00b0c24
 SHA512:
-  metadata.gz: 9d0fd32f0b95d06b21957abfe480bbc1e5ad49c160e98fb929c106d94f3da646dff0033c5207fb760975676c1a650b9c87c31844a8132bb73fa0f9971c92df13
-  data.tar.gz: d110a25bd9513be044ac745cafd39600d096053d16e96968c2ace112cc6b7fa8ad675047eca2b30eaba34eead3da46d929d5dd6d89bd56191f34001287bd10b3
+  metadata.gz: ee54f2a45e67a122f2fa2416e2c26500a852f9e729060d7adff553a6e44b0bd897232f09aaef6224f44f102ac861918ced09aecdea0c4084604a867aa669dbb1
+  data.tar.gz: 2cd88219d657d3cd7d8e8d526e8d02a094ea89c684129e644c139d9dce0f2003eaa37b208d86f83086cfa67f65589bded6b71ec0ae8511bd323de1100b98cea6

data/bin/nest

@@ -48,8 +48,7 @@ begin
 
   command = ARGV.fetch(0, 'build')
 
-  nest = GryphonNest::Nest.new(options[:force])
-  nest.compressor = GryphonNest::GzipCompressor.new if options[:compress]
+  nest = GryphonNest::Nest.new(options[:compress], options[:force])
 
   case command
   when 'clean'

data/lib/gryphon_nest/compressors/brotli_compressor.rb

@@ -0,0 +1,22 @@
+#frozen_string_literal: true
+
+module GryphonNest
+  module Compressors
+    class BrotliCompressor
+      def extname
+        '.br'
+      end
+
+      # @param file [Pathname]
+      def compress(file)
+        compressed = "#{file}#{extname}"
+
+        File.open(compressed, 'wb') do |br|
+          writer = Brotli::Writer.new(br)
+          writer.write(IO.binread(file))
+          writer.close
+        end
+      end
+    end
+  end
+end

data/lib/gryphon_nest/compressors/gzip_compressor.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'zlib'
+
+module GryphonNest
+  module Compressors
+    class GzipCompressor
+      def extname
+        '.gz'
+      end
+
+      # @param file [Pathname]
+      def compress(file)
+        compressed = "#{file}#{extname}"
+
+        Zlib::GzipWriter.open(compressed, Zlib::BEST_COMPRESSION) do |gz|
+          gz.mtime = file.mtime
+          gz.orig_name = file.to_s
+          gz.write IO.binread(file)
+        end
+      end
+    end
+  end
+end

data/lib/gryphon_nest/compressors.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module GryphonNest
+  module Compressors
+    autoload :BrotliCompressor, 'gryphon_nest/compressors/brotli_compressor'
+    autoload :GzipCompressor, 'gryphon_nest/compressors/gzip_compressor'
+
+    class << self
+      COMPRESSABLE_FILETYPES = %w[
+        .html
+        .htm
+        .xhtml
+        .txt
+        .csv
+        .css
+        .js
+        .mjs
+        .md
+        .xml
+        .svg
+      ].freeze
+
+      # @param file [Pathname]
+      # @return [Boolean]
+      def can_compress?(file)
+        file.size >= 20 && COMPRESSABLE_FILETYPES.include?(file.extname)
+      end
+
+      # return [Array<Object>]
+      def create
+        compressors = [GzipCompressor.new]
+
+        require 'brotli'
+        compressors.append(BrotliCompressor.new)
+        compressors
+      rescue LoadError
+        compressors
+      end
+    end
+  end
+end

data/lib/gryphon_nest/layout_file.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module GryphonNest
+  # Wrapper class for operations performed on the layout.yaml file
+  class LayoutFile
+    # @param path [Pathname]
+    def initialize(path)
+      @path = path
+      @content = nil
+      @last_mtime = Time.now
+    end
+
+    # @return [Boolean]
+    def exist?
+      @path.exist?
+    end
+
+    # @return [Time]
+    def mtime
+      @path.mtime
+    end
+
+    # @return [String]
+    def content
+      mod_time = mtime
+
+      if @content.nil? || mod_time > @last_mtime
+        @content = @path.read
+        @last_mtime = mod_time
+      end
+
+      @content
+    end
+  end
+end

data/lib/gryphon_nest/processors/mustache_processor.rb

@@ -8,8 +8,10 @@ module GryphonNest
     # Renders a Mustache template into a html file
     class MustacheProcessor
       # @param renderer [Renderers::MustacheRenderer]
-      def initialize(renderer)
+      # @param layout_file [LayoutFile]
+      def initialize(renderer, layout_file)
         @renderer = renderer
+        @layout_file = layout_file
       end
 
       # @param src [Pathname]
@@ -17,8 +19,6 @@ module GryphonNest
       # @raise [Errors::YamlError]
       # @raise [Errors::ParseError]
       def process(src, dest)
-        @layout ||= read_layout_file
-
         context = read_context(src)
         content = build_output(src, context)
         write_file(dest, content)
@@ -36,11 +36,21 @@ module GryphonNest
         path.join('index.html')
       end
 
-      # @param _src [Pathname]
-      # @param _dest [Pathname]
+      # @param src [Pathname]
+      # @param dest [Pathname]
       # @return [Boolean]
-      def file_modified?(_src, _dest)
-        true
+      def file_modified?(src, dest)
+        return true unless dest.exist?
+
+        mod_time = dest.mtime
+        return true if src.mtime > mod_time
+
+        path = context_file_name(src)
+        return true if path.exist? && path.mtime > mod_time
+
+        return false unless @layout_file.exist?
+
+        @layout_file.mtime > mod_time
       end
 
       private
@@ -49,25 +59,30 @@ module GryphonNest
       # @return [Hash]
       # @raise [Errors::YamlError]
       def read_context(src)
-        path = src.sub(CONTENT_DIR, DATA_DIR).sub_ext('.yaml')
-        YAML.safe_load_file(path, symbolize_names: true)
+        YAML.safe_load_file(context_file_name(src), symbolize_names: true)
       rescue IOError, Errno::ENOENT
         {}
       rescue Psych::SyntaxError => e
         raise Errors::YamlError, "Encountered error while reading context file. Reason: #{e.message}"
       end
 
+      # @param src [Pathname]
+      # @return [Pathname]
+      def context_file_name(src)
+        src.sub(CONTENT_DIR, DATA_DIR).sub_ext('.yaml')
+      end
+
       # @param file [Pathname]
       # @param context [Hash]
       # @return [String]
       # @raise [Errors::ParseError]
       def build_output(file, context)
         content =
-          if @layout.empty?
-            @renderer.render_file(file, context)
-          else
+          if @layout_file.exist?
             context[:yield] = file.basename(TEMPLATE_EXT)
-            @renderer.render(@layout, context)
+            @renderer.render(@layout_file.content, context)
+          else
+            @renderer.render_file(file, context)
           end
 
         HtmlBeautifier.beautify(content, stop_on_errors: true)
@@ -83,13 +98,6 @@ module GryphonNest
         path.dirname.mkpath
         path.write(content)
       end
-
-      # @return [String]
-      def read_layout_file
-        File.read(LAYOUT_FILE)
-      rescue IOError, Errno::ENOENT
-        ''
-      end
     end
   end
 end

data/lib/gryphon_nest/processors.rb

@@ -12,9 +12,10 @@ module GryphonNest
       def create
         ProcessorRegistry.new do |reg|
           reg[TEMPLATE_EXT] = proc {
+            layout_file = LayoutFile.new(Pathname(LAYOUT_FILE))
             renderer = Renderers::MustacheRenderer.new
             renderer.template_path = CONTENT_DIR
-            Processors::MustacheProcessor.new(renderer)
+            Processors::MustacheProcessor.new(renderer, layout_file)
           }
 
           sass_proc = proc { Processors::SassProcessor.new }

data/lib/gryphon_nest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GryphonNest
-  VERSION = '4.1.0'
+  VERSION = '4.2.1'
 end

data/lib/gryphon_nest.rb

@@ -6,8 +6,9 @@ require 'pathname'
 require 'webrick'
 
 module GryphonNest
+  autoload :Compressors, 'gryphon_nest/compressors'
   autoload :Errors, 'gryphon_nest/errors'
-  autoload :GzipCompressor, 'gryphon_nest/gzip_compressor'
+  autoload :LayoutFile, 'gryphon_nest/layout_file'
   autoload :Logging, 'gryphon_nest/logging'
   autoload :Processors, 'gryphon_nest/processors'
   autoload :Renderers, 'gryphon_nest/renderers'
@@ -20,27 +21,31 @@ module GryphonNest
   LAYOUT_FILE = 'layout.mustache'
 
   class Nest
-    # @return [GzipCompressor, nil]
-    attr_writer :compressor
-
+    # @param compress [Boolean]
     # @param force [Boolean]
-    def initialize(force)
+    def initialize(compress, force)
       @processors = Processors.create
       @logger = Logging.create
       @force = force
-      @compressor = nil
+      @compressors = compress ? Compressors.create : []
+      @modifications = 0
     end
 
     # @raise [Errors::NotFoundError]
     def build
-      raise Errors::NotFoundError, "Content directory doesn't exist in the current directory" unless Dir.exist?(CONTENT_DIR)
+      unless Dir.exist?(CONTENT_DIR)
+        raise Errors::NotFoundError, "Content directory doesn't exist in the current directory"
+      end
 
       Dir.mkdir(BUILD_DIR) unless Dir.exist?(BUILD_DIR)
 
-      existing_files = glob("#{BUILD_DIR}/**/*").reject { |file| file.to_s.end_with?('.gz') }
-      content_files = glob("#{CONTENT_DIR}/**/*")
+      existing_files = glob(BUILD_DIR, '{!.gz,!.br}')
+      content_files = glob(CONTENT_DIR)
       processed_files = content_files.collect { |src| process_file(src) }
-      existing_files.difference(processed_files).each { |file| delete_file(file) }
+      files_to_delete = existing_files.difference(processed_files)
+      files_to_delete.each { |file| delete_file(file) }
+
+      @logger.info('No changes detected') if @modifications.zero? && files_to_delete.empty?
     end
 
     def clean
@@ -50,24 +55,15 @@ module GryphonNest
 
     def watch
       @logger.info('Watching for content changes')
-      Listen.to(CONTENT_DIR, relative: true) do |modified, added, removed|
-        modified.union(added).each do |file|
-          path = Pathname(file)
-          process_file(path)
-        end
 
-        removed.each do |file|
-          path = Pathname(file)
-          path = @processors[path.extname].dest_name(path)
-          delete_file(path)
-        end
-      end.start
+      # Bypass modification checks, we already know the files been changed
+      @force = true
 
-      Listen.to(DATA_DIR, relative: true) do |modified, added, removed|
-        modified.union(added, removed).each do |file|
-          path = Pathname(file)
-          process_data_file(path)
-        end
+      only = [/^#{CONTENT_DIR}/, /^#{DATA_DIR}/, /^#{LAYOUT_FILE}$/]
+      Listen.to('.', relative: true, only: only) do |modified, added, removed|
+        modified.union(added).each { |file| process_changes(file) }
+
+        removed.each { |file| process_changes(file, removal: true) }
       end.start
     end
 
@@ -89,6 +85,7 @@ module GryphonNest
       dest = processor.dest_name(src)
 
       if @force || processor.file_modified?(src, dest)
+        @modifications += 1
         msg = File.exist?(dest) ? 'Recreating' : 'Creating'
         @logger.info("#{msg} #{dest}")
         processor.process(src, dest)
@@ -100,15 +97,33 @@ module GryphonNest
 
     # @param file [Pathname]
     def compress_file(file)
-      return unless @compressor.is_a?(GzipCompressor)
+      return if @compressors.empty?
+
+      return unless Compressors.can_compress?(file)
 
       @logger.info("Compressing #{file}")
-      unless @compressor.can_compress?(file)
-        @logger.info("Skipping #{file}")
-        return
-      end
+      @compressors.each { |compressor| compressor.compress(file) }
+    end
 
-      @compressor.compress(file)
+    # @param src [String]
+    # @param removal [Boolean]
+    def process_changes(src, removal: false)
+      if src == LAYOUT_FILE
+        glob(CONTENT_DIR, TEMPLATE_EXT).each { |file| process_file(file) }
+      else
+        path = Pathname(src)
+
+        if src.start_with?(DATA_DIR)
+          process_data_file(path)
+        elsif removal
+          path = @processors[path.extname].dest_name(path)
+          delete_file(path)
+        else
+          process_file(path)
+        end
+      end
+    rescue StandardError => e
+      @logger.error(e.message)
     end
 
     # @param src [Pathname]
@@ -121,10 +136,11 @@ module GryphonNest
       process_file(src)
     end
 
-    # @params path [String]
+    # @params base [String]
+    # @params match [String]
     # @return [Array<Pathname>]
-    def glob(path)
-      Pathname.glob(path).reject(&:directory?)
+    def glob(base, match = '')
+      Pathname.glob("#{base}/**/*#{match}").reject(&:directory?)
     end
 
     # @param file [Pathname]
@@ -132,12 +148,13 @@ module GryphonNest
       @logger.info("Deleting #{file}")
       file.delete
 
-      compressed = Pathname("#{file}.gz")
-
-      return unless compressed.exist?
+      @compressors.each do |compressor|
+        compressed_file = "#{file}#{compressor.extname}"
+        next unless compressed_file.exist?
 
-      @logger.info("Deleting #{compressed}")
-      compressed.delete
+        @logger.info("Deleting #{compressed_file}")
+        compressed_file.delete
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gryphon_nest
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Christopher Birmingham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-24 00:00:00.000000000 Z
+date: 2025-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
@@ -120,8 +120,11 @@ files:
 - LICENSE
 - bin/nest
 - lib/gryphon_nest.rb
+- lib/gryphon_nest/compressors.rb
+- lib/gryphon_nest/compressors/brotli_compressor.rb
+- lib/gryphon_nest/compressors/gzip_compressor.rb
 - lib/gryphon_nest/errors.rb
-- lib/gryphon_nest/gzip_compressor.rb
+- lib/gryphon_nest/layout_file.rb
 - lib/gryphon_nest/logging.rb
 - lib/gryphon_nest/processors.rb
 - lib/gryphon_nest/processors/asset_processor.rb

data/lib/gryphon_nest/gzip_compressor.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-require 'zlib'
-
-module GryphonNest
-  class GzipCompressor
-    # @param file [Pathname]
-    # @return [Boolean]
-    def can_compress?(file)
-      file.size >= 20
-    end
-
-    # @param file [Pathname]
-    def compress(file)
-      compressed = "#{file}.gz"
-
-      Zlib::GzipWriter.open(compressed, Zlib::BEST_COMPRESSION) do |gz|
-        gz.mtime = file.mtime
-        gz.orig_name = file.to_s
-        gz.write IO.binread(file)
-      end
-    end
-  end
-end