tabularize 0.1.0 → 0.1.1

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+0.1.1
+-----
+- :unicode_display option added for CJK wide characters.
+
+0.1.0
+-----
+- Initial release

data/Gemfile.lock

@@ -0,0 +1,19 @@
+PATH
+  remote: .
+  specs:
+    tabularize (0.1.1)
+      unicode-display_width (~> 0.1.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    awesome_print (1.0.2)
+    unicode-display_width (0.1.1)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  awesome_print
+  tabularize!

data/README.md

@@ -2,6 +2,7 @@ tabularize
 ==========
 
 Formatting tabular data with paddings.
+
 Inspired by tabular.vim (https://github.com/godlygeek/tabular)
 
 Installation
@@ -107,6 +108,20 @@ Average Joe_ | Engineering | Somewhere over the rainbow | N/A_____
 Hong Gildong | HR_________ | Nowhere___________________ | 555-5555
 ```
 
+#### CJK wide characters
+
+```ruby
+puts Tabularize.it(data, :unicode_display => true).map { |row| row.join ' | ' }
+```
+
+```
+Name         | Dept        | Location                    | Phone
+John Doe     | Finance     | Los Angeles, CA 90089       | 555-1555
+Average Joe  | Engineering | Somewhere over the rainbow  | N/A
+Hong Gildong | HR          | Nowhere                     | 555-5555
+홍길동       | 탁상 3부    | 서울역 3번 출구 김씨 옆자리 | N/A
+```
+
 Copyright
 ---------
 

data/lib/tabularize.rb

@@ -3,7 +3,8 @@ require "tabularize/version"
 module Tabularize
   DEFAULT_OPTIONS = {
     :pad => ' ',
-    :align => :left
+    :align => :left,
+    :unicode_display => false
   }
 
   # Formats two-dimensional tabular data.
@@ -19,17 +20,26 @@ module Tabularize
     options = DEFAULT_OPTIONS.merge(options)
     pad     = options[:pad].to_s
     align   = options[:align]
-    raise ArgumentError.new("Invalid alignment") unless pad.length == 1
+    unicode = options[:unicode_display]
+    raise ArgumentError.new("Invalid padding") unless pad.length == 1
     raise ArgumentError.new("Invalid alignment") unless
         [:left, :right, :center].include?(align)
 
+    l = 
+      if unicode
+        require 'unicode/display_width'
+        :display_width
+      else
+        :length
+      end
+
     rows       = []
     max_widths = []
     table_data.each do |row|
       rows << row = [*row].map(&:to_s).map(&:chomp)
 
       row.each_with_index do |cell, idx|
-        max_widths[idx] = [ cell.length, max_widths[idx] || 0 ].max
+        max_widths[idx] = [ cell.send(l), max_widths[idx] || 0 ].max
       end
     end
 
@@ -38,6 +48,9 @@ module Tabularize
       row.map { |str|
         idx += 1
         w = max_widths[idx]
+        if unicode
+          w += str.length - str.display_width
+        end
         case align
         when :left
           str.ljust(w, pad)

data/lib/tabularize/version.rb

@@ -1,3 +1,3 @@
 module Tabularize
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/tabularize.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "awesome_print"
+  s.add_runtime_dependency 'unicode-display_width', '~> 0.1.1'
 end

data/test/test_tabularize.rb

@@ -101,19 +101,26 @@ class TestTabularize < Test::Unit::TestCase
     end
   end
 
+  # TODO: Need assertion
   def test_tabularize_csv
-    data = CSV.read(File.join(File.dirname(__FILE__), 'test.csv'), :col_sep => '|')
-    ap data
-    output = Tabularize.it(data).map { |row| row.join ' | ' }
-    ap output
-    puts
-    puts output
+    {
+      'test.csv' => false,
+      'test_unicode.csv' => true
+    }.each do |file, unicode|
+      data = CSV.read(File.join(File.dirname(__FILE__), file), :col_sep => '|')
+      ap data
+      output = Tabularize.it(data, :unicode_display => unicode).map { |row| row.join ' | ' }
+      ap output
+      puts
+      puts output
 
-    puts Tabularize.it(data, :align => :right).map { |row| row.join ' | ' }
-    puts
-    puts Tabularize.it(data, :align => :center).map { |row| row.join ' | ' }
-    puts
-    puts Tabularize.it(data, :pad => '_').map { |row| row.join ' | ' }
+      puts Tabularize.it(data, :align => :right, :unicode_display => unicode).map { |row| row.join ' | ' }
+      puts
+      puts Tabularize.it(data, :align => :center, :unicode_display => unicode).map { |row| row.join ' | ' }
+      puts
+      puts Tabularize.it(data, :pad => '_', :unicode_display => unicode).map { |row| row.join ' | ' }
+
+    end
   end
 
   def test_invalid_arguments

data/test/test_unicode.csv

@@ -0,0 +1,5 @@
+Name|Dept|Location|Phone
+John Doe|Finance|Los Angeles, CA 90089|555-1555
+Average Joe|Engineering|Somewhere over the rainbow|N/A
+Hong Gildong|HR|Nowhere|555-5555
+홍길동|탁상 3부|서울역 3번 출구 김씨 옆자리|N/A

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tabularize
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000 Z
+date: 2012-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2152636520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,28 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152636520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Formatting tabular data with paddings and alignments
 email:
 - junegunn.c@gmail.com
@@ -30,7 +51,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -39,6 +62,7 @@ files:
 - tabularize.gemspec
 - test/test.csv
 - test/test_tabularize.rb
+- test/test_unicode.csv
 homepage: ''
 licenses: []
 post_install_message: 
@@ -59,11 +83,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: tabularize
-rubygems_version: 1.8.15
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Formatting tabular data
 test_files:
 - test/test.csv
 - test/test_tabularize.rb
+- test/test_unicode.csv
 has_rdoc: