w2tags 0.9.65 → 0.9.67

data/README.rdoc

@@ -1,10 +1,10 @@
 = W2TAGS
 === Run on MRI Ruby : 1.8.6 / 1.9.x
 
-  me@ubuntu:~$ sudo gem install wharsojo-w2tags
+  gem install w2tags
   
-  me@ubuntu:~$ w2tags -irb
-  ARGV  : -irb
+  w2tags -irb
+  ARGV : -irb
 
   Your W2Tags instance object stored in WH...
   Ex: puts WH.parse_line("#content\n  %span Hello")
@@ -13,15 +13,15 @@
   irb(main):001:0> wh <<END
   irb(main):002:0" #wow
   irb(main):003:0"   #kereen
-  irb(main):004:0"     . Hello World
+  irb(main):004:0"     .greeting Hello World
   irb(main):005:0" END
-  =>/usr/lib/ruby/gems/1.8/gems/wharsojo-w2tags-0.9.49/hot/erb.hot
+  =>/usr/lib/ruby/gems/1.8/gems/w2tags-0.9.67/hot/erb.hot
   <div id="wow">
     <div id="kereen">
-      <div>Hello World</div>
+      <div class="greeting">Hello World</div>
     </div>
   </div>
-  => nil
+  => ["<div id="wow">\n", "  <div id="kereen">\n", "    <div class="greeting">Hello World</div>\n", "  </div>\n", "</div>\n"]
   irb(main):006:0>
 
 == DESCRIPTION:
@@ -43,8 +43,9 @@ define uniq variable "@var=", Key-Variable
   "$:","*:" for attribute NAME, 
   "$#","*#" for attribute ID, 
   "$.","*." for attribute CLASS, 
+  "$$" for all Key-Variable, 
   "$@","*@" for custome attribute,
-  "$$" for all Key-Variable. 
+  "$=" for ruby code ("=" or "==" last Key-Variable).
   
 This Constanta will be ready every time it parse the W2TAGS HOT (% / -).
 

data/VERSION

@@ -1 +1 @@
-0.9.65
+0.9.67

data/bin/w2tags

@@ -57,7 +57,7 @@ end
 arg = ARGV 
 if arg.size>0
   arg = ['w2erb'] + arg if arg.size==1 && arg[0]=='-a'
-  puts 'ARGV  : '+arg.join(" ")
+  puts 'ARGV : '+arg.join(" ")
   puts arg[1]
   
   WH = W2Tags::Parser.new
@@ -80,7 +80,9 @@ if arg.size>0
     
     class Object
       def wh(str)
-        puts WH.parse_line(str)
+        rtn = WH.parse_line(str)
+        puts rtn
+        rtn
       end
     end
 

data/doc/History.rdoc

@@ -2,6 +2,86 @@
 
 Below is a complete list of changes for each revision of W2TAGS.
 
+== 0.9.67
+  
+=== Parser
+  * New Var-Constanta in HOT - "$=" 
+  * Splitter ':' in hot params
+
+==== New Var-Constanta in HOT - "$=", this var fix the need of reconstruct Key-attributes to the tag
+with costume attribute 
+
+  -# Example
+  
+  >>_menu
+  %div$${editor="eclipse" *@}$= $0
+
+  >>>W2TAGS>>>
+  -menu.dor{style="font:bold;"}== 0
+  
+  <div class="dor" editor="eclipse" style="font:bold;"><%= "0" %></div>
+
+==== Parameter in hot support splitter ':' to enhance the parameter manipulation
+ 
+  -# Example:
+
+  >>_a
+  %a$${href="$0.split(':')[1].to_s.strip~" *@}$= $0.split(':')[0].to_s.strip~ 
+
+  %a$${href="$0:1" *@}$= $0:0 
+
+Two command above will produce the same result
+
+  -a.dodol.garut{style="blue"}= \
+    Wow  : #     ;\
+    Home : /     ;\
+    Next : /next
+  
+  -a.dodol.garut{style="background:blue;"}= \
+  Wow  : #     ;\    Home : /     ;\
+  Next : /next
+
+  <a class="dodol garut" href="#" style="background:blue;"><%= Wow %></a>
+  <a class="dodol garut" href="/" style="background:blue;"><%= Home %></a>
+  <a class="dodol garut" href="/next" style="background:blue;"><%= Next %></a>
+
+== 0.9.66
+
+=== Parser
+  * Auto closing tag in HOT now properly indented
+
+==== Auto closing tag in HOT now properly indented
+this example show how we redefine the tag %script to automatically 
+generate <script *all**@type="text/javascript" charset="utf-8">, with
+xhtml comment and line below this tag must not be parse
+
+  -# Example:
+  >>script
+  <script *all**@type="text/javascript" charset="utf-8">
+  %script_end
+  -!
+
+  >>script_end
+  <</
+  </script>
+
+  >>_script_tag
+  %script
+    //<![CDATA[
+    ==$0;
+    //]]>
+
+  >>>W2TAGS>>>
+  -script_tag var instant= '#{@line}'
+
+Result of w2tags command above will be xhtml tag below with proper indentation 
+
+  <script type="text/javascript" charset="utf-8">
+    //<![CDATA[
+    <%= "var instant= '#{@line}'" %>;
+    //]]>
+  </script>
+
 == 0.9.65
 
 === Parser

data/hot/erb_base.hot

@@ -61,7 +61,7 @@
 <</
 <% end %>
 
->>_a
+>>_a1
 %a$${href="*&"} $*
 
 >>_a2

data/hot/html.hot

@@ -75,3 +75,9 @@
 >>_ie_end
 <</
 <![endif]-->
+
+>>_a
+%a$${href="$0:1" *@}$= $0:0 
+
+>>_ax
+%a$${href="$0.split(':')[1].to_s.strip~" *@}$= $0.split(':')[0].to_s.strip~ 

data/lib/w2tags/parser.rb

@@ -204,9 +204,11 @@ module W2Tags
           @row.gsub!(/([\n\t ]*$)/,'')
           @row << "#{@ln_end.strip}\n"
         end
-        if @row.strip!="" 
+        if @row.strip!="" # responsible for generating good output
           p "#####> #{@row}" if @dbg[:parse] 
-          @doc_out << @row.rstrip+"\n" 
+          @doc_out << (@row.rstrip + "\n") 
+          #@doc_out << @row.rstrip # not working for 
+          #@doc_out << "\n"        # shortcut if elsif else 
         end
         @row
     end
@@ -276,12 +278,12 @@ module W2Tags
     # try to shift empty line create document and add current 
     # row to source. but it means re parsing current row.
     def swap_last_empt_src_with_end_tg(end_tg)
-      last = []
-      while @doc_out[-1] && @doc_out[-1].to_s.strip == ''
-        last << @doc_out.pop
+      while @doc_out[-1] && @doc_out[-1].strip == ''
+        @doc_out.pop
       end
+      @doc_out<< "\n" if @doc_out[-1] && @doc_out[-1][-1,1] != "\n" # responsible for generating good output
       end_tg.shift if end_tg[0].strip==''
-      @doc_src = end_tg + @doc_src 
+      @doc_src = end_tg + @doc_src #; p @doc_src; p @doc_out
       #p "Swp..: #{@doc_src[-1]}" if @dbg[:parse] 
     end
     
@@ -450,6 +452,7 @@ module W2Tags
             @new += "\n"+@spc 
           end
         end
+        p "Rept1: #{@new}" if @dbg[:parse] 
       elsif new_alls==[] && new_prms.size==1 && prms.size>1 
         tmp = ""
         rpt = @rgx.to_s.gsub(@rgx[3]+"\n","")
@@ -474,15 +477,25 @@ module W2Tags
              tmp<< "\n#{@spc}" if i+1<prms.size
           end
         end
+        p "Rept2: #{tmp}" if @dbg[:parse] 
         @new = tmp
       else
         i = new_prms.size - 1
         new_prms.sort.reverse.each do |x|
