app/services/landable/render_service.rb in landable-1.13.1 vs app/services/landable/render_service.rb in landable-1.13.2
- old
+ new
@@ -1,6 +1,6 @@
-# TODO Handle layouts-as-themes here
+# TODO: Handle layouts-as-themes here
require_dependency 'landable/liquid'
module Landable
class RenderService
@@ -17,38 +17,36 @@
def render!
variables = options[:responder].try(:controller).try(:fetch_landable_variables)
variables ||= {}
content = render_template(page.body, variables, registers: {
- page: page,
- assets: assets_for_page,
- responder: options[:responder],
- })
+ page: page,
+ assets: assets_for_page,
+ responder: options[:responder]
+ })
if layout?
- content = render_template(theme.body, {'body' => content}, registers: {
- page: page,
- assets: assets_for_theme,
- })
+ content = render_template(theme.body, { 'body' => content }, registers: {
+ page: page,
+ assets: assets_for_theme
+ })
end
# not completely happy about this
if options[:preview]
if page.html?
# fancy!
preview_template = File.open(Landable::Engine.root.join('app', 'views', 'templates', 'preview.liquid')).read
- content = render_template(preview_template, {
- 'content' => content,
- 'is_redirect' => page.redirect?,
- 'is_html' => page.html?,
- 'status_code' => page.status_code,
- 'redirect_url' => page.redirect_url,
- })
+ content = render_template(preview_template, 'content' => content,
+ 'is_redirect' => page.redirect?,
+ 'is_html' => page.html?,
+ 'status_code' => page.status_code,
+ 'redirect_url' => page.redirect_url)
else
# non-html stuff just gets rendered as plaintext for a preview
- content = '<pre>' + CGI::escapeHTML(content) + '</pre>'
+ content = '<pre>' + CGI.escapeHTML(content) + '</pre>'
end
end
content
end
@@ -75,10 +73,10 @@
def assets_for_theme
@assets_for_theme ||= theme ? theme.assets_as_hash : {}
end
- def render_template template, variables = {}, liquid_options = {}
+ def render_template(template, variables = {}, liquid_options = {})
variables['categories'] = Liquid::CategoriesDrop.new
parse(template).render!(variables, liquid_options)
end
end