lifer 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b5555d8af73f17e139a069f5b18b104c7938cf8089525ecd3d27b703d388d64
-  data.tar.gz: 83ed1f8052bb3f7e241276ca2e7354f870429e5fd5ff5a5a2a97c36d1d756c4c
+  metadata.gz: 0ce126108ec46665db3ad8337c07db1e11806bbb9792f5a86e5eed169925fe5d
+  data.tar.gz: 90a6531804b57953fbd5da4d5b0488d6b9e98659111d4b5891aabc9907242ff3
 SHA512:
-  metadata.gz: b79197172aedc215a7d1acab9665406e5065b0aa32451ca5b76d89742021660f87c6ab6366edb581ab2477ad400a3a741468480d5a428cab1113544e11485c3a
-  data.tar.gz: e09e4484fb63f9b093b7a03ddff94ee49e0dc7c3bca1fe68e316540c9a02f4561f215f7c32bb77e842c83d1e63f30d57d252569218b8d2eddf2aa8823ce06d15
+  metadata.gz: 5d403fab16070747ccf5f5e756d135d0a30ebd955f3115f0cb75a549a61cb6affa8558fe17147a731f7ddee92dcc9484d529246353d0def6979ae7ebf004dd09
+  data.tar.gz: cdbffa546204eea258e2488b765e393490103677d25754d8111b3de52429bf5e0a955f1d76e3034854319deb423befb8031120b8881d7acf9b65db1fd6ec855c

data/CHANGELOG.md

@@ -1,7 +1,22 @@
+## Next
+
+## v0.4.1
+
+Resolves a bug where Liquid templates using the `{% layout %}` tag were not able
+to render partials.
+
+## v0.4.0
+
+This release locks the `liquid` dependency to Liquid 5.6 or greater. Liquid 5.6
+added `Liquid::Environment` for managing document context that was previously
+stored in `Liquid::Template`, which was global and unsafe. This release ensures
+that Lifer supports the new `Liquid::Environment` way of handling Liquid's local
+filesystem for templates and partials.
+
 ## v0.3.0
 
 This version marks the first version of Lifer that is kind of usable. The README
-currently describes the big picture best. But I can that as of this version,
+currently describes the big picture best. But I can add that, as of this version,
 I've documented all of the public interfaces and added a good number of `FIXME`
 comments to indicate functionality that _works_ but isn't quite where I want it
 to be long term.

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    lifer (0.3.0)
+    lifer (0.4.1)
       i18n (< 2)
       kramdown (~> 2.4)
-      liquid (< 6)
+      liquid (~> 5.6, < 6)
       listen (< 4)
       puma (< 7)
       rack (< 4)
@@ -26,7 +26,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    concurrent-ruby (1.3.4)
+    concurrent-ruby (1.3.5)
     debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
@@ -34,7 +34,7 @@ GEM
     ffi (1.17.1-arm64-darwin)
     ffi (1.17.1-x86_64-darwin)
     ffi (1.17.1-x86_64-linux-gnu)
-    i18n (1.14.6)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     io-console (0.7.2)
     irb (1.14.0)
@@ -43,9 +43,9 @@ GEM
     kramdown (2.5.1)
       rexml (>= 3.3.9)
     language_server-protocol (3.17.0.3)
-    liquid (5.6.0)
+    liquid (5.7.2)
       bigdecimal
-      strscan
+      strscan (>= 3.1.1)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -66,7 +66,7 @@ GEM
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)
-    puma (6.5.0)
+    puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.1.7)

data/lib/lifer/builder/html/from_liquid/layout_tag.rb

@@ -50,8 +50,8 @@ class Lifer::Builder::HTML::FromLiquid
         .gsub(/\{%\s*#{tag_name}.+%\}/, "")
 
       content_with_layout = Liquid::Template
-        .parse(current_layout_file, error_mode: :strict)
-        .render(document_context, render_options)
+        .parse(current_layout_file, **parse_options)
+        .render(document_context, **render_options)
 
       Liquid::Template
         .parse(

data/lib/lifer/builder/html/from_liquid/liquid_env.rb

@@ -0,0 +1,30 @@
+class Lifer::Builder::HTML::FromLiquid
+  # From the `liquid` gem's README:
+  #
+  # "In Liquid, a "Environment" is a scoped environment that encapsulates
+  # custom tags, filters, and other configurations. This allows you to
+  # define and isolate different sets of functionality for different
+  # contexts, avoiding global overrides that can lead to conflicts
+  # and unexpected behavior."
+  #
+  # For Lifer, we simply use a single global environment for each build.
+  #
+  class LiquidEnv
+    # Returns the global Liquid environment that contains all local
+    # templates, custom tags, and filters.
+    #
+    # @return [Lifer::Environment]
+    def self.global
+      Liquid::Environment.build do |environment|
+        environment.error_mode = :strict
+
+        environment.file_system =
+          Liquid::LocalFileSystem.new(Lifer.root, "%s.html.liquid")
+
+        environment.register_filter Lifer::Builder::HTML::FromLiquid::Filters
+        environment.register_tag "layout",
+          Lifer::Builder::HTML::FromLiquid::LayoutTag
+      end
+    end
+  end
+end

data/lib/lifer/builder/html/from_liquid.rb

@@ -3,6 +3,8 @@ require "liquid"
 require_relative "from_liquid/drops"
 require_relative "from_liquid/filters"
 require_relative "from_liquid/layout_tag"
+require_relative "from_liquid/liquid_env"
+
 
 class Lifer::Builder::HTML
   # If the HTML builder is given a Liquid template, it uses this class to parse
@@ -88,16 +90,7 @@ class Lifer::Builder::HTML
       contents + "\n{% #{LayoutTag::ENDNAME} %}"
     end
 
-    def liquid_environment
-      @liquid_environment ||= Liquid::Environment.build do |environment|
-        environment.file_system =
-          Liquid::LocalFileSystem.new(Lifer.root, "%s.html.liquid")
-
-        environment.register_filter Lifer::Builder::HTML::FromLiquid::Filters
-        environment.register_tag "layout",
-          Lifer::Builder::HTML::FromLiquid::LayoutTag
-      end
-    end
+    def liquid_environment = (@liquid_environment ||= LiquidEnv.global)
 
     def parse_options
       {

data/lib/lifer/version.rb

@@ -1,3 +1,3 @@
 module Lifer
-  VERSION = "0.3.0"
+  VERSION = "0.4.1"
 end

data/lifer.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "i18n", "< 2"
   spec.add_dependency "kramdown", "~> 2.4"
-  spec.add_dependency "liquid", "< 6"
+  spec.add_dependency "liquid", ["~> 5.6", "< 6"]
   spec.add_dependency "listen", "< 4"
   spec.add_dependency "puma", "< 7"
   spec.add_dependency "rack", "< 4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lifer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - benjamin wil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -42,6 +42,9 @@ dependencies:
   name: liquid
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -49,6 +52,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.6'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
@@ -171,6 +177,7 @@ files:
 - lib/lifer/builder/html/from_liquid/drops/settings_drop.rb
 - lib/lifer/builder/html/from_liquid/filters.rb
 - lib/lifer/builder/html/from_liquid/layout_tag.rb
+- lib/lifer/builder/html/from_liquid/liquid_env.rb
 - lib/lifer/builder/rss.rb
 - lib/lifer/builder/txt.rb
 - lib/lifer/cli.rb