Skip to content

Commit

Permalink
Revert back to liquid 5.3.0, each no longer exists on the registers
Browse files Browse the repository at this point in the history
  • Loading branch information
tdegrunt committed Apr 9, 2024
1 parent 3e112c5 commit 38451a5
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 26 deletions.
49 changes: 25 additions & 24 deletions lib/liquidum.rb
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
# frozen_string_literal: true

require 'liquid'
require 'tilt'
require 'sassc'
require 'addressable/uri'

require 'liquidum/version'
require 'liquidum/engine'
require 'liquidum/configuration'
require 'liquidum/drop'

require 'liquidum/liquid/liquid_helpers'
require 'liquidum/liquid/liquid_template_extensions'
require 'liquidum/liquid/liquidum_block'
require 'liquidum/liquid/liquidum_tag'
require 'liquidum/liquid/parser'
require "liquid"
require "tilt"
require "sassc"
require "addressable/uri"

require "liquidum/version"
require "liquidum/engine"
require "liquidum/configuration"
require "liquidum/drop"

require "liquidum/liquid/liquid_helpers"
require "liquidum/liquid/liquid_template_extensions"
require "liquidum/liquid/liquidum_block"
require "liquidum/liquid/liquidum_tag"
require "liquidum/liquid/parser"

module Liquidum
extend Configurable

class Error < StandardError; end

class UnknownStepTypeError < Error; end

class LiquidumFileSystem
Expand All @@ -30,12 +31,12 @@ def initialize(registers)
end

def read_template_file(template_path)
current_content = registers['content']
current_content = registers["content"]

contents = current_content.site.contents.published

content = contents.include(template_path).first
content&.data || ''
content&.data || ""
end
end

Expand All @@ -44,20 +45,20 @@ def render(content, options = {})
template = Liquid::Template.parse(content)
options[:assigns] ||= {}
options[:registers] ||= {}
options[:registers]['file_system'] =
options[:registers]["file_system"] =
Liquidum.config.liquidum_file_system.constantize.new(options[:registers])
result = template.render(options[:context] || options[:assigns].stringify_keys,
registers: options[:registers])
registers: options[:registers])

if template.errors.present?
Liquidum.config.logger.error '--- Template rendering errors: ' + '-' * 49
Liquidum.config.logger.error "--- Template rendering errors: " + "-" * 49
template.errors.map do |error|
next unless error.cause

Liquidum.config.logger.error error
Liquidum.config.logger.error '=> ' + error.cause.backtrace.first.to_s + ': ' + error.cause.message
Liquidum.config.logger.error "=> " + error.cause.backtrace.first.to_s + ": " + error.cause.message
end
Liquidum.config.logger.error '-' * 80
Liquidum.config.logger.error "-" * 80
end

assigns = options[:assigns].deep_stringify_keys
Expand All @@ -70,8 +71,8 @@ def render(content, options = {})
end.render
end
if options[:layout].present?
result = render(options[:layout], assigns: assigns.merge('content' => result),
registers: options[:registers])
result = render(options[:layout], assigns: assigns.merge("content" => result),
registers: options[:registers])
end

result
Expand Down
5 changes: 3 additions & 2 deletions liquidum.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,18 @@ Gem::Specification.new do |spec|
spec.add_runtime_dependency("i18n", ["~> 1.8"])
spec.add_runtime_dependency("kramdown", ["~> 2.1"])
spec.add_runtime_dependency("kramdown-parser-gfm", ["~> 1.0"])
spec.add_runtime_dependency("liquid", ["~> 5.1"])
spec.add_runtime_dependency("liquid", ["< 5.4"])
spec.add_runtime_dependency("parslet", [">= 0"])
spec.add_runtime_dependency("pg", [">= 0"])
spec.add_runtime_dependency("rails", [">= 5.2"])
spec.add_runtime_dependency("sassc", ["~> 2.2"])
spec.add_runtime_dependency "slim-rails", "~> 3.6"

spec.add_development_dependency("minitest", ["~> 5.11"])
spec.add_development_dependency("minitest-reporters", ["~> 1.1"])
spec.add_development_dependency("pry", ["> 0"])
spec.add_development_dependency("pry-rails", ["~> 0.3"])
spec.add_development_dependency "rubocop", "~> 1"

spec.add_development_dependency "standard", "~> 1"
spec.add_development_dependency "debug", "~> 1"
end

0 comments on commit 38451a5

Please sign in to comment.