w2tags 0.9.59 → 0.9.60

data/Manifest.txt

@@ -71,6 +71,7 @@ lib\w2tags\try\public\w2\checkbox.w2erb
 lib\w2tags\try\public\w2\check_onhot.w2erb
 lib\w2tags\try\public\w2\combobox.w2erb
 lib\w2tags\try\public\w2\combo_onhot.w2erb
+lib\w2tags\try\public\w2\css01.w2erb
 lib\w2tags\try\public\w2\demo.hot.html
 lib\w2tags\try\public\w2\diet.w2erb
 lib\w2tags\try\public\w2\diet1.w2erb

data/lib/w2tags/block/block_hot.rb

@@ -2,7 +2,8 @@ module W2Tags
   module Block
     module BlockHot
       def bhot_skip_initialize
-        @key_hot= '' #key for hot 
+        @end_hot= nil
+        @key_hot= '' #key for hot
         @doc_hot= [] #bhot buffer
         @bht    = 99 #hot indentation block
       end
@@ -10,28 +11,44 @@ module W2Tags
       def bhot_skip
         @rgx = nil
         if(/(^[\t ]*)(!H!) *(\w+) *\n/ =~ @row;@rgx = $~)
+          # if current line was inside in this block 
+          # flush as an adding hot and reinit for new hot
+          if @bht != 99
+             make_hot
+          end
+          @end_hot= nil
           @key_hot= $3.strip
           @doc_hot= [] #bhot buffer
           @bht = @spc.size
         elsif @bht!= 99 
-          if @spc.size<= @bht
-            les= 999
-            @doc_hot.each do |l|
-              if l.strip!=''
-                x=(/[^ ]/=~l)
-                les=x if x<les
-              end
-            end
-            ref  =@doc_hot.collect{|l|l[les,999]}.join
-            @tg_hot[@key_hot]= [proc {|this|ref}, nil]
-            @bht = 99
+          if @spc.size<= @bht && @ron!=0
+             make_hot
+             @bht = 99
           elsif @row.strip!=''
-            @doc_hot<< @row
+             if /(\<\<\/)(.+)/ =~ @row
+               @end_hot= $2
+             else
+               @doc_hot<< @row
+             end
           end
         end
         @row = '' if @bht!=99
         @bht!=99
       end
+      
+      private
+      
+      def make_hot
+        les= 999
+        @doc_hot.each do |l|
+          if l.strip!=''
+             x=(/[^ ]/=~l)
+             les=x if x<les
+          end
+        end
+        ref  =@doc_hot.collect{|l|l[les,999]}.join
+        @tg_hot[@key_hot]= [proc {|this|ref}, [@end_hot]]
+      end
     end
   end
 end

data/lib/w2tags/block/plain_text.rb

@@ -32,7 +32,7 @@ module W2Tags
             end
           end
         elsif @plt != 99 
-          if @spc.size<= @plt 
+          if @spc.size<= @plt && @ron!=0
             @doc_out   = @doc_out + @doc_plt
             @plt = 99
           else

data/lib/w2tags/block/remark.rb

