kwartz 3.0.0 → 3.1.0

data/lib/kwartz/translator.rb

@@ -1,6 +1,6 @@
 ####
-#### $Rev: 117 $
-#### $Release: 3.0.0 $
+#### $Rev: 128 $
+#### $Release: 3.1.0 $
 #### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ####
 
@@ -93,7 +93,7 @@ module Kwartz
     attr_accessor :escape, :header, :footer
 
 
-    def translate(stmt_list=[])
+    def translate(stmt_list)
       @sb = ''
       @sb << @header if @header
       stmt_list.each do |stmt|
@@ -114,7 +114,8 @@ module Kwartz
       stmt.args.each do |arg|
         #arg.accept(self)
         if arg.is_a?(String)
-          translate_string(arg)
+          #translate_string(arg)
+          parse_embedded_expr(arg)
         elsif arg.is_a?(NativeExpression)
           translate_native_expr(arg)
         else
@@ -129,9 +130,9 @@ module Kwartz
       flag_escape = expr.escape?
       flag_escape = @escape if flag_escape == nil
       if flag_escape
-        @sb << @escape_l << expr.code << @escape_r     # ex. <%=h expr.code %>
+        add_escaped_expr(expr.code)
       else
-        @sb << @expr_l << expr.code << @expr_r         # ex. <%= expr.code %>
+        add_plain_expr(expr.code)
       end
     end
 
@@ -146,8 +147,105 @@ module Kwartz
 #    end
 
 
+    protected
+
+
+    def parse_embedded_expr(text)
+      pos = 0
+      text.scan(/@(!*)\{(.*?)\}@/) do |indicator, expr_code|
+        m = Regexp.last_match
+        s = text[pos, m.begin(0) - pos]
+        pos = m.end(0)
+        translate_string(s) unless s.empty?
+        case indicator
+        when nil, ''  ;  add_escaped_expr(expr_code)
+        when '!'      ;  add_plain_expr(expr_code)
+        when '!!'     ;  add_debug_expr(expr_code)
+        else          ;  # do nothing
+        end
+      end
+      rest = pos == 0 ? text : $'
+      translate_string(rest) unless rest.empty?
+    end
+
+
+    def add_plain_expr(expr_code)
+      @sb << @expr_l << expr_code << @expr_r       # ex. <%= expr_code %>
+    end
+
+
+    def add_escaped_expr(expr_code)
+      @sb << @escape_l << expr_code << @escape_r   # ex. <%=h expr_code %>
+    end
+
+
+    def add_debug_expr(expr_code)
+      not_implemented
+    end
+
+
+    ## concat several print statements into a statement
+    def optimize_print_stmts(stmt_list)
+      stmt_list2 = []
+      args = []
+      stmt_list.each do |stmt|
+        if stmt.is_a?(PrintStatement)
+          args += stmt.args
+        else
+          if !args.empty?
+            args = _compact_args(args)
+            stmt_list2 << PrintStatement.new(args)
+            args = []
+          end
+          stmt_list2 << stmt
+        end
+      end
+      if !args.empty?
+        args = _compact_args(args)
+        stmt_list2 << PrintStatement.new(args)
+      end
+      return stmt_list2
+    end
+
+
+    private
+
+
+    ## concat several string arguments into a string in arguments
+    def _compact_args(args)
+      args2 = []
+      s = ''
+      args.each do |arg|
+        if arg.is_a?(NativeExpression)
+          args2 << s unless s.empty?
+          s = ''
+          args2 << arg
+        else
+          s << arg
+        end
+      end
+      args2 << s unless s.empty?
+      return args2
+    end
+
+
   end #class
 
 
 
+  module NoTextEnhancer  # :nodoc:
+
+
+    def translate_string(str)
+      @sb << (@nl * str.count("\n"))
+      pos = str.rindex("\n")
+      len = pos ? str.length - pos - 1 : str.length
+      @sb << (' ' * len)
+    end
+
+
+  end
+
+
+
 end #module

data/lib/kwartz/util.rb

