ttable 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 848ced9a6e3d3713df2705bc0c1e2d09e8480962
-  data.tar.gz: 842f58e9371c834e36755738b686db91a813b1e7
+  metadata.gz: e9ad6164cd3372852f9897c81e17e3d9e6b5739f
+  data.tar.gz: e787f4da84c71d9bea389f894fe3c68455dbfbe4
 SHA512:
-  metadata.gz: 91fd34dcb375c8cad28523e5965233f6452a16d3e503a6a4784f0bfe29d2914fec3bd86e1b19ffb3f9aa91685b631fd87b8416453f7be653d75147c2dd6359eb
-  data.tar.gz: 0b9a31805ecb628a1893028f985ba310d0409b3563be5fc3e52de9702f79af0f6c7edae956762f8f76c260da3a15f4fe5d6d60fe783c68d082097ae6349b94bc
+  metadata.gz: 55fde9d65d87587463d56104122d8ec653aa42860239117b967cf8bccdbb37240d8742d4be606ebeb972bf1a8c4cfc13e7a89088374e19f18febb81ee0bd9bca
+  data.tar.gz: 7900c006ff4e09e3b5da319b883826de11164e9086aca865dafd9ec208bf2ed6e1a2ff9a1a9e8e58318daa0b911db20b76531f851d8dd9790f68828be5e75970

data/lib/terminal/table/version.rb

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

data/lib/terminal/table.rb

@@ -6,14 +6,11 @@ class String
   def twidth
     result = 0
 
-    # 4 code point emoji
-    %w{ ☺️ ❤️ }.each do |c|
-      result += -3 * scan(c).size
-    end
-
-    # 3 code point emoji
-    %w{ ♍️ }.each do |c|
-      result += -2 * scan(c).size
+    %w{ ☺️ ❤️ ♍️ }.each do |c|
+      if include?(c)
+        result += 1 * scan(c).size
+        gsub!(c, '')
+      end
     end
 
     chars.inject(result) do |result, c|
@@ -22,7 +19,7 @@ class String
       elsif %w{  ͡  ͜ }.include?(c)
         # zero width
         result += 0
-      elsif %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ ※ ◎ ◆ ‘ ★ ’ — ° ʖ ¯ ≥ ≤ }.include?(c)
+      elsif %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ ※ ◎ ◆ ‘ ★ ’ — ° ʖ ¯ ≥ ≤ ≧ ∇ ≦  ❤ }.include?(c)
         result += 1
       elsif c == ' ' # ord == 8198
         result += 1
@@ -49,25 +46,44 @@ module Terminal
     attr_accessor :headings
     attr_accessor :column_widths
 
-    def initialize
+    def initialize(object = nil, options = {})
       @rows = []
       @headings = []
       @column_widths = []
+
+      if object
+        if object.respond_to?(:each)
+          object.each { |o| add_object(o, options) }
+        else
+          add_object(object, options)
+        end
+      end
+
       yield self if block_given?
       recalculate_column_widths!
     end
 
-    def rows=(rows)
-      @rows = rows.map { |row| row.map { |item| item.to_s.gsub("\n", " ") } }
-      recalculate_column_widths!
+    def add_object(object, options)
+      if object.respond_to?(:to_hash)
+        hash = object.to_hash
+        if options[:only]
+          hash.keep_if { |k, v| options[:only].map(&:to_sym).include?(k) }
+        elsif options[:except]
+          hash.delete_if { |k, v| options[:except].map(&:to_sym).include?(k) }
+        end
+
+        @headings = hash.keys.map(&:to_s)
+        @rows << hash.values
+      end
     end
 
     def headings=(headings)
       @headings = headings
-      recalculate_column_widths!
     end
 
     def recalculate_column_widths!
+      @rows = rows.map { |row| row.map { |item| item.to_s.gsub("\r\n", " ").gsub("\n", " ").gsub("\r", " ") } }
+
       if @rows.count > 0
         (0...@rows.first.size).each do |col|
           @column_widths[col] = @rows.map { |row| row[col].to_s.twidth }.max
@@ -82,6 +98,8 @@ module Terminal
     end
 
     def to_s
+      recalculate_column_widths!
+
       result = ''
 
       header_and_footer = '+' + @column_widths.map { |w| '-' * (w + 2) }.join('+') + '+' + "\n"

data/spec/terminal/table_spec.rb

@@ -2,17 +2,106 @@
 
 require "spec_helper"
 
+class Dummy
+  attr_accessor :foo
+
+  def to_hash
+    { foo: @foo }
+  end
+end
+
+class Dummy2
+  attr_accessor :foo1, :foo2, :foo3
+
+  def to_hash
+    { foo1: @foo1, foo2: @foo2, foo3: @foo3 }
+  end
+end
+
 module Terminal
   describe Table do
     it { should respond_to :to_s }
 
