w2tags 0.9.67 → 0.9.68

data/VERSION

@@ -1 +1 @@
-0.9.67
+0.9.68

data/bin/w2tags

@@ -7,18 +7,18 @@
 #  OR
 #  w2tags [file1,file2,file3] [-b] [-d:*opt*]
 #
-#  example:
-#  1. w2tags -a             #=> translate all file with ext: w2erb
-#  2. w2tags *.w2erb -a     #=> translate all file with ext: w2erb
-#  3. w2tags file1.w2erb    #=> translate a file
-#  4. w2tags file1.w2erb -b #=> translate a file with no initialize/finalize
-#  5. w2tags file1.w2erb -d:parser #=> translate with debug parser
-#  6. w2tags file1.w2erb -d:constanta #=> translate with debug constanta
-#  7. w2tags file1.w2erb -d:stack #=> translate with debug stack indentation
-#  8. w2tags -try           #=> Test W2tags using Sinatra http://localhost:4567/
-#  9. w2tags -irb           #=> Start IRB with WH as instance object of W2Tags
-# 10. w2tags -rails         #=> Copy w2scaffold Rails and set environment.rb
-# 11.w2tags -tags2w         #=> Parsing erb to w2tags
+# example:
+# 1. w2tags -a                #=> translate all file with ext: w2erb
+# 2. w2tags *.w2erb -a        #=> translate all file with ext: w2erb
+# 3. w2tags fl.w2erb          #=> translate a file
+# 4. w2tags fl.w2erb -b       #=> translate a file with no initialize/finalize
+# 5. w2tags fl.w2erb -d:parse #=> translate with debug parser
+# 6. w2tags fl.w2erb -d:const #=> translate with debug constanta
+# 7. w2tags fl.w2erb -d:stack #=> translate with debug stack indentation
+# 8. w2tags -try              #=> Test W2tags using Sinatra http://localhost:4567/
+# 9. w2tags -irb              #=> Start IRB with   W2 as instance object of W2Tags
+# 10.w2tags -rails            #=> Copy w2scaffold Rails and set environment.rb
+# 11.w2tags -tags2w           #=> Parsing erb to w2tags
 #
 #  Enjoy... 
 
@@ -37,17 +37,17 @@ OR
 w2tags [file1,file2,file3] [-b] [-d:*opt*]
 
 example:
-1. w2tags -a             #=> translate all file with ext: w2erb
-2. w2tags *.w2erb -a     #=> translate all file with ext: w2erb
-3. w2tags file1.w2erb    #=> translate a file
-4. w2tags file1.w2erb -b #=> translate a file with no initialize/finalize
-5. w2tags file1.w2erb -d:parser #=> translate with debug parser
-6. w2tags file1.w2erb -d:constanta #=> translate with debug constanta
-7. w2tags file1.w2erb -d:stack #=> translate with debug stack indentation
-8. w2tags -try           #=> Test W2tags using Sinatra http://localhost:4567/
-9. w2tags -irb           #=> Start IRB with WH as instance object of W2Tags
-10. w2tags -rails        #=> Copy w2scaffold Rails and set environment.rb
-11.w2tags -tags2w        #=> Parsing erb to w2tags
+1. w2tags -a                #=> translate all file with ext: w2erb
+2. w2tags *.w2erb -a        #=> translate all file with ext: w2erb
+3. w2tags fl.w2erb          #=> translate a file
+4. w2tags fl.w2erb -b       #=> translate a file with no initialize/finalize
+5. w2tags fl.w2erb -d:parse #=> translate with debug parser
+6. w2tags fl.w2erb -d:const #=> translate with debug constanta
+7. w2tags fl.w2erb -d:stack #=> translate with debug stack indentation
+8. w2tags -try              #=> Test W2tags using Sinatra http://localhost:4567/
+9. w2tags -irb              #=> Start IRB with   W2 as instance object of W2Tags
+10.w2tags -rails            #=> Copy w2scaffold Rails and set environment.rb
+11.w2tags -tags2w           #=> Parsing erb to w2tags
 
 Enjoy... 
 END
@@ -60,15 +60,15 @@ if arg.size>0
   puts 'ARGV : '+arg.join(" ")
   puts arg[1]
   
-  WH = W2Tags::Parser.new
+    W2 = W2Tags::Parser.new
 
   x = arg.select {|s|s[0,3]=='-d:'}
-  #WH.dbg[:stack] = (x.size==0)  
+  #  W2.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'
+      W2.dbg[:parse]    = true if s=='-d:parse'
+      W2.dbg[:stack]    = true if s=='-d:stack'
+      W2.dbg[:const]    = true if s=='-d:const'
+      W2.dbg[:show_hot] = true if s=='-d:show_hot'
   end
   
   if arg[0]=='-try'
@@ -79,19 +79,29 @@ if arg.size>0
     ARGV.shift
     
     class Object
-      def wh(str)
-        rtn = WH.parse_line(str)
+      def w2(str)
+        rtn =   W2.parse_line(str)
         puts rtn
-        rtn
       end
     end
 
     require 'irb'
