middleman-syntax 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2938584ddd836e4ce6674e01ad8eab8ac96d87f319261d1d642d0e1975d4d495
-  data.tar.gz: 3fd48b680357a1c4fc8c965495e5540cce89910b0697bcfc68056602a4385180
+  metadata.gz: '069a5916deb149f37860dd78cd181278367e1ae343d4053e619d902e2fb3f87e'
+  data.tar.gz: 3e3e12eef81c32dfc9d683f8925e65d1fc22ed714b869880a8719acaf1c8e50a
 SHA512:
-  metadata.gz: 693ec6000db5121c3e111e6d52c424c3cf9cff277f952b1c05485d25a60580b82b2ffd5ad782c98c61774d4245efa7fa46a28380068d4e62bdc16778b0cfbbb5
-  data.tar.gz: 85be352460bc44e32b05f3d114da90ce9e620aeb996bb0582a43d14f9926de0aae58aaaee63342ee74235f758c260f8ea2b1bee42b8056bafff7a878969ec54f
+  metadata.gz: 98e67a62f908fa76c4588dbd32b39f1374831a944efd604794ee157a9693c45c87b657bcb7497d36c1d162fbd7928fd0e94549c3350b018685419554335222ce
+  data.tar.gz: 1e1c3c2dcf955bbe33b8ca8ffbacb77fcd96896123927971bba2fe3bdeb78a762bdaf53d5aae7ac799a1f5a7e19ea1c064438a3e15b3630d1390470133ce8f44

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/CHANGELOG.md

@@ -1,3 +1,5 @@
+- Fixed HAML :code filter to remove trailing blank lines
+
 # 3.2.0
 
 - Prep for Middleman v5

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

@@ -6,6 +6,7 @@ if defined? Haml
         include Base
 
         def render(code)
+          code = code.rstrip
           code = code.encode(Encoding::UTF_8)
 
           # Allow language to be specified via a special comment like:

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.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: middleman-syntax
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Ben Hollis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: middleman-core
@@ -129,6 +129,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".devcontainer/Dockerfile"
+- ".devcontainer/devcontainer.json"
 - ".gitignore"
 - ".travis.yml"
 - CHANGELOG.md
@@ -181,23 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Code syntax highlighting plugin via rouge for Middleman
-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
+test_files: []