terminal-table 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906edc10ddbc49ce496a4bb49d2b0318ce67ce87
-  data.tar.gz: e28e319ee32ef1be3a81ccd3e324970d7778a20d
+  metadata.gz: cfb17272e7d15b11623d2e7db0b5ee5cece62345
+  data.tar.gz: 01f29016e517f64038ef5da9428cbcdb59a9e192
 SHA512:
-  metadata.gz: 37a853ebbf1ccad933892ed34372ca2126d3f302f4c81e9da4dd3e53937613af6e0f820e62c2675a3da50e3542b185d7bd523d15312f37535ca29c95dba14c13
-  data.tar.gz: 8ef39f7169f4682ed4c94739ef2cda11eb1be487b4991e1c4fa3b70ebb7a30bc728d29eaa991d4849c873f58df04b86e3f4ce7bd5c76647893f439550d71b548
+  metadata.gz: a924d05a9e389acf1e7b5a7eeb6bbc706ae7ca5742d0fb94380dfbadc6de281eb5a8fe81e831379be7201bdde49cbb3d598cc446ce26a830ae3f71b54998cf07
+  data.tar.gz: 9e1d3a3cb750e9074679cfe06bdbd08271a11c64c0783a9847853edbacc622322cc7df499a1afd8849f79173e04ff7955e258aa19079795f6afaffb22d81d291

data/History.rdoc

@@ -1,3 +1,11 @@
+1.7.0 / 2016-08-29
+==================
+
+All props to @vizv for this release!
+
+  * Fixed some spec failures
+  * Added support for full-width characters (East Asian alphabets, etc)
+
 1.6.0 / 2016-06-06
 ==================
 

data/README.rdoc

@@ -190,7 +190,7 @@ And change styles on the fly:
   
 To change the default style options:
 
-  Terminal::Style.defaults = {:width => 80}
+  Terminal::Table::Style.defaults = {:width => 80}
 
 All Table objects created afterwards will inherit these defaults.
 

data/lib/terminal-table/cell.rb

@@ -1,3 +1,5 @@
+require 'unicode/display_width'
+
 module Terminal
   class Table
     class Cell
@@ -55,7 +57,8 @@ module Terminal
       def render(line = 0)
         left = " " * @table.style.padding_left
         right = " " * @table.style.padding_right
-        render_width = lines[line].to_s.size - escape(lines[line]).size + width
+        display_width = Unicode::DisplayWidth.of(escape(lines[line]))
+        render_width = lines[line].to_s.size - display_width + width
         align("#{left}#{lines[line]}#{right}", alignment, render_width + @table.cell_padding)
       end
       alias :to_s :render
@@ -65,7 +68,7 @@ module Terminal
       # removes all ANSI escape sequences (e.g. color)
 
       def value_for_column_width_recalc
-        lines.map{ |s| escape(s) }.max_by{ |s| s.size }
+        lines.map{ |s| escape(s) }.max_by{ |s| Unicode::DisplayWidth.of(s) }
       end
 
       ##

data/lib/terminal-table/table.rb

@@ -1,3 +1,5 @@
+require 'unicode/display_width'
+
 module Terminal
   class Table
 
@@ -57,7 +59,15 @@ module Terminal
 
     def column n, method = :value, array = rows
       array.map { |row|
-        cell = row[n]
+        # for each cells in a row, find the column with index
+        # just greater than the required one, and go back one.
+        index = col = 0
+        row.cells.each do |cell|
+          break if index > n
+          index += cell.colspan
+          col += 1
+        end
+        cell = row[col - 1]
         cell && method ? cell.__send__(method) : cell
       }.compact
     end
@@ -126,7 +136,7 @@ module Terminal
         buffer += @rows
         buffer << separator
       end
-      buffer.map { |r| style.margin_left + r.render }.join("\n")
+      buffer.map { |r| style.margin_left + r.render.rstrip }.join("\n")
     end
     alias :to_s :render
 
@@ -192,7 +202,7 @@ module Terminal
         colspan = cell.colspan
         cell_value = cell.value_for_column_width_recalc
         colspan.downto(1) do |j|
-          cell_length = cell_value.to_s.length
+          cell_length = Unicode::DisplayWidth.of(cell_value.to_s)
           if colspan > 1
             spacing_length = cell_spacing * (colspan - 1)
             length_in_columns = (cell_length - spacing_length)

data/lib/terminal-table/version.rb

@@ -1,5 +1,5 @@
 module Terminal
   class Table
-    VERSION = '1.6.0'
+    VERSION = '1.7.0'
   end
 end

data/terminal-table.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", ">= 3.0"
   spec.add_development_dependency "term-ansicolor"
   spec.add_development_dependency "pry"
+
+  spec.add_runtime_dependency "unicode-display_width", "~> 1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: terminal-table
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-06 00:00:00.000000000 Z
+date: 2016-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unicode-display_width
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 description: 
 email:
 - tj@vision-media.ca
@@ -131,4 +145,3 @@ signing_key:
 specification_version: 4
 summary: Simple, feature rich ascii table generation library
 test_files: []
-has_rdoc: