jekyll-haml 0.1.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b1316d16bb34f14ceb5f24a52f8a3514fe03378f
-  data.tar.gz: 31d9cc50546a20d61f6379cffb08eb76513cd35e
+SHA256:
+  metadata.gz: e9051303083d86acc94dad50b1c0df7ad02b128b02ff750a0c37922456cc6ded
+  data.tar.gz: 112427d6d32930dc72aea85325bb80138c2f16cf528964eb9c7c0b0c75082cb8
 SHA512:
-  metadata.gz: 9ceed8b61c78430f298cfb7ab6ea783106aaa92044669be0f17ea9f306e2c000924d67883ca72222a9d0229d20d3fad85cd6429203e7fa92abd92c434e46587f
-  data.tar.gz: 842516830a14d8d31c7fa51b4e0ccef5b68ea26039a41aec53eeae310a5536a4319f9434853832909b6b50769959b0fa8909188d76799e98d29d9f84fe236933
+  metadata.gz: a1cf72bb0ee0a22a2882aae0e3594200c41f452ff2e69b715df802bdb0ddeadc6d280ee07c72aef680659efc03b1e6f10d0e3f379f624dea8bcc25e272cdfffb
+  data.tar.gz: cd255a43ad7b5fb1f8a6c6db615b931429ca4fb745b1491eef495d3be66140e1629da635bc958281341e17f2261162ff51528a3f4d9ca694a99838320eb4d566

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.0.0 2024-05-15
+### breaking changes in order to work with jekyll ~> 4.0
+  * rework of haml liquid tag implementation - ([@mfaughn][])
+  * change Coverter._renderer to Coverter.renderer in convertible.rb - ([@mfaughn][])
+  * update dependencies in gemspec - ([@mfaughn][])
+
 ## 0.1.6 2017-11-10
 ### minor enhancements
     * removes newlines from `{% haml %}` includes - ([@pedrozath][])

data/jekyll-haml.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'jekyll', '>= 3.3.0'
-  gem.add_runtime_dependency 'haml',   '>= 3.0.0'
+  gem.add_runtime_dependency 'jekyll', '~> 4.0'
+  gem.add_runtime_dependency 'haml',   '~> 5.0'
 end

data/lib/jekyll-haml/ext/convertible.rb

@@ -9,7 +9,7 @@ module Jekyll
     end
 
     def transform
-      _renderer.convert(content)
+      renderer.convert(content)
     end
 
     def extname

data/lib/jekyll-haml/tags/haml_partial.rb

@@ -1,53 +1,59 @@
 require 'haml'
 
 module Jekyll
-
-  class HamlPartialTag < Liquid::Tag
-    def initialize(tag_name, file, tokens)
-      super
-      @file = file.strip
-    end
-
-    def render(context)
-      includes_dir = File.join(context.registers[:site].source, '_includes')
-
-      if File.symlink?(includes_dir)
-        return "Includes directory '#{includes_dir}' cannot be a symlink"
+  module Tags
+    class HamlIncludeTag < IncludeTag
+      def initialize(tag_name, file, tokens)
+        super
+        @file = file.strip
       end
+      
+      def load_cached_partial(path, context)
+        context.registers[:cached_partials] ||= {}
+        cached_partial = context.registers[:cached_partials]
 
-      if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
-        return "Include file '#{@file}' contains invalid characters or sequences"
-      end
-
-      return "File must have \".haml\" extension" if @file !~ /\.haml$/
-
-      Dir.chdir(includes_dir) do
-        choices = Dir['**/*'].reject { |x| File.symlink?(x) }
-        if choices.include?(@file)
-          source     = File.read(@file)
-          conversion = ::Haml::Engine.new(source).render.delete("\n")
-          partial    = Liquid::Template.parse(conversion)
+        if cached_partial.key?(path)
+          cached_partial[path]
+        else
+          html = ::Haml::Engine.new(File.read(path)).render.delete("\n")          
+          unparsed_file = context.registers[:site]
+            .liquid_renderer
+            .file(path)
           begin
-            return partial.render!(context)
+            cached_partial[path] = unparsed_file.parse(html)
           rescue => e
-            print "Liquid Exception: #{e.message}"
-            print "in #{self.data["layout"]}"
-            e.backtrace.each do |backtrace|
-              puts backtrace
-            end
-            abort("Build Failed")
+            e.template_name = path
+            e.markup_context = "haml " if e.markup_context.nil?
+            raise e
           end
+        end
+      end
 
-          context.stack do
-            return partial.render(context)
+      def render(context)
+        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+          return "Include file '#{@file}' contains invalid characters or sequences"
+        end
+        return "File must have \".haml\" extension" if @file !~ /\.haml$/
+        
+        site = context.registers[:site]
+        path = locate_include_file(context, @file, site.safe)
+        return unless path
+        add_include_to_dependency(site, path, context)
+        
+        partial = load_cached_partial(path, context)
+
+        context.stack do
+          begin
+            partial.render!(context)
+          rescue Liquid::Error => e
+            e.template_name = path
+            e.markup_context = "included " if e.markup_context.nil?
+            raise e
           end
-        else
-          "Included file '#{@file}' not found in _includes directory"
         end
       end
-    end
-  end
-
-end
 
-Liquid::Template.register_tag('haml', Jekyll::HamlPartialTag)
+    end # HamlIncludeTag
+  end # Tags
+end # Jekyll
+Liquid::Template.register_tag('haml', Jekyll::Tags::HamlIncludeTag)

data/lib/jekyll-haml/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Haml
-    VERSION = '0.1.6'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/lib/jekyll-haml.rb

@@ -5,20 +5,22 @@ require "jekyll-haml/tags/haml_partial"
 require "jekyll-haml/ext/convertible"
 
 module Jekyll
-  class HamlConverter < Converter
-    safe true
-    priority :low
+  module Converters
+    class Haml < Converter
+      safe true
+      priority :low
 
-    def matches(ext)
-      ext =~ /haml/i
-    end
+      def matches(_ext)
+        _ext =~ /haml/i
+      end
 
-    def output_ext(ext)
-      ".html"
-    end
+      def output_ext(ext)
+        ".html"
+      end
 
-    def convert(content)
-      ::Haml::Engine.new(content).render
+      def convert(content)
+        ::Haml::Engine.new(content).render
+      end
     end
   end
-end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-haml
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 1.0.0
 platform: ruby
 authors:
 - Sam Vincent
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-10 00:00:00.000000000 Z
+date: 2024-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.0'
 description: HAML html converter for Jekyll
 email:
 - sam.vincent@mac.com
@@ -59,7 +59,7 @@ files:
 homepage: ''
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,9 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: Convert HAML files to standard HTML files as part of your Jekyll build.
 test_files: []