gryphon_nest 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19531d127171f4f388faf53f703b2b3f7529dcba0641d6d0eb781a778a7e1390
-  data.tar.gz: 8f90b27680df5977c8af25d7f35bb238960b86a1c6951d3ded1db56977178741
+  metadata.gz: '059e5147460d46712b2b7d7f700e9013aec2b515c440d2e8480dd91429a49055'
+  data.tar.gz: 55887001c613917022871f80eb385ea21ec5fad38257d32a87b61c1ee3f2f1fb
 SHA512:
-  metadata.gz: 1dae70b86362c2ae2c022ec1c0bb4f37787d65b04691ce828a624a2cc222f05a24bd11c68e4b1ea27b1a864cc7ee0ba29d8b81a5f0e4e9bc80109c93ffe67351
-  data.tar.gz: eeb408900bafc6c56de025c1edc502ad4354cfbe6c72d30c10c8df1b268747b8cf56dea9898d4ff71fbf0c28deab8d87e49037b717a748a3adc38027592fc2e5
+  metadata.gz: f916fed436eb1fba621d6921fbc2075dad54079b148b321accb977c5b8550efc8ed495212cec48519fa8ccfa4383f7892b594f2b7941a88542d7d84545178709
+  data.tar.gz: d22e12353543670bd136a803c9b84efa2dc95a88f64897ebe5d1addc638df9e5ad6ef06ea54edaed515a8d7bea282bed1f77bbea21a70ea7a23fe32323811616

data/bin/nest

@@ -45,7 +45,7 @@ begin
   GryphonNest.serve_website(options[:port]) if command == 'serve'
 rescue OptionParser::ParseError => e
   usage_error(e.message, parser)
-# rescue StandardError => e
-#   warn e.message
-#   exit(EXIT_FAILURE)
+rescue StandardError => e
+  warn e.message
+  exit(EXIT_FAILURE)
 end

data/lib/gryphon_nest/processors/asset_processor.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 
 module GryphonNest
   module Processors
+    # Default file processor. Moves files from source to destination
     class AssetProcessor
       # @param file [Pathname]
       # @return [Pathname]

data/lib/gryphon_nest/processors/mustache_processor.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
+require 'htmlbeautifier'
 require 'yaml'
 
 module GryphonNest
   module Processors
+    # Renders a Mustache template into a html file
     class MustacheProcessor
       # @param renderer [Renderers::MustacheRenderer]
       def initialize(renderer)
@@ -17,8 +19,19 @@ module GryphonNest
         dest = dest_name(file)
         msg = File.exist?(dest) ? 'Recreating' : 'Creating'
         puts "#{msg} #{dest}"
+
+        @layout ||= read_layout_file
+
         context = read_context(file)
-        content = @renderer.render_file(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 = HtmlBeautifier.beautify(content)
         write_file(dest, content)
         dest
       end
@@ -43,7 +56,7 @@ module GryphonNest
       def read_context(src)
         basename = src.basename(TEMPLATE_EXT)
         path = "#{DATA_DIR}/#{basename}.yaml"
-        YAML.safe_load_file(path)
+        YAML.safe_load_file(path, symbolize_names: true)
       rescue IOError, Errno::ENOENT
         {}
       rescue Psych::SyntaxError => e
@@ -57,6 +70,13 @@ module GryphonNest
         dir.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/renderers/mustache_renderer.rb

@@ -1,35 +1,18 @@
 # frozen_string_literal: true
 
-require 'htmlbeautifier'
 require 'mustache'
 
 module GryphonNest
   module Renderers
-    # Renders mustache templates to html
+    # Class to override default Mustache behavior
     class MustacheRenderer < Mustache
-      # @param template [String]
-      # @param context [Hash]
-      # @return [String]
-      def render_file(template, context = {})
-        content = super
-        HtmlBeautifier.beautify(content)
-      end
-
-      # @param name [String]
-      # @return [String]
-      def partial(name)
-        content = File.read(name)
-        layout ||= read_layout_file
-        layout.empty? ? content : layout.sub(/{{{\s*yield\s*}}}/, content) 
-      end
-
-      private
 
+      # @param _name [String]
       # @return [String]
-      def read_layout_file
-        File.read(LAYOUT_FILE)
-      rescue IOError, Errno::ENOENT
-        ''
+      def partial(_name)
+        name = @context[:yield]
+        path = "#{template_path}/#{name}.#{template_extension}"
+        File.read(path)
       end
     end
   end

data/lib/gryphon_nest/version.rb

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

data/lib/gryphon_nest.rb

@@ -13,20 +13,16 @@ module GryphonNest
   CONTENT_DIR = 'content'
   DATA_DIR = 'data'
   TEMPLATE_EXT = '.mustache'
-  LAYOUT_FILE = 'layouts/main.mustache'
+  LAYOUT_FILE = 'layout.mustache'
 
   class << self
     # @raise [Errors::NotFoundError]
     def build_website
       raise Errors::NotFoundError, "Content directory doesn't exist in the current directory" unless Dir.exist?(CONTENT_DIR)
 
-      existing_files = []
-      if Dir.exist?(BUILD_DIR)
-        existing_files = glob("#{BUILD_DIR}/**/*")
-      else
-        Dir.mkdir(BUILD_DIR)
-      end
+      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)
     end
@@ -44,20 +40,18 @@ module GryphonNest
 
     # @return [Array<Pathname>]
     def process_content
-      processed_files = []
       renderer = Renderers::MustacheRenderer.new
+      renderer.template_path = CONTENT_DIR
       asset_processor = Processors::AssetProcessor.new
 
       processors = {
         TEMPLATE_EXT => Processors::MustacheProcessor.new(renderer)
       }
 
-      glob("#{CONTENT_DIR}/**/*").each do |source_file|
+      glob("#{CONTENT_DIR}/**/*").map do |source_file|
         processor = processors.fetch(source_file.extname, asset_processor)
-        processed_files << processor.process(source_file)
+        processor.process(source_file)
       end
-
-      processed_files
     end
 
     # @params path [String]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gryphon_nest
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Christopher Birmingham
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlbeautifier
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Yet another static site generator