table_print 1.2.0 → 1.3.0

data/.travis.yml

@@ -9,3 +9,4 @@ rvm:
   - rbx-18mode
   - rbx-19mode
   - ree
+

data/Rakefile

@@ -12,7 +12,11 @@ require 'rake'
 require 'rspec/core/rake_task'
 
 desc 'Default: run specs and cucumber features.'
-task :default => [:spec, :cucumber]
+if RUBY_VERSION < '1.9'
+  task :default => [:spec, :cucumber_187]
+else
+  task :default => [:spec, :cucumber]
+end
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
@@ -24,6 +28,11 @@ Cucumber::Rake::Task.new(:cucumber) do |task|
   task.cucumber_opts = ["features"]
 end
 
+desc 'Run cucumber features for ruby 1.8.7'
+Cucumber::Rake::Task.new(:cucumber_187) do |task|
+  task.cucumber_opts = ["-t", "~@ruby19", "features"]
+end
+
 begin
   require 'rdoc/task'
 rescue LoadError

data/features/multibyte.feature

@@ -0,0 +1,17 @@
+# coding: utf-8
+
+@ruby19
+Feature: Fix the column width for multibyte character
+  Scenario: A simple array of hashes
+    Given a variable named data with
+      |title             | author   |
+      |これは日本語です。| 山田太郎 |
+      |English           | Bob      |
+    When I table_print data
+    Then the output should contain
+    """
+    TITLE              | AUTHOR  
+    -------------------|---------
+    これは日本語です。 | 山田太郎
+    English            | Bob     
+    """

data/lib/table_print/column.rb

@@ -34,7 +34,10 @@ module TablePrint
     end
 
     def data_width
-      [name.length].concat(Array(data).compact.collect(&:to_s).collect(&:length)).max
+      [
+        name.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+),
+        Array(data).compact.collect(&:to_s).collect{|m| m.each_char.collect{|n| n.bytesize == 1 ? 1 : 2}.inject(0, &:+)}.max
+      ].max
     end
 
     def width

data/lib/table_print/formatter.rb

@@ -25,7 +25,8 @@ module TablePrint
     end
 
     def format(value)
-      "%-#{width}s" % truncate(value)
+      padding = width - value.to_s.each_char.collect{|c| c.bytesize == 1 ? 1 : 2}.inject(0, &:+)
+      truncate(value) + (padding < 0 ? '' : " " * padding)
     end
 
     private

data/lib/table_print/version.rb

@@ -1,4 +1,4 @@
 module TablePrint
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_print
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000Z
+date: 2013-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cat
@@ -94,6 +94,7 @@ files:
 - features/adding_columns.feature
 - features/configuring_output.feature
 - features/excluding_columns.feature
+- features/multibyte.feature
 - features/printing_hash.feature
 - features/sensible_defaults.feature
 - features/support/step_definitions/before.rb
@@ -151,6 +152,7 @@ test_files:
 - features/adding_columns.feature
 - features/configuring_output.feature
 - features/excluding_columns.feature
+- features/multibyte.feature
 - features/printing_hash.feature
 - features/sensible_defaults.feature
 - features/support/step_definitions/before.rb