visual_width 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b19580c1adb8f868c39960c5e6368809e361d44
-  data.tar.gz: f835155f72a5f98763c52c63f76473841955863f
+  metadata.gz: 480253e8f93e5a5cc5c3b5f5473697596750adc8
+  data.tar.gz: 2ea8f8132c912004bed62597f41ae0df4b86ba77
 SHA512:
-  metadata.gz: 5b5039c4c044dda8c265f274980a64ed2c15b2bcefa1ec96c0d9abcaa03f2850b9b71927127b82e98a85afaa075e9597cd3f621a3f6dfe7f4f89809f6d80ef04
-  data.tar.gz: 6c2bb85713d02ec1cab6a25568d699170a4018060c4a9eed7ec338bbb68fa219c337e39de1530c21c1e791cb77d275336d66325a68807b7828551d3e8555ba0b
+  metadata.gz: fd9f84aff900049f75e95f9cca809dd48893ab0dc4fd8b115cce57b51b2251e611da3537206a7010bc68a3b0f1dd04b32850b77e7bc5eba131282cc301cf04c0
+  data.tar.gz: d4df22a84f010d86bdbf05852b6fe1b78bced1808bc9cd0753a27ce14b9e0e5f20f155ab0e547ecdd3e8324eca523791a9fc6d756f75837a21cf76cf71b6adc9

data/Changes

@@ -1,5 +1,8 @@
 This is a revision history of visual_width gem.
 
+0.0.6 2013-10-26 17:10:50+0900
+    - Add paddings
+
 0.0.5 2013-10-26 16:01:33+0900
     - Re-packaging the gem
 

data/lib/visual_width/formatter.rb

@@ -2,6 +2,12 @@ require 'visual_width'
 
 module VisualWidth::Formatter
   class Align
+    include VisualWidth
+
+    def initialize(east_asian: VisualWidth::EAST_ASIAN)
+      @east_asian = east_asian
+    end
+
     def left(cell, width)
       align(cell, width) do |line, fill|
         line + (' ' * fill)
@@ -24,7 +30,7 @@ module VisualWidth::Formatter
     private
 
     def align(cell, width)
-      w = VisualWidth.measure(cell)
+      w = measure(cell, east_asian: @east_asian)
       if w > width
         raise ArgumentError, "Invalid width cell: #{cell.inspect}, width: #{width.inspect}"
       end

data/lib/visual_width/table.rb

@@ -6,9 +6,11 @@ class VisualWidth::Table
 
   attr_accessor :header, :style
 
-  def initialize(header: nil, style: [])
+  def initialize(header: nil, style: [], east_asian: VisualWidth::EAST_ASIAN)
     @header = header
     @style  = style.clone
+    @east_asian = east_asian
+    @padding = ' '
 
     if header
       header.length.times do |i|
@@ -80,23 +82,19 @@ class VisualWidth::Table
 
   def draw_row(output, max_widths, style, row)
     output << '|'
-    rows = []
+    pre  = @padding
+    post = @padding + '|'
+    rows = [] # for multi-lined cell
     max_widths.length.times do |i|
       cell = "#{row[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 << '|'
-      if c.length > 0
-        c.each_with_index do |new_cell, row_id|
-          rows[row_id] ||= []
-          rows[row_id][i] = new_cell
-        end
+      first, *rest = cell.split(/\n/)
+      output << pre << aligner.send(align, first.to_s.strip, width) << post
+      rest.each_with_index do |new_cell, row_idx|
+        rows[row_idx] ||= []
+        rows[row_idx][i] = new_cell
       end
     end
     output << "\n"
@@ -109,11 +107,11 @@ class VisualWidth::Table
   end
 
   def line (output, widths)
-    output << '+' << widths.map { |width| '-' * width }.join('+') << "+\n"
+    output << '+' << widths.map { |width| '-' * (width+2) }.join('+') << "+\n"
   end
 
   def aligner
