jekyll-generator-single-source 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2aca19672cf3db42a62347e77ca5576f7e83c7044150ad7fa8f34425e39086e7
-  data.tar.gz: 8ed57306afbc005b1958ff14dc7819070d10c4dd575dc018fd2abcb1f9c7733b
+  metadata.gz: 48cda7ea8aab0b172ac8a43d6e1f994d9dbf00cbba8489ad4d886d11c752675a
+  data.tar.gz: 1725101cef6faad0f034db3bb0c4f4feb427905f8bf1aac58510a279031ee997
 SHA512:
-  metadata.gz: 9ed3e1fe6f04b3ff6d8f24e7be951998617b6d496752fdb5ca7d436d7759b81ee9f5c53f4e2475c03221237d351a4c122ae5d20351e860a2f5625a5e8a6ed4fd
-  data.tar.gz: 9551d769cfe366db6cf50a338435f5e2decb30c24c3bcc022d00b5c65b5b68749071c2b035bdd77eedb7c3fea554b4789dfe6d21948021f94601bc8a376baaec
+  metadata.gz: dd24705318c18e46b31f632dff3577f94ec8e74a10c02895304df31d030ae67b70dd85d114101d24c908cbbe217c527bde70abf5d3f4706dc700f17f4eff68a6
+  data.tar.gz: 2a8aab8f8ca538c99287fcd936ef98f885a136da3a920f0f70bb608b6c06fd06fc5c6c70bd49be44125029f6248676176e5139c4a5db23e320ef0e84477905e0

data/lib/jekyll/generator-single-source/liquid/tags/version_is.rb

@@ -4,7 +4,7 @@ module Jekyll
   module GeneratorSingleSource
     module Liquid
       module Tags
-        class  VersionIs < ::Liquid::Block
+        class VersionIs < ::Liquid::Block
           def initialize(tag_name, markup, tokens)
             @tag = markup
 
@@ -25,19 +25,29 @@ module Jekyll
             # If there's an exact match, check only that
             if @params.key?(:eq)
               version = to_version(@params[:eq])
-              return '' unless current_version == version
+              if Gem::Version.correct?(current_version)
+                return '' unless current_version == version
+              else
+                return '' unless version > to_version(page['latest_released_version'])
+              end
             end
 
             # If there's a greater than or equal to check, fail if it's lower
             if @params.key?(:gte)
               version = to_version(@params[:gte])
-              return '' unless current_version >= version
+              if Gem::Version.correct?(current_version)
+                return '' unless current_version >= version
+              end
             end
 
             # If there's a less than or equal to heck, fail if it's higher
             if @params.key?(:lte)
               version = to_version(@params[:lte])
-              return '' unless current_version <= version
+              if Gem::Version.correct?(current_version)
+                return '' unless current_version <= version
+              else
+                return '' unless version > to_version(page['latest_released_version'])
+              end
             end
 
             # Table rows (starts newline then |, ends with | then newline) need
@@ -60,7 +70,11 @@ module Jekyll
           end
 
           def to_version(input)
-            Gem::Version.new(input.gsub(/\.x$/, '.0'))
+            if Gem::Version.correct?(input)
+              Gem::Version.new(input.gsub(/\.x$/, '.0'))
+            else
+              input
+            end
           end
         end
       end

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,30 +36,38 @@ 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'))
+       if Gem::Version.correct?(input)
+         Gem::Version.new(input.gsub(/\.x$/, '.0'))
+       else
+         input
+       end
       end
     end
   end

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.5'
   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.5
 platform: ruby
 authors:
 - Fabian Rodriguez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-20 00:00:00.000000000 Z
+date: 2023-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement