jekyll-generator-single-source 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 253e5fa9d7d9bb93a522582300e462ed95aacf538537b75f366227b746324d55
-  data.tar.gz: cab91867c2467dbc009b072d331f17e36485e72e3d37ba43e516051dc9a7936e
+  metadata.gz: d938be264eb53f48ab4f3a85dcc1dc2a5c92879454e682ea81bb5d1abf29dcf2
+  data.tar.gz: b61ee8aa0ee3817b032ba99a4c756a5b93a564cd817511da7db85a9a133160cf
 SHA512:
-  metadata.gz: c39a9d017eef7e7f15e13cf8b1d0e96e63afcfa10252d4fa1ca4a99adfb6f6e719eda55f90769839a5511e28be3fb9d6dcfc42247f7788ee23a649b7a6e2d0ee
-  data.tar.gz: a447aadeb5a01e7d09331ee0668f449c9e6c4b316e0d9a420dd4560cf375147c532764e2d6eb037a953886b9ce3d772dddbc365f16ffaedbb52e4d04a0ac24bb
+  metadata.gz: 3a982ea197e630d41bb73170a61b21f1386eaa363dfa81848615d8814fcd704214ef3d2181f4a79971913ade994dac22312dc149e8232fdfe1c7cb811a7ee2c9
+  data.tar.gz: d3d644694c3e60c26081160167c4698b7bddb3f327b1a439389f60f4195b415588f790484c39cce4b2308c5a9b143aa4bcbfdcfe954a2d4fc448fb05974bab9d

data/lib/jekyll/generator-single-source/hooks/version_is.rb

@@ -3,9 +3,18 @@
 Jekyll::Hooks.register :pages, :pre_render do |page|
   # Replace double line breaks when using if_version when
   # combined with <pre> blocks. This is usually in code samples
