visual_width 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 970d02ea37970eae029eb5078fd36eb85e662d9e
-  data.tar.gz: 619d3e14f123e4c9858b9328731209d8fe2f5efd
+  metadata.gz: ede4dcf1c5386fcc56ef316d67d8ec06c197e5f5
+  data.tar.gz: 13f86ac56d180d336347749322f8cffc00c2127d
 SHA512:
-  metadata.gz: 1c531f47569a9c8c4b616be2cf20d6f5bbc8235f61f07ae1e04f02f83863858e47efc73c44d73c5357c51711159c7d4158e2d3e09651ce95d9036e58402ca864
-  data.tar.gz: b2b573865cb4e4ec041f2bc12e5344ac01636dec1a3198273cd1dbf2ba5eb6c723216f436d7d5b72f0ff4e2b6c39677ca69699527a3949bb589343bdf1133cfb
+  metadata.gz: 288435a9f3f043f3b9ca6882b785a2671a31ee0f882a166abc02152d58a04aacf1d891554557050b56099e94ac6ac3f8b800139cf0a7a1e5c6ba9b053988fd1c
+  data.tar.gz: 268d7f59e6844b8d6b7a9a64e4671e96c86bfe83326b39629b5ef3c123b3d50f47ed1e27a20cae8c178aa5cc2fe88f6d3c8df0b70fcacdeb5ad32f0a85a7d14c

data/Changes

@@ -1,5 +1,8 @@
 This is a revision history of visual_width gem.
 
+0.0.3 2013-10-26 15:58:51+0900
+    - Revise interface of VisualWidth::Table
+
 0.0.2 2013-10-26 08:51:02+0900
     - Added visual_width/table.rb to draw text tables
 

data/README.md

@@ -43,15 +43,15 @@ See [Ambiguous Characters](http://www.unicode.org/reports/tr11/#Ambiguous) in th
         { align: :center, width:  8 },
         { align: :right,  width:  5 },
       ],
+      header: ['Nick', 'FullName', 'Age'],
     )
 
-    header = ['Nick', 'FullName', 'Age']
     rows = [
       ['カネダ', '金田 正太郎', 17],
       ['テツオ', '島 鉄雄', 16],
       ['ケイ', '?', 18],
     ]
-    puts t.render(rows, header: header)
+    puts t.render(rows)
     # +--------+--------+-----+
     # |  Nick  |FullName| Age |
     # +--------+--------+-----+

data/Rakefile

@@ -10,5 +10,6 @@ task :data do
 end
 
 task :bench do
-  sh "ruby -Ilib tool/benchmark.rb"
+  sh "ruby -Ilib tool/benchmark-measure.rb"
+  sh "ruby -Ilib tool/benchmark-table.rb"
 end

data/example/table.rb

@@ -6,12 +6,12 @@ t = VisualWidth::Table.new(
     { align: :center, width:  8 },
     { align: :right,  width:  5 },
   ],
+  header: ['Nick', 'FullName', 'Age'],
 )
 
-header = ['Nick', 'FullName', 'Age']
 rows = [
   ['カネダ', '金田 正太郎', 17],
   ['テツオ', '島 鉄雄', 16],
   ['ケイ', '?', 18],
 ]
-puts t.render(rows, header: header)
+puts t.render(rows)

data/lib/visual_width/table.rb

@@ -8,19 +8,29 @@ class VisualWidth::Table
 
   def initialize(header: nil, style: [])
     @header = header
-    @style  = style
+    @style  = style.clone
 
-    @needs_wrap = @style.any? { |style| style[:width] != nil }
+    if header
+      header.length.times do |i|
+        @style[i] ||= {}
+      end
+    end
+
+    widths = @style.map { |s| s[:width] }
+    @needs_wrap = widths.any?
+    if header
+      @header_widths = calc_max_widths([header])
+    end
   end
 
-  def render(rows, header: nil, output: "")
+  def render(rows, output: "")
     if @needs_wrap
-      default_style = {}
       rows = rows.map do |row|
         i = 0
         row.map do |cell|
           cell = "#{cell}"
-          width = (@style[i] || default_style)[:width]
+          style = (@style[i] ||= {})
+          width = style[:width]
           i += 1
           if width
             wrap(cell, width)
@@ -31,19 +41,20 @@ class VisualWidth::Table
       end
     end
     max_widths = calc_max_widths(rows)
-    h = header || @header
-    style_header = []
-    if h
-      max_widths = calc_max_widths([h])
+    if @header
+      header_style = []
+      max_widths = @header_widths
         .zip(max_widths)
         .map { |values| values.max }
-      h.length.times do |i|
-        style = @style[i] || {}
-
-        style_header << style.merge(align: :center)
+      @header.length.times do |i|
+        style = (@style[i] ||= {})
+        header_style << style.merge(align: :center)
       end
+      draw_header(output, max_widths, header_style, @header)
+    else
+      line(output, max_widths)
     end
-    draw_header(output, max_widths, style_header, h)
+
     rows.each do |row|
       draw_row(output, max_widths, @style, row)
     end
@@ -69,18 +80,18 @@ class VisualWidth::Table
 
   def draw_row(output, max_widths, style, row)
     output << '|'
-
     rows = []
     max_widths.length.times do |i|
       cell = "#{row[i]}"
-      s = style[i] || {}
-      align = s[:align] || :left
-      width = s[:width] || max_widths[i]
+      st = (style[i] ||= {})
+      align = st[:align] || :left
+      width = st[:width] || max_widths[i]
       c = cell.split(/\n/)
       if c.length == 0
         c << ""
       end
-      output << aligner.send(align, c.shift.strip, width) << '|'
+      output << aligner.send(align, c.shift.strip, width)
+      output << '|'
       if c.length > 0
         c.each_with_index do |new_cell, row_id|
           rows[row_id] ||= []
@@ -106,14 +117,13 @@ class VisualWidth::Table
   end
 
   def calc_max_widths(rows) # -> [max_col0_width, max_col1_width, ...]
-    result = []
-    default_style = {}
+    result = Array.new((@header || rows[0] || []).length, 0)
     rows.each_with_index do |row|
       row.each_with_index do |cell, i|
         ws = "#{cell}".split(/\n/).map do |line|
           measure(line)
         end
-        style = @style[i] || default_style
+        style = (@style[i] ||= {})
         result[i] = (ws << (result[i] || 0) << (style[:width] || 0)).max
       end
     end

data/lib/visual_width/version.rb

@@ -1,3 +1,3 @@
 module VisualWidth
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/visual_width/table_spec.rb

@@ -63,7 +63,7 @@ describe VisualWidth::Table do
         ['Average', 93, 96],
       ]
 
-      expect(VisualWidth::Table.new.render(rows, header: header)).to eql(<<-'TEXT')
+      expect(VisualWidth::Table.new(header: header).render(rows)).to eql(<<-'TEXT')
 +-------+---------+------+
 |Student|Mid-Terms|Finals|
 +-------+---------+------+

data/tool/benchmark-table.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+require 'benchmark'
+require 'visual_width/table'
+require 'terminal-table'
+require 'text-table'
+
+header = [:Name, :Arity?, :DefinedInTheClass?]
+
+rows = String.instance_methods.map do |sym|
+  [sym, "".method(sym).arity, "".class.superclass.instance_methods.include?(sym)]
+end
+
+tabler = VisualWidth::Table.new(
+  header: header,
+)
+puts tabler.render(rows)
+#puts Terminal::Table.new(rows: rows, headings: header)
+#puts Text::Table.new(head: header, rows: rows)
+
+Benchmark.bmbm do |x|
+  x.report("visual_width/table") do
+    100.times { tabler.render(rows) }
+  end
+  x.report("terminal-table") do
+    100.times { Terminal::Table.new(rows: rows, headings: header).to_s }
+  end
+  x.report("text-table") do
+    100.times { Text::Table.new(rows: rows, head: header).to_s }
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_width
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Fuji, Goro (gfx)
@@ -64,7 +64,8 @@ files:
 - spec/visual_width/string_refine_spec.rb
 - spec/visual_width/table_spec.rb
 - spec/visual_width_spec.rb
-- tool/benchmark.rb
+- tool/benchmark-measure.rb
+- tool/benchmark-table.rb
 - tool/east-asian-width.pl
 - tool/tables.rb
 - visual_width.gemspec