summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormakoto kuwata <kwa@kuwata-lab.com>2011-03-21 20:46:43 +0900
committermakoto kuwata <kwa@kuwata-lab.com>2011-03-21 20:46:43 +0900
commitcd532bfac8127d5526c5d30f5e1d55ff6ff09b1d (patch)
treed74b40e19144226895a53e79439e292af5478d8f
parenta383bfd0df0007acb79b0928f33bcf7a91df79c9 (diff)
downloaderubis-cd532bfac8127d5526c5d30f5e1d55ff6ff09b1d.tar.gz
[change] rename ':bufname' option to ':bufvar'
-rw-r--r--lib/erubis/engine/eruby.rb12
-rw-r--r--lib/erubis/enhancer.rb22
-rw-r--r--test/test-engines.rb2
3 files changed, 18 insertions, 18 deletions
diff --git a/lib/erubis/engine/eruby.rb b/lib/erubis/engine/eruby.rb
index 63828be..64eeb76 100644
--- a/lib/erubis/engine/eruby.rb
+++ b/lib/erubis/engine/eruby.rb
@@ -21,7 +21,7 @@ module Erubis
def init_generator(properties={})
super
@escapefunc ||= "Erubis::XmlHelper.escape_xml"
- @bufname = properties[:bufname] || "_buf"
+ @bufvar = properties[:bufvar] || "_buf"
end
def self.supported_properties() # :nodoc:
@@ -38,12 +38,12 @@ module Erubis
#--
#def add_preamble(src)
- # src << "#{@bufname} = [];"
+ # src << "#{@bufvar} = [];"
#end
#++
def add_text(src, text)
- src << " #{@bufname} << '" << escape_text(text) << "';" unless text.empty?
+ src << " #{@bufvar} << '" << escape_text(text) << "';" unless text.empty?
end
def add_stmt(src, code)
@@ -53,11 +53,11 @@ module Erubis
end
def add_expr_literal(src, code)
- src << " #{@bufname} << (" << code << ').to_s;'
+ src << " #{@bufvar} << (" << code << ').to_s;'
end
def add_expr_escaped(src, code)
- src << " #{@bufname} << " << escaped_expr(code) << ';'
+ src << " #{@bufvar} << " << escaped_expr(code) << ';'
end
def add_expr_debug(src, code)
@@ -68,7 +68,7 @@ module Erubis
#--
#def add_postamble(src)
- # src << "\n#{@bufname}.join\n"
+ # src << "\n#{@bufvar}.join\n"
#end
#++
diff --git a/lib/erubis/enhancer.rb b/lib/erubis/enhancer.rb
index 88a1cac..90d94a5 100644
--- a/lib/erubis/enhancer.rb
+++ b/lib/erubis/enhancer.rb
@@ -67,7 +67,7 @@ module Erubis
end
def add_preamble(src)
- src << "#{@bufname} = $stdout;"
+ src << "#{@bufvar} = $stdout;"
end
def add_postamble(src)
@@ -162,12 +162,12 @@ module Erubis
end
def add_preamble(src)
- src << "#{@bufname} = [];"
+ src << "#{@bufvar} = [];"
end
def add_postamble(src)
src << "\n" unless src[-1] == ?\n
- src << "#{@bufname}\n"
+ src << "#{@bufvar}\n"
end
end
@@ -208,12 +208,12 @@ module Erubis
end
def add_preamble(src)
- src << "#{@bufname} = '';"
+ src << "#{@bufvar} = '';"
end
def add_postamble(src)
src << "\n" unless src[-1] == ?\n
- src << "#{@bufname}.to_s\n"
+ src << "#{@bufvar}.to_s\n"
end
end
@@ -231,12 +231,12 @@ module Erubis
end
def add_preamble(src)
- src << "#{@bufname} = StringIO.new;"
+ src << "#{@bufvar} = StringIO.new;"
end
def add_postamble(src)
src << "\n" unless src[-1] == ?\n
- src << "#{@bufname}.string\n"
+ src << "#{@bufvar}.string\n"
end
end
@@ -254,12 +254,12 @@ module Erubis
end
def add_preamble(src)
- src << "_erbout = #{@bufname} = '';"
+ src << "_erbout = #{@bufvar} = '';"
end
def add_postamble(src)
src << "\n" unless src[-1] == ?\n
- src << "#{@bufname}.to_s\n"
+ src << "#{@bufvar}.to_s\n"
end
end
@@ -698,9 +698,9 @@ module Erubis
#src << " _buf << %Q`" << text << "`;"
if text[-1] == ?\n
text[-1] = "\\n"
- src << " #{@bufname} << %Q`#{text}`\n"
+ src << " #{@bufvar} << %Q`#{text}`\n"
else
- src << " #{@bufname} << %Q`#{text}`;"
+ src << " #{@bufvar} << %Q`#{text}`;"
end
end
diff --git a/test/test-engines.rb b/test/test-engines.rb
index b93f880..98b763a 100644
--- a/test/test-engines.rb
+++ b/test/test-engines.rb
@@ -70,7 +70,7 @@ __END__
- name: ruby2_options
lang: ruby
class: Eruby
- options: { :bufname: '@_out_buf' }
+ options: { :bufvar: '@_out_buf' }
input: |
<table>
<% for item in @items %>