jekyll_flexible_include 2.0.21 → 2.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 000dda7b37378861311b6663e9e1e246da0479ddde8a115674a1001833655b0a
-  data.tar.gz: ea530cdba36b41a67e5d60eb6ba15b51ff051e5b13a109cda8f81d362bfc08b0
+  metadata.gz: a2bbd3d775f087cefca7f18e68966dc58afb1b19099154b7e56dce5fba9b6f25
+  data.tar.gz: '065912548161e1cce5d139566f370cabe68ad0521e87e7dd50f424e3a8e958f0'
 SHA512:
-  metadata.gz: 815da6cd2afecfbab624e4392d7127cbc7e238f203c44c7d24b5c98258cf39013ce90026cab5942f061dc894049f899c271b4252bcace82198a2f0abdf7d55cf
-  data.tar.gz: 07e0cf4ae181bd334aa9fc79a7cb396cad3cf9a2750ba6ca3d37d17782518cd01a1671beac0b83db2ee914b619f41e869ecf0595b6de2fb364fa2c9d380a5508
+  metadata.gz: 6c965faec3f89eb9d005dc2ad7fea3847f77d716039b9f903f8f84ea20e49ba991f016664013826d0fb4e044203a7ae82338aca7b1b7a699a8d1e59ae18f4f62
+  data.tar.gz: b4fb7d8c8b0afddef8f0c5d359b5bbe7077ae4418b38641e6f52dd537005a75c7a47a2eb371ea3de24cc4269295e423f8ff8a3b1c719e2f8b8c862f9ed4f8b20

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Change Log
 
+## 2.0.23 / 2024-07-22
+
+* Made compatible with `jekyll_plugin_support` v1.0.0
+
+
+## 2.0.22 / 2024-02-27
+
+* Improved error reporting
+
+
 ## 2.0.21 / 2023-11-16
 
 * Restructured code

data/jekyll_flexible_include_plugin.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.version = JekyllFlexibleIncludePluginVersion::VERSION
 
   spec.add_dependency 'jekyll_from_to_until'
-  spec.add_dependency 'jekyll_plugin_support', '>= 0.7.3'
+  spec.add_dependency 'jekyll_plugin_support', '>= 1.0.0'
+  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.21'.freeze
+  VERSION = '2.0.23'.freeze
 end

data/lib/flexible_include.rb

@@ -25,7 +25,7 @@ module FlexibleInclude
 
     def render_impl
       setup
-      @path = JekyllPluginHelper.expand_env @filename
+      @path = ::JekyllSupport::JekyllPluginHelper.expand_env @filename, @logger
       handle_path_types
       render_completion
     rescue Errno::EACCES => e
@@ -89,7 +89,7 @@ module FlexibleInclude
                         "of #{@page['name']} denied by DISABLE_FLEXIBLE_INCLUDE value.")
         end
 
-        @filename = JekyllPluginHelper.remove_quotes(@helper.argv.first) if @helper.argv.first
+        @filename = ::JekyllSupport::JekyllPluginHelper.remove_quotes(@helper.argv.first) if @helper.argv.first
         @filename = @filename.delete_prefix '!'
         @contents = run(@filename)
       else # Relative path
@@ -99,6 +99,6 @@ module FlexibleInclude
       end
     end
 
-    JekyllPluginHelper.register(self, 'flexible_include')
+    ::JekyllSupport::JekyllPluginHelper.register(self, 'flexible_include')
   end
 end

data/lib/flexible_include_class.rb

@@ -14,8 +14,8 @@ module FlexibleInclude
     end
 
     def normalize_path(path)
-      JekyllPluginHelper.expand_env(path, die_if_undefined: true)
-                        .gsub('~', Dir.home)
+      ::JekyllSupport::JekyllPluginHelper.expand_env(path, die_if_undefined: true)
+                                         .gsub('~', Dir.home)
     end
 
     def number_content(content)

data/lib/flexible_include_private_methods.rb

@@ -1,4 +1,5 @@
 require 'pathname'
+require 'English'
 require 'jekyll_from_to_until'
 
 module FlexibleInclude
@@ -98,6 +99,7 @@ module FlexibleInclude
       raise e
     rescue StandardError => e
       @do_not_escape = true
+      e = e.exception "'#{e.message}' while executing '#{cmd}'"
       maybe_reraise_error(e, throw_error: @die_on_run_error)
     end
 

data/spec/flexible_include_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe(FlexibleInclude) do
 
     expect(described_class.access_allowed('~/.mem_settings.yaml')).to be_truthy
 
-    home_file = JekyllPluginHelper.expand_env('$HOME/.mem_settings.yaml')
+    home_file = JekyllPluginHelper.expand_env '$HOME/.mem_settings.yaml'
     expect(described_class.access_allowed(home_file)).to be_truthy
 
     expect(described_class.access_allowed('/asdf')).to be_falsey

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll_flexible_include
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.23
 platform: ruby
 authors:
 - Mike Slinn
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-22 00:00:00.000000000 Z
+date: 2024-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll_from_to_until
@@ -32,14 +32,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: jekyll-sass-converter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Jekyll plugin supports various ways to include content into the generated