+          while Regexp.new('\\'+x+':(\d+)') =~ "\n#{@new}" do
+            idx = $1
+            src = $~.to_s
+            rpl = idx ? prms[i].split(':')[idx.to_i].to_s.strip : ''
+            p "Splt : #{prms[i]} => #{idx}" if @dbg[:parse] 
+            @new.gsub!(src,rpl)
+          end
+         
           rgx = '\\'+x+'\.([^~ ]+)~'     #/\$0\.([^~ ]~)/ => fix: next-tag (~^)
           eva_v = Regexp.new(rgx)        #Ex:$1.upcase~
           while eva_v=~ "\n#{@new}" do
             src = "#{x}.#{$1}~"          #p "\n#{@new} => #{src}"
             evl = "\"#{prms[i]}\".#{$1}" #p "====> #{evl} <=="
+            p "Eval : #{evl}" if @dbg[:parse] 
             rpl =  prms[i] ? eval(evl).to_s : ""
             @new.gsub!(src,rpl)
           end
@@ -523,11 +536,11 @@ module W2Tags
             @doc_src = scrpt[1,99]+@doc_src
           else
             spc = send[/(^[ \t]*)/,1].to_s
-            rpls << send.gsub(/\n/,"\n#{spc}") + "\n" 
+            rpls << (send.gsub("\n","\n#{spc}") + "\n") 
           end
         end
       end
-      p "End2 : #{rpls.strip}" if @dbg[:parse] && rpls!= ''
+      p "End2 : #{rpls}" if @dbg[:parse] && rpls!= ''
       rpls
     end
     
@@ -616,14 +629,16 @@ module W2Tags
     # this var will be use in parsing w2tags/hot command
     def nameidclass_var()
       #@key = keys = @rgx[2].strip.gsub(/(\{(.*)\})/,'') #greedy :)
-      @key = keys = @key.strip.gsub(/(\{(.*)\})/,'') #greedy :)
+      @key = keys = @key.strip.gsub(/(\{(.*)\})(=*)/,'') #greedy :)
       @att = $2.to_s.strip
+      lkey = $3.to_s.strip
       @mem_var['$$'     ]= ''
       @mem_var['$&'     ]= ''
       @mem_var['$:'     ]= ''
       @mem_var['$#'     ]= ''
       @mem_var['$.'     ]= ''
       @mem_var['$@'     ]= $1.to_s
+      @mem_var['$='     ]= ''
       @mem_var['*&'     ]= ''
       @mem_var['*:'     ]= ''
       @mem_var['*#'     ]= ''
@@ -675,12 +690,15 @@ module W2Tags
       @mem_var['*all*'] << @mem_var['*@']
       @mem_var['*att*']  = @mem_var['*@']
       if @key[0,1]!='='
-        if @key.gsub!(/==$/,'')
+        @key << lkey
+        if @key.gsub!(/==+$/,'')
           @mem_var['*code*'] = '<%= "$*" %>'
           @mem_var['$@']<< "=="
+          @mem_var['$='] = "=="
         elsif @key.gsub!(/=$/,'')
           @mem_var['*code*'] = "<%= $* %>"
           @mem_var['$@']<< "="
+          @mem_var['$='] = "="
         end
       end
     end
@@ -704,7 +722,7 @@ module W2Tags
             prms = @rgx[3].to_s.strip
             if /^\!/ =~ @key
               @new = (multi_end2(nil)+@spc+@rgx.to_s.gsub('%!','%')).split("\n")
-              swap_last_empt_src_with_end_tg(@new)
+              swap_last_empt_src_with_end_tg(@new) #@new array of src
               @row = ''
             else
               nameidclass_var()
@@ -841,7 +859,7 @@ module W2Tags
       else
         @plt_opt= ''  
         #rtn= true if @selector.select{|f|send(f)}.length>0
