w2tags 0.9.64 → 0.9.65

data/README.rdoc

@@ -36,7 +36,7 @@ some popular patern in view engine, so I change the patern. Now syntax mimics HA
 to easy transisition, and proven to be useable and best.
 
 Extended Syntax are the remain patern before I choose HAML-like syntax like
-"^" - NextTag (next tag will be use after using a tag like "ul" next tag "li"), 
+"^" or "*" - NextTag (next tag will be use after using a tag like "ul" next tag "li"), 
 Redefinition NextTag command using "~^", define variable "&var=", 
 define uniq variable "@var=", Key-Variable 
 

data/VERSION

@@ -1 +1 @@
-0.9.64
+0.9.65

data/doc/History.rdoc

@@ -1,6 +1,68 @@
 = Change Log
 
-Below is a complete listing of changes for each revision of W2TAGS.
+Below is a complete list of changes for each revision of W2TAGS.
+
+== 0.9.65
+
+=== Parser
+  * small refactor parser including regexp
+  * source code w2tags now can embed hot file
+  * nexttag '^' now implement '*' but for reassign still using '~^'
+  * nexttag now can redefine/create new global nexttag
+    
+==== embed hot file in w2tags code
+
+  -# Example:
+  >>_cok
+   %cooook$$ $0
+  >>>W2TAGS>>>
+  %tr
+    ^.c1 column1
+    *.c2 column2
+
+  <tr>
+    <th class="c1">column1</th>
+    <th class="c2">column2</th>
+  </tr>
+
+==== Redefine/create new global nexttag
+  
+  -# Example:
+  ~^%tr%td.wheel $0
+  %tr
+    * roda1
+    * roda2
+    
+  <tr>
+    <td class="wheel">roda1</td>
+    <td class="wheel">roda2</td>
+  </tr>
+    
+==== Parsing nexttag '^' now support w/o params
+
+  -# Example:
+  %table
+    %tr
+      ^.c1 column1
+      ^.c2
+        .last
+          %b goood
+
+  <table>
+    <tr>
+      <th class="c1">column1</th>
+      <th class="c2">
+        <div class="last">
+          <b>goood</b>
+        </div>
+      </th>
+    </tr>
+  </table>
+
+== 0.9.64
+
+=== Parser
+  fix loading hot file 
 
 == 0.9.63
 

data/lib/w2tags.rb

@@ -68,8 +68,12 @@ module W2Tags
   #   <div>Hello Tags</div>
   #  </body>
   def self.read_filehot(fhot)
+    parsing_hot(IO.read(fhot).delete("\r"))
+  end
+  
+  def self.parsing_hot(src)
     hot_new = {} 
-    hot = ("\n"+IO.read(fhot)).delete("\r").split(/\n\>\>/)
+    hot = ("\n"+src).split(/\n\>\>/)
     hot.shift
     hot.each do |item|
       item.gsub!(/\n([ \t]*)$/,'') #remove blank lines
@@ -95,6 +99,6 @@ module W2Tags
       hot_new[keys] = hot
     end
     hot_new
-  end  
+end  
 end
 require 'w2tags/parser'

data/lib/w2tags/parser.rb