@@ -26,7 +26,7 @@ module W2Tags
         if(/(^[\t ]*)(-#)([^\n]*)\n/ =~ @row;@rgx = $~)
           @rmk = @spc.size #@plt = 99
         elsif @rmk !=99
-          @rmk = 99 if @spc.size <= @rmk  
+          @rmk = 99 if @spc.size <= @rmk && @ron!=0
           #p "remrk> #{@rgx[3].strip}" if @dbg[:parse]
         end
         @row = '' if @rmk!=99

data/lib/w2tags/block/sass.rb

@@ -11,13 +11,14 @@ module W2Tags
       def sass_skip
         @rgx = nil
         if(/(^[\t ]*)(~~~) *\n/ =~ @row;@rgx = $~)
-          @row = ''
           @sas = @spc.size
           @doc_sas = [[' '*@sas,"<style>\n"].join]
           @key_sas = [] #sass indentation
           @nms_sas = [0,""]
+          @row = ''
+          auto_close
         elsif @sas!= 99 
-          if @spc.size<= @sas
+          if @spc.size<= @sas && @ron!=0
             @doc_sas<< "#{' '*@key_sas[-1][0]}}\n"
             @doc_sas<< @doc_sas[0].gsub("<style>","</style>")
             @doc_out = @doc_out + @doc_sas
@@ -33,11 +34,11 @@ module W2Tags
       
       def sass_parser
         spc= @spc.size
-        if(/(^[\t ]*)(:[\w\-]+) *\n/ =~ @row;@rgx = $~)
-          @nms_sas= [spc,[$1,$2[1,99],"-"].join] 
-        elsif(/(^[\t ]*)(:[\w\-]+) +([^\n]+)\n/ =~ @row;@rgx = $~)
+        if(/(^[\t ]*)([\w\-]+)\: *\n/ =~ @row;@rgx = $~)
+          @nms_sas= [spc,[$1,$2,"-"].join] 
+        elsif(/(^[\t ]*)([\w\-]+\:) +([^\n]+)\n/ =~ @row;@rgx = $~)
           nms= @nms_sas[0]!=0 && @nms_sas[0]<spc ? @nms_sas[1] : $1
-          @doc_sas << [nms,$2[1,99],":",$3,";\n"].join
+          @doc_sas << [nms,$2,$3,";\n"].join
         else
           old_spc= nil
           if @key_sas!=[]

data/lib/w2tags/parser.rb

@@ -35,7 +35,8 @@ module W2Tags
       @hot    = 'hot'  #source of file hot
       @src_path= ''    #path for source file
       @silent = false  #for test
-      
+
+      @ron    = 0      #strip current source line if size it empty or not
       @spc    = ''     #current begining space of current source line
       @ind    = '  '   #indentation size
       @row    = 'row'  #current source line
@@ -371,6 +372,7 @@ module W2Tags
     #must continue with current column (indent). 
     def parse_spc
       @spc = @row[/(^[ \t]+)/,1].to_s       #sometime result is nil
+      @ron = @row.strip.size
     end
     
     #do the translation from the params inside function like:
@@ -789,7 +791,7 @@ module W2Tags
         if @spc.size <= sz
            ed = multi_end(nil).rstrip
            p "AutE:#{ed}#{@row}" if @dbg[:parse]
-           @doc_out += [ed,@row]
+           @doc_out += [ed,"\n",@row]
            @row = ''
           true
         end
@@ -801,6 +803,7 @@ module W2Tags
     #it try to check the indentation to auto_close the line.
     def parse_all
       #check for skipping the block using add on module...
+      parse_spc
       if @skiper.select{|f|send(f)}.length>0
         p "skip > #{@row}" if @dbg[:parse]
       else

data/lib//w2tags//try//public//javascripts//jquery.live.accordion.js

@@ -7,9 +7,14 @@
 	//ACCORDION BUTTON ACTION	
 	$('div.accordionButton').live('click',function() {
     var prn = $(this).parent();
-    prn.find('>div.accordionContent').slideUp('normal');
-    prn.find('>div.accordionButton.open').removeClass('open');
-		$(this).addClass('open').next().slideDown('normal');
+    var crn = $(this);
+    if(crn.hasClass('open')){
+       crn.removeClass('open').next().slideUp('normal');
+    } else {
+      prn.find('>div.accordionContent').slideUp('normal');
+      prn.find('>div.accordionButton.open').removeClass('open');
+		  $(this).addClass('open').next().slideDown('normal');
+    }
 	});
  });
  $(function(){

data/lib//w2tags//try//public//w2//css01.w2erb

@@ -0,0 +1,13 @@
+~~~
+ #main
+  width: 90%
+  p
+   border:
+    style: solid
+    width: 1px
+    color: #00f
+   a,b
+    text-decoration: none
+    font-weight: bold
+   a:hover
+    text-decoration: underline

data/lib//w2tags//try//public//w2//demo.hot.html

@@ -1,44 +1,44 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd">
 <html>
-<head>
-<META http-equiv=Content-Type content="text/html; charset=windows-1252">
-<title>Exported from Notepad++</title>
-<style type="text/css">
-body{margin:0;} 
-span {
-	font-family: 'Inconsolata';
-	font-size: 10pt;
-	color: #FFFFFF;
-}
-.sc0 {
-}
-.sc4 {
-	color: #FF0000;
-}
-.sc5 {
-	font-size: 11pt;
-	font-weight: bold;
-	text-decoration: underline;
-	color: #FF8040;
-}
-.sc6 {
-	font-size: 9pt;
-	font-weight: bold;
-	text-decoration: underline;
-	color: #FFFF00;
-}
-.sc7 {
-	color: #FFFF00;
-}
-.sc10 {
-	font-weight: bold;
-	color: #80FFFF;
-}
-.sc11 {
-}
-</style>
-</head>
-<body>
+  <head>
+    <META http-equiv=Content-Type content="text/html; charset=windows-1252">
+    <title>Exported from Notepad++</title>
+    <style type="text/css">
+      body{margin:0;} 
+      span {
+        font-family: 'Inconsolata';
+        font-size: 10pt;
+        color: #FFFFFF;
+      }
+      .sc0 {
+      }
+      .sc4 {
+        color: #FF0000;
+      }
+      .sc5 {
+        font-size: 11pt;
+        font-weight: bold;
+        text-decoration: underline;
+        color: #FF8040;
+      }
+      .sc6 {
+        font-size: 9pt;
+        font-weight: bold;
+        text-decoration: underline;
+        color: #FFFF00;
+      }
+      .sc7 {
+        color: #FFFF00;
+      }
+      .sc10 {
+        font-weight: bold;
+        color: #80FFFF;
+      }
+      .sc11 {
+      }
+    </style>
+  </head>
+  <body>
 <div style="width:600px;height:535px;overflow:auto;float: left; white-space: pre; line-height: 1; background: #000000; "><span class="sc5">&gt;&gt;_nav</span><span class="sc0">
  </span><span class="sc6">%ul</span><span class="sc10">$#</span><span class="sc0">
    </span><span class="sc6">-itm</span><span class="sc10">$.</span><span class="sc0"> </span><span class="sc10">$*</span><span class="sc0">
@@ -69,5 +69,9 @@ span {
 </span><span class="sc6">%label</span><span class="sc10">{</span><span class="sc11">for</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">*#</span><span class="sc11">"</span><span class="sc10">}</span><span class="sc0"> </span><span class="sc10">$</span><span class="sc4">0</span><span class="sc11">&lt;</span><span class="sc0">
   </span><span class="sc6">%textarea</span><span class="sc10">$$</span><span class="sc0">
 
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

data/lib//w2tags//try//public//w2//erb_base.hot.html

@@ -164,5 +164,9 @@ span {
 <</
  %&gt;</span><span class="sc0">
 
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

data/lib//w2tags//try//public//w2//erb_rails.hot.html

@@ -56,5 +56,9 @@ span {
 </span><span class="sc5">&gt;&gt;_content_for</span><span class="sc0">
 </span><span class="sc6">-</span><span class="sc0"> </span><span class="sc11">content_for</span><span class="sc0"> </span><span class="sc10">$*</span><span class="sc0"> </span><span class="sc11">do</span><span class="sc0"> 
 </span><span class="sc6">-end</span><span class="sc0">
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

data/lib//w2tags//try//public//w2//html.hot.html

@@ -112,5 +112,9 @@ span {
 
 </span><span class="sc5">&gt;&gt;post</span><span class="sc0">
 </span><span class="sc6">%form</span><span class="sc10">$:$#.</span><span class="sc11">lelouch</span><span class="sc10">.*.{*</span><span class="sc11">@method</span><span class="sc10">=</span><span class="sc11">"post"</span><span class="sc10">~</span><span class="sc7">action</span><span class="sc10">=</span><span class="sc11">"</span><span class="sc10">$</span><span class="sc4">0</span><span class="sc11">"</span><span class="sc10">~}</span><span class="sc0">
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

data/lib//w2tags//try//public//w2//rails.hot.html

@@ -34,5 +34,9 @@ span {
 
 </span><span class="sc5">&gt;&gt;finallize</span><span class="sc0">
 </span><span class="sc8">,/</span><span class="sc0">
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

data/lib//w2tags//try//public//w2//try.rb.hot.html

@@ -47,5 +47,9 @@ span {
   </span><span class="sc16">@result</span><span class="sc10">=</span><span class="sc0"> </span><span class="sc11">W2</span><span class="sc10">.</span><span class="sc11">parse_line</span><span class="sc10">(</span><span class="sc6">"%initialize\n"</span><span class="sc10">&lt;&lt;</span><span class="sc11">params</span><span class="sc10">[</span><span class="sc14">:input</span><span class="sc10">]).</span><span class="sc11">join</span><span class="sc10">(</span><span class="sc7">''</span><span class="sc10">)</span><span class="sc0">
   </span><span class="sc11">erb</span><span class="sc0"> </span><span class="sc14">:index</span><span class="sc0">
 </span><span class="sc5">end</span><span class="sc0">
-</span></div></body>
+</span></div>
+<script type="text/javascript">
+window.parent.hideIndicator();
+</script>
+</body>
 </html>

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

@@ -82,6 +82,10 @@ td.i2{
         <a href="#" class="load" loc="layout1">Table</a> 
         <a href="#" class="load" loc="layout2">Div</a> 
      </div>
+     <div class="accordionButton" >Css</div>
+     <div class="accordionContent">
+        <a href="#" class="load" loc="css01">Css 1</a> 
+     </div>
   </div>
   <div class="accordionButton" >Demo Index Html</div>
   <div class="accordionContent">
@@ -175,13 +179,16 @@ $(function(){
   });
   
   $('a.load').live('click',function(){
+    $('#load').show();
     var loc= "/w2/"+$(this).attr('loc')+".w2erb";
     $.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();

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

@@ -10,6 +10,11 @@
     <script type="text/javascript" src="/javascripts/jquery.js" > </script>
     <script type="text/javascript" src="/javascripts/jquery.cluetip.js" > </script>
     <script type="text/javascript" src="/javascripts/jquery.live.accordion.js" > </script>
+    <script type="text/javascript">
+    function hideIndicator(){
+      $('#load').hide();
+    }
+    </script>
   </head>
   <body>
     <%= yield %>

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.59',
+  :version => ENV['VERSION'] || '0.9.60',
   :exclude => %w(tmp$ bak$ ~$ CVS \.svn/ \.git/ ^pkg/),
   :release_name => ENV['RELEASE'],
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: w2tags
 version: !ruby/object:Gem::Version 
-  version: 0.9.59
+  version: 0.9.60
 platform: ruby
 authors: 
 - widi harsojo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-16 00:00:00 +07:00
+date: 2009-12-11 00:00:00 +07:00
 default_executable: 
 dependencies: []
 
@@ -91,6 +91,7 @@ files:
 - lib\w2tags\try\public\w2\check_onhot.w2erb
 - lib\w2tags\try\public\w2\combobox.w2erb
 - lib\w2tags\try\public\w2\combo_onhot.w2erb
+- lib\w2tags\try\public\w2\css01.w2erb
 - lib\w2tags\try\public\w2\demo.hot.html
 - lib\w2tags\try\public\w2\diet.w2erb
 - lib\w2tags\try\public\w2\diet1.w2erb