erubis 2.3.1 → 2.4.0

data/lib/erubis/engine.rb

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

data/lib/erubis/engine/ec.rb

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

data/lib/erubis/engine/ejava.rb

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

data/lib/erubis/engine/ejavascript.rb

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

data/lib/erubis/engine/enhanced.rb

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

data/lib/erubis/engine/eperl.rb

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

data/lib/erubis/engine/ephp.rb

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

data/lib/erubis/engine/eruby.rb

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

data/lib/erubis/engine/escheme.rb

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

data/lib/erubis/engine/optimized.rb

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

data/lib/erubis/enhancer.rb

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

data/lib/erubis/error.rb

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

data/lib/erubis/evaluator.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
+## $Rev: 91 $
+## $Release: 2.4.0 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -53,7 +53,8 @@ module Erubis
       _arg = _binding_or_hash
       if _arg.is_a?(Hash)
         ## load _context data as local variables by eval
-        eval _arg.keys.inject("") { |s, k| s << "#{k.to_s} = _arg[#{k.inspect}];" }
+        #eval _arg.keys.inject("") { |s, k| s << "#{k.to_s} = _arg[#{k.inspect}];" }
+        eval _arg.collect{|k,v| "#{k} = _arg[#{k.inspect}]; "}.join
         _arg = binding()
       end
       return eval(@src, _arg, (@filename || '(erubis)'))
@@ -62,9 +63,19 @@ module Erubis
     ## invoke context.instance_eval(@src)
     def evaluate(context=Context.new)
       context = Context.new(context) if context.is_a?(Hash)
-      return context.instance_eval(@src, (@filename || '(erubis)'))
+      #return context.instance_eval(@src, @filename || '(erubis)')
+      @_proc ||= eval("proc { #{@src} }", TOPLEVEL_BINDING, @filename || '(erubis)')
+      return context.instance_eval(&@_proc)
     end
 
+    ## if object is an Class or Module then define instance method to it,
+    ## else define singleton method to it.
+    def def_method(object, method_name, filename=nil)
+      m = object.is_a?(Module) ? :module_eval : :instance_eval
+      object.__send__(m, "def #{method_name}; #{@src}; end", filename || @filename || '(erubis)')
+    end
+
+
   end
 
 

data/lib/erubis/generator.rb

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

data/lib/erubis/helper.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
+## $Rev: 89 $
+## $Release: 2.4.0 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -27,9 +27,21 @@ module Erubis
       #value.to_s.gsub(/[&<>"]/) { ESCAPE_TABLE[$&] }
     end
 
+    def escape_xml2(value)
+      return value.to_s.gsub(/\&/,'&amp;').gsub(/</,'&lt;').gsub(/>/,'&gt;').gsub(/"/,'&quot;')
+    end
+
     alias h escape_xml
     alias html_escape escape_xml
 
+    def url_encode(str)
+      return str.gsub(/[^-_.a-zA-Z0-9]+/) { |s|
+        s.unpack('C*').collect { |i| "%%%02X" % i }.join
+      }
+    end
+
+    alias u url_encode
+
   end
 
 

data/lib/erubis/helpers/rails_helper.rb

@@ -1,11 +1,12 @@
 ###
-### $Rev: 82 $
-### $Release: 2.3.1 $
+### $Rev: 90 $
+### $Release: 2.4.0 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 
 
 require 'erubis'
+require 'cgi'
 
 
 module Erubis
@@ -30,7 +31,8 @@ module Erubis
     ##      require 'erubis/helpers/rails_helper'
     ##      #Erubis::Helpers::RailsHelper.engine_class = Erubis::Eruby # or Erubis::FastEruby
     ##      #Erubis::Helpers::RailsHelper.init_properties = {}
-    ##      #Erubis::Helpers::RailsHelper.show_src = false             # set true for debugging
+    ##      #Erubis::Helpers::RailsHelper.show_src = false       # set true for debugging
+    ##      #Erubis::Helpers::RailsHelper.preprocessing = true   # set true to enable preprocessing
     ##
     ## 2. (optional) apply the patch for 'action_view/base.rb'
     ##
@@ -78,6 +80,27 @@ module Erubis
         @@show_src = flag
       end
 
+      ##----- preprocessor: experimental -----
+      @@preprocessing = false
+      def self.preprocessing
+        @@preprocessing
+      end
+      def self.preprocessing=(flag)
+        @@preprocessing = flag
+      end
+      class PreprocessingEruby < Erubis::Eruby
+        def initialize(input, params={})
+          params = params.dup
+          params[:pattern] = '\[% %\]'    # use '[%= %]' instead of '<%= %>'
+          params[:escape] = true          # transport '[%= %]' and '[%== %]'
+          super
+        end
+        def add_expr_escaped(src, code)
+          add_expr_literal(src, "_decode((#{code}))")
+        end
+      end
+      ##----------------------------------------
+
     end
 
   end
@@ -187,11 +210,33 @@ class ActionView::Base  # :nodoc:
     klass      = Erubis::Helpers::RailsHelper.engine_class
     properties = Erubis::Helpers::RailsHelper.init_properties
     show_src   = Erubis::Helpers::RailsHelper.show_src
+    ##----- preprocessing: experimental -----
+    if Erubis::Helpers::RailsHelper.preprocessing
+      preprocessor = Erubis::Helpers::RailsHelper::PreprocessingEruby.new(template)
+      template = self.instance_eval(preprocessor.src)
+      logger.debug "** Erubis: preprocessed==<<'END'\n#{template}END\n" if show_src
+    end
+    ##----------------------------------------
     src = klass.new(template, properties).src
     #src.insert(0, '_erbout = ')
     logger.debug "** Erubis: src==<<'END'\n#{src}END\n" if show_src
     src
   end
+
+  ##----- preprocessing: experimental -----
+  def _expr(arg)
+    return "<%=#{arg}%>"
+  end
+  alias _x _expr
+  alias _? _expr
+  def _decode(arg)
+    arg = arg.to_s
+    arg.gsub!(/%3C%25%3D(.*?)%25%3E/) { "<%=#{CGI.unescape($1)}%>" }
+    arg.gsub!(/&lt;%=(.*?)%&gt;/) { "<%=#{CGI.unescapeHTML($1)}%>" }
+    return arg
+  end
+  ##----------------------------------------
+
 end
 
 

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 78 $
-### $Release: 2.3.1 $
+### $Rev: 91 $
+### $Release: 2.4.0 $
 ### copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ###
 
@@ -173,7 +173,7 @@ module Erubis
           msg = nil if val
         end
       else
-        engine.filename = '(stdin)'
+        engine.filename = filename = '(stdin)'
         engine.convert!($stdin.read())
         val = do_action(action, engine, context, filename, opts)
         msg = nil if val
@@ -215,8 +215,8 @@ module Erubis
       return source
     end
 
-    def usage
-      command = File.basename($0)
+    def usage(command=nil)
+      command ||= File.basename($0)
       buf = []
       buf << "erubis - embedded program converter for multi-language"
       buf << "Usage: #{command} [..options..] [file ...]"
@@ -247,10 +247,9 @@ module Erubis
       #  -c class      : class name (XmlEruby/PercentLineEruby/...) (default Eruby)
       #  -r library    : require library
       #  -a            : action (convert/execute)
-      return join("\n")
+      return buf.join("\n")
     end
 
-
     def collect_supported_properties(erubis_klass)
       list = []
       erubis_klass.ancestors.each do |klass|
@@ -407,7 +406,7 @@ module Erubis
 
     def load_datafiles(filenames, opts)
       context = Erubis::Context.new
-      return hash unless filenames
+      return context unless filenames
       filenames.split(/,/).each do |filename|
         filename.strip!
         test(?f, filename) or raise CommandOptionError.new("#{filename}: file not found.")

data/lib/erubis/tiny.rb

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

data/test/assert-text-equal.rb

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

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

@@ -0,0 +1,14 @@
+require 'erubis'
+s = "hello <%= name %>"
+eruby = Erubis::Eruby.new(s)
+filename = 'hello.rhtml'
+
+## define instance method to Dummy class (or module)
+class Dummy; end
+eruby.def_method(Dummy, 'render(name)', filename)  # filename is optional
+p Dummy.new.render('world')    #=> "hello world"
+
+## define singleton method to dummy object
+obj = Object.new
+eruby.def_method(obj, 'render(name)', filename)    # filename is optional
+p obj.render('world')          #=> "hello world"

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

@@ -0,0 +1,3 @@
+$ ruby def_method.rb
+"hello world"
+"hello world"

data/test/test-engines.rb

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

data/test/test-enhancers.rb

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

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 77 $
-## $Release: 2.3.1 $
+## $Rev: 91 $
+## $Release: 2.4.0 $
 ## copyright(c) 2006-2007 kuwata-lab.com all rights reserved.
 ##
 
@@ -154,6 +154,44 @@ END
   end
 
 
+  class Dummy
+  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'))
+    eruby.def_method(Dummy, 'render(list)', 'foo.rhtml')
+    assert(Dummy.instance_methods.include?('render'))
+    actual = Dummy.new().render(%w[1 2 3])
+    assert_equal("i=1\ni=2\ni=3\n", actual)
+  end
+
+  def test_def_method2
+    s = "<%for i in list%>i=<%=i%>\n<%end%>"
+    eruby = Erubis::Eruby.new(s)
+    assert(! (eruby.respond_to? :render))
+    eruby.def_method(eruby, 'render(list)', 'foo.rhtml')
+    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)
+  end
+
+  def test_evaluate_creates_proc
+    s = "hello <%= @name %>"
+    eruby = Erubis::Eruby.new(s)
+    assert_nil(eruby.instance_variable_get('@_proc'))
+    actual1 = eruby.evaluate(:name=>'world')
+    assert_not_nil(eruby.instance_variable_get('@_proc'))
+    assert_instance_of(Proc, eruby.instance_variable_get('@_proc'))
+    actual2 = eruby.evaluate(:name=>'world')
+    assert_equal(actual1, actual2)
+    # convert() must clear @_proc
+    eruby.convert(s)
+    assert_nil(eruby.instance_variable_get('@_proc'))
+  end
+
 end
 
 __END__