ttable 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee884467d48100b295bd4d3d5b9ca21a651d1ad8
-  data.tar.gz: c2c5fd97bfbe4014b47e19a5c4d2bfd76da0c68f
+  metadata.gz: 848ced9a6e3d3713df2705bc0c1e2d09e8480962
+  data.tar.gz: 842f58e9371c834e36755738b686db91a813b1e7
 SHA512:
-  metadata.gz: 21fc5f06070be22a6785e9c616176f2d0d07a53c1eec7d01f879e65a1f2c6bd5ed242c55fc3bd45a1857e37d049d8422851987d8d0fc369c90d4653c1c8c42a8
-  data.tar.gz: 702dcf5e24dd764d30b926cf7fad809e18ab62147fd44c9ed28cc60db81a43964370e6d0ff8cb58d90a5100af85261d02fc07752b0a864e14b96bec5096ccb3d
+  metadata.gz: 91fd34dcb375c8cad28523e5965233f6452a16d3e503a6a4784f0bfe29d2914fec3bd86e1b19ffb3f9aa91685b631fd87b8416453f7be653d75147c2dd6359eb
+  data.tar.gz: 0b9a31805ecb628a1893028f985ba310d0409b3563be5fc3e52de9702f79af0f6c7edae956762f8f76c260da3a15f4fe5d6d60fe783c68d082097ae6349b94bc

data/README.md

@@ -28,6 +28,10 @@ Or install it yourself as:
 
 TODO: Write usage instructions here
 
+## TODO
+
+- handle new lines properly
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/ttable/fork )

data/lib/terminal/table.rb

@@ -19,7 +19,12 @@ class String
     chars.inject(result) do |result, c|
       if c.ord <= 126
         result += 1
-      elsif %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ }.include?(c)
+      elsif %w{  ͡  ͜ }.include?(c)
+        # zero width
+        result += 0
+      elsif %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ ※ ◎ ◆ ‘ ★ ’ — ° ʖ ¯ ≥ ≤ }.include?(c)
+        result += 1
+      elsif c == ' ' # ord == 8198
         result += 1
       elsif Emoji.find_by_unicode(c)
         result += 1
@@ -40,8 +45,6 @@ end
 
 module Terminal
   class Table
-    VERSION = '0.0.2'
-
     attr_accessor :rows
     attr_accessor :headings
     attr_accessor :column_widths
@@ -54,6 +57,16 @@ module Terminal
       recalculate_column_widths!
     end
 
+    def rows=(rows)
+      @rows = rows.map { |row| row.map { |item| item.to_s.gsub("\n", " ") } }
+      recalculate_column_widths!
+    end
+
+    def headings=(headings)
+      @headings = headings
+      recalculate_column_widths!
+    end
+
     def recalculate_column_widths!
       if @rows.count > 0
         (0...@rows.first.size).each do |col|

data/lib/terminal/table/version.rb

@@ -0,0 +1,5 @@
+module Terminal
+  class Table
+    VERSION = '0.0.3'
+  end
+end

data/lib/ttable.rb

@@ -1,2 +1,2 @@
-require "ttable/version"
+require "terminal/table/version"
 require "terminal/table"

data/spec/terminal/table_spec.rb

@@ -12,10 +12,43 @@ module Terminal
         its(:to_s) { should == "++\n++\n" }
       end
 
+      context 'new lines' do
+        subject { Table.new { |t| t.rows = [["a\nb"]] } }
+
+        expected = <<END
+        +-----+
+        | a b |
+        +-----+
+END
+        its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+      end
+
       context 'when only heading' do
         subject { Table.new { |t| t.headings = %w{ head } } }
         its(:to_s) { should == "+------+\n| head |\n+------+\n+------+\n" }
       end
+
+      context 'when set contents after' do
+        subject { Table.new.tap { |t| t.headings = %w{ head } } }
+        its(:to_s) { should == "+------+\n| head |\n+------+\n+------+\n" }
+      end
+
+      context 'with nil values' do
+        subject { Table.new { |t| t.headings = %w{ head }; t.rows = [ [ nil ] ] } }
+        its(:to_s) { should == "+------+\n| head |\n+------+\n|      |\n+------+\n" }
+      end
+
+      context 'with nil values' do
+        subject { Table.new { |t| t.headings = %w{ head1 head2 }; t.rows = [ [ nil, nil ] ] } }
+        expected = <<END
+        +-------+-------+
+        | head1 | head2 |
+        +-------+-------+
+        |       |       |
+        +-------+-------+
+END
+        its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+      end
     end
   end
 end
@@ -76,5 +109,60 @@ describe String do
       subject { '☻' }
       its(:twidth) { should == 1 }
     end
+
+    context '※' do
+      subject { '※' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '◎' do
+      subject { '◎' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '◆' do
+      subject { '◆' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '‘' do
+      subject { '‘' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '★ ’' do
+      subject { '★ ’' }
+      its(:twidth) { should == 3 }
+    end
+
+    context '—' do
+      subject { '—' }
+      its(:twidth) { should == 1 }
+    end
+
+    context 'special whitespace' do
+      subject { ' ' }
+      its(:twidth) { should == 1 }
+    end
+
+    context ' ͡° ͜ʖ ͡°' do
+      subject { ' ͡° ͜ʖ ͡°' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '（¯﹃¯）' do
+      subject { '（¯﹃¯）' }
+      its(:twidth) { should == 8 }
+    end
+
+    context '（）' do
+      subject { '（）' }
+      its(:twidth) { should == 4 }
+    end
+
+    context '≥≤' do
+      subject { '≥≤' }
+      its(:twidth) { should == 2 }
+    end
   end
 end

data/ttable.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'terminal/table'
+require 'terminal/table/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "ttable"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttable
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Forrest Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-15 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ files:
 - Rakefile
 - bin/ttable
 - lib/terminal/table.rb
+- lib/terminal/table/version.rb
 - lib/ttable.rb
 - screenshot.png
 - spec/spec_helper.rb