gryphon_nest 3.1.0 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a15200889f6f72f775094aed126ad46ef5dae7546395b4ebef80f830e389505
-  data.tar.gz: c582fb185b2663a96f959823bf769a079aeca856b8303fe83f99088078339c78
+  metadata.gz: 11bbaedf3fbca0e216d16bd03a8452ee6ffc57930dac0ab8a30c3d02fef15f2e
+  data.tar.gz: 63ed7c032ef8478697ee0372ff569c54f3408a92dc68728f892c7a938e7e4955
 SHA512:
-  metadata.gz: 1ce6e28ae987f0bf357f3035d34734e09589cf6060b9d5e9c60b327d8ed84fb9616e00994fc70e93cfc7b95a29a82cc42b1ac85704e71cf32eccbe7dcad586ef
-  data.tar.gz: d069c1bb1f27bcc1dca9ca4817e3d8fa06db8aeb5d0fc7aa28a1d877940ed0ece4ae720e42d2821eedf382ee14a4a2bce03c3454e8d642a310869cfdd82b034a
+  metadata.gz: 865a4ed653820f359cd8d608e38e7f1c9c1697def2f4958ea18b11e4f4df84b701663571b10bf03eb06a2a1f9cd530a0c1f7579c613b710611b7014cd93c9851
+  data.tar.gz: 16838330ada34079d02f4ef629a878c2f6afdd55fa288e180a44e17b9fc8425fe3c6c5eaa27883ebb7ec900d30ce0ae2e82dd84525384e7dbbe464732f976fa6

data/bin/nest

@@ -8,7 +8,8 @@ DEFAULT_PORT = 8000
 EXIT_FAILURE = 1
 
 options = {
-  port: DEFAULT_PORT
+  port: DEFAULT_PORT,
+  watch: false
 }
 
 # @param msg [String]
@@ -24,6 +25,8 @@ begin
 
     opts.on('-p', '--port [PORT]', Integer, 'Port to run dev server on')
 
+    opts.on('-w', '--watch', 'Watch for file changes when running the local server')
+
     opts.on('-h', '--help', 'Show this message') do
       puts opts
       exit
@@ -41,8 +44,14 @@ begin
 
   usage_error("Unknown command #{command}", parser) unless %w[build serve].include?(command)
 
-  GryphonNest.build_website
-  GryphonNest.serve_website(options[:port]) if command == 'serve'
+  nest = GryphonNest::Nest.new
+  nest.build
+
+  if command == 'serve'
+    nest.watch if options[:watch]
+
+    nest.serve(options[:port])
+  end
 rescue OptionParser::ParseError => e
   usage_error(e.message, parser)
 rescue StandardError => e

data/lib/gryphon_nest/logging.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+module GryphonNest
+  # Mixing module used for logging messages to the console
+  module Logging
+    class << self
+      # @return [Logger]
+      def create
+        logger = Logger.new($stdout)
+
+        # Create formatter that matches WebBricks log messages
+        logger.formatter = proc do |severity, datetime, _progname, msg|
+          date_format = datetime.strftime('%Y-%m-%d %H:%M:%S')
+          "[#{date_format}] #{severity.ljust(5)} #{msg}\n"
+        end
+
+        logger
+      end
+    end
+  end
+end

data/lib/gryphon_nest/processors/asset_processor.rb

@@ -6,22 +6,13 @@ module GryphonNest
   module Processors
     # Default file processor. Moves files from source to destination
     class AssetProcessor
-      # @param file [Pathname]
-      # @return [Pathname]
-      def process(file)
-        dest = dest_name(file)
-
-        if file_modified?(file, dest)
-          puts "Copying #{file} to #{dest}"
-          dest.dirname.mkpath
-          FileUtils.copy_file(file, dest)
-        end
-
-        dest
+      # @param src [Pathname]
+      # @param dest [Pathname]
+      def process(src, dest)
+        dest.dirname.mkpath
+        FileUtils.copy_file(src, dest)
       end
 
-      private
-
       # @param src [Pathname]
       # @return [Pathname]
       def dest_name(src)

data/lib/gryphon_nest/processors/mustache_processor.rb

@@ -12,25 +12,18 @@ module GryphonNest
         @renderer = renderer
       end
 
-      # @param file [Pathname]
-      # @return [Pathname]
+      # @param src [Pathname]
+      # @param dest [Pathname]
       # @raise [Errors::YamlError]
       # @raise [Errors::ParseError]
-      def process(file)
-        dest = dest_name(file)
-        msg = File.exist?(dest) ? 'Recreating' : 'Creating'
-        puts "#{msg} #{dest}"
-
+      def process(src, dest)
         @layout ||= read_layout_file
 
-        context = read_context(file)
-        content = build_output(file, context)
+        context = read_context(src)
+        content = build_output(src, context)
         write_file(dest, content)
-        dest
       end
 
-      private
-
       # @param src [Pathname]
       # @return [Pathname]
       def dest_name(src)
