tabulate 0.1.1 → 0.1.2

data/lib/tabulate.rb

@@ -16,7 +16,7 @@
 # * :hrframe: heading right frame
 # * :padding: number of padding characters for each field on each side
 #
-$template = { 
+$table_template = { 
     "simple" => { 
         :rs => '', :fs => ' | ',  :cross => '+',
         :lframe => '', :rframe => '' ,
@@ -78,11 +78,13 @@ def tabulate(labels, data, opts = { } )
     opts = { :indent => 0, :style => 'fancy'}.merge opts
     indent = opts[:indent]
     style = opts[:style]
-    raise "Invalid table style!"    unless  $template.keys.include? style
+    raise "Invalid table style!"    unless  $table_template.keys.include? style
+
+    style = $table_template[style]
 
     data = data.inject([]){|rs, r| rs += r.to_rows }
     data = data.unshift(labels).transpose
-    padding = $template[style][:padding] 
+    padding = style[:padding] 
     data = data.collect {|c| 
         c.collect {|e|  ' ' * padding + e.to_s + ' ' * padding } 
     }
@@ -93,37 +95,37 @@ def tabulate(labels, data, opts = { } )
     }
     data = newdata
     data = data.transpose
-    data = [ $template[style][:hlframe] + data[0].join($template[style][:fs]) + $template[style][:hrframe] ] + \
-        data[1..-1].collect {|l| $template[style][:lframe] + l.join($template[style][:fs]) + $template[style][:rframe] }
+    data = [ style[:hlframe] + data[0].join(style[:fs]) + style[:hrframe] ] + \
+        data[1..-1].collect {|l| style[:lframe] + l.join(style[:fs]) + style[:rframe] }
     lines = []
 
     #add top frame
-    if !$template[style][:tframe].to_s.empty?
-        lines << $template[style][:cross] + widths.collect{|n| $template[style][:tframe] *n }.join($template[style][:cross]) + $template[style][:cross]
+    if !style[:tframe].to_s.empty?
+        lines << style[:cross] + widths.collect{|n| style[:tframe] *n }.join(style[:cross]) + style[:cross]
     end
 
     #add title 
     lines << data[0]
 
     #add title ruler
-    if !$template[style][:hs].to_s.empty? and !$template[style][:lframe].to_s.empty?
-        lines << $template[style][:cross] + widths.collect{|n| $template[style][:hs] *n }.join($template[style][:cross]) + $template[style][:cross]
-    elsif !$template[style][:hs].to_s.empty?
-        lines << widths.collect{|n| $template[style][:hs] *n }.join($template[style][:cross])
+    if !style[:hs].to_s.empty? and !style[:lframe].to_s.empty?
+        lines << style[:cross] + widths.collect{|n| style[:hs] *n }.join(style[:cross]) + style[:cross]
+    elsif !style[:hs].to_s.empty?
+        lines << widths.collect{|n| style[:hs] *n }.join(style[:cross])
     end
 
     #add data
     data[1..-2].each{ |line|
         lines << line
-        if !$template[style][:rs].to_s.empty?
-            lines << $template[style][:cross] + widths.collect{|n| $template[style][:rs] *n }.join($template[style][:cross]) + $template[style][:cross]
+        if !style[:rs].to_s.empty?
+            lines << style[:cross] + widths.collect{|n| style[:rs] *n }.join(style[:cross]) + style[:cross]
         end
     }
 
     #add last record and bottom frame
     lines << data[-1]
-    if !$template[style][:bframe].to_s.empty?
-        lines << $template[style][:cross] + widths.collect{|n| $template[style][:bframe] *n }.join($template[style][:cross]) + $template[style][:cross]
+    if !style[:bframe].to_s.empty?
+        lines << style[:cross] + widths.collect{|n| style[:bframe] *n }.join(style[:cross]) + style[:cross]
     end
 
     #add indent
@@ -163,8 +165,8 @@ end
 if __FILE__ == $0
     source = [["\e[31maht\e[m",3],[4,"\e[33msomething\e[m"],['s',['abc','de']]]
     labels = ["a",'b']
-    puts "Available themes: #{$template.keys.inspect}"
-    $template.keys.each do |k|
+    puts "Available themes: #{$table_template.keys.inspect}"
+    $table_template.keys.each do |k|
         puts "#{k} :"
         puts tabulate(labels, source, :indent => 4, :style => k)
         puts 

data/version.txt

@@ -1 +1 @@
-0.1.1
+0.1.2

metadata

@@ -1,36 +1,39 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: tabulate
-version: !ruby/object:Gem::Version
-  version: 0.1.1
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.1.2
 platform: ruby
-authors:
+authors: 
 - Roy Zuo (aka roylez)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-25 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-05-19 00:00:00 +08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: bones
-  requirement: &86175090 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.6.5
   type: :development
-  prerelease: false
-  version_requirements: *86175090
+  version_requirements: *id001
 description: Create fancy command line tables with ease.
 email: roylzuo AT gmail DOT com
-executables:
+executables: 
 - tabulate
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - History.txt
 - bin/tabulate
-files:
+files: 
 - .bnsignore
 - History.txt
 - README.md
@@ -41,31 +44,34 @@ files:
 - spec/tabulate_spec.rb
 - test/test_tabulate.rb
 - version.txt
+has_rdoc: true
 homepage: http://tabulate.rubygems.org
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.md
-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
-      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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: tabulate
-rubygems_version: 1.7.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Create fancy command line tables with ease.
-test_files:
+test_files: 
 - test/test_tabulate.rb