erubis 2.4.0 → 2.4.1

data/lib/erubis/error.rb

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

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 91 $
-## $Release: 2.4.0 $
+## $Rev: 94 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -10,6 +10,8 @@ require 'erubis/context'
 
 module Erubis
 
+  EMPTY_BINDING = binding()
+
 
   ##
   ## evaluate code
@@ -64,7 +66,7 @@ module Erubis
     def evaluate(context=Context.new)
       context = Context.new(context) if context.is_a?(Hash)
       #return context.instance_eval(@src, @filename || '(erubis)')
-      @_proc ||= eval("proc { #{@src} }", TOPLEVEL_BINDING, @filename || '(erubis)')
+      @_proc ||= eval("proc { #{@src} }", Erubis::EMPTY_BINDING, @filename || '(erubis)')
       return context.instance_eval(&@_proc)
     end
 

data/lib/erubis/generator.rb

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

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 89 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 90 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 91 $
-### $Release: 2.4.0 $
+### $Release: 2.4.1 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 

data/lib/erubis/tiny.rb

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

data/test/assert-text-equal.rb

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

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

@@ -0,0 +1,8 @@
+require 'erubis'
+eruby = Erubis::Eruby.new(File.read('template1.rhtml'))
+items = ['foo', 'bar', 'baz']
+x = 1
+## local variable 'x' and 'eruby' are passed to template as well as 'items'!
+print eruby.result(binding())    
+## local variable 'x' is changed unintendedly because it is changed in template!
+puts "** debug: x=#{x.inspect}"  #=> "baz"

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

@@ -0,0 +1,6 @@
+$ ruby main_program1.rb
+item = foo
+item = bar
+item = baz
+** debug: local variables=["eruby", "items", "x", "_buf"]
+** debug: x="baz"

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

@@ -0,0 +1,8 @@
+require 'erubis'
+eruby = Erubis::Eruby.new(File.read('template2.rhtml'))
+items = ['foo', 'bar', 'baz']
+x = 1
+## only 'items' are passed to template
+print eruby.evaluate(:items=>items)    
+## local variable 'x' is not changed!
+puts "** debug: x=#{x.inspect}"  #=> 1

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

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

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

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

data/test/data/users-guide/template1.rhtml

@@ -0,0 +1,4 @@
+<% for x in items %>
+item = <%= x %>
+<% end %>
+** debug: local variables=<%= local_variables().inspect() %>

data/test/data/users-guide/template2.rhtml

@@ -0,0 +1,4 @@
+<% for x in @items %>
+item = <%= x %>
+<% end %>
+** debug: local variables=<%= local_variables().inspect() %>

data/test/test-engines.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Rev: 95 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -298,11 +298,11 @@ __END__
       '); print('*** debug: $i=', $i, "\n");print('
       '); 
 ##
-- name:  javascript
+- name:  javascript1
   lang:  javascript
   class: Ejavascript
   options:
-  input: |
+  input: &javascript_input |
       <%
          var user = 'Erubis';
          var list = ['<aaa>', 'b&b', '"ccc"'];
@@ -340,3 +340,28 @@ __END__
       alert("*** debug: i="+(i)); _buf.push("\n");
       document.write(_buf.join(""));
  ##
+- name:  javascript2
+  lang:  javascript
+  class: Ejavascript
+  options: { :docwrite: false }
+  input: *javascript_input
+  expected: |4
+      var _buf = [];
+         var user = 'Erubis';
+         var list = ['<aaa>', 'b&b', '"ccc"'];
+      
+      _buf.push("<p>Hello "); _buf.push(user); _buf.push("!</p>\n\
+      <table>\n\
+        <tbody>\n");
+           var i; 
+           for (i = 0; i < list.length; i++) { 
+      _buf.push("    <tr bgcolor="); _buf.push(++i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'); _buf.push("\">\n\
+            <td>"); _buf.push(i); _buf.push("</td>\n\
+            <td>"); _buf.push(list[i]); _buf.push("</td>\n\
+          </tr>\n");
+           } 
+      _buf.push("  </tbody>\n\
+      </table>\n");
+      alert("*** debug: i="+(i)); _buf.push("\n");
+      _buf.join("");
+ ##

data/test/test-enhancers.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.4.0 $
+## $Rev: 93 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -471,8 +471,8 @@ __END__
       '; end
        _buf << '</table>
       <pre>
-      '; _buf << '% double percent
-      '; _buf << ' % spaced percent
+      % double percent
+       % spaced percent
       </pre>
       ';
       _buf.to_s

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 91 $
-## $Release: 2.4.0 $
+## $Rev: 94 $
+## $Release: 2.4.1 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -192,8 +192,23 @@ END
     assert_nil(eruby.instance_variable_get('@_proc'))
   end
 
+  #def test_toplevel_binding
+  #  s = "locals = <%= local_variables().inspect %>\n<% x = 50 %>\n"
+  #  eruby = Erubis::Eruby.new(s)
+  #  _x = eval 'x', TOPLEVEL_BINDING
+  #  _y = eval 'y', TOPLEVEL_BINDING
+  #  actual = eruby.evaluate(:x=>_x, :y=>_y)
+  #  _x = eval 'x', TOPLEVEL_BINDING
+  #  _y = eval 'y', TOPLEVEL_BINDING
+  #  puts "*** actual=#{actual.inspect}, x=#{_x.inspect}, y=#{_y.inspect}"
+  #end
+
 end
 
+x = 10
+y = 20
+
+
 __END__
 - name:  basic1
   input: &basic1_input|

data/test/test-main.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 87 $
-## $Release: 2.4.0 $
+## $Release: 2.4.1 $
 ## $Date: 2007-07-12 05:01:24 +0900 (Thu, 12 Jul 2007) $
 ##
 
@@ -178,7 +178,7 @@ END
 
   def test_version    # -v
     @options = '-v'
-    @expected = (("$Release: 2.4.0 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.4.1 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-users-guide.rb

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

data/test/test.rb

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

data/test/testutil.rb

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

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.4.0
-date: 2007-07-19 00:00:00 +09:00
+  version: 2.4.1
+date: 2007-09-25 00:00:00 +09:00
 summary: a fast and extensible eRuby implementation which supports multi-language
 require_paths: 
 - lib
@@ -153,6 +153,10 @@ files:
 - test/data/users-guide/headerfooter_example.result
 - test/data/users-guide/headerfooter_example2.result
 - test/data/users-guide/interpolation_example.result
+- test/data/users-guide/main_program1.rb
+- test/data/users-guide/main_program1.result
+- test/data/users-guide/main_program2.rb
+- test/data/users-guide/main_program2.result
 - test/data/users-guide/nocode-example.eruby
 - test/data/users-guide/nocode-php.result
 - test/data/users-guide/nocode_example.result
@@ -169,8 +173,11 @@ 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/template1.rhtml
+- test/data/users-guide/template2.rhtml
 - test/test-engines.rb
 - test/test-enhancers.rb
 - test/test-erubis.rb