@@ -0,0 +1,113 @@
+###
+### $Rev: 126 $
+### $Release: 3.1.0 $
+### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
+###
+
+module Kwartz
+
+
+  module Util
+
+
+    module_function
+
+
+
+    ##
+    ## expand tab characters to spaces
+    ##
+    def untabify(str, width=8)
+      list = str.split(/\t/)
+      last = list.pop
+      buf = []
+      list.each do |s|
+        column = (pos = s.rindex(?\n)) ? s.length - pos - 1 : s.length
+        n = width - (column % width)
+        buf << s << (" " * n)
+      end
+      buf << last
+      return buf.join
+    end
+    #--
+    #def untabify(str, width=8)
+    #  sb = ''
+    #  str.scan(/(.*?)\t/m) do |s, |
+    #    len = (n = s.rindex(?\n)) ? s.length - n - 1 : s.length
+    #    sb << s << (" " * (width - len % width))
+    #  end
+    #  return $' ? (sb << $') : str
+    #end
+    #++
+
+
+    ##
+    ## convert hash's key string into symbol.
+    ##
+    ## ex.
+    ##   hash = YAML.load_file('foo.yaml')
+    ##   intern_hash_keys(hash)
+    ##
+    def intern_hash_keys(obj, done={})
+      return if done.key?(obj.__id__)
+      case obj
+      when Hash
+        done[obj.__id__] = obj
+        obj.keys.each do |key|
+          obj[key.intern] = obj.delete(key) if key.is_a?(String)
+        end
+        obj.values.each do |val|
+          intern_hash_keys(val, done) if val.is_a?(Hash) || val.is_a?(Array)
+        end
+      when Array
+        done[obj.__id__] = obj
+        obj.each do |val|
+          intern_hash_keys(val, done) if val.is_a?(Hash) || val.is_a?(Array)
+        end
+      end
+    end
+
+
+    ##
+    ## convert string pattern into regexp.
+    ## metacharacter '*' and '?' are available.
+    ##
+    ## ex.
+    ##   pattern_to_regexp('*.html')    #=> /\A(.*)\.html\z/
+    ##
+    def pattern_to_regexp(pattern)
+      i = 0
+      len = pattern.length
+      s = '\A'
+      while i < len
+        case ch = pattern[i]
+        when ?\\  ;  s << Regexp.escape(pattern[i+=1].chr)
+        when ?*   ;  s << '(.*)'
+        when ??   ;  s << '(.)'
+        else      ;  s << Regexp.escape(ch.chr)
+        end
+        i += 1
+      end
+      s << '\z'
+      return Regexp.compile(s)
+    end
+
+
+    ##
+    ## select items from list with patterns.
+    ##
+    ## ex.
+    ##   patterns = %w[user_*]
+    ##   names = %w[user_name user_age error_msg]
+    ##   select_with_patterns(list, patterns)   #=> ['user_name', 'user_age']
+    ##
+    def select_with_patterns(list, patterns)
+      regexp_list = patterns.collect { |pattern| pattern_to_regexp(pattern) }
+      return list.select { |item| regexp_list.any? { |rexp| rexp =~ item } }
+    end
+
+
+  end
+
+
+end

data/lib/kwartz/util/assert-text-equal.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev: 117 $
-### $Release: 3.0.0 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 

data/lib/kwartz/util/testcase-helper.rb

@@ -1,6 +1,6 @@
 ###
 ### $Rev$
-### $Release: 3.0.0 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -12,13 +12,24 @@ class Test::Unit::TestCase   # :nodoc:
 
 
   def self._untabify(str, width=8)         # :nodoc:
-    sb = []
-    str.scan(/(.*?)\t/m) do |s, |
-      len = (n = s.rindex(?\n)) ? s.length - n - 1 : s.length
-      sb << s << (" " * (width - len % width))
+    list = str.split(/\t/, -1)
+    return list.first if list.length == 1
+    last = list.pop
+    buf = []
+    list.each do |s|
+      column = (pos = s.rindex(?\n)) ? s.length - pos - 1 : s.length
+      n = width - (column % width)
+      buf << s << (" " * n)
     end
