tty-table 0.1.0 → 0.2.0

data/spec/unit/renderer/unicode/render_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, '#render' do
     let(:table) { TTY::Table.new rows }
 
     it 'display table rows' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         ┌──┬──┬──┐
         │a1│a2│a3│
         │b1│b2│b3│
@@ -24,7 +24,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, '#render' do
 
   context 'with header' do
     it 'displays table with header' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         ┌──┬──┬──┐
         │h1│h2│h3│
         ├──┼──┼──┤
@@ -40,7 +40,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, '#render' do
     let(:rows)   { [['aaa1', 'a2'], ['b1', 'bb1']] }
 
     it 'displays table according to widths' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         ┌────┬───┐
         │h1  │h2 │
         ├────┼───┤
@@ -55,7 +55,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, '#render' do
     let(:header) { ['header1', 'header2', 'header3'] }
 
     it 'header greater than row sizes' do
-      expect(renderer.render).to eq <<-EOS.normalize
+      expect(renderer.render).to eq unindent(<<-EOS)
         ┌───────┬───────┬───────┐
         │header1│header2│header3│
         ├───────┼───────┼───────┤

data/spec/unit/renderer/unicode/separator_spec.rb

@@ -13,7 +13,7 @@ RSpec.describe TTY::Table::Renderer::Unicode, 'with separator' do
 
   it "renders each row" do
     renderer.border.separator= :each_row
-    expect(renderer.render).to eq <<-EOS.normalize
+    expect(renderer.render).to eq unindent(<<-EOS)
       ┌──┬──┬──┐
       │h1│h2│h3│
       ├──┼──┼──┤

data/spec/unit/to_s_spec.rb

@@ -5,15 +5,12 @@ require 'spec_helper'
 RSpec.describe TTY::Table, '#to_s' do
   let(:header)   { ['h1', 'h2', 'h3'] }
   let(:rows)     { [['a1', 'a2', 'a3'], ['b1', 'b2', 'b3']] }
-  let(:renderer) { :basic }
 
   subject(:table) { described_class.new(header, rows) }
 
   context 'without renderer' do
-    let(:renderer) { nil }
-
     it 'displayes basic table' do
-      expect(table.to_s).to eq <<-EOS.normalize
+      expect(table.render(:basic)).to eq unindent(<<-EOS)
         h1 h2 h3
         a1 a2 a3
         b1 b2 b3
@@ -23,7 +20,7 @@ RSpec.describe TTY::Table, '#to_s' do
 
   context 'without border' do
     it 'displays table' do
-      expect(table.to_s).to eq <<-EOS.normalize
+      expect(table.to_s).to eq unindent(<<-EOS)
         h1 h2 h3
         a1 a2 a3
         b1 b2 b3
@@ -32,10 +29,8 @@ RSpec.describe TTY::Table, '#to_s' do
   end
 
   context 'with ascii border' do
-    let(:renderer) { :ascii }
-
     it 'displays table' do
-      expect(table.render(renderer)).to eq <<-EOS.normalize
+      expect(table.render(:ascii)).to eq unindent(<<-EOS)
         +--+--+--+
         |h1|h2|h3|
         +--+--+--+
@@ -47,10 +42,8 @@ RSpec.describe TTY::Table, '#to_s' do
   end
 
   context 'with unicode border' do
-    let(:renderer) { :unicode}
-
     it 'displays table' do
-      expect(table.render(renderer)).to eq <<-EOS.normalize
+      expect(table.render(:unicode)).to eq unindent(<<-EOS)
         ┌──┬──┬──┐
         │h1│h2│h3│
         ├──┼──┼──┤

data/spec/unit/utf_spec.rb

@@ -0,0 +1,33 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+RSpec.describe TTY::Table, 'unicode support' do
+  it "measures utf characters correctly for :basic" do
+    table = TTY::Table[['こんにちは', 'a2'], ['b1','選択']]
+    expect(table.render(:basic)).to eq unindent(<<-EOS)
+      こんにちは a2  
+      b1         選択
+    EOS
+  end
+
+  it "measure utf characters correctly for :ascii" do
+    table = TTY::Table[['こんにちは', 'a2'], ['b1','選択']]
+    expect(table.render(:ascii)).to eq unindent(<<-EOS)
+     +----------+----+
+     |こんにちは|a2  |
+     |b1        |選択|
+     +----------+----+
+    EOS
+  end
+
+  it "measure utf characters correctly for :unicode" do
+    table = TTY::Table[['こんにちは', 'a2'], ['b1','選択']]
+    expect(table.render(:unicode)).to eq unindent(<<-EOS)
+     ┌──────────┬────┐
+     │こんにちは│a2  │
+     │b1        │選択│
+     └──────────┴────┘
+    EOS
+  end
+end

data/tty-table.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'necromancer', '~> 0.3'
   spec.add_dependency 'pastel',      '~> 0.4'
   spec.add_dependency 'tty-screen',  '~> 0.1'
-  spec.add_dependency 'verse',       '~> 0.1'
+  spec.add_dependency 'verse',       '~> 0.4'
+  spec.add_dependency 'unicode_utils','~> 1.4.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tty-table
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Murach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equatable
@@ -72,14 +72,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +119,7 @@ files:
 - .rspec
 - .ruby-version
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -112,6 +127,7 @@ files:
 - benchmarks/speed.rb
 - lib/tty-table.rb
 - lib/tty/table.rb
+- lib/tty/table/alignment_set.rb
 - lib/tty/table/border.rb
 - lib/tty/table/border/ascii.rb
 - lib/tty/table/border/null.rb
@@ -119,14 +135,14 @@ files:
 - lib/tty/table/border/unicode.rb
 - lib/tty/table/border_dsl.rb
 - lib/tty/table/border_options.rb
+- lib/tty/table/column_constraint.rb
 - lib/tty/table/column_set.rb
-- lib/tty/table/columns.rb
 - lib/tty/table/empty.rb
 - lib/tty/table/error.rb
 - lib/tty/table/field.rb
 - lib/tty/table/header.rb
 - lib/tty/table/indentation.rb
-- lib/tty/table/operation/alignment_set.rb
+- lib/tty/table/operation/alignment.rb
 - lib/tty/table/operation/escape.rb
 - lib/tty/table/operation/filter.rb
 - lib/tty/table/operation/padding.rb
@@ -137,11 +153,9 @@ files:
 - lib/tty/table/orientation.rb
 - lib/tty/table/orientation/horizontal.rb
 - lib/tty/table/orientation/vertical.rb
-- lib/tty/table/padder.rb
 - lib/tty/table/renderer.rb
 - lib/tty/table/renderer/ascii.rb
 - lib/tty/table/renderer/basic.rb
-- lib/tty/table/renderer/color.rb
 - lib/tty/table/renderer/unicode.rb
 - lib/tty/table/row.rb
 - lib/tty/table/transformation.rb
@@ -150,6 +164,10 @@ files:
 - spec/spec_helper.rb
 - spec/unit/access_spec.rb
 - spec/unit/add_row_spec.rb
+- spec/unit/alignment_set/each_spec.rb
+- spec/unit/alignment_set/new_spec.rb
+- spec/unit/alignment_set/to_ary_spec.rb
+- spec/unit/alignment_spec.rb
 - spec/unit/border/ascii/rendering_spec.rb
 - spec/unit/border/new_spec.rb
 - spec/unit/border/null/rendering_spec.rb
@@ -158,11 +176,11 @@ files:
 - spec/unit/border/unicode/rendering_spec.rb
 - spec/unit/border_options/new_spec.rb
 - spec/unit/border_options/update_spec.rb
+- spec/unit/column_constraint/enforce_spec.rb
+- spec/unit/column_constraint/widths_spec.rb
 - spec/unit/column_set/extract_widths_spec.rb
 - spec/unit/column_set/total_width_spec.rb
 - spec/unit/column_set/widths_from_spec.rb
-- spec/unit/columns/enforce_spec.rb
-- spec/unit/columns/widths_spec.rb
 - spec/unit/data_spec.rb
 - spec/unit/each_spec.rb
 - spec/unit/each_with_index_spec.rb
@@ -182,12 +200,9 @@ files:
 - spec/unit/header/set_spec.rb
 - spec/unit/header/to_ary_spec.rb
 - spec/unit/header_spec.rb
-- spec/unit/indentation/insert_indent_spec.rb
-- spec/unit/initialize_spec.rb
-- spec/unit/operation/alignment_set/call_spec.rb
-- spec/unit/operation/alignment_set/each_spec.rb
-- spec/unit/operation/alignment_set/new_spec.rb
-- spec/unit/operation/alignment_set/to_ary_spec.rb
+- spec/unit/indentation/indent_spec.rb
+- spec/unit/new_spec.rb
+- spec/unit/operation/alignment/call_spec.rb
 - spec/unit/operation/escape/call_spec.rb
 - spec/unit/operation/filter/call_spec.rb
 - spec/unit/operation/truncation/call_spec.rb
@@ -196,13 +211,14 @@ files:
 - spec/unit/options/access_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/orientation_spec.rb
-- spec/unit/padder/parse_spec.rb
-- spec/unit/padder/to_s_spec.rb
 - spec/unit/padding_spec.rb
 - spec/unit/properties_spec.rb
+- spec/unit/render_repeat_spec.rb
 - spec/unit/render_spec.rb
 - spec/unit/render_with_spec.rb
+- spec/unit/renderer/ascii/coloring_spec.rb
 - spec/unit/renderer/ascii/indentation_spec.rb
+- spec/unit/renderer/ascii/multiline_spec.rb
 - spec/unit/renderer/ascii/padding_spec.rb
 - spec/unit/renderer/ascii/render_spec.rb
 - spec/unit/renderer/ascii/resizing_spec.rb
@@ -212,7 +228,7 @@ files:
 - spec/unit/renderer/basic/extract_column_widths_spec.rb
 - spec/unit/renderer/basic/filter_spec.rb
 - spec/unit/renderer/basic/indentation_spec.rb
-- spec/unit/renderer/basic/multiline_content_spec.rb
+- spec/unit/renderer/basic/multiline_spec.rb
 - spec/unit/renderer/basic/new_spec.rb
 - spec/unit/renderer/basic/options_spec.rb
 - spec/unit/renderer/basic/padding_spec.rb
@@ -224,7 +240,7 @@ files:
 - spec/unit/renderer/border_spec.rb
 - spec/unit/renderer/render_spec.rb
 - spec/unit/renderer/select_spec.rb
-- spec/unit/renderer/style_spec.rb
+- spec/unit/renderer/unicode/coloring_spec.rb
 - spec/unit/renderer/unicode/indentation_spec.rb
 - spec/unit/renderer/unicode/padding_spec.rb
 - spec/unit/renderer/unicode/render_spec.rb
@@ -241,6 +257,7 @@ files:
 - spec/unit/row/to_ary_spec.rb
 - spec/unit/to_s_spec.rb
 - spec/unit/transformation/extract_tuples_spec.rb
+- spec/unit/utf_spec.rb
 - spec/unit/validatable/validate_options_spec.rb
 - spec/unit/validatable_spec.rb
 - tasks/console.rake
@@ -275,6 +292,10 @@ test_files:
 - spec/spec_helper.rb
 - spec/unit/access_spec.rb
 - spec/unit/add_row_spec.rb
+- spec/unit/alignment_set/each_spec.rb
+- spec/unit/alignment_set/new_spec.rb
+- spec/unit/alignment_set/to_ary_spec.rb
+- spec/unit/alignment_spec.rb
 - spec/unit/border/ascii/rendering_spec.rb
 - spec/unit/border/new_spec.rb
 - spec/unit/border/null/rendering_spec.rb
@@ -283,11 +304,11 @@ test_files:
 - spec/unit/border/unicode/rendering_spec.rb
 - spec/unit/border_options/new_spec.rb
 - spec/unit/border_options/update_spec.rb
+- spec/unit/column_constraint/enforce_spec.rb
+- spec/unit/column_constraint/widths_spec.rb
 - spec/unit/column_set/extract_widths_spec.rb
 - spec/unit/column_set/total_width_spec.rb
 - spec/unit/column_set/widths_from_spec.rb
-- spec/unit/columns/enforce_spec.rb
-- spec/unit/columns/widths_spec.rb
 - spec/unit/data_spec.rb
 - spec/unit/each_spec.rb
 - spec/unit/each_with_index_spec.rb
@@ -307,12 +328,9 @@ test_files:
 - spec/unit/header/set_spec.rb
 - spec/unit/header/to_ary_spec.rb
 - spec/unit/header_spec.rb
-- spec/unit/indentation/insert_indent_spec.rb
-- spec/unit/initialize_spec.rb
-- spec/unit/operation/alignment_set/call_spec.rb
-- spec/unit/operation/alignment_set/each_spec.rb
-- spec/unit/operation/alignment_set/new_spec.rb
-- spec/unit/operation/alignment_set/to_ary_spec.rb
+- spec/unit/indentation/indent_spec.rb
+- spec/unit/new_spec.rb
+- spec/unit/operation/alignment/call_spec.rb
 - spec/unit/operation/escape/call_spec.rb
 - spec/unit/operation/filter/call_spec.rb
 - spec/unit/operation/truncation/call_spec.rb
@@ -321,13 +339,14 @@ test_files:
 - spec/unit/options/access_spec.rb
 - spec/unit/options_spec.rb
 - spec/unit/orientation_spec.rb
