bridgetown-haml 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b447e6fdc5ca2638ad2d3515ef58c3d4dbcf3568e6e60e5a46247ad3cfaefd9e
-  data.tar.gz: 37da206046e473f9747ab2b1747ca428cc02bb5eae79ae64df7ab37079d115c9
+  metadata.gz: 827345d279383a29038c57908b534b843e0a234973dc1216b48287076fc9a0b8
+  data.tar.gz: b7d6ad4c36d1ec3bf28d0adb857704c54d48e1b77c1f0ca432b52c4d4f9840ee
 SHA512:
-  metadata.gz: bf084f41dd21a87ae0450953d438c4423e429826efbdc7aae66a06d2a2567499dbb7d3783eca731c887d202e61fe58f003cc0c94d0141da4b9d8e1c09efdb6b1
-  data.tar.gz: '0973467470eb2d733bba581e03bc63f748bb0a91caf1d6fb1f4f0bd8ee12ed481f83db55d1b4e4325fc92d365b31232a939cba684647741011b3f09845c118aa'
+  metadata.gz: c0c9a36d60b55aa6d994b27ac6d9aeab2573260e353dfdf8337701d6c95dcf43967d33cfb09ccd9f263202092cdc07cf2c6f6cda2788958f57f486410fbd8d43
+  data.tar.gz: 58ff41d405ff0378e04a71d2e230f68f8d98fc8192514ce0407baa99c5dab5bf44d2b1d05e7bf4be24a04e05b2de4e4826d1d37e2750bc0e9864d7df543bcb7e

data/.rubocop.yml

@@ -4,19 +4,20 @@ inherit_gem:
   rubocop-bridgetown: .rubocop.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
-  Include:
-    - lib/**/*.rb
+  TargetRubyVersion: 2.7
 
   Exclude:
     - .gitignore
     - .rspec
     - .rubocop.yml
 
+    - Rakefile
+    - "*.gemspec"
     - Gemfile.lock
     - CHANGELOG.md
     - LICENSE.txt
     - README.md
 
     - script/**/*
+    - spec/**/*
     - vendor/**/*

data/CHANGELOG.md

@@ -1,13 +1,21 @@
-# main
+# Changelog
 
-# 1.1.0 / 2020-10-30
+## 2.0.0 / 2022-01-22
+
+* Upgrade to initializers system in Bridgetown 1.2
+
+## 1.1.1 / 2020-11-01
+
+* Set template_engine frontmatter when matching on extension alone
+
+## 1.1.0 / 2020-10-30
 
 * Updated for compatibilty with Bridgetown 0.18
 
-# 1.0.1 / 2020-07-24
+## 1.0.1 / 2020-07-24
 
 * Fix broken link to GitHub repo
 
-# 1.0.0 / 2020-07-24
+## 1.0.0 / 2020-07-24
 
 * First release of the bridgetown-haml plugin

data/README.md

@@ -2,19 +2,25 @@
 
 A Bridgetown plugin to provide support for [Haml templates](http://haml.info/).
 
-_Requires Bridgetown 0.18 or greater._
-
-## Installation
+## Installation for Bridgetown 1.2+
 
 Run this command to add this plugin to your site's Gemfile:
 
 ```shell
-$ bundle add bridgetown-haml -g bridgetown_plugins
+$ bundle add bridgetown-haml
 ```
 
+And then add the initializer to your configuration in `config/initializers.rb`:
+
+```ruby
+init :"bridgetown-haml"
+```
+
+(For Bridgetown 1.1 or earlier, [read these instructions](https://github.com/bridgetownrb/bridgetown-slim/tree/v1.1.1).)
+
 ## Usage
 
-Simply name your page, layout, or partial with a `.haml` extension. The available features will be fairly analogous to [the ERB support](https://www.bridgetownrb.com/docs/erb-and-beyond#haml-and-slim) in Bridgetown, including support for helpers, partials, and rendering Liquid components. You can even [embed Markdown and other template languages](https://github.com/haml/haml/blob/master/REFERENCE.md#filters-filters) using standard Haml syntax.
+Simply name your page, layout, or partial with a `.haml` extension. The available features will be fairly analogous to [the ERB support](https://www.bridgetownrb.com/docs/template-engines/erb-and-beyond#haml-and-slim) in Bridgetown, including support for helpers, partials, and rendering Liquid components. You can even [embed Markdown and other template languages](https://github.com/haml/haml/blob/master/REFERENCE.md#filters-filters) using standard Haml syntax.
 
 You can also add `template_engine: haml` to your file's front matter and use any extension you want. For example, you could add `data.xml` to your source folder and simply make sure the front matter contains `template_engine: haml`.
 

data/bridgetown-haml.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r!^spec/!)
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.add_dependency "bridgetown", ">= 0.18", "< 2.0"
-  spec.add_dependency "haml", ">= 5.1.2"
+  spec.add_dependency "bridgetown", ">= 1.2.0.beta5", "< 2.0"
+  spec.add_dependency "haml", ">= 6.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "nokogiri", "~> 1.6"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop-bridgetown", "~> 0.2"
 end

data/lib/bridgetown-haml/haml_templates.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "tilt/haml"
+require "haml"
 
 module Bridgetown
   class HamlView < RubyTemplateView
@@ -11,14 +11,15 @@ module Bridgetown
       partial_segments.last.sub!(%r!^!, "_")
       partial_name = partial_segments.join("/")
 
-      Tilt::HamlTemplate.new(
+      Haml::Template.new(
         site.in_source_dir(site.config[:partials_dir], "#{partial_name}.haml")
-      ).render(self, options)
+      ).render(self, options).html_safe
     end
   end
 
   module Converters
     class HamlTemplates < Converter
+      priority :highest
       input :haml
 
       # Logic to do the Haml content conversion.
@@ -29,9 +30,11 @@ module Bridgetown
       #
       # @return [String] The converted content.
       def convert(content, convertible)
+        return content if convertible.data[:template_engine] != "haml"
+
         haml_view = Bridgetown::HamlView.new(convertible)
 
-        haml_renderer = Tilt::HamlTemplate.new(convertible.relative_path) { content }
+        haml_renderer = Haml::Template.new(convertible.relative_path) { content }
 
         if convertible.is_a?(Bridgetown::Layout)
           haml_renderer.render(haml_view) do
@@ -45,7 +48,9 @@ module Bridgetown
       def matches(ext, convertible)
         return true if convertible.data[:template_engine] == "haml"
 
-        super(ext)
+        super(ext).tap do |ext_matches|
+          convertible.data[:template_engine] = "haml" if ext_matches
+        end
       end
 
       def output_ext(ext)

data/lib/bridgetown-haml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BridgetownHaml
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/bridgetown-haml.rb

@@ -1,4 +1,7 @@
 # frozen_string_literal: true
 
 require "bridgetown"
-require "bridgetown-haml/haml_templates"
+
+Bridgetown.initializer :"bridgetown-haml" do
+  require "bridgetown-haml/haml_templates"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-haml
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Bridgetown Team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-30 00:00:00.000000000 Z
+date: 2023-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 1.2.0.beta5
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: 1.2.0.beta5
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.2
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-description: 
+description:
 email: maintainers@bridgetownrb.com
 executables: []
 extensions: []
@@ -136,7 +136,7 @@ homepage: https://github.com/bridgetownrb/bridgetown-haml
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,15 +144,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: A Bridgetown plugin which provides support for Haml templates.
 test_files: []