@@ -22,13 +22,13 @@ module W2Tags
       
       #regex for w2tags   
       @rg_tag = [
-      /^[ \t]*(%)([!]?[\w\-&\/:#.]+\{.*\}[=]*)!([^\n]*)\n/,
-      /^[ \t]*(%)([!]?[\w\-&\/:#.=]+)!([^\n]*)([\n])/]
+      /^[ \t]*(%)([!]?[\w\-&\/:#.\[\]]+\{.*\}[=]*)!([^\n]*)\n/,
+      /^[ \t]*(%)([!]?[\w\-&\/:#.\[\]=]+)!([^\n]*)([\n])/]
       
       #regex for function tags    
       @rg_hot = [
-      /(%)([!]?[ \t\$\w\-&\/:#.%=]+\{.*\}[=]*)~([^\n]*)\n/,
-      /(%)([!]?[ \t\$\w\-&\/:#.%=]+)~([^\n]*)\n/    ]
+      /(%)([!]?[ \t\$\w\-&\/:#.\[\]%=]+\{.*\}[=]*)~([^\n]*)\n/,
+      /(%)([!]?[ \t\$\w\-&\/:#.\[\]%=]+)~([^\n]*)\n/    ]
       @rgx    =  nil   #current regular expression
       @mrg    =  mrg   #another hot to include
       @ext    = 'erb'  #target extension 
@@ -53,24 +53,6 @@ module W2Tags
       @doc_src= []
       @doc_out= []
       
-      @tg_nex['html'  ]= [0,proc { @mem_tag["^"] = "%head $*\n"}]
-      @tg_nex['head'  ]= [0,proc { @mem_tag["^"] = "%body $*\n"}]
-      @tg_nex['ol'    ]= [0,proc { @mem_tag["^"] = "%li $0\n"  }]
-      @tg_nex['ul'    ]= [0,proc { @mem_tag["^"] = "%li $0\n"  }]
-      @tg_nex['dl'    ]= [0,proc { @mem_tag["^"] = "%dt $0\n"  }]
-      @tg_nex['dd'    ]= [0,proc { @mem_tag["^"] = "%dt $0\n"  }]
-      @tg_nex['form'  ]= [0,proc { @mem_tag["^"] = "%input $0\n"}]
-      @tg_nex['select']= [0,proc { @mem_tag["^"] = "%option $0\n"}]
-      @tg_nex['table' ]= [0,proc { @tg_nex['tr'][0]= 0 }]
-      @tg_nex['tr'    ]= [0,proc { 
-         @tg_nex['tr'   ][0]+= 1
-         if @tg_nex['tr'][0]== 1
-            @mem_tag["^"] = "%th $0\n" 
-         else
-            @mem_tag["^"] = "%td $0\n"
-         end
-      }]
-
       @tagr = proc do |this|
         @key.strip!
         tags_created =  "<#{@key}"
@@ -105,7 +87,42 @@ module W2Tags
         @skiper << [$1,'_skip'].join.to_sym if /(.*)_skip$/ =~ meth
       end
     end
+    
+    #it use to clean all the definition and reloading the hot file
+    def parse_init
+      @tg_end   = [] #momorize tag end from regex function
+      @doc_src  = []
+      @doc_out  = []
+      @tg_hot   = {} 
+      merge_tags @mrg ? @mrg : @ext
+      next_tag_init
+    end
+    
+    def next_tag_init
+      @tg_nex['html'  ]= [0,proc { @mem_tag["^"] = "%head $*\n"}]
+      @tg_nex['head'  ]= [0,proc { @mem_tag["^"] = "%body $*\n"}]
+      @tg_nex['ol'    ]= [0,proc { @mem_tag["^"] = "%li $0\n"  }]
+      @tg_nex['ul'    ]= [0,proc { @mem_tag["^"] = "%li $0\n"  }]
+      @tg_nex['dl'    ]= [0,proc { @mem_tag["^"] = "%dt $0\n"  }]
+      @tg_nex['dd'    ]= [0,proc { @mem_tag["^"] = "%dt $0\n"  }]
+      @tg_nex['form'  ]= [0,proc { @mem_tag["^"] = "%input $0\n"}]
+      @tg_nex['select']= [0,proc { @mem_tag["^"] = "%option $0\n"}]
+      @tg_nex['table' ]= [0,proc { @tg_nex['tr'][0]= 0 }]
+      @tg_nex['tr'    ]= [0,proc { 
+         @tg_nex['tr'   ][0]+= 1
+         if @tg_nex['tr'][0]== 1
+            @mem_tag["^"] = "%th $0\n" 
+         else
+            @mem_tag["^"] = "%td $0\n"
+         end
+      }]
+    end
 
+    def read_w2tags(src,spc=nil)
+      src = src.delete("\r").split(/\n\>\>\>W2TAGS\>\>\>/)
+      @tg_hot.merge!(W2Tags.parsing_hot(src.shift)) if src.length>1
+      (spc ? src[0].gsub("\n","\n"+@spc) : src[0]) 
+    end
     #parsing from fullpath source to the fullpath target/result
     #with the option of auto add 'initialize' and 'finalize'
     #for source file in w2tags only fill with LF it will not
@@ -121,7 +138,7 @@ module W2Tags
       puts ">>#{tgt}"
       parse_init
       @src_path= File.dirname(src)
-      @doc_src = IO.read(src).delete("\r").split("\n")
+      @doc_src = read_w2tags(IO.read(src)).split("\n")
       @doc_src<< "%finallize" if @tg_hot['finallize' ]
       
       while (@row = @doc_src.shift) do  #;p "row:#{@row}"
@@ -151,21 +168,13 @@ module W2Tags
       
     end
     
-    #it use to clean all the definition and reloading the hot file
-    def parse_init
-      @tg_end   = [] #momorize tag end from regex function
-      @doc_src  = []
-      @doc_out  = []
-      @tg_hot   = {} 
-      merge_tags @mrg ? @mrg : @ext
-    end
-    
     #to test parsing on source line and return will be the result, 
     #everytime it execude, it clean up and reloading the HOT files.
     def parse_line row,init=true
       parse_init if init
       dbg[:parse]= false
-      @doc_src   = row.delete("\r").split("\n") << ",/"
+      @doc_src   = read_w2tags(row).split("\n") << ",/"
+      #@doc_src   = row.delete("\r").split("\n") << ",/"
       while (@row= @doc_src.shift) do  #;p "row:#{@row}"
         parse_row
       end
@@ -351,12 +360,13 @@ module W2Tags
     #it will include / replace current row from file include, and after 
     #parser will try to get current row after merging to be evaluate
     def merge_w2x
-      if(/!inc! *([\/\w._]+)([\n])/ =~ @row;@rgx = $~)
+      if(/!inc! *([\/\w\d._]+)([\n])/ =~ @row;@rgx = $~)
         mac = @src_path+'/'+$1 
         src = $~.to_s #;p mac
         if File.exist?(mac)
           pop = $~.captures.pop
-          new = IO.read(mac).delete("\r").gsub("\n","\n"+@spc) 
+          #new = IO.read(mac).delete("\r").gsub("\n","\n"+@spc) 
+          new = read_w2tags(IO.read(mac))
           @doc_src= @row.gsub(src,new).split("\n")+@doc_src
           @row= @doc_src.shift+"\n"
           parse_spc
@@ -468,10 +478,11 @@ module W2Tags
       else
         i = new_prms.size - 1
         new_prms.sort.reverse.each do |x|
-          eva_v = Regexp.new('\\'+x+'\.([^~]+)~') #$1.upcase~
+          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} <=="
+            src = "#{x}.#{$1}~"          #p "\n#{@new} => #{src}"
+            evl = "\"#{prms[i]}\".#{$1}" #p "====> #{evl} <=="
             rpl =  prms[i] ? eval(evl).to_s : ""
             @new.gsub!(src,rpl)
           end
@@ -624,10 +635,10 @@ module W2Tags
       @mem_var['*class*']= ''
       @mem_var['*code*' ]= ''
       #p keys
-      if @key.gsub!(/([:#.&=])([\/\t\w\-#.&= ]*$)/,'')
+      if @key.gsub!(/([:#.&=])([\/\t\w\-#.\[\]&= ]*$)/,'')
         keys = $1+$2
         @mem_var['$$'] = keys.clone
-        if keys.gsub!(/^:([\w\-.]*)/,'')
+        if keys.gsub!(/^:([\w\-.\[\]]*)/,'')
           if $1!=''
             @mem_var['$:'     ] = ":#{$1}"
             @mem_var['*:'     ] = $1
@@ -834,10 +845,10 @@ module W2Tags
         rtn = true if shortcut_exec( /(^[\t ]*)\-([\w\-&\/:#.%=]*) *([^\n]*)\n/) 
         rtn = true if shortcut_equal( /(^[\t ]*)=([\w\-&\/:#.%=]*) *([^\n]*)\n/) 
         
-        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.]+\{.*?\}[= ]*)([^\n]*)\n/)
-        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.]+\{.*?\}[= ]*)()\n/)
-        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.%=]+ )([^\n]*)\n/) 
-        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.%=]+)()\n/) 
+        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.\[\]]+\{.*?\}[= ]*)([^\n]*)\n/)
+        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.\[\]]+\{.*?\}[= ]*)()\n/)
+        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.\[\]%=]+ )([^\n]*)\n/) 
+        rtn = true if get_hot_simple(/^[\t ]*(%)([\$\w\-&\/:#.\[\]%=]+)()\n/) 
         
         rtn = true if get_div(/^[\t ]*([#.])([\w\-&\/.]*\{.*\}[= ]*)([^\n]*)\n/)
         rtn = true if get_div(/^[\t ]*([#.])([\w\-&\/.]*\{.*\}[= ]*)()\n/)
@@ -875,22 +886,39 @@ module W2Tags
     #   ^ inside td
     #I think its Ok.
     def parse_set_mem
-      if @row.gsub!(/([ \t]*~\^)([^\n]+)(\n)/,'')
-         p "setMem ^ => #{$2+"\n"}" if @dbg[:parse]
-         @mem_tag["^"]= $2+"\n" 
+      if @row.gsub!(/([ \t]*~\^)([^\n]+\n)/,'')
+         set_mem = $2  
+         if !global_set_mem(set_mem)
+            p "setMem ^ => #{set_mem}" if @dbg[:parse]
+            @mem_tag["^"]= set_mem
+         end 
       end
     end
     
-    #call from parse_get_mem
-    def get_mem(regex)
-      if(regex =~ @row;@rgx = $~)
+    def global_set_mem(set_mem)
+      return nil if !(/^%(\w+)([%-].+)/ =~ set_mem)
+      @tg_nex[$1]= [0,proc { @mem_tag["^"] = $2}]
+    end
+    
+    #remember command "^", not really use but if you want less typing you can
+    #define this command inside HOT file for the next command to be execute like:
+    # HOT file:
+    # >>_tr
+    # ~^%td
+    #
+    # Source file:
+    # -tr
+    #   ^ inside td
+    #I think its Ok.
+    def parse_get_mem
+      if(/([\^*])([^ ]*) *([^\n]*)(\n)/ =~ @row;@rgx = $~)
         keys,tmp,prms,opt,ends= @rgx.captures
         if opt=='!'
           opt=''
           @mem_hot=nil
         end
+        keys.sub!('*','^')
         params_inline prms #concenation line if params end with \
-
         @new = @mem_tag[keys].split(' ')
         @new[0] << tmp
         @new = @new.join(" ") << "\n"
@@ -907,20 +935,6 @@ module W2Tags
       @rgx!=nil
     end
     
-    #remember command "^", not really use but if you want less typing you can
-    #define this command inside HOT file for the next command to be execute like:
-    # HOT file:
-    # >>_tr
-    # ~^%td
-    #
-    # Source file:
-    # -tr
-    #   ^ inside td
-    #I think its Ok.
-    def parse_get_mem
-      get_mem(/([\^])([^ ]*) ([^\n]*)(\n)/)
-    end
-    
     #it call from parse_end
     def get_end(regex)
       if(regex =~ @row;@rgx = $~)

data/lib/w2tags/try/public/js/parsew2tags.js

@@ -4,12 +4,14 @@ var CSSParser = Editor.Parser = (function() {
   var tokenizeCSS = (function() {
     function normal(source, setState) {
       var ch = source.next();
+      if (ch == "\>" && source.equals("\>")) { source.nextWhileMatches(/./); return "rb-symbol"; } else 
       if (ch == "-" && source.equals("#")) { source.nextWhileMatches(/./); return "rb-comment"; } else 
       if (ch == ":") { source.nextWhileMatches(/[\w-]/); return "rb-method-parameter"; } else 
       if (ch == "#") { source.nextWhileMatches(/[\w-]/); return "rb-constant"; } else 
       if (ch == ".") { source.nextWhileMatches(/[\w-]/); return "rb-method";   } else 
       if (ch == "-") { source.nextWhileMatches(/\w/); return "rb-symbol";   } else 
       if (ch == "^") { source.nextWhileMatches(/\w/); return "rb-symbol";   } else 
+      if (ch == "*") { source.nextWhileMatches(/\w/); return "rb-symbol";   } else 
       if (ch == "%") { source.nextWhileMatches(/\w/); return "rb-keyword";  } else 
       if (ch == "=") { source.nextWhileMatches(/\w/); return "rb-operator"; } else 
       if (ch == "@") { source.nextWhileMatches(/\w/); return "rb-keyword";  } else 

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.64',
+  :version => ENV['VERSION'] || '0.9.65',
   :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: 187
+  hash: 185
   prerelease: false
   segments: 
   - 0
   - 9
-  - 64
-  version: 0.9.64
+  - 65
+  version: 0.9.65
 platform: ruby
 authors: 
 - widi harsojo
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +07:00
+date: 2010-12-20 00:00:00 +07:00
 default_executable: 
 dependencies: []