-- spec/unit/padder/parse_spec.rb
-- spec/unit/padder/to_s_spec.rb
 - spec/unit/padding_spec.rb
 - spec/unit/properties_spec.rb
+- spec/unit/render_repeat_spec.rb
 - spec/unit/render_spec.rb
 - spec/unit/render_with_spec.rb
+- spec/unit/renderer/ascii/coloring_spec.rb
 - spec/unit/renderer/ascii/indentation_spec.rb
+- spec/unit/renderer/ascii/multiline_spec.rb
 - spec/unit/renderer/ascii/padding_spec.rb
 - spec/unit/renderer/ascii/render_spec.rb
 - spec/unit/renderer/ascii/resizing_spec.rb
@@ -337,7 +356,7 @@ test_files:
 - spec/unit/renderer/basic/extract_column_widths_spec.rb
 - spec/unit/renderer/basic/filter_spec.rb
 - spec/unit/renderer/basic/indentation_spec.rb
-- spec/unit/renderer/basic/multiline_content_spec.rb
+- spec/unit/renderer/basic/multiline_spec.rb
 - spec/unit/renderer/basic/new_spec.rb
 - spec/unit/renderer/basic/options_spec.rb
 - spec/unit/renderer/basic/padding_spec.rb
@@ -349,7 +368,7 @@ test_files:
 - spec/unit/renderer/border_spec.rb
 - spec/unit/renderer/render_spec.rb
 - spec/unit/renderer/select_spec.rb
-- spec/unit/renderer/style_spec.rb
+- spec/unit/renderer/unicode/coloring_spec.rb
 - spec/unit/renderer/unicode/indentation_spec.rb
 - spec/unit/renderer/unicode/padding_spec.rb
 - spec/unit/renderer/unicode/render_spec.rb
@@ -366,6 +385,7 @@ test_files:
 - spec/unit/row/to_ary_spec.rb
 - spec/unit/to_s_spec.rb
 - spec/unit/transformation/extract_tuples_spec.rb
+- spec/unit/utf_spec.rb
 - spec/unit/validatable/validate_options_spec.rb
 - spec/unit/validatable_spec.rb
 has_rdoc: 

data/lib/tty/table/operation/alignment_set.rb

@@ -1,103 +0,0 @@
-# encoding: utf-8
-
-module TTY
-  class Table
-    module Operation
-      # A class which responsiblity is to align table rows and header.
-      class AlignmentSet
-        include Enumerable
-        # Initialize an AlignmentSet
-        #
-        # @api private
-        def initialize(aligns, widths = nil)
-          @converter = Necromancer.new
-          @elements = @converter.convert(aligns).to(:array)
-          @widths   = widths
-        end
-
-        # Iterate over each element in the alignment set
-        #
-        # @example
-        #   alignment = AlignmentSet.new [1,2,3]
-        #   alignment.each { |element| ... }
-        #
-        # @return [self]
-        #
-        # @api public
-        def each
-          return to_enum unless block_given?
-          to_ary.each { |element| yield element }
-          self
-        end
-
-        # Lookup an alignment by index
-        #
-        # @param [Integer]
-        #
-        # @return [Symbol] alignment
-        #
-        # @api public
-        def [](index)
-          elements.fetch(index, :left)
-        end
-
-        # Return each alignment in an Array
-        #
-        # @return [Array]
-        #
-        # @api private
-        def alignments
-          map { |alignment| alignment }
-        end
-
-        # Evaluate alignment of the provided row
-        #
-        # @param [Array] row
-        #  the table row
-        # @param [Hash] options
-        #  the table options
-        #
-        # @return [TTY::Table::Field]
-        #
-        # @api public
-        def call(field, row, col)
-          align_field(field, col)
-        end
-
-        # Convert to array
-        #
-        #  @return [Array]
-        #
-        # @api public
-        def to_ary
-          @elements
-        end
-
-        protected
-
-        attr_reader :widths
-
-        attr_reader :elements
-
-        # Align each field in a row
-        #
-        # @param [TTY::Table::Field] field
-        #   the table field
-        #
-        # @param [Integer] col
-        #   the table column index
-        #
-        # @param [Hash] options
-        #
-        # @return [TTY::Table::Field]
-        #
-        # @api private
-        def align_field(field, col)
-          column_width = widths[col]
-          direction    = field.align || self[col]
-          field.value = Verse.align(field.to_s, column_width, direction)
-        end
-      end # AlignmentSet
-    end # Operation
-  end # Table
-end # TTY