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

35 Коммитов

Автор SHA1 Сообщение Дата
drbrain 421875eeff * lib/erb.rb: Restore documentation for ERB::Util and ERB::DefMethod
(oops).  [Ruby 1.9 - Bug #4694]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-24 23:24:32 +00:00
drbrain 373ea89e17 * lib/erb.rb: Hide documentation for implementation details of ERB.
[Ruby 1.9 - Bug #4694]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31724 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-24 23:22:40 +00:00
nobu d371e3583e * lib: revert r31635-r31638 and untabify with expand(1).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-19 00:07:25 +00:00
drbrain 7bbf2f3085 * lib: Convert tabs to spaces for ruby files per
http://redmine.ruby-lang.org/projects/ruby/wiki/DeveloperHowto#coding-style
	  Patch by Steve Klabnik [Ruby 1.9 - Bug #4730]
	  Patch by Jason Dew [Ruby 1.9 - Feature #4718]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31635 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-18 21:19:18 +00:00
nobu 3a47cf3395 * remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31573 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-15 11:55:52 +00:00
drbrain 6d198d2377 * lib/erb.rb: Document ERB::Compiler. Patch by Simon Chiang.
[Ruby 1.9 - Bug #4694]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31571 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2011-05-14 18:24:11 +00:00
nobu 287a34ae0d * {ext,lib,test}/**/*.rb: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22784 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-03-06 03:56:38 +00:00
seki 2d53925643 remove PercentScanner. fixed % after %> bug. [ruby-dev:37751] [Bug #997]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-11 07:58:02 +00:00
seki da3eba7551 merged r20850, r17881, r16811, r16763, r16748, r15829, r15794 and r15698 from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-01-03 15:36:14 +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
kazu f0bb63782a * lib/erb.rb: adjust line number for magic comment.
* test/erb/test_erb.rb: add tests for def_method.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-27 08:48:24 +00:00
naruse f94c46a745 * lib/erb.rb (ERB::Compiler:Buffer#new): push magic comment first.
* lib/erb.rb (ERB::Compiler#compile): fix for broken input.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-25 04:44:32 +00:00
naruse 30e263fc07 * lib/erb.rb (ERB::Compiler#compile): magic comment needs LF.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-25 03:10:57 +00:00
naruse 8eb4988a03 * lib/erb.rb (ERB::Compiler#compile): output magic comment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-25 00:33:11 +00:00
matz e6c1752137 * lib/rdoc.rb: massive spelling correction patch from Evan Farrar
<evanfarrar at gmail.com> in [ruby-doc:1382] applied.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16810 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-04 09:37:38 +00:00
knu 5b7464b047 * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Oops. This
change did not apply to trunk.  Backed out.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16750 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-02 07:15:12 +00:00
knu 92623d3db8 * lib/erb.rb (ERB::Compiler::TrimScanner#scan_line): Fix a bug
where tokens are not yilelded one by one.

* test/erb/test_erb.rb (TestERBCore#_test_01)
  (TestERBCore#test_02_safe_04): The expected value should come
  first for assert_equal().


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16749 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-02 07:10:35 +00:00
seki b72ef21cd3 [ruby-dev:34497] ERB::Util#url_encode bug fix. Reported by rubikitch.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-04-30 12:40:52 +00:00
akr 35f28e6b81 * lib/erb.rb (ERB::Revision): cut off locale dependent string in Date
keyword.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-06 16:07:04 +00:00
aamine 2f32af52c4 * lib/erb.rb: String#each was removed, use #each_line instead.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11182 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-10-17 13:03:24 +00:00
seki b468b45f7a (ERB::Compiler): add instance variable @insert_cmd to change <%='s behavior.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-01-10 15:21:45 +00:00
seki d1d0c52a1e make module_function
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-02-12 16:34:45 +00:00
matz 84bd21465e * io.c (io_read): move StringValue() check before GetOpenFile().
[ruby-dev:24959]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7376 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-11-25 15:23:19 +00:00
seki c85e310795 * MANIFEST: add test_erb.rb
* lib/erb.rb, test/erb/test_erb.rb: don't forget filename,
          if both filename and safe_level given. [ruby-dev:23050]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-02-28 01:52:14 +00:00
aamine 62b368dc4a * lib/erb.rb: new method ERB#filename(=). [ruby-dev:22208]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-12-10 09:07:52 +00:00
seki 6b43c9bfbf import erb-2.0.4b4
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4246 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-31 14:49:19 +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 38ac53f0c1 import erb_2_0_4b2
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-29 14:35:42 +00:00
seki 7470938822 fix: keep lineno
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-25 22:03:52 +00:00
seki e96641be8e import erb-2.0.4b1
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4125 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-07-23 09:47:16 +00:00
seki 5c4c320c81 fix ERB::DefMethod bug
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-04-22 16:29:47 +00:00
seki 49123e550a make public ERB::Compiler
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3375 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-20 12:11:35 +00:00
seki 9f22034ae0 fix: % in <%..%>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-01-20 11:32:19 +00:00
seki 4352461b9c * erb.rb: fix def_class bug.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-11-21 14:39:26 +00:00
seki e6251100cc * add ERB
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3050 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-11-17 16:11:40 +00:00