Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support to Haml::Plugin for Rails 6 #1008

Merged
merged 1 commit into from Mar 15, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/haml/plugin.rb
Expand Up @@ -5,22 +5,24 @@ module Haml
class Plugin
def handles_encoding?; true; end

def compile(template)
def compile(template, source)
options = Haml::Template.options.dup
if template.respond_to?(:type)
options[:mime_type] = template.type
elsif template.respond_to? :mime_type
options[:mime_type] = template.mime_type
end
options[:filename] = template.identifier
Haml::Engine.new(template.source, options).compiler.precompiled_with_ambles(
Haml::Engine.new(source, options).compiler.precompiled_with_ambles(
[],
after_preamble: '@output_buffer = output_buffer ||= ActionView::OutputBuffer.new if defined?(ActionView::OutputBuffer)',
)
end

def self.call(template)
new.compile(template)
def self.call(template, source = nil)
source ||= template.source

new.compile(template, source)
end

def cache_fragment(block, name = {}, options = nil)
Expand Down