kwartz 3.0.0 → 3.1.0

data/lib/kwartz/binding/pierubis.rb

@@ -0,0 +1,58 @@
+###
+### $Rev: 137 $
+### $Release: 3.1.0 $
+### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
+###
+
+require 'kwartz/converter'
+require 'kwartz/translator'
+require 'kwartz/binding/ruby'
+
+
+
+module Kwartz
+
+
+
+  class PIErubisHandler < RubyHandler
+  end
+  Handler.register_class('pierubis', PIErubisHandler)
+
+
+
+  ##
+  ## translator for Erubis
+  ##
+  class PIErubisTranslator < BaseTranslator
+
+
+    PIERUBIS_EMBED_PATTERNS = [
+      '<?rb ', ' ?>',      # statement
+      '@!{',   '}@',       # expression
+      '@{',    '}@',       # escaped expression
+    ]
+
+
+    def initialize(properties={})
+      super(PIERUBIS_EMBED_PATTERNS, properties)
+      #@escape = true if @escape == nil
+    end
+
+
+    def translate_native_expr(expr)
+      assert unless expr.is_a?(NativeExpression)
+      if expr.code.include?(?}) || expr.code.include?(?>)
+        @expr_l, @expr_r, @escape_l, @escape_r = '<%=', '%>', '<%==', '%>'
+      else
+        @expr_l, @expr_r, @escape_l, @escape_r = '@!{', '}@', '@{', '}@'
+      end
+      super(expr)
+    end
+
+
+  end
+  Translator.register_class('pierubis', PIErubisTranslator)
+
+
+
+end #module

data/lib/kwartz/binding/rails.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 110 $
-### $Release: 3.0.0 $
+### $Rev: 135 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -23,65 +23,65 @@ module Kwartz
   ## directive examples.
   ##
   ##  ## text_field, password_field
-  ##  <input type="text" size="10" maxsize="20" title="text_field 'user', 'name'">
+  ##  <input type="text" size="10" maxsize="20" kw:d="text_field 'user', 'name'">
   ##   => <%= text_field 'user', 'name', :size=>10, :maxsize=>20 %>
-  ##  <input type="text" name="user[name]" title="text_field :size=>10">
+  ##  <input type="text" name="user[name]" kw:d="text_field :size=>10">
   ##   => <%= text_field "user", "name", :size=>10 %>
-  ##  <input type="text" id="user_name" size="10" title="text_field">
+  ##  <input type="text" id="user_name" size="10" kw:d="text_field">
   ##   => <%= text_field "user", "name", :size=>10 %>
   ##
   ##  ## link_to, link_to_remote
-  ##  <a href="#" title="link_to :action=>'list'">Show list</a>
+  ##  <a href="#" kw:d="link_to :action=>'list'">Show list</a>
   ##   => <%= link_to 'Show list', :action=>'list' %>
   ##
-  ##  ## start_link_to, start_link_to_remote
-  ##  <a href="#" title="start_link_to :action=>'list'">Show list</a>
-  ##   => <%= start_link_to 'action'=>'list' %>Show list</a>
+  ##  ## start_link_tag, start_remote_link_tag
+  ##  <a href="#" kw:d="start_link_tag :action=>'list'">Show list</a>
+  ##   => <%= start_link_tag 'action'=>'list' %>Show list</a>
   ##
   ##  ## mail_to
-  ##  <a href="mail:www@example.com" title="mail_to">admin</a>
+  ##  <a href="mail:www@example.com" kw:d="mail_to">admin</a>
   ##   => <%= mail_to "www@example.com", "admin" %>
   ##
   ##  ## form_tag
-  ##  <form action="show" title="form_tag :id=>2"> ... </form>
+  ##  <form action="show" kw:d="form_tag :id=>2"> ... </form>
   ##   => <%= form_tag :action=>"show", :id=>2 %> ... </form>
   ##
   ##  ## submit_tag
-  ##  <input type="submit" value="OK" title="submit_tag">
+  ##  <input type="submit" value="OK" kw:d="submit_tag">
   ##   => <%= submit_tag "OK" %>
   ##
   ##  ## text_area
-  ##  <textarea cols="30" rows="3" id="user_desc" title="text_area"></textarea>
+  ##  <textarea cols="30" rows="3" id="user_desc" kw:d="text_area"></textarea>
   ##   => <%= text_area "user", "desc", :cols=>30, :rows=>3 %>
-  ##  <textarea cols="30" rows="3" name="user[desc]" title="text_area"></textarea>
+  ##  <textarea cols="30" rows="3" name="user[desc]" kw:d="text_area"></textarea>
   ##   => <%= text_area "user", "desc", :cols=>30, :rows=>3 %>
   ##
   ##  ## hidden_field
-  ##  <input type="hidden" id="user_id" title="hidden_field">
+  ##  <input type="hidden" id="user_id" kw:d="hidden_field">
   ##   => <%= hidden_field "user", "id" %>
-  ##  <input type="hidden" name="user[id]" title="hidden_field">
+  ##  <input type="hidden" name="user[id]" kw:d="hidden_field">
   ##   => <%= hidden_field "user", "id" %>
   ##
   ##  ## check_box
-  ##  <input type="checkbox" id="user_chk1" title="check_box">
+  ##  <input type="checkbox" id="user_chk1" kw:d="check_box">
   ##   => <%= check_box "user", "chk1" %>
-  ##  <input type="checkbox" name="user[chk2]" title="check_box">
+  ##  <input type="checkbox" name="user[chk2]" kw:d="check_box">
   ##   => <%= check_box "user", "chk2" %>
   ##
   ##  ## radio_button
-  ##  <input type="radio" id="user_radio" value="val1" title="radio_button">
+  ##  <input type="radio" id="user_radio" value="val1" kw:d="radio_button">
   ##   => <%= radio_button "user", "radio", "val1" %>
-  ##  <input type="radio" name="user[radio]" value="val2" title="radio_button">
+  ##  <input type="radio" name="user[radio]" value="val2" kw:d="radio_button">
   ##   => <%= radio_button "user", "radio", "val2" %>
   ##
   ##  ## select, collection_select, country_select, time_zone_select, date_select, datetime_select
-  ##  <select name="user[birth]" title="date_select :start_year=>1970">
+  ##  <select name="user[birth]" kw:d="date_select :start_year=>1970">
   ##    <option value="2000">2000</option>
   ##  </select>
   ##   => <% date_select "user", "birth", :start_year=>1970 %>
   ##
   ##  ## image_tag, link_image_to, link_to_image
-  ##  <img src="foo.gif" alt="text" width="20" heigth="10" title="image_tag :size=>'30x40'">
+  ##  <img src="foo.gif" alt="text" width="20" heigth="10" kw:d="image_tag :size=>'30x40'">
   ##   => <%= image_tag "foo.gif", :alt=>"text", :size=>'30x40' %>
   ##
 
@@ -93,16 +93,18 @@ module Kwartz
     ##
     ## everytime return true whenever directive name is unknown.
     ##
-    def handle(directive_name, directive_arg, directive_str, stag_info, etag_info, cont_stmts, attr_info, append_exprs, stmt_list)
+    def handle(stmt_list, handler_arg)
       ret = super
       return ret if ret
 
-      d_name = directive_name
-      d_arg  = directive_arg
-      d_str  = directive_str
+      arg = handler_arg
+      d_name = arg.directive_name
+      d_arg  = arg.directive_arg
+      d_str  = arg.directive_str
+      attr_info = arg.attr_info
 
       ## parse 'name="user[name]"' or 'id="user_name"'
-      case directive_name.to_s
+      case d_name.to_s
       when /(_|\A)radio_button\z/
         add_directive_object_and_method_and_value(d_arg, attr_info)
       when /_field\z/, /_area\z/, /_box\z/, /(_|\A)select\z/, 'input'
@@ -110,9 +112,9 @@ module Kwartz
       end
 
       ## replace whole element, or only start tag
-      replace_elem = directive_name.to_s !~ /\Astart_/
+      replace_elem = d_name.to_s !~ /\Astart_/
 
-      case directive_name
+      case d_name
 
       when :text_field, :password_field, :hidden_field
         #add_directive_object_and_method(d_arg, attr_info)
@@ -124,13 +126,13 @@ module Kwartz
         add_directive_integer_option(d_arg, 'size', attr_info['size'])
 
       when :link_to, :link_to_remote, :link_to_unless_current
-        add_directive_content_as_arg(d_arg, cont_stmts)
+        add_directive_content_as_arg(d_arg, arg.cont_stmts)
 
       when :anchor, :anchor_remote
         replace_elem = false
 
       when :mail_to
