jekyll_flexible_include 2.0.25 → 2.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c41e1810d12f5452b662944c1903eff7b04d944497ce8565e9bd0f7cf42902
-  data.tar.gz: b5b8592e381e6e5b494018e340cc5e59c8f4422195e719c5c60e9e7252ca37f3
+  metadata.gz: 67f3e7b3a00f5c61ca7a1a811076e3658e1455bc4b9a846095dff44cbac849a3
+  data.tar.gz: 3393282c6df4d789b490bc2b93259c1ab19b12135ef2e374d5e075ce669d19de
 SHA512:
-  metadata.gz: 7b49278506aa5230d915bd2bd919c94e5fa111cf1c5414ae0b1cf4d961e12a510b4b22904b50e9bb21b596784cea498a0f982a90c4a443db9fa0b5817cb00fae
-  data.tar.gz: 3bd38e8915a07260bd17d8eab24c35671b1c7067e9d556cb1b76b9fd75c6c11e471e434f1177cd5dd4b40553bc0fd6addfe19de28ce4cd69d179b599b658d4c2
+  metadata.gz: a06435f6b338f5391c301401e62109fd75ee8f0099cb8a8eb39f64a49a1c7d76d36ad46b9916347535dbd068625ce69b9eeef6e1e8a73bb9f8b6e96f16118e7a
+  data.tar.gz: c80358ed148a45ce66b0cef6baabc9c2db5cc36d5d6745c620b56100426bfccd55d470933bdbc63c3bdbbb0c39e0389dc1b34bab74ca13c18821ffa1132d0486

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 2.0.27 / 2025-09-25
+
+* Handle evaluation of Windows-style env var on a non-Windows machine #16
+
+
+## 2.0.26 / 2025-09-13
+
+* Replaced the CSS class `bg_yellow` with `bg_yellow_nopad`.
+* Windows environment variables references provided to the `file` option are looked up.
+  If they are not found, they are removed (just like CMD.EXE.)
+  Requires `jekyll_plugin_support` .
+
+
 ## 2.0.25 / 2024-12-11
 
 * Fixed `from` / `to` / `until` issue

data/README.md

@@ -93,7 +93,7 @@ and are not intended to be written literally.
 - `from='regex'` specifies that the beginning of the output should discarded until the matching string or regex is encountered.
 
 - `highlight='regex pattern here'` wraps content matching the regex pattern within a
-  `<span class='bg_yellow'></span>` tag.
+  `<span class='bg_yellow_nopad'></span>` tag.
   Note that the pattern can simply consist of the exact text that you want to highlight.
 
 - `pre` is a keyword option that causes the included file to be wrapped inside a
@@ -268,8 +268,13 @@ You can load it from your project, as shown below, or from a CDN.
 
 ## Additional Information
 
-More information is available on
-[Mike Slinn&rsquo;s website](https://www.mslinn.com/blog/2020/10/03/jekyll-plugins.html).
+The complete documentation is available on
+[Mike Slinn&rsquo;s website](https://mslinn.com/jekyll_plugins/jekyll_flexible_include.html).
+
+Topics that are not mentioned in this `README.md` file include:
+
+- How environment variables are expanded on Linux, Mac and Windows.
+- Numbering lines.
 
 
 ## GitHub Pages

data/jekyll_flexible_include_plugin.gemspec

@@ -35,8 +35,8 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.test_files = spec.files.grep(%r!^(test|spec|features)/!)
   spec.version = JekyllFlexibleIncludePluginVersion::VERSION
 
-  spec.add_dependency 'jekyll_from_to_until', '>= 1.0.5'
-  spec.add_dependency 'jekyll_plugin_support', '>= 1.0.3'
+  spec.add_dependency 'jekyll_from_to_until',  '>= 1.0.5'
+  spec.add_dependency 'jekyll_plugin_support', '>= 3.1.1'
   spec.add_dependency 'jekyll-sass-converter', '= 2.2.0'
   spec.add_dependency 'rugged'
 end

data/lib/flexible_include/version.rb

@@ -1,3 +1,3 @@
 module JekyllFlexibleIncludePluginVersion
-  VERSION = '2.0.25'.freeze
+  VERSION = '2.0.27'.freeze
 end

data/lib/flexible_include.rb

@@ -34,9 +34,12 @@ module FlexibleInclude
       END_MSG
     end
 
+    # Look for *nix version of @path if Windows expansion did not yield a file that exists
     def render_impl
       setup
       @path = ::JekyllSupport::JekyllPluginHelper.expand_env @filename, @logger
+      linux_path = `wslpath '#{@path}' 2>/dev/null`.chomp
+      @path = linux_path if !File.exist?(@path) && File.exist?(linux_path)
       handle_path_types
       render_completion
     rescue Errno::EACCES => e

data/lib/flexible_include_private_methods.rb

@@ -19,7 +19,7 @@ module FlexibleInclude
     def highlight(content, pattern)
       raise FlexibleIncludeError, "content is a #{content.class}, not a String" unless content.instance_of? String
 
-      content.gsub(Regexp.new(pattern), "<span class='bg_yellow'>\\0</span>")
+      content.gsub(Regexp.new(pattern), "<span class='bg_yellow_nopad'>\\0</span>")
     end
 
     def maybe_raise_error(msg, throw_error: true)

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_flexible_include
 version: !ruby/object:Gem::Version
-  version: 2.0.25
+  version: 2.0.27
 platform: ruby
 authors:
 - Mike Slinn
 - Tan Nhu
 - Maarten Brakkee
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-16 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll_from_to_until
@@ -32,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: jekyll-sass-converter
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +92,6 @@ files:
 - spec/flexible_include_spec.rb
 - spec/git_file_reader_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
 homepage: https://www.mslinn.com/jekyll_plugins/jekyll_flexible_include.html
 licenses:
 - MIT
@@ -121,8 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Jekyll plugin supports various ways to include content into the generated
   site.
@@ -130,5 +127,4 @@ test_files:
 - spec/flexible_include_spec.rb
 - spec/git_file_reader_spec.rb
 - spec/spec_helper.rb
-- spec/status_persistence.txt
 ...

data/spec/status_persistence.txt

@@ -1,7 +0,0 @@
-example_id                           | status | run_time        |
------------------------------------- | ------ | --------------- |
-./spec/flexible_include_spec.rb[1:1] | passed | 0.00164 seconds |
-./spec/git_file_reader_spec.rb[1:1]  | failed | 0.04395 seconds |
-./spec/git_file_reader_spec.rb[1:2]  | passed | 0.0411 seconds  |
-./spec/git_file_reader_spec.rb[1:3]  | passed | 0.03189 seconds |
-./spec/git_file_reader_spec.rb[1:4]  | passed | 0.02975 seconds |