+    describe 'initialize with object#to_hash' do
+      let(:object) { Dummy.new.tap { |d| d.foo = 'bar' } }
+      subject { Table.new(object) }
+
+      expected = <<END
+      +-----+
+      | foo |
+      +-----+
+      | bar |
+      +-----+
+END
+      its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+    end
+
+    describe 'initialize with objects' do
+      let(:object1) { Dummy.new.tap { |d| d.foo = 'bar1' } }
+      let(:object2) { Dummy.new.tap { |d| d.foo = 'bar2' } }
+
+      subject { Table.new([object1, object2]) }
+
+      expected = <<END
+      +------+
+      | foo  |
+      +------+
+      | bar1 |
+      | bar2 |
+      +------+
+END
+      its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+    end
+
+    describe 'initialize with object#to_hash and :only option' do
+      let(:object) { Dummy2.new.tap { |d| d.foo1 = 'bar1'; d.foo2 = 'bar2'; d.foo3 = 'bar3' } }
+      subject { Table.new(object, only: [:foo1, :foo2]) }
+
+      expected = <<END
+      +------+------+
+      | foo1 | foo2 |
+      +------+------+
+      | bar1 | bar2 |
+      +------+------+
+END
+      its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+    end
+
+    describe 'initialize with object#to_hash and :only option' do
+      let(:object) { Dummy2.new.tap { |d| d.foo1 = 'bar1'; d.foo2 = 'bar2'; d.foo3 = 'bar3' } }
+      subject { Table.new(object, only: %w{ foo1 foo2 }) }
+
+      expected = <<END
+      +------+------+
+      | foo1 | foo2 |
+      +------+------+
+      | bar1 | bar2 |
+      +------+------+
+END
+      its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+    end
+
+    describe 'initialize with object#to_hash and :except option' do
+      let(:object) { Dummy2.new.tap { |d| d.foo1 = 'bar1'; d.foo2 = 'bar2'; d.foo3 = 'bar3' } }
+      subject { Table.new(object, except: [:foo1, :foo3]) }
+
+      expected = <<END
+      +------+
+      | foo2 |
+      +------+
+      | bar2 |
+      +------+
+END
+      its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+    end
+
     describe '#to_s' do
       context 'when empty' do
         subject { Table.new }
         its(:to_s) { should == "++\n++\n" }
       end
 
-      context 'new lines' do
+      context 'new lines \n' do
         subject { Table.new { |t| t.rows = [["a\nb"]] } }
 
         expected = <<END
@@ -23,6 +112,45 @@ END
         its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
       end
 
+      context 'new lines \n when <<' do
+        subject { Table.new { |t| t.rows << ["a\nb"] } }
+
+        expected = <<END
+        +-----+
+        | a b |
+        +-----+
+END
+        its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+      end
+
+      context 'new lines \r' do
+        subject { Table.new { |t| t.rows = [["a\rb"]] } }
+
+        expected = <<END
+        +-----+
+        | a b |
+        +-----+
+END
+        its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
+      end
+
+      context 'mutli calls to <<' do
+        it 'works as well' do
+          table = Table.new
+          table.rows << %w{ a }
+          table.rows << %w{ b }
+
+          expected = <<END
+          +---+
+          | a |
+          | b |
+          +---+
+END
+
+          table.to_s.should == expected.gsub(/^(\s+)/, '')
+        end
+      end
+
       context 'when only heading' do
         subject { Table.new { |t| t.headings = %w{ head } } }
         its(:to_s) { should == "+------+\n| head |\n+------+\n+------+\n" }
@@ -80,6 +208,11 @@ describe String do
       its(:twidth) { should == 1 }
     end
 
+    context '☺️☺️' do
+      subject { '☺️☺️' }
+      its(:twidth) { should == 2 }
+    end
+
     context '❤️' do
       subject { '❤️' }
       its(:twidth) { should == 1 }
@@ -105,6 +238,11 @@ describe String do
       its(:twidth) { should == 1 }
     end
 
+    context '♍️♍️' do
+      subject { '♍️♍️' }
+      its(:twidth) { should == 2 }
+    end
+
     context '☻' do
       subject { '☻' }
       its(:twidth) { should == 1 }
@@ -164,5 +302,20 @@ describe String do
       subject { '≥≤' }
       its(:twidth) { should == 2 }
     end
+
+    context '（≧∇≦）' do
+      subject { '（≧∇≦）' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '' do
+      subject { '' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '❤' do
+      subject { '❤' }
+      its(:twidth) { should == 1 }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttable
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Forrest Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler