jekyll_flexible_include 2.0.24 → 2.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e55df13c1d72abd77ed8e3c3c38b9b90948421f88b42a069a067df044aae6fe7
-  data.tar.gz: 366f8ca463a84047d0e8ccfc6c4a861ee1516318ce6f5eb715d6feb4e0267947
+  metadata.gz: 90105bf937a22652cb622a28c288427ea3a631cec5eeb811360eff7bcaa405de
+  data.tar.gz: 5564b7d84f0860c7f52f5ff9683f58a9802460d9de9a1ad36f427cfaa3c31df8
 SHA512:
-  metadata.gz: b4dd897174369c3e5bf440d97eb95c0870b6566f10de91a9028c37ad8a5a3c7a9c62f675e2431d00a540511465dd4d849d2dd4a87952cff61a08d44b0886c57d
-  data.tar.gz: 22591d355535172b074c52f7522ebbbbda39a1c94d6e0107c1bd08b7fe85d051cc04cf3160092fb82e5e90cb020bfd225cb4963006b979c8ae9571598b7386c4
+  metadata.gz: e5bc5bbeac42ca37bd83058b1adf392e6029a31fc3ed2b2edd968dba0211adef8e1f72a6dc84722a6de3adb88f2fc672bf51ef6722af1dd01855d6420ebb4b6c
+  data.tar.gz: 9d41c9be9c84f77f5338ada0c22441b035d7f050d619cf10dad50aed4adbc7da117faa66cd0114fdad471274d40ab535af74879e335474949b1276d41b5bab8e

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Change Log
 
+## 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
+
+
 ## 2.0.24 / 2024-00-20
 
 * Made compatible with `jekyll_plugin_support` v1.0.2

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
@@ -185,6 +185,8 @@ and a red error message will be logged on the console that says something like:
 
 ## Installation
 
+### Gem
+
 1. Add the following to `Gemfile`, inside the `jekyll_plugins` group:
 
    ```ruby
@@ -213,6 +215,36 @@ and a red error message will be logged on the console that says something like:
    $ bundle
    ```
 
+### CSS and Assets
+
+Copy assets and CSS from the demo/ directory of the jekyll_pre GitHub project.
+
+- Copy `demo/assets/images/clippy.svg` to a directory of the same name in your Jekyll project.
+- Copy `demo/assets/css/jekyll_plugin_support.css` to your Jekyll project assets directory.
+- Copy `demo/assets/css/shared_include_pre.css` to your Jekyll project assets directory.
+- Copy `demo/assets/css/jekyll_flexible_include.css` to your Jekyll project assets directory.
+- Incorporate the CSS stylesheets into the appropriate layout in your Jekyll project:
+
+```html
+{% assign nowMillis = site.time | date: '%s' %}
+<link rel="stylesheet" href="{{ '/assets/css/jekyll_plugin_support.css?v=' | append: nowMillis }}" type="text/css">
+<link rel="stylesheet" href="{{ '/assets/css/shared_include_pre.css?v=' | append: nowMillis }}" type="text/css">
+<link rel="stylesheet" href="{{ '/assets/css/jekyll_flexible_include.css?v=' | append: nowMillis }}" type="text/css">
+```
+
+
+### JavaScript
+
+Copy `demo/assets/js/clipboard.min.js` from the `jekyll_flexible_include_plugin` GitHub project
+to your Jekyll project’s JavaScript directory.
+
+Modify the Jekyll layout or selected pages to load the JavaScript.
+You can load it from your project, as shown below, or from a CDN.
+
+```html
+<script defer src="/assets/js/clipboard.min.js"></script>
+```
+
 
 ## Examples
 

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'
-  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.24'.freeze
+  VERSION = '2.0.26'.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

@@ -6,6 +6,8 @@ require 'jekyll_from_to_until'
 
 module FlexibleInclude
   module FlexiblePrivateMethods
+    include FromToUntil
+
     def denied(msg)
       msg_no_html = remove_html_tags(msg)
       @logger.error { "#{@page['path']} - #{msg_no_html}" }
@@ -17,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.24
+  version: 2.0.26
 platform: ruby
 authors:
 - Mike Slinn
 - Tan Nhu
 - Maarten Brakkee
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll_from_to_until
@@ -18,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: jekyll_plugin_support
   requirement: !ruby/object:Gem::Requirement
     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
@@ -121,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Jekyll plugin supports various ways to include content into the generated
   site.