-        rtn = true if shortcut_exec( /(^[\t ]*)\-([\w\-&\/:#.%]*\{.*\}[=]?) *([^\n]*)\n/) 
+        rtn = true if shortcut_exec( /(^[\t ]*)\-([\w\-&\/:#.%]*\{.*\}=*) *([^\n]*)\n/) 
         rtn = true if shortcut_exec( /(^[\t ]*)\-([\w\-&\/:#.%=]*) *([^\n]*)\n/) 
         rtn = true if shortcut_equal( /(^[\t ]*)=([\w\-&\/:#.%=]*) *([^\n]*)\n/) 
         

data/lib/w2tags/try/views/index.erb

@@ -1,44 +1,3 @@
-<style>
-td{padding:0;}
-.h{display:none;}
-#content a{font-size:1em;}
-
-#tryit td{
-  vertical-align:top;}
-  
-textarea {
-  border:0;
-  font-size:11px;
-  line-height:12px;}
-  
-#link{
-  width:200px;}
-  
-textarea.in1{
-  width:400px;}
-  
-textarea.in2{
-  width:450px;
-  height:539px;
-  background-color:#EEEEEE;}
-  
-iframe{height:539px;}
-#ifr{
-  width:450px;}
-  
-td.i2{
-  border:2px inset;}
-  
-.CodeMirror-line-numbers div{
-  line-height:1.362em;
-  margin: 0;
-  width:20px;
-  text-align:right;
-  padding-right:1px;
-  background:#EE00FF;
-}
-
-</style>
 <div id="content">
 <table id="tryit">
 <tr>
@@ -164,61 +123,4 @@ td.i2{
 </tr>
 </table>
 </div>
-<script type="text/javascript">
-var editor1 = null;
-var editor2 = null;
-$(function(){
-  $('#btnclick').click(function(){
-    $('#load').show();
-    $.post('/parse',{input : editor1.getCode()},function(data){
-      editor2.setCode(data);
-      $('td.i3').hide();
-      $('td.i2').show();
-      $('#load').hide();
-    });
-  });
-  
-  $('a.load').live('click',function(){
-    $('#load').show();
-    var loc= "/w2/"+$(this).attr('loc')+".w2erb.htm";
-    $.get(loc, function(data){
-      editor1.setCode(data);
-      $('#load').hide();
-    });
-  });
-  
-  $('a.load2').live('click',function(){
-    $('#load').show();
-    var src= '/w2/'+$(this).attr('loc')+'.hot.html'
-    $('#ifr').attr('src',src);
-    $('td.i2').hide();
-    $('td.i3').show();
-  });
-  
-  $('a.load').cluetip({showtitle : false});
-  
-  editor1 = CodeMirror.fromTextArea('code1', {
-    parserfile: ["parsew2tags.js"],
-    stylesheet: "/css/rubycolors.css",
-    path: "../js/",
-    lineNumbers: true,
-    textWrapping: false,
-    indentUnit: 4,
-    parserConfig: {},
-    width:  '400px',
-    height: '539px'
-  });
-  
-  editor2 = CodeMirror.fromTextArea('code2', {
-    parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js", "parsehtmlmixed.js"],
-    stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css"],
-    path: "../js/",
-    lineNumbers: false,
-    textWrapping: false,
-    indentUnit: 4,
-    parserConfig: {},
-    width:  '450px',
-    height: '535px'
-  });
-});
-</script>
+<script type="text/javascript" src="/javascripts/application.js" > </script>

data/lib/w2tags/try/views/layout.erb

@@ -4,6 +4,7 @@
   <head>
     <meta content="text/html; charset=utf-8" http-equiv="Content-type"/>
     <title>W2tags Try</title>
+    <link rel="stylesheet" href="/stylesheets/application.css" type="text/css" />
     <link rel="stylesheet" href="/stylesheets/jquery.cluetip.css" type="text/css" />
     <link rel="stylesheet" href="/stylesheets/jquery.live.accordion.css" type="text/css" />
     <script type="text/javascript" src="/js/codemirror.js" > </script>

data/tasks/setup.rb

@@ -17,7 +17,7 @@ PROJ = OpenStruct.new(
   :authors => 'Widi Harsojo',
   :email => 'wharsojo@gmail.com',
   :url => "\000",
-  :version => ENV['VERSION'] || '0.9.65',
+  :version => ENV['VERSION'] || '0.9.67',
   :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: w2tags
 version: !ruby/object:Gem::Version 
-  hash: 185
+  hash: 189
   prerelease: false
   segments: 
   - 0
   - 9
-  - 65
-  version: 0.9.65
+  - 67
+  version: 0.9.67
 platform: ruby
 authors: 
 - widi harsojo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +07:00
+date: 2011-01-05 00:00:00 +07:00
 default_executable: 
 dependencies: []