-  page.content = page.content.gsub(/\n(\s*{% if_version)/, '\1')
-  page.content = page.content.gsub("{% endif_version %}\n\n", "{% endif_version %}\n")
+  # TODO: comment this for now, I need to double-check if we need it
+  # page.content = page.content.gsub(/\n(\s*{% if_version)/, '\1')
+  # page.content = page.content.gsub("{% endif_version %}\n\n", "{% endif_version %}\n")
 
   # Also allow for a newline after endif_version when in a table
-  page.content = page.content.gsub("{% endif_version %}\n|", '{% endif_version %}|')
+  # strip extra new lines
+  page.content = page.content.gsub(/\|\s*\n\n\s*{% if_version /, "|\n{% if_version ")
+  page.content = page.content.gsub(/\|\s*\n{% endif_version %}\n+\|/, "|\n{% endif_version -%}\n\|")
+  page.content = page.content.gsub(/\|\s*\n{% endif_version %}\n+\s*{% if_version (.*) %}\n/) do |_match|
+    "|\n{% endif_version -%}\n{% if_version #{$1} -%}\n"
+  end
+  page.content = page.content.gsub(/\|\s*\n+{% if_version (.*) %}\n/) do |_match|
+    "|\n{% if_version #{$1} -%}\n"
+  end
 end

data/lib/jekyll/generator-single-source/liquid/drops/release.rb

@@ -13,7 +13,7 @@ module Jekyll
             @release = release
           end
 
-          def_delegators :@release, :value, :label, :latest?, :to_s, :to_str, :versions
+          def_delegators :@release, :value, :label, :latest?, :to_s, :to_str, :versions, :tag
 
           def hash
             @hash ||= "#{@release.edition}-#{@release.value}".hash

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

@@ -5,69 +5,126 @@ module Jekyll
     module Liquid
       module Tags
         class VersionIs < ::Liquid::Block
-          def initialize(tag_name, markup, tokens)
-            @tag = markup
+          attr_reader :blocks
 
-            @params = {}
-            markup.scan(::Liquid::TagAttributes) do |key, value|
-              @params[key.to_sym] = value
-            end
+          def initialize(tag_name, markup, options)
             super
+            @blocks = []
+            push_block('if_version'.freeze, markup)
           end
 
-          def render(context) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-            page = context.environments.first['page']
+          def nodelist
+            @blocks.map(&:attachment)
+          end
 
-            current_version = to_version(page['release'].value)
+          def parse(tokens)
+            while parse_body(@blocks.last.attachment, tokens)
+            end
+          end
 
-            # If there's an exact match, check only that
-            if @params.key?(:eq)
-              version = to_version(@params[:eq])
-              return '' unless current_version == version
+          def unknown_tag(tag, markup, tokens)
+            if 'else'.freeze == tag
+              push_block(tag, markup)
+            else
+              super
             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
+          def render(context)
+            context.stack do
+              @blocks.each do |block|
+                if block.evaluate(context)
+                  return block.attachment.render(context)
+                end
+              end
+              ''.freeze
             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
+          private
+
+          def push_block(tag, markup)
+            block = if tag == 'else'.freeze
+                      ::Liquid::ElseCondition.new
+                    else
+                      parse_with_selected_parser(markup)
+                    end
+
+            @blocks.push(block)
+            block.attach(::Liquid::BlockBody.new)
+          end
+
+          def lax_parse(markup)
+            parse_condition(markup)
+          end
+
+          def strict_parse(markup)
+            parse_condition(markup)
+          end
+
+          def parse_condition(markup)
+            IfVersionCondition.new(markup)
+          end
+
+          class IfVersionCondition < ::Liquid::Condition
+            # Extracted from:
+            # https://github.com/Shopify/liquid/blob/ae3057e94b7c4d657e6bc02e1d50398e34cc6ed7/lib/liquid.rb#L37
+            # and modified to support comma-separated values
+            TAG_ATTRIBUTES = /(\w+)\s*\:\s*((?-mix:(?-mix:"[^"]*"|'[^']*')|(?:[^\s\|'"]|(?-mix:"[^"]*"|'[^']*'))+))/o
+
+            def else?
+              false
             end
 
-            # Don't evaluate the liquid block unconditionally,
-            # only evaluate it if the version matches
-            contents = super
+            def evaluate(context)
+              params = {}
+              @left.scan(TAG_ATTRIBUTES) do |key, value|
+                params[key.to_sym] = value
+              end
 
-            # Table rows (starts newline then |, ends with | then newline) need
-            # special handline
-            is_table_row = /^\n\s*\|/.match(contents) && /\|\s*\n$/.match(contents)
+              page = context.environments.first['page']
 
-            # Remove the leading whitespace and return
-            # We can't use .strip as that removes all leading whitespace,
-            # including indentation
-            contents = contents.sub(/^\n/, '')
+              current_version = to_version(page['release'].value)
 
-            # Remove the trailing whitespace
-            # But ONLY if it's not a table row
-            contents = contents.sub(/\n$/, '') unless is_table_row
+              if params.key? :eq
+                # If there's an exact match, check only that
+                versions = params[:eq].split(',').map { |v| to_version(v) }
+                return false unless versions.any? { |v| v == current_version }
+              end
+              if params.key? :gte
+                # If there's a greater than or equal to check, fail if it's lower
+                version = to_version(params[:gte])
+                return false unless current_version >= version
+              end
+              if params.key? :lte
+                # If there's a less than or equal to check, fail if it's higher
+                version = to_version(params[:lte])
+                return false unless current_version <= version
+              end
+              if params.key? :neq
+                # If there's a not-equal to check, fail if they are equal
+                version = to_version(params[:neq])
+                return false if current_version == version
+              end
 
-            # If it's not a table row, put the \n that we removed in pre_render back
-            contents = "\n#{contents}\n" unless is_table_row || @params[:inline]
+              true
+            end
 
-            contents
+            def to_version(input)
+              Gem::Version.new(input.to_s.gsub(/\.x$/, '.0'))
+            end
           end
 
-          def to_version(input)
-            Gem::Version.new(input.to_s.gsub(/\.x$/, '.0'))
+          class ParseTreeVisitor < ::Liquid::ParseTreeVisitor
+            def children
+              @node.blocks
+            end
           end
         end
+
       end
     end
   end
 end
 
-Liquid::Template.register_tag('if_version', Jekyll::GeneratorSingleSource::Liquid::Tags::VersionIs)
+::Liquid::Template.register_tag('if_version'.freeze, Jekyll::GeneratorSingleSource::Liquid::Tags::VersionIs)

data/lib/jekyll/generator-single-source/product/release.rb

@@ -38,6 +38,10 @@ module Jekyll
                         end
         end
 
+        def tag
+          @tag ||= value.split('.')[0..1].join('.')
+        end
+
         def default_version
           @default_version ||= versions['default']
         end

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

@@ -2,6 +2,6 @@
 
 module Jekyll
   module GeneratorSingleSource
-    VERSION = '0.0.11'
+    VERSION = '0.0.13'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-generator-single-source
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.13
 platform: ruby
 authors:
 - Fabian Rodriguez
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-31 00:00:00.000000000 Z
+date: 2024-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll