erubis 2.5.0 → 2.6.0

data/lib/erubis/local-setting.rb

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

data/lib/erubis/main.rb

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

data/lib/erubis/preprocessing.rb

@@ -0,0 +1,59 @@
+###
+### $Rev: 102 $
+### $Release: 2.6.0 $
+### copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
+###
+
+require 'cgi'
+
+
+module Erubis
+
+
+  ##
+  ## for preprocessing
+  ##
+  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
+
+
+  ##
+  ## helper methods for preprocessing
+  ##
+  module PreprocessingHelper
+
+    module_function
+
+    def _p(arg)
+      return "<%=#{arg}%>"
+    end
+
+    def _P(arg)
+      return "<%=h(#{arg})%>"
+    end
+
+    alias _? _p
+
+    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
+
+
+end

data/lib/erubis/tiny.rb

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

data/test/assert-text-equal.rb

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

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/tail_260.result

@@ -0,0 +1,4 @@
+$ erubis -c '{var: "AAA\n"}' tailnewline.rhtml
+<div>
+AAA
+</div>

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

@@ -0,0 +1,3 @@
+<div>
+<%= @var -%>
+</div>

data/test/test-engines.rb

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

data/test/test-enhancers.rb

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

data/test/test-erubis.rb

@@ -1,6 +1,6 @@
 ##
-## $Rev: 94 $
-## $Release: 2.5.0 $
+## $Rev: 104 $
+## $Release: 2.6.0 $
 ## copyright(c) 2006-2008 kuwata-lab.com all rights reserved.
 ##
 
@@ -516,6 +516,48 @@ __END__
       <>&"
       <>&"
 
+##
+- name:  tailch1
+  options:
+  input: |
+        <p>
+          <% str = '<>&"' %>
+          <%= str %>
+          <%= str =%>
+          <%= str -%>
+        </p>
+  src: |
+        _buf = ''; _buf << '<p>
+        ';   str = '<>&"' 
+         _buf << '  '; _buf << ( str ).to_s; _buf << '
+        '; _buf << '  '; _buf << ( str ).to_s; _buf << '  '; _buf << ( str ).to_s; _buf << '</p>
+        ';
+        _buf.to_s
+  output: |
+        <p>
+          <>&"
+          <>&"  <>&"</p>
+
+##
+- name:  doublepercent1
+  options:
+  input: |
+        <% x1 = 10 %>
+        <%% x2 = 20 %>
+        <%= x1 %>
+        <%%= x2 %>
+  src: |
+        _buf = ''; x1 = 10 
+         _buf << '<% x2 = 20 %>
+        '; _buf << ( x1 ).to_s; _buf << '
+        '; _buf << '<%= x2 %>
+        ';
+        _buf.to_s
+  output: |
+        <% x2 = 20 %>
+        10
+        <%= x2 %>
+
 ##
 - name:  optimized1
   class: OptimizedEruby

data/test/test-main.rb

@@ -1,6 +1,6 @@
 ##
 ## $Rev: 87 $
-## $Release: 2.5.0 $
+## $Release: 2.6.0 $
 ## $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.5.0 $" =~ /[.\d]+/) && $&) + "\n"
+    @expected = (("$Release: 2.6.0 $" =~ /[.\d]+/) && $&) + "\n"
     @filename = false
     _test()
   end

data/test/test-users-guide.rb

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

data/test/test.rb

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

data/test/testutil.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: erubis
 version: !ruby/object:Gem::Version 
-  version: 2.5.0
+  version: 2.6.0
 platform: ruby
 authors: 
 - makoto kuwata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-30 00:00:00 +09:00
+date: 2008-05-05 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,6 +54,7 @@ files:
 - lib/erubis/helpers/rails_helper.rb
 - lib/erubis/local-setting.rb
 - lib/erubis/main.rb
+- lib/erubis/preprocessing.rb
 - lib/erubis/tiny.rb
 - lib/erubis.rb
 - bin/erubis
@@ -175,8 +176,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/tail_260.result
+- test/data/users-guide/tailnewline.rhtml
 - test/data/users-guide/template1.rhtml
 - test/data/users-guide/template2.rhtml
 - test/test-engines.rb
@@ -192,7 +196,6 @@ files:
 - CHANGES.txt
 - MIT-LICENSE
 - setup.rb
-- contrib/action_view_base_rb.patch
 - contrib/erubis
 - contrib/erubis-run.rb
 - contrib/inline-require
@@ -206,6 +209,10 @@ files:
 - benchmark/templates/bench_erubis.rhtml
 - benchmark/templates/bench_eruby.rhtml
 - doc-api/classes
+- doc-api/classes/ActionView
+- doc-api/classes/ActionView/TemplateHandlers
+- doc-api/classes/ActionView/TemplateHandlers/Erubis.html
+- doc-api/classes/ActionView.html
 - doc-api/classes/ERB.html
 - doc-api/classes/Erubis
 - doc-api/classes/Erubis/ArrayBufferEnhancer.html
@@ -251,7 +258,7 @@ files:
 - doc-api/classes/Erubis/Helpers
 - doc-api/classes/Erubis/Helpers/RailsFormHelper.html
 - doc-api/classes/Erubis/Helpers/RailsHelper
-- doc-api/classes/Erubis/Helpers/RailsHelper/PreprocessingEruby.html
+- doc-api/classes/Erubis/Helpers/RailsHelper/TemplateConverter.html
 - doc-api/classes/Erubis/Helpers/RailsHelper.html
 - doc-api/classes/Erubis/Helpers.html
 - doc-api/classes/Erubis/InterpolationEnhancer.html
@@ -283,6 +290,8 @@ files:
 - doc-api/classes/Erubis/PI/Escheme.html
 - doc-api/classes/Erubis/PI/TinyEruby.html
 - doc-api/classes/Erubis/PI.html
+- doc-api/classes/Erubis/PreprocessingEruby.html
+- doc-api/classes/Erubis/PreprocessingHelper.html
 - doc-api/classes/Erubis/PrintEnabledEnhancer.html
 - doc-api/classes/Erubis/PrintEnabledEruby.html
 - doc-api/classes/Erubis/PrintOutEnhancer.html
@@ -329,6 +338,7 @@ files:
 - doc-api/files/erubis/helpers/rails_helper_rb.html
 - doc-api/files/erubis/local-setting_rb.html
 - doc-api/files/erubis/main_rb.html
+- doc-api/files/erubis/preprocessing_rb.html
 - doc-api/files/erubis/tiny_rb.html
 - doc-api/files/erubis_rb.html
 - doc-api/files/README_txt.html
@@ -359,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: erubis
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: a fast and extensible eRuby implementation which supports multi-language

data/contrib/action_view_base_rb.patch

@@ -1,23 +0,0 @@
---- action_view/base.rb	(original)
-+++ action_view/base.rb	(working copy)
-@@ -445,6 +445,11 @@
-         end
-       end
- 
-+      # convert template into ruby code
-+      def convert_template_into_ruby_code(template)
-+        ERB.new(template, nil, @@erb_trim_mode).src
-+      end
-+
-       # Create source code for given template
-       def create_template_source(extension, template, render_symbol, locals)
-         if template_requires_setup?(extension)
-@@ -458,7 +463,7 @@
-               "update_page do |page|\n#{template}\nend"
-           end
-         else
--          body = ERB.new(template, nil, @@erb_trim_mode).src
-+          body = convert_template_into_ruby_code(template)
-         end
- 
-         @@template_args[render_symbol] ||= {}