From 767e2981f3484d2f837ee822404b868aa310e594 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Wed, 4 Jan 2023 13:37:13 -0800 Subject: [PATCH 1/3] CI on 3.2. --- .github/workflows/ci.yml | 10 ++-------- .github/workflows/generate-docs.yml | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4ff343f..ed774c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,16 +19,10 @@ jobs: strategy: fail-fast: false matrix: - ruby: - - 2.6 - - 2.7 - - "3.0" - - 3.1 - - ruby-head - - jruby + ruby: [2.6, 2.7, '3.0', 3.1, 3.2, ruby-head, jruby] steps: - name: Clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/generate-docs.yml b/.github/workflows/generate-docs.yml index b8d16ed..65aea93 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/workflows/generate-docs.yml @@ -10,7 +10,7 @@ jobs: name: Update gh-pages with docs steps: - name: Clone repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Ruby uses: ruby/setup-ruby@v1 with: From 52c783b71ab19404cd48624f40bba47021c7cd76 Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 3 Apr 2023 15:54:37 -0700 Subject: [PATCH 2/3] Allow Haml >= 5.2 and < 7. --- lib/rdf/vocab/extensions.rb | 7 ++++++- rdf-vocab.gemspec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/rdf/vocab/extensions.rb b/lib/rdf/vocab/extensions.rb index 15576e4..d623b01 100644 --- a/lib/rdf/vocab/extensions.rb +++ b/lib/rdf/vocab/extensions.rb @@ -391,7 +391,12 @@ def to_html(graph: nil, prefixes: nil, jsonld: nil, template: nil) case template when /.haml$/ require 'haml' - haml = Haml::Engine.new(File.read(template)) + haml = if Haml.const_defined?(:Template) + Haml::Template.new {File.read(template)} + else + Haml::Engine.new(File.read(template)) + end + haml.render(self, ont: expanded, context: json['@context'], prefixes: prefixes) when /.erb$/ require 'erubis' diff --git a/rdf-vocab.gemspec b/rdf-vocab.gemspec index 77db724..da0558b 100755 --- a/rdf-vocab.gemspec +++ b/rdf-vocab.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |gem| gem.add_runtime_dependency 'rdf', '~> 3.2', '>= 3.2.4' # Either of these are required for HTML vocabulary generation - gem.add_development_dependency 'haml', '~> 5.2' + gem.add_development_dependency 'haml', '>= 5.2', "< 7" gem.add_development_dependency 'erubis', '~> 2.7' gem.add_development_dependency 'json-ld', '~> 3.2' From 04cecfcd43ba854344266599ccadad129c24558b Mon Sep 17 00:00:00 2001 From: Gregg Kellogg Date: Mon, 3 Apr 2023 16:23:24 -0700 Subject: [PATCH 3/3] Version 3.2.4. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b347b11..351227f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.2.3 +3.2.4