middleman-syntax 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '069a5916deb149f37860dd78cd181278367e1ae343d4053e619d902e2fb3f87e'
-  data.tar.gz: 3e3e12eef81c32dfc9d683f8925e65d1fc22ed714b869880a8719acaf1c8e50a
+  metadata.gz: e10bda9e80f47020802183bad3a3849929d927afd99d2da43f0bf67547213028
+  data.tar.gz: f930e8d69b461e426ae8e3ad63b3111d6b2607df9b66cee73fcd7f88e5d9fda8
 SHA512:
-  metadata.gz: 98e67a62f908fa76c4588dbd32b39f1374831a944efd604794ee157a9693c45c87b657bcb7497d36c1d162fbd7928fd0e94549c3350b018685419554335222ce
-  data.tar.gz: 1e1c3c2dcf955bbe33b8ca8ffbacb77fcd96896123927971bba2fe3bdeb78a762bdaf53d5aae7ac799a1f5a7e19ea1c064438a3e15b3630d1390470133ce8f44
+  metadata.gz: b7d960fc8adae60a7f21b67ba7ebbfd7c103121ac000ff94361fee9fcdb64e2df6c8a57161f125103c296c4c242943d5b5593e7f9b29b621d2a0b2c223ecaa52
+  data.tar.gz: 141ea649e0a810ecfde705d7072290a85377bc2d73194fed063da2adb5bd03e85a74b09c35f87fb9fef7aab40f74e5af501ae1c581b3063ae8e0f8108a3b76af

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    name: ubuntu-ruby-${{ matrix.ruby-version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"]
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+      - name: Runs tests
+        run: bundle exec rake test

data/CHANGELOG.md

@@ -1,19 +1,31 @@
-- Fixed HAML :code filter to remove trailing blank lines
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+# 3.4.0
+
+- Haml 6 support (#82, #84).
+- Migrate CI from Travis to GitHub Actions (#83).
+
+# 3.3.0
+
+- Remove trailing blank lines from HAML's :code filter (#79).
+- Allow for Linewise Rouge formatter (#78).
 
 # 3.2.0
 
-- Prep for Middleman v5
+- Prep for Middleman v5.
 
 # 3.0.0
 
-- Upgrade to Rouge 2.0. #66.
-- Added the ability to disable the line numbers on a specific code block when using Markdown and Redcarpet. #63.
+- Upgrade to Rouge 2.0 (#66).
+- Added the ability to disable the line numbers on a specific code block when using Markdown and Redcarpet (#63).
 - Lexer options are properly passed down to the highlighter.
 
 # 2.1.0
 
-- Version compatibility with Middleman 4. #58
-- Allow passing Rouge formatter options from the `code` helper. #50.
+- Version compatibility with Middleman 4 (#58).
+- Allow passing Rouge formatter options from the `code` helper (#50).
 - Fixed tests and code reorganization.
 
 # 2.0.0
@@ -32,17 +44,17 @@
 # 1.2.0
 
 - Support Kramdown as Markdown engine in addition to Redcarpet.
-- Switch to Rouge from Pygments.rb
+- Switch to Rouge from Pygments.rb.
 - Fix bugs around setting language options.
 
 # 1.1.1
 
-- Properly merge language attribute for Markdown. #14
+- Properly merge language attribute for Markdown (#14).
 
 # 1.1.0
 
-- Avoid errors when language is empty. #9
-- Allow passing options to Pygments. #5 & #7
+- Avoid errors when language is empty (#9).
+- Allow passing options to Pygments (#5, #7).
 
 # 1.0.1
 

data/Gemfile

@@ -1,27 +1,24 @@
 source "https://rubygems.org"
 
-gem "middleman-core", :git => "https://github.com/middleman/middleman.git", :branch => '4.x'
+gem "middleman-core", git: "https://github.com/middleman/middleman.git"
 
 # Specify your gem's dependencies in middleman-syntax.gemspec
 gemspec
 
 # Build and doc tools
-gem 'rake', '~> 10.3', require: false
-gem 'yard', '~> 0.8', require: false
+gem 'rake', '~> 13.1', require: false
+gem 'yard', '~> 0.9', require: false
 
 # Test tools
 gem 'pry', '~> 0.10', group: :development
-gem 'aruba', '~> 0.10.0'
+gem 'aruba', '~> 1.0.0'
 gem 'rspec', '~> 3.0'
 gem 'cucumber', '~> 2.0'
 gem 'capybara', '~> 2.5.0'
+gem 'haml', RUBY_VERSION > '3.0' ? '< 7' : '< 6'
+gem 'slim', '>= 3', '< 5'
+gem 'kramdown'
+gem "redcarpet"
 
-platforms :ruby do
-  gem "redcarpet"
-end
-
-# Code Quality
-gem "cane", :platforms => [:mri_19, :mri_20], :require => false
-
-# For old rubies
-gem 'nokogiri', ['~> 1.5', '< 1.7']
+# For old Rubies
+gem 'nokogiri', '~> 1.12.0'

data/README.md

@@ -3,8 +3,7 @@
 `middleman-syntax` is an extension for the [Middleman] static site generator that adds syntax highlighting via [Rouge](https://github.com/jayferd/rouge).
 
 [![Gem Version](https://badge.fury.io/rb/middleman-syntax.svg)][gem]
-[![Build Status](https://travis-ci.org/middleman/middleman-syntax.svg)][travis]
-[![Dependency Status](https://gemnasium.com/middleman/middleman-syntax.svg?travis)][gemnasium]
+[![CI](https://github.com/middleman/middleman-syntax/actions/workflows/ci.yml/badge.svg)](https://github.com/middleman/middleman-syntax/actions/workflows/ci.yml)
 [![Code Quality](https://codeclimate.com/github/middleman/middleman-syntax.svg)][codeclimate]
 
 ## Installation
@@ -16,9 +15,7 @@ gem install middleman
 middleman init MY_PROJECT
 ```
 
-If you already have a Middleman project: Add `gem "middleman-syntax"` to your `Gemfile` and run `bundle install`.
-
-**This plugin will not work on Ruby 1.8!** Rouge requires 1.9+, so we do too.
+If you already have a Middleman project, add `gem "middleman-syntax"` to your `Gemfile` and run `bundle install`.
 
 ## Configuration
 
@@ -197,7 +194,7 @@ The best way to get quick responses to your issues and swift fixes to your bugs
 
 ## Donate
 
-[Click here to lend your support to Middleman](https://spacebox.io/s/4dXbHBorC3)
+[Click here to lend your support to Middleman](https://github.com/sponsors/tdreyno)
 
 ## License
 
@@ -205,7 +202,5 @@ Copyright (c) 2012-2014 Benjamin Hollis. MIT Licensed, see [LICENSE] for details
 
 [middleman]: http://middlemanapp.com
 [gem]: https://rubygems.org/gems/middleman-syntax
-[travis]: http://travis-ci.org/middleman/middleman-syntax
-[gemnasium]: https://gemnasium.com/middleman/middleman-syntax
 [codeclimate]: https://codeclimate.com/github/middleman/middleman-syntax
 [LICENSE]: https://github.com/middleman/middleman-syntax/blob/master/LICENSE.md

data/Rakefile

@@ -1,6 +1,4 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
@@ -9,23 +7,7 @@ Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
-require 'rake/clean'
-
 task :test => ["cucumber"]
-
-begin
-  require 'cane/rake_task'
-
-  desc "Run cane to check quality metrics"
-  Cane::RakeTask.new(:quality) do |cane|
-    cane.no_style = true
-    cane.no_doc = true
-    cane.abc_glob = "lib/middleman-syntax/**/*.rb"
-  end
-rescue LoadError
-  # warn "cane not available, quality task not provided."
-end
-
 task :default => :test
 
 desc "Build HTML documentation"

data/lib/middleman-syntax/haml_monkey_patch.rb

@@ -1,22 +1,42 @@
 # If Haml is around, define a :code filter that can be used to more conveniently output highlighted code.
+
 if defined? Haml
-  module Haml
-    module Filters
-      module Code
-        include Base
+  module HamlMonkeyPatch
+    def render(code)
+      code = code.rstrip
+      code = code.encode(Encoding::UTF_8)
+
+      # Allow language to be specified via a special comment like:
+      # # lang: ruby
+      if code.lines.first =~ /\A\s*#\s*lang:\s*(\w+)$/
+        language = $1
+        code = code.lines.to_a[1..-1].join # Strip first line
+      end
 
-        def render(code)
-          code = code.rstrip
-          code = code.encode(Encoding::UTF_8)
+      Middleman::Syntax::Highlighter.highlight(code, language)
+    end
+  end
 
-          # Allow language to be specified via a special comment like:
-          #  # lang: ruby
-          if code.lines.first =~ /\A\s*#\s*lang:\s*(\w+)$/
-              language = $1
-            code = code.lines.to_a[1..-1].join # Strip first line
+  if Gem::Version.new(Haml::VERSION) >= Gem::Version.new("6.0.0")
+    module Haml
+      class Filters
+        class Code < Base
+          include HamlMonkeyPatch
+
+          def compile(node)
+            [:static, render(node.value[:text])]
           end
+        end
 
-          Middleman::Syntax::Highlighter.highlight(code, language)
+        register :code, Code
+      end
+    end
+  else
+    module Haml
+      module Filters
+        module Code
+          include Base
+          extend HamlMonkeyPatch
         end
       end
     end

data/lib/middleman-syntax/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Syntax
-    VERSION = "3.3.0"
+    VERSION = "3.4.0"
   end
 end

data/middleman-syntax.gemspec

@@ -1,6 +1,4 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "middleman-syntax/version"
+require "./lib/middleman-syntax/version"
 
 Gem::Specification.new do |s|
   s.name = "middleman-syntax"
@@ -17,9 +15,8 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.add_runtime_dependency("middleman-core", [">= 3.2"])
   s.add_runtime_dependency("rouge", ["~> 3.2"])
-  s.add_development_dependency("aruba", "~> 0.5.1")
-  s.add_development_dependency("cucumber", "~> 1.3.1")
-  s.add_development_dependency("fivemat")
+  s.add_development_dependency("aruba")
+  s.add_development_dependency("cucumber")
   s.add_development_dependency("haml")
   s.add_development_dependency("kramdown")
   s.add_development_dependency("slim")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-syntax
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Ben Hollis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2024-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -42,32 +42,18 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: fivemat
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -131,8 +117,8 @@ extra_rdoc_files: []
 files:
 - ".devcontainer/Dockerfile"
 - ".devcontainer/devcontainer.json"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -168,7 +154,7 @@ homepage: https://github.com/middleman/middleman-syntax
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,8 +169,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Code syntax highlighting plugin via rouge for Middleman
-test_files: []
+test_files:
+- features/haml_filter.feature
+- features/helper.feature
+- features/markdown.feature
+- features/markdown_line_numbers_disabled.feature
+- features/markdown_line_numbers_enabled.feature
+- features/support/env.rb
+- features/support/step_definitions.rb
+- fixtures/test-app/config.rb
+- fixtures/test-app/source/code.html.markdown
+- fixtures/test-app/source/code_haml.html.haml
+- fixtures/test-app/source/code_haml_filter.html.haml
+- fixtures/test-app/source/code_html.html.erb
+- fixtures/test-app/source/code_slim.html.slim
+- fixtures/test-app/source/code_with_disabled_line_numbers.html.markdown
+- fixtures/test-app/source/code_with_enabled_line_numbers.html.markdown

data/.travis.yml

@@ -1,14 +0,0 @@
-rvm:
-  - ruby-head
-  - 2.6.3
-  - 2.5.5
-os:
-  - linux
-matrix:
-  fast_finish: true
-  allow_failures:
-    - rvm: ruby-head
-script: "bundle exec rake test"
-
-env: TEST=true
-sudo: false