-    puts "Your W2Tags instance object stored in WH..."
-    puts 'Ex: puts WH.parse_line "#content\\n  %span Hello"'
-    puts 'Shortcut wh() => puts WH.parse_line()'
-    puts ''
-    
+
+    puts <<EOF
+Your W2Tags instance object stored in   W2
+Ex: puts   W2.parse_line "#content\\n  %span.say Hello"
+Shortcut w2, example:
+1.9.3p125 :001 > w2 <<EOF
+1.9.3p125 :002 > #content
+1.9.3p125 :003 >   %span.say Hello
+1.9.3p125 :004 > EOF
+=>/Users/wharsojo/.rvm/gems/ruby-1.9.3-p125@gems/gems/w2tags-0.9.68/hot/erb.hot
+<div id="content">
+  <span class="say">Hello</span>
+</div>
+=> nil 
+EOF
+
     IRB.start      
   elsif arg[0]=='-rails'
     if !File.exist?('vendor/plugins')
@@ -171,10 +181,10 @@ END
     when '-a' ;
        fls = Dir["./**/views/**/#{arg[0]}"]
        fls = Dir["./**/#{arg[0]}"] if fls==[]
-       #WH.parse_files(Dir["*.#{arg[0]}*"]) 
-       WH.parse_files(fls) 
-    when '-b' ;WH.parse_files(arg[0].split(','),false)
-    else      ;WH.parse_files(arg[0].split(','))
+       #  W2.parse_files(Dir["*.#{arg[0]}*"]) 
+         W2.parse_files(fls) 
+    when '-b' ;  W2.parse_files(arg[0].split(','),false)
+    else      ;  W2.parse_files(arg[0].split(','))
     end
   end
 else

data/doc/History.rdoc

@@ -2,6 +2,14 @@
 
 Below is a complete list of changes for each revision of W2TAGS.
 
+== 0.9.68
+
+=== Command line
+  * refactor the command paramters
+  * shortcut change from WH => W2
+  * shortcut change from w2 => w2
+  * shortcut w2 return nil
+
 == 0.9.67
   
 === Parser

data/lib/w2tags.rb

@@ -102,3 +102,23 @@ module W2Tags
 end  
 end
 require 'w2tags/parser'
+
+if Object.const_defined?(:Rails) && 
+  Rails.version.match(/^3/) && 
+  Rails.env == "development" 
+  puts 'W2Tags Hooked on Rails 3.x !'
+
+  module ActionView
+    class PathResolver
+      alias :w2query :query
+      W2TAGS = W2Tags::Parser.new('rails')
+
+      def query(path, details, formats)
+        tpl = "app/views/#{path}.#{formats[0]}.w2erb"
+        W2TAGS.parse_file(tpl, true, true)
+        w2query(path, details, formats)
+      end
+    end
+  end
+  
+end

data/lib/w2tags/rails_hook-3.x.rb

@@ -1,6 +1,6 @@
 module ActionView
-  if	Object::RAILS_ENV != "development"  
-    puts 'W2Tags Only RUN on (RAILS_ENV == "development")'
+  if	Object::Rails.env != "development"  
+    puts 'W2Tags Only RUN on (Rails.env == "development")'
   else
     puts 'W2Tags Hooked on Rails 3.x !'
     class PathResolver

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

metadata

@@ -1,31 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: w2tags
-version: !ruby/object:Gem::Version 
-  hash: 189
-  prerelease: false
-  segments: 
-  - 0
-  - 9
-  - 67
-  version: 0.9.67
+version: !ruby/object:Gem::Version
+  version: 0.9.68
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - widi harsojo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-05 00:00:00 +07:00
-default_executable: 
+date: 2012-09-22 00:00:00.000000000 Z
 dependencies: []
-
-description: w2tags is the way to tags, a short cut / macros. when it do it use some patern define in files (HOT file) to produce tags from minimal code to become full fledge tags
+description: w2tags is the way to tags, a short cut / macros. when it do it use some
+  patern define in files (HOT file) to produce tags from minimal code to become full
+  fledge tags
 email: wharsojo@gmail.com
-executables: 
+executables:
 - w2tags
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - doc/W2TAGS.rdoc
 - doc/ERB.HOT.rdoc
@@ -104,7 +97,7 @@ extra_rdoc_files:
 - lib/w2tags/try/views/index.erb
 - lib/w2tags/try/views/layout.erb
 - lib/w2tags/try/views/parse.erb
-files: 
+files:
 - Manifest.txt
 - README.rdoc
 - Rakefile
@@ -257,12 +250,10 @@ files:
 - plugins/w2tags/generators/w2scaffold/templates/view_new.html.w2erb
 - plugins/w2tags/generators/w2scaffold/templates/view_show.html.erb
 - plugins/w2tags/generators/w2scaffold/templates/view_show.html.w2erb
-has_rdoc: true
 homepage: http://w2tags.rubyforge.org
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - -A cattr_accessor=object
@@ -271,32 +262,24 @@ rdoc_options:
 - --all
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: w2tags
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Its Way to Tags
 test_files: []
-