Граф коммитов

19 Коммитов

Автор SHA1 Сообщение Дата
k0kubun cc777d09f4 erb.rb: deprecate safe_level of ERB.new
Also, as it's in the middle of the list of 4 arguments, 3rd and 4th arguments
(trim_mode, eoutvar) are changed to keyword arguments.
Old ways to specify arguments are deprecated and warned now.

bin/erb: deprecate -S option.

We'll remove all of deprecated ones at Ruby 2.7+.

enc/make_encmake.rb: stopped using deprecated interface
ext/etc/mkconstants.rb: ditto
ext/socket/mkconstants.rb: ditto
sample/ripper/ruby2html.rb: ditto
spec/ruby/library/erb/defmethod/def_erb_method_spec.rb: ditto
spec/ruby/library/erb/new_spec.rb: ditto
test/erb/test_erb.rb: ditto
test/erb/test_erb_command.rb: ditto
tool/generic_erb.rb: ditto
tool/ruby_vm/helpers/dumper.rb: ditto
tool/transcode-tblgen.rb: ditto
lib/rdoc/erbio.rb: ditto
lib/rdoc/generator/darkfish.rb: ditto

[Feature #14256]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62529 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-22 13:28:25 +00:00
k0kubun e16bd0f4d8 bin/erb: change template file encoding to UTF-8
Unlike Ruby source file encoding (script encoding) whose default is
changed to UTF-8 in Ruby 2.0 (Feature #6679), template's file encoding
given to erb(1) has been ASCII-8BIT since ERB supports m17n at r21170.

Like Ruby source file encoding, erb template file encoding should be
UTF-8 in Ruby 2.

[Bug #14095] [ruby-core:83708]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60739 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2017-11-10 13:59:01 +00:00
kazu 6c45fa78cb * bin/erb: $SAFE=3 is obsolete.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2015-06-18 14:53:26 +00:00
nobu 8326a747f9 erb: suppress warnings
* bin/erb (ERB::Main#run): get rid of shadowing outer local
  variables.  [ruby-core:65772] [Feature #10395]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48788 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-12 19:59:22 +00:00
nobu 9e52416cd3 erb: set variables from the command line
* bin/erb (ARGV.switch, ERB::Main#run): allow variables to be set
  from the command line.  [ruby-core:65772] [Feature #10395]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-12-12 10:48:57 +00:00
nobu ae7de68961 erb: multiline anchors
* bin/erb (ARGV.switch, ERB::Main#run): use beginning/end of
  string anchors instead of beginning/end of line anchors.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-17 06:30:08 +00:00
nobu 99eeaca547 erb: fix -U option
* bin/erb (ERB::Main#run): fix NoMethodError at -U option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2014-10-17 06:23:39 +00:00
ktsj 04f0de74dd * error.c, file.c, gc.c, hash.c, thread.c, variable.c, vm_eval.c, bin/erb:
$SAFE=4 is obsolete.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42608 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-08-18 10:36:51 +00:00
nobu 0c216c32dc * bin/erb: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-04-02 04:40:34 +00:00
yugui bbd1a18aaf * bin/erb: accepts options in more flexible styles.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 09:26:42 +00:00
yugui af91b42354 * lib/erb.rb (ERB): m17n of ERB. adds rdoc.
fixes #712. c.f. [ruby-dev:37516].

* lib/erb.rb (ERB::Compiler#compile): recognizes magic comments.
  returns a pair of compiled script and its script encoding.

* lib/erb.rb (ERB#set_eoutvar): make generated scripts return a
  string in correct encoding.

* lib/erb.rb (ERB#def_method): use Kernel#eval for encoding-awareness
  of the evaluated string.

* bin/erb.rb (ERB::Main.run): adds -E and -U options.
  String is no longer Enumerable.

* man/erb.1: new manapage.

* test/erb/test_erb_m17n.rb: new test case for m17n features.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-12-29 09:26:34 +00:00
seki 56228b4da6 remove -K option.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-11-17 02:14:24 +00:00
matz 5b014a7427 * bin/erb (ERB::Main::run): typo fixed. [ruby-core:06337]
* env.h: move struct METHOD and struct BLOCK from eval.c to
  support NodeWrap and ParseTree.

* rubysig.h (CHECK_INTS): prevent signal handler to run during
  critical section.  [ruby-core:04039]

* eval.c (load_wait): need not to call rb_thread_schedule()
  explicitly.  [ruby-core:04039]

* eval.c (rb_thread_schedule): clear rb_thread_critical.
  [ruby-core:04039]

* eval.c (rb_obj_instance_exec): create instance_exec and
  module_exec which pass arguments to the block.

* eval.c (rb_f_funcall): rename fcall to funcall to follow
  tradition.

* st.c (st_free_table): do not call free() but xfree().
  [ruby-core:06205]

* eval.c (splat_value): call rb_Array() to convert svalue to
  values.  [ruby-dev:27397]

* lib/cgi.rb (CGI::Cookie::parse): Cookies from Nokia devices may
  not be parsed correctly.  A patch from August Z. Flatby
  (augustzf) in [ruby-Patches-2595].  [ruby-core:06183]

* object.c (rb_Array): Array() to raise error for objects without
  to_ary, nor to_a.

* object.c (nil_to_a): revert NilClass#to_a.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-21 09:00:02 +00:00
seki 59f296ffb4 typo fixed, again. thanks, Doug Kearns.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-10-15 10:57:50 +00:00
seki 977176d702 typo fixed
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-25 03:06:23 +00:00
seki 48a9b6170e set ERB#filename so that it is used when reporting syntax/runtime errors.
Tabs converted to spaces.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-11 13:18:59 +00:00
seki f8817c7262 add explicit trim mode
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-31 03:42:17 +00:00
seki e97af583f7 * bin/erb: fix -S 4 option bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3073 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-11-21 14:38:37 +00:00
seki 4de16dfb24 add bin/erb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3065 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-11-20 14:41:05 +00:00