no-style-please2-plugins 0.10.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f82e1c6a05044ef732806e52e77c0fc951f0deb1b90160d6e877e7da2470a14a
-  data.tar.gz: f20c7c46f7bc1ddb8faef3b8d8465d35db325c6fae51d283228c5268b95ec731
+  metadata.gz: afe6e6995a5c47069cd2b21d4e48a1cf29afab98905f355f227e1241cb30ee4b
+  data.tar.gz: 2c09e5836ff991484ad4ed9bd62e3c3b48e1be398bd77c66f17687bcdc854f13
 SHA512:
-  metadata.gz: d58cd20a98fa8d47b20e7d9a3e924a5c12a7a8eda34fe778efc7b1b56786e2a41856c88d1e2164a8ed0106020310d85113c35182c7de6f3374e98f66a7fdb602
-  data.tar.gz: 27aedd26b1c4a59e93da490e58f97a1a58746e41f44b5cc01948909b9044ce897a2e3b234187d304bc8390fdf6b70909844b21434bd423edb7d9b7315de2f1f3
+  metadata.gz: faa96fe0004c5b9a525f5feb106aaf68ad788e2659a0aaea1d3662ac3b0b177a957215e6e37adab275f2e532f9f7b53eef05be249d92ef83a2c9cefd8ae1ee44
+  data.tar.gz: 29a9c97558cce0c387fda8a94163ffe5cb75e9d171e65424e7dcf74c25d6df2d90593e09613ab24a5d0749187141cd0a764609990b51ca12a3cddac9801d699a

data/lib/ext.rb

@@ -127,7 +127,7 @@ module Jekyll
   
       def initialize(tag_name, text, tokens)
         rootPath0 = $g_config['include_file_path'] || 'assets'
-        filePath0 = "#{rootPath0}/#{text}".strip!()
+        filePath0 = "#{rootPath0}/#{text}".strip()
         begin
           file = File.open(filePath0)
           @filecontent = file.read()
@@ -152,9 +152,9 @@ module Jekyll
 
         rootPath = $g_config['code_root_path'] || 'static'
         if text.start_with?("/")
-          filePath = "#{text}"[1..-1].strip!()
+          filePath = "#{text}"[1..-1].strip()
         else
-          filePath = "#{rootPath}/#{text}".strip!()
+          filePath = "#{rootPath}/#{text}".strip()
         end
         filePath = File.expand_path(filePath)
         puts "--------- include code: #{filePath}"
@@ -183,31 +183,75 @@ EOF
 
 
     class IncludeRaw < Liquid::Tag
-      @filecontent = ""
-      def initialize(tag_name, text, tokens)
-
+      Syntax = /\s*file\s*=\s*(\S+)/
+ 
+       
+      def getPath(text,context)
         rootPath = $g_config['code_root_path'] || 'static'
         if text.start_with?("/")
-          filePath = "#{text}"[1..-1].strip!()
+          filePath = "#{text}"[1..-1].strip()
+          filePath = File.expand_path(filePath)
+        elsif  text.start_with?("@") 
+          # _include/
+          filePath = "#{text}"[1..-1].strip()
+
+
+          site = context.registers[:site]
+          user_include_path = File.join(site.source, "_includes", filePath)
+
+          site = Jekyll.sites.first # 或你自己已有的 site
+          theme = site.theme
+
+          themeroot = theme.root # 就是当前主题的根目录
+          plugin_include_file = File.join(themeroot, "_includes/" + filePath)
+
+          if File.exist?(user_include_path)
+            filePath = user_include_path
+          elsif File.exist?(plugin_include_file)
+            filePath = plugin_include_file
+          else
+            filePath = user_include_path
+          end
+
+
         else
-          filePath = "#{rootPath}/#{text}".strip!()
+          filePath = "#{rootPath}/#{text}".strip()
+          filePath = File.expand_path(filePath)
         end
-        filePath = File.expand_path(filePath)
-        puts "--------- include raw:\n #{filePath}"
+        return filePath
+      end
+      def initialize(tag_name, text, tokens)
+
+        @file = ""
+        @dynamicFile = ""
+
+        if text =~ Syntax
+          dynfile = Regexp.last_match(1) 
+          @dynamicFile = dynfile.gsub(/^['"]|['"]$/, '')
+        else
+          @filename = text.gsub(/^['"]|['"]$/, '')
+        end
+        
+       
         
+      end
+      
+      def render(context)
+        filePath = @filename
+        if @dynamicFile.length > 1
+          filePath = context[@dynamicFile]
+        end
+        filePath = getPath(filePath,context)
+
+        puts "include_raw :#{filePath} failed   #{@dynamicFile}"
         begin
           file = File.open(filePath)
-          @filecontent = file.read()
+          return file.read()
         rescue => exception
           puts exception
-          @filecontent = "load file:#{filePath} failed"
+          return "Load file:#{filePath} failed   #{@dynamicFile}"
           
         end
-        
-      end
-      
-      def render(context)
-        return @filecontent
       end
     end
 

data/lib/version/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NoStylePlease2
-  VERSION = "0.10.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: no-style-please2-plugins
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.1
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-04-25 00:00:00.000000000 Z
+date: 2025-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll