ttable 0.0.8 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 829caabb9f6ecd7558801ce9018bb718b782a761
-  data.tar.gz: 13c4d80c988f1e6540a36680a202762fc44bb5c5
+  metadata.gz: d8ae3e64a798e07f32c13402a936e74a529f1427
+  data.tar.gz: a54686e3897e2ec48ae70b6a05614121655c6aaf
 SHA512:
-  metadata.gz: 3ee3b47945d736053de60e3e85e9d89d0f1fdacf8805a664ffc1ed5d56f108fc3a093af66b48a4fce39df1ece39a2272d49275f3b20b93bcdcdd63037003d4b6
-  data.tar.gz: 89fce1106da7dcd7813942f308b1932b803d995d0cfcec999dc47b4a1ac6f735ed83cfe84d3b03b954b27f56d92bd0dfe6e575511da9e2c0c2c9416ead69844d
+  metadata.gz: 4078a2f5bf58bdeda5756332cd96066f8ebc5360a15ad25c4c3f52611eb977dff5f718e71d71e27d84391d5fe730c7cc477cd1096b95d6882650f9a3b018986d
+  data.tar.gz: b432e8888c40e2ac345aef905a7c6b3268796ff734160f6ea09e523d2504098dbb5919754a3b81f32b44774e2cd0e9ad787d27be88930f897c47e445baae9c0b

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
   - 2.0.0
+  - jruby-1.7.16
 script: bundle exec rspec
 gemfile: Gemfile.ci

data/README.md

@@ -27,15 +27,90 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+Supports array of array:
 
-## TODO
+```ruby
+puts Terminal::Table.new([%w{ hello 1 }, %w{ world 2 }])
+=>
++-------+---+
+| hello | 1 |
+| world | 2 |
++-------+---+
+```
+
+Supports hash:
+
+```ruby
+puts Terminal::Table.new({ foo: 'bar' })
+=>
++-----+
+| foo |
++-----+
+| bar |
++-----+
+```
+
+Support array of hash:
+
+```ruby
+puts Terminal::Table.new([{ foo: 'bar1' }, { foo: 'bar2' }])
+=>
++------+
+| foo  |
++------+
+| bar1 |
+| bar2 |
++------+
+```
+
+Support display of objects responds_to `#to_hash`:
+
+```ruby
+class Dummy
+  attr_accessor :foo
+
+  def to_hash
+    { foo: @foo }
+  end
+end
+
+puts Terminal::Table.new(Dummy.new.tap { |d| d.foo = 'bar' })
+=>
++-----+
+| foo |
++-----+
+| bar |
++-----+
+```
+
+Support :only and :except option:
+
+```ruby
+class Dummy2
+  attr_accessor :foo1, :foo2, :foo3
+
+  def to_hash
+    { foo1: @foo1, foo2: @foo2, foo3: @foo3 }
+  end
+end
+
+object = Dummy2.new.tap { |d| d.foo1 = 'bar1'; d.foo2 = 'bar2'; d.foo3 = 'bar3' }
+puts Terminal::Table.new(object, only: %w{ foo1 foo2 })
+=>
++------+------+
+| foo1 | foo2 |
++------+------+
+| bar1 | bar2 |
++------+------+
+```
+
+## Credits
 
-- handle new lines properly
+- [terminal-table gem](https://github.com/tj/terminal-table)
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/ttable/fork )
+1. Fork it ( https://github.com/forresty/ttable/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/terminal/table.rb

@@ -3,24 +3,51 @@
 require "gemoji"
 
 class String
+  CHARS_OF_WIDTH_OF_2 = %w{ }
+  CHARS_OF_WIDTH_OF_1 = %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ ※ ◎ ◆ ‘ ★ ’ — ° ʖ ¯ ≥ ≤
+    ≧ ∇ ≦  ❤ ☺ ╭ ╯ ε ╰ ╮ з ∠ → ☞ ë ϵ Θ ϶ Ο Ι ⏎ ← ¥ ó ˶ ˵ ╥ ⊙ ☁ ▽ ⬇ ✌ ‾ ♚ ☀ ℃ Д
+    ↓  ● ´ ☆ ･ _ ᵌ ∀ ﾉ Н а т ш △  ಠ ಥ ʕ ʔ ᴥ ୧ ◡ ୨ ๑ ƪ ˘ ₀ ᵒ ٩ ۶ ∮ ∧ ʚ Ծ ‸ Ï ♡
+    □ ¦ ┮ ┭ ✿ }
+  CHARS_OF_WIDTH_OF_0 = %w{  ͡  ͜  ̫  ᷄  }
+  CHAR_CODES_OF_WIDTH_0 = %w{ 8411 776 8409 8408 809 804 785 2370 820 822 823 769 800 768 805 }
+  CHAR_CODES_OF_WIDTH_1 = %w{ 8203 }
+
+  MULTI_CHAR_OF_WIDTH_1 = %w{ ☺️ ❤️ ♍️ ☔️ ‾᷄ ‾᷅ ⁻̫ ✖️ 😂 ☀︎ ❓ ⁉️ ☁︎ }
+  MULTI_CHAR_OF_WIDTH_2 = %w{ ・᷄ ・᷅ }
+
   def twidth
     result = 0
 
-    %w{ ☺️ ❤️ ♍️ ☔️ }.each do |c|
+    MULTI_CHAR_OF_WIDTH_1.each do |c|
       if include?(c)
         result += 1 * scan(c).size
         gsub!(c, '')
       end
     end
 
+    MULTI_CHAR_OF_WIDTH_2.each do |c|
+      if include?(c)
+        result += 2 * scan(c).size
+        gsub!(c, '')
+      end
+    end
+
     chars.inject(result) do |result, c|
       if c.ord <= 126
         result += 1
-      elsif %w{  ͡  ͜ }.include?(c)
+      elsif CHAR_CODES_OF_WIDTH_0.find { |code| c.ord.to_s == code }
+        # zero width
+        result += 0
+      elsif CHAR_CODES_OF_WIDTH_1.find { |code| c.ord.to_s == code }
+        # zero width
+        result += 1
+      elsif CHARS_OF_WIDTH_OF_0.include?(c)
         # zero width
         result += 0
-      elsif %w{ ě ì • é · ♪ … ω ˊ ˋ √ “ ” ☻ ※ ◎ ◆ ‘ ★ ’ — ° ʖ ¯ ≥ ≤ ≧ ∇ ≦  ❤ ☺ ╭ ╯ ε ╰ ╮ з ∠ → ☞ ë ϵ Θ ϶ Ο Ι }.include?(c)
+      elsif CHARS_OF_WIDTH_OF_1.include?(c)
         result += 1
+      elsif CHARS_OF_WIDTH_OF_2.include?(c)
+        result += 2
       elsif c == ' ' # ord == 8198
         result += 1
       elsif Emoji.find_by_unicode(c)
@@ -45,11 +72,19 @@ module Terminal
     attr_accessor :rows
     attr_accessor :headings
     attr_accessor :column_widths
+    attr_accessor :new_line_symbol
 
     def initialize(object = nil, options = {})
       @rows = []
       @headings = []
       @column_widths = []
+
+      if options[:use_new_line_symbol]
+        @new_line_symbol = '⏎'
+      else
+        @new_line_symbol = ' '
+      end
+
       if object
         if object.is_a?(Hash)
           add_hash(object, options)
@@ -88,7 +123,7 @@ module Terminal
     end
 
     def recalculate_column_widths!
-      @rows = rows.map { |row| row.map { |item| item.to_s.gsub("\r\n", " ").gsub("\n", " ").gsub("\r", " ") } }
+      @rows = rows.map { |row| row.map { |item| item.to_s.gsub("\r\n", @new_line_symbol).gsub("\n", @new_line_symbol).gsub("\r", @new_line_symbol) } }
 
       if @rows.count > 0
         (0...@rows.first.size).each do |col|
@@ -128,5 +163,11 @@ module Terminal
 
       result + header_and_footer
     end
+
+    class << self
+      def special_tokens
+        String::CHARS_OF_WIDTH_OF_1 + String::CHARS_OF_WIDTH_OF_0
+      end
+    end
   end
 end

data/lib/terminal/table/version.rb

@@ -1,5 +1,5 @@
 module Terminal
   class Table
-    VERSION = '0.0.8'
+    VERSION = '0.0.10'
   end
 end

data/spec/terminal/table_spec.rb

@@ -20,6 +20,11 @@ end
 
 module Terminal
   describe Table do
+    describe 'class methods' do
+      subject { Table }
+      it { should respond_to :special_tokens }
+    end
+
     it { should respond_to :to_s }
 
     describe 'initialize with array of array' do