-    str = (sb << $').join if $'
-    return str
+    buf << last
+    return buf.join
+    #sb = []
+    #str.scan(/(.*?)\t/m) do |s, |
+    #  len = (n = s.rindex(?\n)) ? s.length - n - 1 : s.length
+    #  sb << s << (" " * (width - len % width))
+    #end
+    #str = (sb << $').join if $'
+    #return str
   end
 
 
@@ -48,9 +59,16 @@ class Test::Unit::TestCase   # :nodoc:
       ident         or  raise "*** #{identkey} is not found."
       table[ident]  and raise "*** #{identkey} '#{ident}' is duplicated."
       table[ident] = ydoc
-      yield(ydoc) if block_given?
     end
     #
+    target = $target || ENV['TEST']
+    if target
+       table[target] or raise "*** target '#{target}' not found."
+       list = [ table[target] ]
+    end
+    #
+    list.each do |ydoc| yield(ydoc) end if block_given?
+    #
     return list
   end
 

data/test/test-compile.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 117 $
-### $Release: 3.0.0 $
+### $Rev: 128 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -13,7 +13,7 @@ class CompileTest < Test::Unit::TestCase
 
   ## define test methods
   filename = __FILE__.sub(/\.rb$/, '.yaml')
-  load_yaml_testdata_with_each_lang(filename, :langs=>%w[eruby php jstl eperl])
+  load_yaml_testdata_with_each_lang(filename, :langs=>%w[eruby ruby erubis pierubis php jstl eperl])
 
 
   def _test

data/test/test-compile.yaml

@@ -17,11 +17,11 @@
 	    </table>
 	  </body>
 	</html>
+	<!-- end -->
 
-  
   plogic*:
-  
-    eruby: |
+
+    eruby: &plogic1_ruby|
 	#list {
 	  attrs: 'bgcolor' color,
 	         'title'   user.name;
@@ -40,6 +40,12 @@
 	#mail {
 	  cont: user[:mail];
 	}
+
+    ruby: *plogic1_ruby
+
+    erubis: *plogic1_ruby
+
+    pierubis: *plogic1_ruby
   
     php: |
 	#list {
@@ -118,11 +124,64 @@
 	        <td>{{*<%=h user.name %>*}}</td>
 	        <td>{{*<%= user[:mail] %>*}}</td>
 	      </tr>
-	<%     } %>
+	{{*<%     } %>*}}
 	    </table>
 	  </body>
 	</html>
