jekyll-uj-powertools 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e13016489f0630f73c9327a5f2d57732de7fa71aeaf2b62b3a5a74064f09b9e
-  data.tar.gz: 137eb99273904dd784739aa126b46ac3d9aa475f5fc874c332be4fe46169e42b
+  metadata.gz: bee69fe37cc10927e8f51898ed41337c5f71a2a013f1270f3ff0dea6b9318a42
+  data.tar.gz: 6a07ff1145e4d2fc93dd2f269ce38ed51d42606206d435afb9a47c909b8575ff
 SHA512:
-  metadata.gz: 0516d15e7915a3f9f67f869405244ca59d0032f058fc22e9e63f1b7f9cc7e6466988b327b8bcc254a5f45f9c7787af931f5d5f41df4b232c668e6fadf9ff0ea2
-  data.tar.gz: 66def45c09200d5791aec723cfa0f4a30d49c42de7c1a8a1dd40002412b4ce6a11bd0c7c7b68be5d87d4d813f0880d02514382bc06f70b041e0445ebb4cbebd9
+  metadata.gz: 7b87aa8225fd7cbebb64c20a21711e04f1faefd7221ddfc351a322424f46fb26c3b9459ce1b62938c430842c27b8b4aebf910c49517c846ceacab01fc6664c19
+  data.tar.gz: 7b8e91ed9fb513e952163f53519f4eaf065a516832422dbc11ad9f5c39c0e0d535c4bfba312f36d9272f0ff11bb234475121dee9ad5367b04c98fc76e458c887

data/README.md

@@ -78,7 +78,7 @@ Use the `site.uj.cache_breaker` variable to append a cache-busting query paramet
 <link rel="stylesheet" href="{{ "/assets/css/style.css" | prepend: site.baseurl }}?v={{ site.uj.cache_breaker }}">
 ```
 
-### Page Variables
+## Page Variables
 ### `page.random_id` Variable
 Generate a random ID for each page, useful for sorting randomly or for unique identifiers.
 
@@ -126,6 +126,24 @@ Resolves the site, layout, and page data into a single object, which can be usef
 {{ page.my.variable | default: layout.my.variable | default: site.my.variable }}
 ```
 
+## Tags
+### `iftruthy` Tag
+A custom Liquid tag that checks if a variable is truthy (not nil, not false, not empty string, not 0) and renders the content inside the tag if it is truthy.
+```liquid
+{% iftruthy my_variable %}
+  <p>This content will only be rendered if my_variable is truthy.</p>
+{% endiftruthy %}
+```
+
+### `iffalsy` Tag
+A custom Liquid tag that checks if a variable is falsy (nil, false, empty string, or 0) and renders the content inside the tag if it is falsy.
+```liquid
+{% iffalsy my_variable %}
+  <p>This content will only be rendered if my_variable is falsy.</p>
+{% endifalsy %}
+```
+
+## Final notes
 These examples show how you can use the features of `jekyll-uj-powertools` in your Jekyll site.
 
 ## 🔧 Development
@@ -133,16 +151,20 @@ After checking out the repo, run `bin/setup` to install dependencies. You can al
 
 To install this gem onto your local machine, run `bundle exec rake install`.
 