@@ -179,6 +184,17 @@ END
         its(:to_s) { should == expected.gsub(/^(\s+)/, '') }
       end
 
+      context 'new line symbol' do
+        subject { Table.new(nil, use_new_line_symbol: true).tap { |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
@@ -407,5 +423,400 @@ describe String do
       subject { 'にΟΙ' }
       its(:twidth) { should == 4 }
     end
+
+    context ' ̫' do
+      subject { ' ̫' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '　' do
+      subject { '　' }
+      its(:twidth) { should == 2 }
+    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 == 9 }
+    end
+
+    context '╥' do
+      subject { '╥' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '⊙' do
+      subject { '⊙' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(｡･ω･｡)ﾉ♡' do
+      pending 'not finished yet'
+    end
+
+    context '' do
+      subject { '' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '👋' do
+      subject { '👋' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '↓↓' do
+      subject { '↓↓' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '℃' do
+      subject { '℃' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(●✿∀✿●)' do
+      subject { '(●✿∀✿●)' }
+      its(:twidth) { should == 7 }
+    end
+
+    context 'Д' do
+      subject { 'Д' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(´•̥̥̥ω•̥̥̥`)' do
+      pending
+    end
+
+    context ' ᷄' do
+      subject { ' ᷄' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '‾' do
+      subject { '‾' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '༼蛇精༽༄ ' do
+      pending
+    end
+
+    context '✌' do
+      subject { '✌' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(´Д` )' do
+      subject { '(´Д` )' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '゜∀)ノ' do
+      subject { '゜∀)ノ' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '⬇⬇⬇⬇' do
+      subject { '⬇⬇⬇⬇' }
+      its(:twidth) { should == 4 }
+    end
+
+    context 'ヽ(#`Д´)ﾉ' do
+      subject { 'ヽ(#`Д´)ﾉ' }
+      its(:twidth) { should == 9 }
+    end
+
+    context '～٩(๑ᵒ̴̶̷͈᷄ᗨᵒ̴̶̷͈᷅)و' do
+      pending
+    end
+
+    context '😂' do
+      subject { '😂' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '⊙▽⊙' do
+      subject { '⊙▽⊙' }
+      its(:twidth) { should == 3 }
+    end
+
+    context '✖️✖️' do
+      subject { '✖️✖️' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '☁' do
+      subject { '☁' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '( ・᷄ ᵌ・᷅ )' do
+      subject { '( ・᷄ ᵌ・᷅ )' }
+      its(:twidth) { should == 10 }
+    end
+
+    context '(☆_☆)Y(^_^)Y ♪─Ｏ（≧∇≦）Ｏ─♪' do
+      pending
+    end
+
+    context '12～★ 今天新换的 (๑¯ิε ¯ิ๑）' do
+      pending
+    end
+
+    context '☀' do
+      subject { '☀' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '☀︎' do
+      subject { '☀︎' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(´･_･`)' do
+      subject { '(´･_･`)' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '୧⃛(๑⃙⃘◡̈๑⃙⃘)୨⃛' do
+      subject { '୧⃛(๑⃙⃘◡̈๑⃙⃘)୨⃛' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '❓⁉️' do
+      subject { '❓⁉️' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '⬇️⬇️⬇️⬇️⬇️…🌚！！！😰😤😤' do
+      pending
+    end
+
+    context '！' do
+      subject { '！' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '～' do
+      subject { '～' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '(˘̩̩̩ε˘̩ƪ)' do
+      subject { '(˘̩̩̩ε˘̩ƪ)' }
+      its(:twidth) { should == 6 }
+    end
+
+    context 'ʕ •ᴥ•ʔ' do
+      subject { 'ʕ •ᴥ•ʔ' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '´●＿●`' do
+      subject { '´●＿●`' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '＿' do
+      subject { '＿' }
+      its(:twidth) { should == 2 }
+    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
+      pending
+    end
+
+    context '₍₍ (̨̡ ᗣ )̧̢ ₎₎' do
+      pending
+    end
+
+    context '♚' do
+      subject { '♚' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '(●°u°●)​ 」' do
+      subject { '(●°u°●)​ 」' }
+      its(:twidth) { should == 11 }
+    end
+
+    context '」' do
+      subject { '」' }
+      its(:twidth) { should == 2 }
+    end
+
+    context '​​' do
+      subject { '​' } # 8203
+      its(:twidth) { should == 1 }
+    end
+
+    context 'ಥ_ಥ' do
+      subject { 'ಥ_ಥ' }
+      its(:twidth) { should == 3 }
+    end
+
+    context '♪٩(´▽｀๑)۶ ' do
+      subject { '♪٩(´▽｀๑)۶ ' }
+      its(:twidth) { should == 11 }
+    end
+
+    context 'ಠ_ಠ' do
+      subject { 'ಠ_ಠ' }
+      its(:twidth) { should == 3 }
+    end
+
+    context '(ᵒ̤̑ ₀̑ ᵒ̤̑)' do
+      subject { '(ᵒ̤̑ ₀̑ ᵒ̤̑)' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '눈_눈' do
+      subject { '눈_눈' }
+      its(:twidth) { should == 5 }
+    end
+
+    context '' do
+      subject { '' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '((((；ﾟДﾟ)))))))' do
+      pending
+    end
+
+    context '（∮∧∮）' do
+      subject { '（∮∧∮）' }
+      its(:twidth) { should == 7 }
+    end
+
+    context 'ヽ(￣д￣;)ノ' do
+      pending
+    end
+
+    context '(Ծ‸ Ծ )' do
+      subject { '(Ծ‸ Ծ )' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '(۶ૈ ۜ ᵒ̌▱๋ᵒ̌ )۶ૈ=͟͟͞͞ ⌨' do
+      pending
+    end
+
+    context '(๑˃̵ᴗ˂̵)و ' do
+      pending
+    end
+
+    context '嘤ू(ʚ̴̶̷́ .̠ ʚ̴̶̷̥̀ ू) ' do
+      subject { '嘤ू(ʚ̴̶̷́ .̠ ʚ̴̶̷̥̀ ू) ' }
+      its(:twidth) { should == 11 }
+    end
+
+    context '⁽⁽٩(๑˃̶͈̀  ˂̶͈́)۶⁾⁾' do
+      pending
+    end
+
+    context '(ᵒ̤̑ ₀̑ ᵒ̤̑)' do
+      subject { '(ᵒ̤̑ ₀̑ ᵒ̤̑)' }
+      its(:twidth) { should == 7 }
+    end
+
+    context 'AÏcha' do
+      subject { 'AÏcha' }
+      its(:twidth) { should == 5 }
+    end
+
+    context '(ᵒ̤̑ ₀̑ ᵒ̤̑)' do
+      subject { '(ᵒ̤̑ ₀̑ ᵒ̤̑)' }
+      its(:twidth) { should == 7 }
+    end
+
+    context '(╯°Д°)╯︵ ┻━┻ ' do
+      pending
+    end
+
+    context '┭┮﹏┭┮' do
+      subject { '┭┮﹏┭┮' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '=△=' do
+      subject { '=△=' }
+      its(:twidth) { should == 3 }
+    end
+
+    context ' (ؓؒؒؑؑؖؔؓؒؐؐ⁼̴̀ωؘؙؖؕؔؓؒؑؐؕ⁼̴̀ )✧' do
+      pending
+    end
+
+    context '(¦3[____]' do
+      subject { '(¦3[____]' }
+      its(:twidth) { should == 9 }
+    end
+
+    context '( •̥́ ˍ •̀ू )' do
+      pending
+    end
+
+    context 'Σ（ﾟдﾟlll） ' do
+      pending
+    end
+
+    context '☁︎' do
+      subject { '☁︎' }
+      its(:twidth) { should == 1 }
+    end
+
+    context '▀ ▄ ‖ █ ‖▌‖' do
+      pending
+    end
+
+    context 'にこにー♡' do
+      subject { 'にこにー♡' }
+      its(:twidth) { should == 9 }
+    end
+
+    context 'Наташа' do
+      subject { 'Наташа' }
+      its(:twidth) { should == 6 }
+    end
+
+    context '(╯°□°）╯︵' do
+      subject { '(╯°□°）╯︵' }
+      its(:twidth) { should == 10 }
+    end
+
+    context 'Facebig(((o(*ﾟ▽ﾟ*)o)))' do
+      pending
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ttable
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.10
 platform: ruby
 authors:
 - Forrest Ye
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-18 00:00:00.000000000 Z
+date: 2014-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Terminal Table with @2x width character support