-    VisualWidth::Formatter::Align.new
+    VisualWidth::Formatter::Align.new(east_asian: @east_asian)
   end
 
   def calc_max_widths(rows) # -> [max_col0_width, max_col1_width, ...]
@@ -121,7 +119,7 @@ class VisualWidth::Table
     rows.each_with_index do |row|
       row.each_with_index do |cell, i|
         ws = "#{cell}".split(/\n/).map do |line|
-          measure(line)
+          measure(line, east_asian: @east_asian)
         end
         style = (@style[i] ||= {})
         result[i] = (ws << (result[i] || 0) << (style[:width] || 0)).max

data/lib/visual_width/version.rb

@@ -1,3 +1,3 @@
 module VisualWidth
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/visual_width/table_spec.rb

@@ -18,11 +18,11 @@ describe VisualWidth::Table do
       t = VisualWidth::Table.new
 
       expect(t.render(rows)).to eql(<<-'TEXT')
-+----------+----------+
-|りんご    |なし      |
-|べにしぐれ|せいぎょく|
-|となみ    |いなぎ    |
-+----------+----------+
++------------+------------+
+| りんご     | なし       |
+| べにしぐれ | せいぎょく |
+| となみ     | いなぎ     |
++------------+------------+
       TEXT
     end
 
@@ -32,11 +32,11 @@ describe VisualWidth::Table do
       )
 
       expect(t.render(rows)).to eql(<<-'TEXT')
-+----------+----------+
-|  りんご  |      なし|
-|べにしぐれ|せいぎょく|
-|  となみ  |    いなぎ|
-+----------+----------+
++------------+------------+
+|   りんご   |       なし |
+| べにしぐれ | せいぎょく |
+|   となみ   |     いなぎ |
++------------+------------+
       TEXT
     end
 
@@ -45,13 +45,13 @@ describe VisualWidth::Table do
         header: %w(A B),
       )
       expect(t.render(rows)).to eql(<<-'TEXT')
-+----------+----------+
-|    A     |    B     |
-+----------+----------+
-|りんご    |なし      |
-|べにしぐれ|せいぎょく|
-|となみ    |いなぎ    |
-+----------+----------+
++------------+------------+
+|     A      |     B      |
++------------+------------+
+| りんご     | なし       |
+| べにしぐれ | せいぎょく |
+| となみ     | いなぎ     |
++------------+------------+
       TEXT
     end
 
@@ -64,13 +64,13 @@ describe VisualWidth::Table do
       ]
 
       expect(VisualWidth::Table.new(header: header).render(rows)).to eql(<<-'TEXT')
-+-------+---------+------+
-|Student|Mid-Terms|Finals|
-+-------+---------+------+
-|Sam    |94       |93    |
-|Jane   |92       |99    |
-|Average|93       |96    |
-+-------+---------+------+
++---------+-----------+--------+
+| Student | Mid-Terms | Finals |
++---------+-----------+--------+
+| Sam     | 94        | 93     |
+| Jane    | 92        | 99     |
+| Average | 93        | 96     |
++---------+-----------+--------+
       TEXT
     end
   end
@@ -79,10 +79,10 @@ describe VisualWidth::Table do
     it "wraps with 10 width" do
       t = VisualWidth::Table.new(style: [{width: 10}, {width: 10}])
       expect(t.render([['テレポーター！', '*いしのなかにいる*']])).to eql(<<-'TEXT')
-+----------+----------+
-|テレポータ|*いしのな |
-|ー！      |かにいる* |
-+----------+----------+
++------------+------------+
+| テレポータ | *いしのな  |
+| ー！       | かにいる*  |
++------------+------------+
       TEXT
     end
   end

data/tool/benchmark-table.rb

@@ -14,9 +14,10 @@ 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)
+
+a = tabler.render(rows)
+b = Terminal::Table.new(rows: rows, headings: header)
+c = Text::Table.new(head: header, rows: rows)
 
 Benchmark.bmbm do |x|
   x.report("visual_width/table") do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: visual_width
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Fuji, Goro (gfx)