-To release a new version, update the version number in the `.gemspec` and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
-
 ## ⚠️ Testing
 Run the tests
 ```shell
-bundle install
-bundle exec rspec
+bundle install && bundle exec rspec
+```
+
+Test in your [Ultimate Jekyll Site](http://github.com/itw-creative-works/ultimate-jekyll)
+```shell
+npm start -- --ujPluginDevMode=true
 ```
 
 ## 💎 Build + Publish the Gem
+To release a new version, update the version number in the `.gemspec` and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
 ```shell
 # Release
 bundle exec rake release

data/jekyll-uj-powertools.gemspec

@@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |spec|
   # Gem info
   spec.name = "jekyll-uj-powertools"
-  spec.version = "1.5.1"
+  spec.version = "1.6.0"
 
   # Author info
   spec.authors = ["ITW Creative Works"]

data/lib/filters/main.rb

@@ -1,7 +1,7 @@
 # Libraries
 require "jekyll"
 
-# Module
+# Filters
 module Jekyll
   module UJPowertools
     # Initialize a timestamp that will remain consistent across calls

data/lib/generators/inject-properties.rb

@@ -1,7 +1,7 @@
 # Libraries
 # ...
 
-# Module
+# Generator
 module Jekyll
   class InjectData < Generator
     safe true
@@ -72,6 +72,39 @@ module Jekyll
       ]
     end
 
+    def get_layout_chain(layout_name, site)
+      chain = []
+      current_layout_name = layout_name
+
+      # Traverse up the layout hierarchy
+      while current_layout_name
+        layout = site.layouts[current_layout_name]
+        break unless layout
+
+        chain.unshift(layout)  # Add to beginning to maintain parent->child order
+        current_layout_name = layout.data['layout']
+      end
+
+      chain
+    end
+
+    def filter_front_matter(data)
+      # Jekyll internal properties that shouldn't be in resolved data
+      jekyll_internals = [
+        'layout', 'permalink', 'published', 'date', 'categories', 'tags',
+        'path', 'relative_path', 'collection', 'type', 'id', 'url',
+        'next', 'previous', 'draft', 'ext', 'excerpt', 'output'
+      ]
+
+      filtered = {}
+      data.each do |key, value|
+        next if jekyll_internals.include?(key)
+        filtered[key] = value
+      end
+
+      filtered
+    end
+
     def inject_data(item, site)
       # Inject a random number into the item's data
       item.data['random_id'] = rand(100) # Random number between 0 and 99
@@ -82,8 +115,8 @@ module Jekyll
       end
 
       # Set resolved data for site, layout, and page
-      # Create a deep merge of site -> layout -> page data
-      # Priority: page (highest) -> layout -> site (lowest)
+      # Create a deep merge of site -> child layouts -> parent layouts -> page data
+      # Priority: page (highest) -> parent layouts -> child layouts -> site (lowest)
       resolved = {}
 
       # Start with site data
@@ -93,19 +126,31 @@ module Jekyll
         resolved = deep_merge(resolved, filtered_config)
       end
 
-      # Merge layout data if available
+      # Merge layout data if available (traverse the entire layout chain)
       if item.data['layout']
-        layout_name = item.data['layout']
-        layout = site.layouts[layout_name]
-        if layout && layout.data
-          resolved = deep_merge(resolved, layout.data)
-          # Also add layout_data for backward compatibility
-          item.data['layout_data'] = layout.data
+        layout_chain = get_layout_chain(item.data['layout'], site)
+
+        # Merge each layout in reverse order (child to parent)
+        # This gives parent layouts (base layouts) higher priority
+        layout_chain.reverse.each do |layout|
+          if layout && layout.data
+            # Filter out Jekyll internal layout properties
+            layout_data = filter_front_matter(layout.data)
+            resolved = deep_merge(resolved, layout_data)
+          end
+        end
+
+        # Also add layout_data for backward compatibility (immediate layout only)
+        immediate_layout = site.layouts[item.data['layout']]
+        if immediate_layout && immediate_layout.data
+          item.data['layout_data'] = immediate_layout.data
         end
       end
 
       # Finally merge page data (highest priority)
-      resolved = deep_merge(resolved, item.data)
+      # Filter out Jekyll internal properties
+      page_data = filter_front_matter(item.data)
+      resolved = deep_merge(resolved, page_data)
 
       # Add the resolved data to the item
       item.data['resolved'] = resolved

data/lib/jekyll-uj-powertools.rb

@@ -12,5 +12,6 @@ module Jekyll
   require_relative "hooks/inject-properties"
 
   # Load Tags
-  # require_relative "tags/ifistruthy"
+  require_relative "tags/iftruthy"
+  require_relative "tags/iffalsy"
 end

data/lib/tags/iffalsy.rb

@@ -0,0 +1,38 @@
+# Libraries
+# ...
+
+# Tag
+module Jekyll
+  module UJPowertools
+    class IfFalsyTag < Liquid::Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @variable = markup.strip
+      end
+
+      def render(context)
+        # Use Liquid's variable lookup to handle nested properties
+        value = context.scopes.last[@variable] || context[@variable]
+
+        # For nested properties like page.my.variable
+        if @variable.include?('.')
+          parts = @variable.split('.')
+          value = context[parts.first]
+          parts[1..-1].each do |part|
+            value = value.is_a?(Hash) ? value[part] : nil
+            break if value.nil?
+          end
+        end
+
+        # Check if the value is falsy (nil, false, empty string, or 0)
+        if value.nil? || value == false || value == "" || value == 0
+          super
+        else
+          ""
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('iffalsy', Jekyll::UJPowertools::IfFalsyTag)

data/lib/tags/iftruthy.rb

@@ -0,0 +1,38 @@
+# Libraries
+# ...
+
+# Tag
+module Jekyll
+  module UJPowertools
+    class IfTruthyTag < Liquid::Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @variable = markup.strip
+      end
+
+      def render(context)
+        # Use Liquid's variable lookup to handle nested properties
+        value = context.scopes.last[@variable] || context[@variable]
+
+        # For nested properties like page.my.variable
+        if @variable.include?('.')
+          parts = @variable.split('.')
+          value = context[parts.first]
+          parts[1..-1].each do |part|
+            value = value.is_a?(Hash) ? value[part] : nil
+            break if value.nil?
+          end
+        end
+
+        # Check if the value is truthy (not nil, not false, not empty string, not 0)
+        if value && value != false && value != "" && value != 0
+          super
+        else
+          ""
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('iftruthy', Jekyll::UJPowertools::IfTruthyTag)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-uj-powertools
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - ITW Creative Works
@@ -103,7 +103,8 @@ files:
 - lib/generators/inject-properties.rb
 - lib/hooks/inject-properties.rb
 - lib/jekyll-uj-powertools.rb
-- lib/tags/ifistruthy.rb
+- lib/tags/iffalsy.rb
+- lib/tags/iftruthy.rb
 homepage: https://github.com/itw-creative-works/jekyll-uj-powertools
 licenses:
 - MIT

data/lib/tags/ifistruthy.rb

@@ -1,161 +0,0 @@
-module Jekyll
-  module UJPowertools
-    class IfIsTruthyTag < Liquid::Block
-      Syntax = /(\w+)/
-
-      def initialize(tag_name, markup, tokens)
-        super
-        
-        if markup =~ Syntax
-          @variable_name = $1
-        else
-          raise SyntaxError, "Invalid syntax for ifistruthy tag. Usage: {% ifistruthy variable_name %}"
-        end
-      end
-
-      def render(context)
-        variable = context[@variable_name]
-        is_truthy = check_truthy(variable)
-        
-        # Split content at else tag
-        else_index = nil
-        @nodelist.each_with_index do |node, index|
-          if node.respond_to?(:tag_name) && node.tag_name == 'else'
-            else_index = index
-            break
-          end
-        end
-        
-        if is_truthy
-          if else_index
-            render_nodelist(@nodelist[0...else_index], context)
-          else
-            super(context)
-          end
-        else
-          if else_index
-            render_nodelist(@nodelist[(else_index + 1)..-1], context)
-          else
-            ''
-          end
-        end
-      end
-
-      def unknown_tag(tag_name, markup, tokens)
-        if tag_name == 'else'
-          @nodelist << Liquid::ElseTag.new(tag_name, markup, tokens)
-        else
-          super
-        end
-      end
-
-      private
-
-      def check_truthy(value)
-        return false if value.nil?
-        return false if value.respond_to?(:empty?) && value.empty?
-        return false if value.to_s.downcase == 'null'
-        return false if value == false
-        true
-      end
-
-      def render_nodelist(nodelist, context)
-        output = []
-        nodelist.each do |token|
-          case token
-          when String
-            output << token
-          else
-            if token.respond_to?(:render)
-              output << token.render(context)
-            else
-              output << token.to_s
-            end
-          end
-        end
-        output.join
-      end
-    end
-
-    class UnlessIsTruthyTag < Liquid::Block
-      Syntax = /(\w+)/
-
-      def initialize(tag_name, markup, tokens)
-        super
-        
-        if markup =~ Syntax
-          @variable_name = $1
-        else
-          raise SyntaxError, "Invalid syntax for unlessistruthy tag. Usage: {% unlessistruthy variable_name %}"
-        end
-      end
-
-      def render(context)
-        variable = context[@variable_name]
-        is_truthy = check_truthy(variable)
-        
-        # Split content at else tag
-        else_index = nil
-        @nodelist.each_with_index do |node, index|
-          if node.respond_to?(:tag_name) && node.tag_name == 'else'
-            else_index = index
-            break
-          end
-        end
-        
-        if !is_truthy
-          if else_index
-            render_nodelist(@nodelist[0...else_index], context)
-          else
-            super(context)
-          end
-        else
-          if else_index
-            render_nodelist(@nodelist[(else_index + 1)..-1], context)
-          else
-            ''
-          end
-        end
-      end
-
-      def unknown_tag(tag_name, markup, tokens)
-        if tag_name == 'else'
-          @nodelist << Liquid::ElseTag.new(tag_name, markup, tokens)
-        else
-          super
-        end
-      end
-
-      private
-
-      def check_truthy(value)
-        return false if value.nil?
-        return false if value.respond_to?(:empty?) && value.empty?
-        return false if value.to_s.downcase == 'null'
-        return false if value == false
-        true
-      end
-
-      def render_nodelist(nodelist, context)
-        output = []
-        nodelist.each do |token|
-          case token
-          when String
-            output << token
-          else
-            if token.respond_to?(:render)
-              output << token.render(context)
-            else
-              output << token.to_s
-            end
-          end
-        end
-        output.join
-      end
-    end
-  end
-end
-
-# Register the tags
-Liquid::Template.register_tag('ifistruthy', Jekyll::UJPowertools::IfIsTruthyTag)
-Liquid::Template.register_tag('unlessistruthy', Jekyll::UJPowertools::UnlessIsTruthyTag)