@@ -43,12 +36,20 @@ module GryphonNest
         path.join('index.html')
       end
 
+      # @param _src [Pathname]
+      # @param _dest [Pathname]
+      # @return [Boolean]
+      def file_modified?(_src, _dest)
+        true
+      end
+
+      private
+
       # @param src [Pathname]
       # @return [Hash]
       # @raise [Errors::YamlError]
       def read_context(src)
-        basename = src.basename(TEMPLATE_EXT)
-        path = "#{DATA_DIR}/#{basename}.yaml"
+        path = src.sub(CONTENT_DIR, DATA_DIR).sub_ext('.yaml')
         YAML.safe_load_file(path, symbolize_names: true)
       rescue IOError, Errno::ENOENT
         {}
@@ -61,16 +62,17 @@ module GryphonNest
       # @return [String]
       # @raise [Errors::ParseError]
       def build_output(file, context)
-        if @layout.empty?
-          content = @renderer.render_file(file, context)
-        else
-          context[:yield] = file.basename(TEMPLATE_EXT)
-          content = @renderer.render(@layout, context)
-        end
+        content =
+          if @layout.empty?
+            @renderer.render_file(file, context)
+          else
+            context[:yield] = file.basename(TEMPLATE_EXT)
+            @renderer.render(@layout, context)
+          end
 
         HtmlBeautifier.beautify(content, stop_on_errors: true)
       rescue Mustache::Parser::SyntaxError => e
-        raise Errors::ParseError, "Failed to process mustache template #{file}.\nReason: #{e}"
+        raise Errors::ParseError, "Failed to process mustache template #{file}. Reason:\n#{e}"
       rescue RuntimeError => e
         raise Errors::ParseError, "Failed to beautify template output #{file}. Reason: #{e.message}"
       end
@@ -78,8 +80,7 @@ module GryphonNest
       # @param path [Pathname]
       # @param content [String]
       def write_file(path, content)
-        dir = path.dirname
-        dir.mkpath
+        path.dirname.mkpath
         path.write(content)
       end
 

data/lib/gryphon_nest/processors/processor_registry.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module GryphonNest
+  module Processors
+    class ProcessorRegistry
+      def initialize
+        @asset_processor = AssetProcessor.new
+        @processors = Hash.new(@asset_processor)
+        yield self
+      end
+
+      # @param key [String]
+      # @param value [Proc]
+      def []=(key, value)
+        @processors[key] = value
+      end
+
+      # @param key [String]
+      # @return [Object]
+      def [](key)
+        processor = @processors[key]
+
+        if processor.is_a?(Proc)
+          processor = processor.call
+          @processors[key] = processor
+        end
+
+        processor
+      rescue LoadError
+        @processors[key] = nil
+        @asset_processor
+      end
+    end
+  end
+end

data/lib/gryphon_nest/processors/sass_processor.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'sass-embedded'
+
+module GryphonNest
+  module Processors
+    class SassProcessor
+      # @param src [Pathname]
+      # @param dest [Pathname]
+      # @raise [Errors::ParseError]
+      def process(src, dest)
+        result = Sass.compile(src)
+        File.write(dest, result.css)
+      rescue Sass::CompileError => e
+        raise Errors::ParseError, "Failed to process sass style sheet #{src}. Reason:\n#{e.full_message}"
+      end
+
+      # @param src [Pathname]
+      # @return [Pathname]
+      def dest_name(src)
+        src.sub(CONTENT_DIR, BUILD_DIR).sub_ext('.css')
+      end
+
+      # @param src [Pathname]
+      # @param des [Pathname]
+      # @return [Boolean]
+      def file_modified?(src, dest)
+        return true unless dest.exist?
+
+        src.mtime > dest.mtime
+      end
+    end
+  end
+end

data/lib/gryphon_nest/processors.rb

@@ -4,5 +4,25 @@ module GryphonNest
   module Processors
     autoload :AssetProcessor, 'gryphon_nest/processors/asset_processor'
     autoload :MustacheProcessor, 'gryphon_nest/processors/mustache_processor'
+    autoload :ProcessorRegistry, 'gryphon_nest/processors/processor_registry'
+    autoload :SassProcessor, 'gryphon_nest/processors/sass_processor.rb'
+
+    class << self
+      # @return [ProcessorRegistry]
+      def create
+        ProcessorRegistry.new do |reg|
+          reg[TEMPLATE_EXT] = proc {
+            renderer = Renderers::MustacheRenderer.new
+            renderer.template_path = CONTENT_DIR
+            Processors::MustacheProcessor.new(renderer)
+          }
+
+          sass_proc = proc { Processors::SassProcessor.new }
+
+          reg['.scss'] = sass_proc
+          reg['.sass'] = sass_proc
+        end
+      end
+    end
   end
 end

data/lib/gryphon_nest/version.rb

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

data/lib/gryphon_nest.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'listen'
 require 'pathname'
 require 'webrick'
 
 module GryphonNest
   autoload :Errors, 'gryphon_nest/errors'
+  autoload :Logging, 'gryphon_nest/logging'
   autoload :Processors, 'gryphon_nest/processors'
   autoload :Renderers, 'gryphon_nest/renderers'
   autoload :VERSION, 'gryphon_nest/version'
@@ -15,21 +17,55 @@ module GryphonNest
   TEMPLATE_EXT = '.mustache'
   LAYOUT_FILE = 'layout.mustache'
 
-  class << self
+  class Nest
+    def initialize
+      @processors = Processors.create
+      @logger = Logging.create
+    end
+
     # @raise [Errors::NotFoundError]
-    def build_website
+    def build
       raise Errors::NotFoundError, "Content directory doesn't exist in the current directory" unless Dir.exist?(CONTENT_DIR)
 
       Dir.mkdir(BUILD_DIR) unless Dir.exist?(BUILD_DIR)
 
       existing_files = glob("#{BUILD_DIR}/**/*")
-      existing_files = existing_files.difference(process_content)
-      delete_files(existing_files)
+      content_files = glob("#{CONTENT_DIR}/**/*")
+      processed_files = content_files.collect { |src| process_file(src) }
+      existing_files.difference(processed_files).each { |file| delete_file(file) }
+    end
+
+    def watch
+      @logger.info('Watching for content changes')
+      listener = Listen.to(CONTENT_DIR, DATA_DIR, relative: true) do |modified, added, removed|
+        modified.union(added).each do |file|
+          path = Pathname(file)
+
+          if file.start_with?(DATA_DIR)
+            process_data_file(path)
+          else
+            process_file(path)
+          end
+        end
+
+        removed.each do |file|
+          path = Pathname(file)
+
+          if file.start_with?(DATA_DIR)
+            process_data_file(path)
+          else
+            path = @processors[path.extname].dest_name(path)
+            delete_file(path)
+          end
+        end
+      end
+
+      listener.start
     end
 
     # @param port [Integer]
-    def serve_website(port)
-      puts "Running local server on #{port}"
+    def serve(port)
+      @logger.info("Running local server on #{port}")
       server = WEBrick::HTTPServer.new(Port: port, DocumentRoot: BUILD_DIR)
       # Trap ctrl c so we don't get the horrible stack trace
       trap('INT') { server.shutdown }
@@ -38,20 +74,29 @@ module GryphonNest
 
     private
 
-    # @return [Array<Pathname>]
-    def process_content
-      renderer = Renderers::MustacheRenderer.new
-      renderer.template_path = CONTENT_DIR
-      asset_processor = Processors::AssetProcessor.new
-
-      processors = {
-        TEMPLATE_EXT => Processors::MustacheProcessor.new(renderer)
-      }
-
-      glob("#{CONTENT_DIR}/**/*").map do |source_file|
-        processor = processors.fetch(source_file.extname, asset_processor)
-        processor.process(source_file)
+    # @param src [Pathname]
+    # @return [Pathname]
+    def process_file(src)
+      processor = @processors[src.extname]
+      dest = processor.dest_name(src)
+
+      if processor.file_modified?(src, dest)
+        msg = File.exist?(dest) ? 'Recreating' : 'Creating'
+        @logger.info("#{msg} #{dest}")
+        processor.process(src, dest)
       end
+
+      dest
+    end
+
+    # @param src [Pathname]
+    # @return [Pathname]
+    def process_data_file(src)
+      src = src.sub(DATA_DIR, CONTENT_DIR).sub_ext(TEMPLATE_EXT)
+
+      return unless src.exist?
+
+      process_file(src)
     end
 
     # @params path [String]
@@ -60,13 +105,10 @@ module GryphonNest
       Pathname.glob(path).reject(&:directory?)
     end
 
-    # @param junk_files [Array<Pathname>]
-    def delete_files(junk_files)
-      junk_files.each do |f|
-        puts "Deleting #{f}"
-        f.delete
-      end
-      nil
+    # @param file [Pathname]
+    def delete_file(file)
+      @logger.info("Deleting #{file}")
+      file.delete
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gryphon_nest
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Christopher Birmingham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-26 00:00:00.000000000 Z
+date: 2025-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: listen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -44,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -107,9 +121,12 @@ files:
 - bin/nest
 - lib/gryphon_nest.rb
 - lib/gryphon_nest/errors.rb
+- lib/gryphon_nest/logging.rb
 - lib/gryphon_nest/processors.rb
 - lib/gryphon_nest/processors/asset_processor.rb
 - lib/gryphon_nest/processors/mustache_processor.rb
+- lib/gryphon_nest/processors/processor_registry.rb
+- lib/gryphon_nest/processors/sass_processor.rb
 - lib/gryphon_nest/renderers.rb
 - lib/gryphon_nest/renderers/mustache_renderer.rb
 - lib/gryphon_nest/version.rb