w2tags 0.9.52 → 0.9.53

data/bin/w2tags

@@ -24,6 +24,7 @@
 require File.expand_path(
         File.join(File.dirname(__FILE__),%w[.. lib w2tags]))
 wpath=  File.dirname(__FILE__).gsub(/bin$/,'')
+
 def howto_w2tags
 puts <<END
 
@@ -53,22 +54,22 @@ end
 
 arg = ARGV 
 if arg.size>0
-	arg = ['w2erb'] + arg if arg.size==1 && arg[0]=='-a'
-	puts 'ARGV  : '+arg.join(" ")
-	puts arg[1]
-	
-	WH = W2Tags::Parser.new
+  arg = ['w2erb'] + arg if arg.size==1 && arg[0]=='-a'
+  puts 'ARGV  : '+arg.join(" ")
+  puts arg[1]
+  
+  WH = W2Tags::Parser.new
 
-	x = arg.select {|s|s[0,3]=='-d:'}
-	#WH.dbg[:stack] = (x.size==0)	
-	x.each do |s|
-		WH.dbg[:parse]     = true if s=='-d:parser'
-		WH.dbg[:stack]     = true if s=='-d:stack'
-		WH.dbg[:constanta] = true if s=='-d:constanta'
-		WH.dbg[:show_hot]  = true if s=='-d:show_hot'
-	end
-	
-	if arg[0]=='-irb'
+  x = arg.select {|s|s[0,3]=='-d:'}
+  #WH.dbg[:stack] = (x.size==0)  
+  x.each do |s|
+    WH.dbg[:parse]     = true if s=='-d:parser'
+    WH.dbg[:stack]     = true if s=='-d:stack'
+    WH.dbg[:constanta] = true if s=='-d:constanta'
+    WH.dbg[:show_hot]  = true if s=='-d:show_hot'
+  end
+  
+  if arg[0]=='-irb'
     ARGV.shift
     
     class Object
@@ -84,7 +85,7 @@ if arg.size>0
     puts ''
     
     IRB.start      
-	elsif arg[0]=='-rails'
+  elsif arg[0]=='-rails'
     if !File.exist?('vendor/plugins')
       puts 'No Folder: vendor/plugins...'
     elsif !File.exist?('config/environment.rb')
@@ -134,7 +135,7 @@ script/server
 
 END
     end
-	elsif arg[0]=='-tags2w'
+  elsif arg[0]=='-tags2w'
     require 'tags2w'
     t2t = MakeTag.new
     t2w = Tags2w.new
@@ -167,7 +168,7 @@ END
     when '-b' ;WH.parse_files(arg[0].split(','),false)
     else      ;WH.parse_files(arg[0].split(','))
     end
-	end
+  end
 else
-	howto_w2tags
+  howto_w2tags
 end

data/lib/w2tags/parser.rb

@@ -327,7 +327,7 @@ module W2Tags
     #in gem/hot and merging the HOT, this command can have multiple
     #file HOT separate with ";"
     def merge_hot
-      if(/!hot! *([\w;]+)([`\n])/ =~ @row;@rgx = $~)
+      if(/!hot! *([\w;]+)([\n])/ =~ @row;@rgx = $~)
         hots= @rgx[1].split(';').collect {|x|x+'.'+@hot}
         rpl = ['']
         hots.each do |hot|
@@ -350,12 +350,12 @@ 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._]+)([\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) + ( pop=='`' ? "\n"+@spc : '' )
+          new = IO.read(mac).delete("\r").gsub("\n","\n"+@spc) 
           @doc_src= @row.gsub(src,new).split("\n")+@doc_src
           @row= @doc_src.shift+"\n"
           parse_spc
@@ -445,10 +445,11 @@ module W2Tags
         classs.sub!(/=$/,'') if classs
         clsmlt = classs.to_s.split(';')
         clscnt = clsmlt.length
+        clsmlt+= clscnt==1 ? clsmlt*prms.length : ['']*prms.length
         prms.each_with_index do |x,i|
           line = rpt+x #tmp<< @new.gsub(new_prms[0],x) 
-          #implement multi class params ^.d;.g canggh;bow              
-          line.gsub!(classs,(clscnt>i ? clsmlt[i] : '')) if classs
+          #implement multi class params ^.d;.g canggh;bow
+          line.gsub!(classs,clsmlt[i]) if classs
           tmp<< line
           tmp<< "\n#{@spc}" if i+1<prms.size
         end

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.52',
+  :version => ENV['VERSION'] || '0.9.53',
   :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.52
+  version: 0.9.53
 platform: ruby
 authors: 
 - widi harsojo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-10-27 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: w2tags
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Its Way to Tags