jekyll-generator-single-source 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aca19672cf3db42a62347e77ca5576f7e83c7044150ad7fa8f34425e39086e7
-  data.tar.gz: 8ed57306afbc005b1958ff14dc7819070d10c4dd575dc018fd2abcb1f9c7733b
+  metadata.gz: aaa7fc639637793b289f7e6aa4d3789bfabaa63c98fcd60ddfb646c4fe3bd7a3
+  data.tar.gz: d0a69a8d0b809d597af1d7136ab4ea61e2c1201b0be16217fb4669c035ef313f
 SHA512:
-  metadata.gz: 9ed3e1fe6f04b3ff6d8f24e7be951998617b6d496752fdb5ca7d436d7759b81ee9f5c53f4e2475c03221237d351a4c122ae5d20351e860a2f5625a5e8a6ed4fd
-  data.tar.gz: 9551d769cfe366db6cf50a338435f5e2decb30c24c3bcc022d00b5c65b5b68749071c2b035bdd77eedb7c3fea554b4789dfe6d21948021f94601bc8a376baaec
+  metadata.gz: 5799ee54ea764e6486d6404a815b211dca85fbf37cf07a89c2215e3d622adab62dcb0330619dd21951d8bb47255702808a77709d81c3ed6632bbc74cf05ac27c
+  data.tar.gz: d9b2463ea71fdd0e59f3bdfcd59a58d15de35a98fda8e3767f48f634a8d3879f336a433339806dd872db23a1f58de58baa49ef4b294b9ceb3e041de9ebc0b9bf

data/lib/jekyll/generator-single-source/single_source_page.rb

@@ -26,7 +26,6 @@ module Jekyll
         @data['edit_link'] = nav_item.source.file_path
 
         # Make it clear that this content comes from a generated file
-        @data['path'] = "GENERATED:nav=#{nav_item.nav}:src=#{nav_item.source.file_path}:#{@dir}"
         @data['is_dir_index'] = nav_item.source.dir?
 
         # Set the current release and concrete version
@@ -37,27 +36,31 @@ module Jekyll
         # Set the layout if it's not already provided
         @data['layout'] ||= GeneratorConfig.new(@site).layout
 
+        # Apply any overrides
+        current = to_version(@data['release'])
+        @data['overrides']&.each do |key, entries|
+          entries.each do |value, conditions|
+            gte = conditions['gte'] ? to_version(conditions['gte']) : nil
+            lte = conditions['lte'] ? to_version(conditions['lte']) : nil
+            eq = conditions['eq'] ? to_version(conditions['eq']) : nil
 
-       # Apply any overrides
-       current = to_version(@data['release'])
-       @data['overrides']&.each do |key, entries|
-         entries.each do |value, conditions|
-           gte = conditions['gte'] ? to_version(conditions['gte']) : nil
-           lte = conditions['lte'] ? to_version(conditions['lte']) : nil
-           eq = conditions['eq'] ? to_version(conditions['eq']) : nil
+            if gte && lte
+              @data[key] = value if current >= gte && current <= lte
+            elsif gte
+              @data[key] = value if current >= gte
+            elsif lte
+              @data[key] = value if current <= lte
+            elsif eq
+              @data[key] = value if current == eq
+            end
+          end
+        end
 
-           if gte && lte
-             @data[key] = value if current >= gte && current <= lte
-           elsif gte
-             @data[key] = value if current >= gte
-           elsif lte
-             @data[key] = value if current <= lte
-           elsif eq
-             @data[key] = value if current == eq
-           end
-         end
-       end
-     end
+        # Needed so that regeneration works for single sourced pages
+        # It must be set to the source file
+        # Also, @path MUST NOT be set, it falls back to @relative_path
+        @relative_path = nav_item.source.file_path
+      end
 
      def to_version(input)
        Gem::Version.new(input.gsub(/\.x$/, '.0'))

data/lib/jekyll/generator-single-source/source/base.rb

@@ -4,7 +4,7 @@ module Jekyll
   module GeneratorSingleSource
     module Source
       class Base
-        PATH = 'src'
+        PATH = '_src'
 
         def self.make_for(path:, site:)
           # Normalize path
@@ -13,7 +13,7 @@ module Jekyll
             path.delete_prefix('/').delete_suffix('/')
           )
 
-          src_dir = File.expand_path('..', site.source)
+          src_dir = File.expand_path(site.source)
 
           # Read the source file, either `<src>.md or <src>/index.md`
           if File.exist?(File.join(src_dir, "#{file_path}.md"))

data/lib/jekyll/generator-single-source/version.rb

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GeneratorSingleSource
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-generator-single-source
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Fabian Rodriguez
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -72,7 +72,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.11'
-description:
+description: 
 email:
 - fabian.rodriguez@konghq.com
 executables: []
@@ -104,7 +104,7 @@ homepage: https://github.com/kong/jekyll-generator-single-source
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -119,8 +119,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.24
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: A Jekyll plugin to dynamically generate pages from a single source file
 test_files: []