middleman-syntax 3.2.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2938584ddd836e4ce6674e01ad8eab8ac96d87f319261d1d642d0e1975d4d495
-  data.tar.gz: 3fd48b680357a1c4fc8c965495e5540cce89910b0697bcfc68056602a4385180
+  metadata.gz: e10bda9e80f47020802183bad3a3849929d927afd99d2da43f0bf67547213028
+  data.tar.gz: f930e8d69b461e426ae8e3ad63b3111d6b2607df9b66cee73fcd7f88e5d9fda8
 SHA512:
-  metadata.gz: 693ec6000db5121c3e111e6d52c424c3cf9cff277f952b1c05485d25a60580b82b2ffd5ad782c98c61774d4245efa7fa46a28380068d4e62bdc16778b0cfbbb5
-  data.tar.gz: 85be352460bc44e32b05f3d114da90ce9e620aeb996bb0582a43d14f9926de0aae58aaaee63342ee74235f758c260f8ea2b1bee42b8056bafff7a878969ec54f
+  metadata.gz: b7d960fc8adae60a7f21b67ba7ebbfd7c103121ac000ff94361fee9fcdb64e2df6c8a57161f125103c296c4c242943d5b5593e7f9b29b621d2a0b2c223ecaa52
+  data.tar.gz: 141ea649e0a810ecfde705d7072290a85377bc2d73194fed063da2adb5bd03e85a74b09c35f87fb9fef7aab40f74e5af501ae1c581b3063ae8e0f8108a3b76af

data/.devcontainer/Dockerfile

@@ -0,0 +1,19 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/ruby/.devcontainer/base.Dockerfile
+
+# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.1, 3.0, 2, 2.7, 3-bullseye, 3.1-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 3-buster, 3.1-buster, 3.0-buster, 2-buster, 2.7-buster
+ARG VARIANT="3.1-bullseye"
+FROM mcr.microsoft.com/vscode/devcontainers/ruby:0-${VARIANT}
+
+# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
+ARG NODE_VERSION="none"
+RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi
+
+# [Optional] Uncomment this section to install additional OS packages.
+# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
+#     && apt-get -y install --no-install-recommends <your-package-list-here>
+
+# [Optional] Uncomment this line to install additional gems.
+# RUN gem install <your-gem-names-here>
+
+# [Optional] Uncomment this line to install global node packages.
+# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1

data/.devcontainer/devcontainer.json

@@ -0,0 +1,37 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.241.1/containers/ruby
+{
+	"name": "Ruby",
+	"build": {
+		"dockerfile": "Dockerfile",
+		"args": { 
+			// Update 'VARIANT' to pick a Ruby version: 3, 3.1, 3.0, 2, 2.7
+			// Append -bullseye or -buster to pin to an OS version.
+			// Use -bullseye variants on local on arm64/Apple Silicon.
+			"VARIANT": "2.7",
+			// Options
+			"NODE_VERSION": "lts/*"
+		}
+	},
+
+	// Configure tool-specific properties.
+	"customizations": {
+		// Configure properties specific to VS Code.
+		"vscode": {
+			// Add the IDs of extensions you want installed when the container is created.
+			"extensions": [
+				"rebornix.Ruby"
+			]
+		}
+	},
+	
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "ruby --version",
+
+	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	"remoteUser": "vscode"
+
+}

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,17 +1,31 @@
+# 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
@@ -30,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/features/haml_filter.feature

@@ -11,3 +11,15 @@ Feature: Haml :code filter.
     When I go to "/code_haml_filter.html"
     Then I should see '<span class="k">def</span>'
     Then I should see '<pre class="highlight plaintext"><code>This is some code'
+
+  Scenario: Filter doesn't keep trailing blank lines
+    Given a fixture app "test-app"
+    And a file named "config.rb" with:
+      """
+      set :haml, { :ugly => false }
+      activate :syntax
+      """
+    Given the Server is running at "test-app"
+    When I go to "/code_haml_filter.html"
+    Then I should see '<span class="k">def</span>'
+    Then I should see '<pre class="highlight plaintext"><code>This is some code</code></pre>'

data/lib/middleman-syntax/extension.rb

@@ -9,6 +9,7 @@ module Middleman
     class SyntaxExtension < Extension
       option :css_class, 'highlight', 'Class name applied to the syntax-highlighted output.'
       option :line_numbers, false, 'Generate line numbers.'
+      option :line_numbers_div, false, 'Generate line numbers with wrapping divs.'
       option :start_line, 1, 'Start the line numbering (if enabled) at the desired integer'
       option :inline_theme, nil, 'A Rouge::CSSTheme that will be used to highlight the output with inline styles instead of using CSS classes.'
       option :wrap, true, 'Wrap the highlighted content in a container (<pre> or <div>, depending on whether :line_numbers is on).'

data/lib/middleman-syntax/formatters.rb

@@ -12,6 +12,8 @@ module Middleman
                        end
 
           @formatter = Rouge::Formatters::HTMLTable.new(@formatter, opts) if opts[:line_numbers]
+        
+          @formatter = Rouge::Formatters::HTMLLinewise.new(@formatter, class:'line-%i') if opts[:line_numbers_div]
 
           if opts.fetch(:wrap, true)
             @formatter = Rouge::Formatters::HTMLPygments.new(@formatter, opts.fetch(:css_class, 'codehilite'))

data/lib/middleman-syntax/haml_monkey_patch.rb

@@ -1,21 +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.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/language_parameter_parser.rb

@@ -9,6 +9,9 @@ module Middleman
           if attribute == "line_numbers" and value == "false"
             return { line_numbers: false }
           end
+          if attribute == "line_numbers_div" and value == "false"
+            return { line_numbers_div: false }
+          end
         end
         {}
       end

data/lib/middleman-syntax/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Syntax
-    VERSION = "3.2.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.2.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Ben Hollis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-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:
     - - ">="
@@ -129,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -166,7 +154,7 @@ homepage: https://github.com/middleman/middleman-syntax
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -181,8 +169,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Code syntax highlighting plugin via rouge for Middleman
 test_files:

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