erubis 2.6.1 → 2.6.2

data/test/data/users-guide/example1.rb

@@ -8,6 +8,7 @@ puts eruby.src                      # print script source
 puts "---------- result ----------"
 list = ['aaa', 'bbb', 'ccc']
 puts eruby.result(binding())        # get result
+## or puts eruby.result(:list=>list)  # or pass Hash instead of Binding
 
 ## # or
 ## eruby = Erubis::Eruby.new

data/test/data/users-guide/main_program2.result

@@ -2,5 +2,5 @@ $ ruby main_program2.rb
 item = foo
 item = bar
 item = baz
-** debug: local variables=["x", "_buf"]
+** debug: local variables=["_context", "x", "_buf"]
 ** debug: x=1

data/test/hoge.rb

@@ -0,0 +1,5 @@
+<ul>
+<% for item in list %>
+  <li><%= item[:name]] %></li>
+<% end %>
+</ul>

data/test/test-engines.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 95 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -29,6 +29,9 @@ class EnginesTest < Test::Unit::TestCase
     assert_text_equal(@expected, actual)
   end
 
+
+  self.post_definition()
+
 end
 
 __END__

data/test/test-enhancers.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 93 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -98,6 +98,8 @@ class EnhancersTest < Test::Unit::TestCase
   end
 
 
+  self.post_definition()
+
 end
 
 __END__

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 104 $
-## $Release: 2.6.1 $
+## $Rev: 115 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -157,12 +157,16 @@ END
   class Dummy
   end
 
+  def _class_has_instance_method(klass, method)
+    return klass.instance_methods.collect{|m| m.to_s}.include?(method.to_s)
+  end
+
   def test_def_method1
     s = "<%for i in list%>i=<%=i%>\n<%end%>"
     eruby = Erubis::Eruby.new(s)
-    assert(! Dummy.instance_methods.include?('render'))
+    assert(! _class_has_instance_method(Dummy, 'render'))
     eruby.def_method(Dummy, 'render(list)', 'foo.rhtml')
-    assert(Dummy.instance_methods.include?('render'))
+    assert(_class_has_instance_method(Dummy, 'render'))
     actual = Dummy.new().render(%w[1 2 3])
     assert_equal("i=1\ni=2\ni=3\n", actual)
   end
@@ -175,7 +179,7 @@ END
     assert eruby.respond_to?(:render)
     actual = eruby.render([1, 2, 3])
     assert_equal("i=1\ni=2\ni=3\n", actual)
-    assert !(eruby.class.instance_methods.include? :render)
+    assert(! _class_has_instance_method(eruby.class, 'render'))
   end
 
   def test_evaluate_creates_proc
@@ -203,6 +207,8 @@ END
   #  puts "*** actual=#{actual.inspect}, x=#{_x.inspect}, y=#{_y.inspect}"
   #end
 
+  self.post_definition()
+
 end
 
 x = 10

data/test/test-main.rb

@@ -1,7 +1,7 @@
 ##
-## $Rev: 87 $
-## $Release: 2.6.1 $
-## $Date: 2007-07-12 05:01:24 +0900 (Thu, 12 Jul 2007) $
+## $Rev: 116 $
+## $Release: 2.6.2 $
+## $Date: 2008-06-12 21:08:47 +0900 (Thu, 12 Jun 2008) $
 ##
 
 require  "#{File.dirname(__FILE__)}/test.rb"
@@ -22,6 +22,9 @@ class StringWriter < String
   def write(arg)
     self << arg
   end
+  def flush(*args)
+    # pass
+  end
 end
 
 class Erubis::Main
@@ -144,6 +147,7 @@ END
     end
     if @filename.nil?
       method = (caller[0] =~ /in `(.*)'/) && $1    #'
+      method =~ /block in (.*)/ and method = $1    # for Ruby 1.9
       @filename = "tmp.#{method}"
     end
     File.open(@filename, 'w') { |f| f.write(@input) } if @filename
@@ -178,7 +182,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.6.1 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.2 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end
@@ -227,7 +231,21 @@ END
     basename = 'tmp.test_syntax2_%d.rhtml'
     filenames = [ basename % 0, basename % 1 ]
     errmsgs = []
-    errmsgs << <<'END'
+    if ruby19?
+      errmsgs << <<'END'
+3: syntax error, unexpected ']', expecting ')'
+ _buf << '  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
+                                         ^
+-:4: syntax error, unexpected keyword_end, expecting ')'
+'; end 
+      ^
+-:7: syntax error, unexpected $end, expecting ')'
+END
+      errmsgs << <<'END'
+7: syntax error, unexpected $end, expecting keyword_end or keyword_endfor
+END
+    else
+      errmsgs << <<'END'
 3: syntax error, unexpected ']', expecting ')'
  _buf << '  <li>'; _buf << ( item[:name]] ).to_s; _buf << '</li>
                                          ^
@@ -236,9 +254,10 @@ END
       ^
 -:7: syntax error, unexpected $end, expecting ')'
 END
-    errmsgs << <<'END'
+      errmsgs << <<'END'
 7: syntax error, unexpected $end, expecting kEND
 END
+    end
     #
     max = inputs.length
     (0...max).each do |i|
@@ -650,4 +669,6 @@ END
   end
 
 
+  self.post_definition()
+
 end

data/test/test-users-guide.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 77 $
-### $Release: 2.6.1 $
+### $Rev: 115 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -53,4 +53,6 @@ class KwarkUsersGuideTest < Test::Unit::TestCase
   end
 
 
+  self.post_definition()
+
 end

data/test/test.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 77 $
-## $Release: 2.6.1 $
+## $Release: 2.6.2 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 

data/test/testutil.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 77 $
-### $Release: 2.6.1 $
+### $Rev: 116 $
+### $Release: 2.6.2 $
 ### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ###
 
@@ -9,6 +9,21 @@ require 'yaml'
 require 'test/unit/testcase'
 
 
+
+def _ruby_ver_str  # :nodoc:
+  return /\d+\.\d+/.match(RUBY_VERSION)[0]
+end
+
+def ruby18?  # :nodoc:
+  _ruby_ver_str() == "1.8"
+end
+
+def ruby19?  # :nodoc:
+  _ruby_ver_str() > "1.8"
+end
+
+
+
 class Test::Unit::TestCase
 
 
@@ -21,7 +36,7 @@ class Test::Unit::TestCase
     end
     # untabify
     unless options[:tabify] == false
-      s = s.inject('') do |sb, line|
+      s = s.split(/^/).inject('') do |sb, line|
         sb << line.gsub(/([^\t]{8})|([^\t]*)\t/n) { [$+].pack("A8") }
       end
     end
@@ -72,4 +87,15 @@ class Test::Unit::TestCase
   end
 
 
+  def self.post_definition
+    if ENV['TEST']
+      target = "test_#{ENV['TEST']}"
+      self.instance_methods.each do |method_name|
+        m = method_name.to_s
+        private m if m =~ /\Atest_/ && m != target
+      end
+    end
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.6.1
+  version: 2.6.2
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-06 00:00:00 +09:00
+date: 2008-06-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,6 @@ files:
 - lib/erubis
 - lib/erubis/context.rb
 - lib/erubis/converter.rb
-- "lib/erubis/converter.rb:"
 - lib/erubis/engine
 - lib/erubis/engine/ec.rb
 - lib/erubis/engine/ejava.rb
@@ -78,6 +77,7 @@ files:
 - examples/pi/example.escheme
 - examples/pi/Makefile
 - test/assert-text-equal.rb
+- test/assert-text-equal.rbc
 - test/data
 - test/data/users-guide
 - test/data/users-guide/array_example.result
@@ -177,20 +177,25 @@ files:
 - test/data/users-guide/printenabled-example.rb
 - test/data/users-guide/printstatement_example.result
 - test/data/users-guide/simplify_example.result
-- test/data/users-guide/stderr.log
 - test/data/users-guide/stdout_exmple.result
 - test/data/users-guide/stringbuffer_example.result
 - test/data/users-guide/tail_260.result
 - test/data/users-guide/tailnewline.rhtml
 - test/data/users-guide/template1.rhtml
 - test/data/users-guide/template2.rhtml
+- test/hoge.rb
 - test/test-engines.rb
+- test/test-engines.rbc
 - test/test-enhancers.rb
 - test/test-erubis.rb
+- test/test-erubis.rbc
 - test/test-main.rb
 - test/test-users-guide.rb
+- test/test-users-guide.rbc
 - test/test.rb
+- test/test.rbc
 - test/testutil.rb
+- test/testutil.rbc
 - doc/docstyle.css
 - doc/users-guide.html
 - README.txt

data/test/data/users-guide/stderr.log

@@ -1,3 +0,0 @@
-*** debug: item="<aaa>"
-*** debug: item="b&b"
-*** debug: item="\"ccc\""