Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/synvert/core/engine/erb.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,18 +31,18 @@ def decode(source)
private

def decode_ruby_stmt(source)
source.gsub(/#{ERUBY_STMT_SPLITTER}(.+?)#{ERUBY_STMT_SPLITTER}/m) { "<%#{$1}%>" }
source.gsub(/#{ERUBY_STMT_SPLITTER}(.+?)#{ERUBY_STMT_SPLITTER}/m) { "<%#{Regexp.last_match(1)}%>" }
end

def decode_ruby_output(source)
source.gsub(/@output_buffer.append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m) { "<%=#{$1}%>" }
source.gsub(/@output_buffer.append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m) { "<%=#{Regexp.last_match(1)}%>" }
.gsub(/@output_buffer.append= (.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/m) { |m| "<%=#{m.sub("@output_buffer.append= ", "").sub(ERUBY_EXPR_SPLITTER, "")}%>" }
end

def decode_html_output(source)
source.gsub(/@output_buffer.safe_append='(.+?)'.freeze;/m) { reverse_escape_text($1) }
.gsub(/@output_buffer.safe_append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m) { reverse_escape_text($1) }
.gsub(/@output_buffer.safe_append=(.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/m) { reverse_escape_text($1) }
source.gsub(/@output_buffer.safe_append='(.+?)'.freeze;/m) { reverse_escape_text(Regexp.last_match(1)) }
.gsub(/@output_buffer.safe_append=\((.+?)\);#{ERUBY_EXPR_SPLITTER}/m) { reverse_escape_text(Regexp.last_match(1)) }
.gsub(/@output_buffer.safe_append=(.+?)\s+(do|\{)(\s*\|[^|]*\|)?\s*#{ERUBY_EXPR_SPLITTER}/m) { reverse_escape_text(Regexp.last_match(1)) }
end

def remove_erubis_buf(source)
Expand Down Expand Up @@ -112,9 +112,9 @@ def add_stmt(src, code)
flush_newline_if_pending(src)
if code != "\n" && code != ""
index = if code =~ /\A(\s*)\r?\n/
$1.length
Regexp.last_match(1).length
elsif code =~ /\A(\s+)/
$1.end_with?(' ') ? $1.length - 1 : $1.length
Regexp.last_match(1).end_with?(' ') ? Regexp.last_match(1).length - 1 : Regexp.last_match(1).length
else
0
end
Expand Down
2 changes: 1 addition & 1 deletion lib/synvert/core/node_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ def match?(rules)
# @raise [Synvert::Core::MethodNotSupported] if string in block {{ }} does not support.
def rewritten_source(code)
code.gsub(/{{(.*?)}}/m) do
old_code = $1
old_code = Regexp.last_match(1)
if self.respond_to? old_code.split(/\.|\[/).first
evaluated = self.instance_eval old_code
case evaluated
Expand Down
6 changes: 3 additions & 3 deletions lib/synvert/core/rewriter/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ def add_curly_brackets_if_necessary(code)
#
# strip_brackets("(1..100)") #=> "1..100"
def strip_brackets(code)
code.sub(/^\((.*)\)$/) { $1 }
.sub(/^\[(.*)\]$/) { $1 }
.sub(/^{(.*)}$/) { $1 }
code.sub(/^\((.*)\)$/) { Regexp.last_match(1) }
.sub(/^\[(.*)\]$/) { Regexp.last_match(1) }
.sub(/^{(.*)}$/) { Regexp.last_match(1) }
end
end
end