-  
+	<!-- end -->
+
+    ruby: |
+	_buf = ""; _buf << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+	<html>
+	  <body>
+	    <table>\n";
+	    {{*@list.each_with_index { |user, i|*}}
+	      {{*color = i % 2 == 0 ? '#FFCCCC' : '#CCCCFF'*}}
+	_buf << "      <tr bgcolor=\""; _buf << {{*(color).to_s*}}; _buf << "\" title=\""; _buf << {{*(user.name).to_s*}}; _buf << "\">
+	        <td>"; _buf << {{*ERB::Util.h(user.name)*}}; _buf << "</td>
+	        <td>"; _buf << {{*(user[:mail]).to_s*}}; _buf << "</td>
+	      </tr>\n";
+	    {{*}*}}
+	_buf << "    </table>
+	  </body>
+	</html>
+	<!-- end -->\n";
+	; _buf
+
+    erubis: |
+	<?xml version="1.0" encoding="UTF-8"?>
+	<html>
+	  <body>
+	    <table>
+	{{*<%     @list.each_with_index { |user, i| %>*}}
+	{{*<%       color = i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' %>*}}
+	      <tr bgcolor="{{*<%= color %>*}}" title="{{*<%= user.name %>*}}">
+	        <td>{{*<%== user.name %>*}}</td>
+	        <td>{{*<%= user[:mail] %>*}}</td>
+	      </tr>
+	{{*<%     } %>*}}
+	    </table>
+	  </body>
+	</html>
+	<!-- end -->
+
+    pierubis: |
+	<?xml version="1.0" encoding="UTF-8"?>
+	<html>
+	  <body>
+	    <table>
+	{{*<?rb     @list.each_with_index { |user, i| ?>*}}
+	{{*<?rb       color = i % 2 == 0 ? '#FFCCCC' : '#CCCCFF' ?>*}}
+	      <tr bgcolor="{{*@!{color}@*}}" title="{{*@!{user.name}@*}}">
+	        <td>{{*@{user.name}@*}}</td>
+	        <td>{{*@!{user[:mail]}@*}}</td>
+	      </tr>
+	{{*<?rb     } ?>*}}
+	    </table>
+	  </body>
+	</html>
+	<!-- end -->
+
     php: |
 	<{{*<?php ?>*}}?xml version="1.0" encoding="UTF-8"?>
 	<html>
@@ -140,6 +199,7 @@
 	    </table>
 	  </body>
 	</html>
+	<!-- end -->
 
     jstl: |
 	{{*<%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>*}}
@@ -158,6 +218,7 @@
 	    </table>
 	  </body>
 	</html>
+	<!-- end -->
   
     eperl: |
 	<?xml version="1.0" encoding="UTF-8"?>
@@ -176,3 +237,72 @@
 	    </table>
 	  </body>
 	</html>
+	<!-- end -->
+
+##
+- name:   embedded_expr1
+  desc:   embedded expression
+  pdata*:
+    eruby: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:<%=email%>"><%=h name%></a>
+    ruby: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:#{email}">#{ERB::Util.h name}</a>
+    erubis: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:<%= email %>"><%== name %></a>
+    pierubis: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="#" id="mark:link_to_destroy">Destroy</a>
+    php: |
+      <a href="mailto:@!{$email}@">@{$name}@</a>
+      <a href="mailto:<?php echo $email; ?>"><?php echo htmlspecialchars($name); ?></a>
+    jstl: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:<c:out value="${email}" escapeXml="false"/>">${name}</a>
+    eperl: |
+      <a href="mailto:@!{$email}@">@{$name}@</a>
+      <a href="mailto:<?= $email !>"><?= encode_entities($name) !></a>
+
+  plogic*:
+    eruby: |
+    ruby: |
+    erubis: |
+    pierubis: |
+      #link_to_destroy {
+        stag: start_link_tag {:action=>'destroy', :id=>@member.id},
+	                    :confirm=>"Are you OK?";
+      }
+    php: |
+    jstl: |
+    eperl: |
+
+  expected*:
+    eruby: |
+      <a href="mailto:<%= email %>"><%=h name %></a>
+      <a href="mailto:<%=email%>"><%=h name%></a>
+    ruby: |
+      _buf = ""; _buf << "<a href=\"mailto:"; _buf << (email).to_s; _buf << "\">"; _buf << ERB::Util.h(name); _buf << "</a>
+      <a href=\"mailto:#{email}\">#{ERB::Util.h name}</a>\n";
+      ; _buf
+    erubis: |
+      <a href="mailto:<%= email %>"><%== name %></a>
+      <a href="mailto:<%= email %>"><%== name %></a>
+    pierubis: |
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <a href="mailto:@!{email}@">@{name}@</a>
+      <%=start_link_tag {:action=>'destroy', :id=>@member.id},
+                            :confirm=>"Are you OK?"%>Destroy</a>
+    php: |
+      <a href="mailto:<?php echo $email; ?>"><?php echo htmlspecialchars($name); ?></a>
+      <a href="mailto:<?php echo $email; ?>"><?php echo htmlspecialchars($name); ?></a>
+    jstl: |
+      <%@ taglib prefix="c"  uri="http://java.sun.com/jsp/jstl/core" %>
+      <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+      <a href="mailto:<c:out value="${email}" escapeXml="false"/>">${name}</a>
+      <a href="mailto:<c:out value="${email}" escapeXml="false"/>">${name}</a>
+    eperl: |
+      <a href="mailto:<?= $email !>"><?= encode_entities($name) !></a>
+      <a href="mailto:<?= $email !>"><?= encode_entities($name) !></a>