-        add_directive_content_as_arg(d_arg, cont_stmts)
+        add_directive_content_as_arg(d_arg, arg.cont_stmts)
         add_directive_attr_as_arg(d_arg, attr_info, 'href')
         d_arg.sub!(/\A\'mailto:/, "'")
 
@@ -168,7 +170,7 @@ module Kwartz
       end #case
 
       ##
-      print_directive(d_name, d_arg, stag_info, etag_info, cont_stmts, attr_info, stmt_list, replace_elem)
+      print_directive(stmt_list, arg, replace_elem)
 
       return true      # everytime return true
 
@@ -249,17 +251,18 @@ module Kwartz
     end
 
 
-    def print_directive(d_name, d_arg, stag_info, etag_info, cont_stmts, attr_info, stmt_list, replace_elem=true)
-      head_space = stag_info.head_space
-      tail_space = (etag_info || stag_info).tail_space
-      args = []
-      args << head_space if head_space
-      args << NativeExpression.new("#{d_name} #{d_arg}")
-      args << tail_space if tail_space
-      stmt_list << PrintStatement.new(args)
+    def print_directive(stmt_list, handler_arg, replace_elem=true)
+      arg = handler_arg
+      head_space = arg.stag_info.head_space
+      tail_space = (arg.etag_info || arg.stag_info).tail_space
+      pargs = []
+      pargs << head_space if head_space
+      pargs << NativeExpression.new("#{arg.directive_name} #{arg.directive_arg}")
+      pargs << tail_space if tail_space
+      stmt_list << PrintStatement.new(pargs)
       unless replace_elem
-        stmt_list.concat(cont_stmts)
-        stmt_list << PrintStatement.new([etag_info.tag_text])
+        stmt_list.concat(arg.cont_stmts)
+        stmt_list << PrintStatement.new([arg.etag_info.tag_text])
       end
     end
 

data/lib/kwartz/binding/ruby.rb

@@ -0,0 +1,193 @@
+###
+### $Rev: 128 $
+### $Release: 3.1.0 $
+### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
+###
+
+require 'kwartz/converter'
+require 'kwartz/translator'
+
+
+
+module Kwartz
+
+
+
+  ##
+  ## directive handler for Ruby
+  ##
+  class RubyHandler < Handler
+
+
+    RUBY_DIRECTIVE_PATTERN = /\A(\w+)(?:[:\s]\s*(.*))?\z/
+
+    def directive_pattern
+      return RUBY_DIRECTIVE_PATTERN
+    end
+
+
+    RUBY_MAPPING_PATTERN = /\A'([-:\w]+)'\s+(.*)\z/
+
+    def mapping_pattern
+      return RUBY_MAPPING_PATTERN
+    end
+
+
+    RUBY_DIRECTIVE_FORMAT = '%s: %s'
+
+    def directive_format
+      return RUBY_DIRECTIVE_FORMAT
+    end
+
+
+    def handle(stmt_list, handler_arg)
+      ret = super
+      return ret if ret
+
+      arg = handler_arg
+      d_name = arg.directive_name
+      d_arg  = arg.directive_arg
+      d_str  = arg.directive_str
+      #stag_info = arg.stag_info
+      #etag_info = arg.etag_info
+      #cont_stmts = arg.cont_stmts
+
+      case d_name
+
+      when :for, :For, :FOR, :list, :List, :LIST
+        unless d_arg =~ /\A(\w+)(?:,\s*(\w+))?\s+in\s+(.*)\z/  \
+            || d_arg =~ /\A(\w+)(?:,(\w+))?\s*[:=]\s*(.*)\z/
+          raise convert_error("'#{d_str}': invalid argument.", arg.stag_info.linenum)
+        end
+        loopvar = $1 ;  loopval = $2 ;  looplist = $3
+        is_foreach = d_name == :for || d_name == :For || d_name == :FOR
+        counter = d_name == :for || d_name == :list ? nil : "#{loopvar}_ctr"
+        toggle  = d_name != :FOR && d_name != :LIST ? nil : "#{loopvar}_tgl"
+        foreach_code = loopval ? "#{looplist}.each do |#{loopvar}, #{loopval}|" \
+                               : "for #{loopvar} in #{looplist} do"
+        code = []
+        code << "#{counter} = 0" if counter
+        code << foreach_code
+        code << "  #{counter} += 1" if counter
+        code << "  #{toggle} = #{counter}%2==0 ? #{@even} : #{@odd}" if toggle
+        if is_foreach
+          wrap_element_with_native_stmt(stmt_list, arg, code, "end", :foreach)
+        else
+          wrap_content_with_native_stmt(stmt_list, arg, code, "end", :foreach)
+        end
+
+      when :while
+        wrap_element_with_native_stmt(stmt_list, arg, "while #{d_arg} do", "end", :while)
+        #stmt_list << NativeStatement.new("while #{d_arg} do", :while)
+        #stmt_list << stag_stmt(arg)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << etag_stmt(arg)
+        #stmt_list << NativeStatement.new("end", :while)
+
+      when :loop
+        error_if_empty_tag(arg)
+        wrap_content_with_native_stmt(stmt_list, arg, "while #{d_arg} do", "end", :while)
+        #stmt_list << stag_stmt(arg)
+        #stmt_list << NativeStatement.new("while #{d_arg} do", :while)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << NativeStatement.new("end", :while)
+        #stmt_list << etag_stmt(arg)
+
+      when :set
+        wrap_element_with_native_stmt(stmt_list, arg, d_arg, nil, :set)
+        #stmt_list << NativeStatement.new(d_arg, :set)
+        #stmt_list << stag_stmt(arg)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << etag_stmt(arg)
+
+      when :if
+        wrap_element_with_native_stmt(stmt_list, arg, "if #{d_arg} then", "end", :if)
+        #stmt_list << NativeStatement.new("if #{d_arg} then", :if)
+        #stmt_list << stag_stmt(arg)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << etag_stmt(arg)
+        #stmt_list << NativeStatement.new("end", :if)
+
+      when :elsif, :else
+        error_when_last_stmt_is_not_if(stmt_list, arg)
+        stmt_list.pop    # delete 'end'
+        kind = d_name == :else ? :else : :elseif
+        code = d_name == :else ? "else" : "elsif #{d_arg} then"
+        wrap_element_with_native_stmt(stmt_list, arg, code, "end", kind)
+        #stmt_list << NativeStatement.new(code, kind)
+        #stmt_list << stag_stmt(arg)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << etag_stmt(arg)
+        #stmt_list << NativeStatement.new("end", kind)
+
+      when :default, :Default, :DEFAULT
+        error_if_empty_tag(arg)
+        expr_code = d_arg
+        flag_escape = d_name == :default ? nil : (d_name == :Default)
+        add_native_expr_with_default(stmt_list, arg, expr_code, flag_escape,
+                                     "if (#{d_arg}) && !(#{d_arg}).to_s.empty? then",
+                                     "else", "end")
+        #stmt_list << stag_stmt(arg)
+        #stmt_list << NativeStatement.new_without_newline("if (#{d_arg}) && !(#{d_arg}).to_s.empty? then", :if)
+        #flag_escape = d_name == :default ? nil : (d_name == :Default)
+        #stmt_list << PrintStatement.new([ NativeExpression.new(d_arg, flag_escape) ])
+        #stmt_list << NativeStatement.new_without_newline("else", :else)
+        #stmt_list.concat(arg.cont_stmts)
+        #stmt_list << NativeStatement.new_without_newline("end", :else)
+        #stmt_list << etag_stmt(arg)
+
+      else
+        return false
+
+      end #case
+      return true
+
+    end #def
+
+
+  end #class
+  Handler.register_class('ruby', RubyHandler)
+
+
+
+  ##
+  ## translator for eRuby
+  ##
+  class RubyTranslator < BaseTranslator
+
+
+    def initialize(properties={})
+      escapefunc = properties[:escapefunc] || 'ERB::Util.h'
+      marks = ['', '', '_buf << (', ').to_s; ', "_buf << #{escapefunc}(", '); ']
+      super(marks, properties)
+      @header = '_buf = ""; '  unless @header == false
+      @footer = '; _buf' + @nl   unless @footer == false
+    end
+
+
+    def translate_string(str)
+      return if str.nil? || str.empty?
+      #str.gsub!(/['\\]/, '\\\\\&')
+      #@sb << "_buf << '#{str}'; "
+      str.gsub!(/["\\]/, '\\\\\&')
+      if str[-1] == ?\n
+        str.chop!
+        @sb << "_buf << \"#{str}\\n\";" << @nl
+      else
+        @sb << "_buf << \"#{str}\"; "
+      end
+    end
+
+
+    def translate(stmt_list)
+      stmt_list2 = optimize_print_stmts(stmt_list)
+      return super(stmt_list2)
+    end
+
+
+  end #class
+  Translator.register_class('ruby', RubyTranslator)
+
+
+
+end #module

data/lib/kwartz/binding/struts.rb

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

data/lib/kwartz/config.rb

@@ -1,6 +1,6 @@
 ###
-### $Rev: 110 $
-### $Release: 3.0.0 $
+### $Rev: 135 $
+### $Release: 3.1.0 $
 ### copyright(c) 2004-2006 kuwata-lab.com all rights reserved
 ###
 
@@ -15,8 +15,9 @@ module Kwartz
     PROPERTY_ODD        = "'odd'"
     PROPERTY_EVEN       = "'even'"
     PROPERTY_LANG       = 'eruby'
-    PROPERTY_DATTR      = 'title'
+    PROPERTY_DATTR      = 'kw:d'    # or 'title'
     PROPERTY_DELSPAN    = false     # delete dummy <span> tag or not
+    PROPERTY_JSTL       = 1.2       # jstl version (1.2 or 1.1)
     #
     NO_ETAGS            = [ 'input', 'img' ,'br', 'hr', 'meta', 'link' ]
     #ALLOW_DUPLICATE_ID  = false