kosi 0.0.1 → 0.0.2

data/lib/kosi/options.rb

@@ -1,15 +1,15 @@
-# encoding: utf-8
-
-# TableFormat for Terminal(Use Japanese Charactors)
-module Kosi
-  # Options
-  module OptionKeys
-    ALIGN = :align
-    HEADER = :header
-    HAS_HEADER = :has_header
-    CONNECTOR_CHAR = :connector_char
-    HORIZONTAL_BORDER_CHAR = :horizontal_border_char
-    VERTICAL_BORDER_CHAR = :vertical_border_char
-    SEPARATE_EACH_ROW = :separate_each_row
-  end
-end
+# encoding: utf-8
+
+# TableFormat for Terminal(Use Japanese Charactors)
+module Kosi
+  # Options
+  module OptionKeys
+    ALIGN = :align
+    HEADER = :header
+    HAS_HEADER = :has_header
+    CONNECTOR_CHAR = :connector_char
+    HORIZONTAL_BORDER_CHAR = :horizontal_border_char
+    VERTICAL_BORDER_CHAR = :vertical_border_char
+    SEPARATE_EACH_ROW = :separate_each_row
+  end
+end

data/lib/kosi/separate_each_row.rb

@@ -1,15 +1,15 @@
-# encoding: utf-8
-require 'kosi/options'
-
-# TableFormat for Terminal(Use Japanese Charactors)
-module Kosi
-  # SeparateEachRow
-  class SeparateEachRow
-    attr_reader :value
-    DEFAULT = false
-
-    def initialize(options)
-      @value = options[OptionKeys::SEPARATE_EACH_ROW] || DEFAULT
-    end
-  end
-end
+# encoding: utf-8
+require 'kosi/options'
+
+# TableFormat for Terminal(Use Japanese Charactors)
+module Kosi
+  # SeparateEachRow
+  class SeparateEachRow
+    attr_reader :value
+    DEFAULT = false
+
+    def initialize(options)
+      @value = options[OptionKeys::SEPARATE_EACH_ROW] || DEFAULT
+    end
+  end
+end

data/lib/kosi/validators.rb

@@ -1,3 +1,3 @@
-# encoding: utf-8
-require 'kosi/validators/each_array_length_validator'
-require 'kosi/validators/row_type_validator'
+# encoding: utf-8
+require 'kosi/validators/each_array_length_validator'
+require 'kosi/validators/row_type_validator'

data/lib/kosi/validators/each_array_length_validator.rb

@@ -1,21 +1,21 @@
-# encoding: utf-8
-
-# Kosi
-module Kosi
-  # Validators
-  module Validators
-    # EachArrayLength Validator
-    # if row class is not Array, fail ArgumentError.
-    class EachArrayLength
-      INVALID_ARRAY_LENGTH_MESSAGE = \
-          'invalid array length.each array must be same length'
-      def self.validate(row)
-        row_sizes = row.map(&:size)
-        return if row_sizes.uniq.size == 0
-        unless row_sizes.uniq.size == 1
-          fail ArgumentError, INVALID_ARRAY_LENGTH_MESSAGE
-        end
-      end
-    end
-  end
-end
+# encoding: utf-8
+
+# Kosi
+module Kosi
+  # Validators
+  module Validators
+    # EachArrayLength Validator
+    # if row class is not Array, fail ArgumentError.
+    class EachArrayLength
+      INVALID_ARRAY_LENGTH_MESSAGE = \
+          'invalid array length.each array must be same length'
+      def self.validate(row)
+        row_sizes = row.map(&:size)
+        return if row_sizes.uniq.size == 0
+        unless row_sizes.uniq.size == 1
+          fail ArgumentError, INVALID_ARRAY_LENGTH_MESSAGE
+        end
+      end
+    end
+  end
+end

data/lib/kosi/validators/row_type_validator.rb

@@ -1,19 +1,19 @@
-# encoding: utf-8
-
-# Kosi
-module Kosi
-  # Validators
-  module Validators
-    # RowType Validator
-    # if row class is not Array, fail ArgumentError.
-    class RowType
-      INVALID_ROW_MESSAGE = 'invalid row class %s. row class must be Array.'
-      def self.validate(row)
-        unless row.is_a?(Array)
-          message = format(INVALID_ROW_MESSAGE, row.class)
-          fail ArgumentError, message
-        end
-      end
-    end
-  end
-end
+# encoding: utf-8
+
+# Kosi
+module Kosi
+  # Validators
+  module Validators
+    # RowType Validator
+    # if row class is not Array, fail ArgumentError.
+    class RowType
+      INVALID_ROW_MESSAGE = 'invalid row class %s. row class must be Array.'
+      def self.validate(row)
+        unless row.is_a?(Array)
+          message = format(INVALID_ROW_MESSAGE, row.class)
+          fail ArgumentError, message
+        end
+      end
+    end
+  end
+end

data/lib/kosi/version.rb

@@ -1,4 +1,4 @@
-# TableFormat for Terminal(Use Japanese Charactors)
-module Kosi
-  VERSION = '0.0.1'
-end
+# TableFormat for Terminal(Use Japanese Charactors)
+module Kosi
+  VERSION = '0.0.2'
+end

data/lib/kosi/vertical_border_char.rb

@@ -1,26 +1,26 @@
-require 'kosi/options'
-require 'kosi/char_option'
-
-# TableFormat for Terminal(Use Japanese Charactors)
-module Kosi
-  # VerticalBorderChar
-  class VerticalBorderChar < CharOption
-    DEFAULT = '|'
-    INVALID_CHAR_MSG = \
-        'vertical_border_char must be 1 length(%d) char %s'
-
-    def default
-      DEFAULT
-    end
-
-    def key
-      OptionKeys::VERTICAL_BORDER_CHAR
-    end
-
-    private
-
-    def invalid_char_msg
-      INVALID_CHAR_MSG
-    end
-  end
-end
+require 'kosi/options'
+require 'kosi/char_option'
+
+# TableFormat for Terminal(Use Japanese Charactors)
+module Kosi
+  # VerticalBorderChar
+  class VerticalBorderChar < CharOption
+    DEFAULT = '|'
+    INVALID_CHAR_MSG = \
+        'vertical_border_char must be 1 length(%d) char %s'
+
+    def default
+      DEFAULT
+    end
+
+    def key
+      OptionKeys::VERTICAL_BORDER_CHAR
+    end
+
+    private
+
+    def invalid_char_msg
+      INVALID_CHAR_MSG
+    end
+  end
+end

data/lib/table.rb

@@ -1,138 +1,149 @@
-# encoding: utf-8
-require 'kosi'
-require 'kosi/validators'
-
-# TableFormat for Terminal(Use Japanese Charactors)
-module Kosi
-  # Table
-  class Table
-    attr_reader :align, :header, :connector_char, :horizontal_border_char,
-                :vertical_border_char, :separate_each_row
-
-    def initialize(options = {})
-      @align = Kosi::Align.new(options)
-      @header = Kosi::Header.new(options)
-      @connector_char = Kosi::ConnectorChar.new(options)
-      @horizontal_border_char = Kosi::HorizontalBorderChar.new(options)
-      @vertical_border_char = Kosi::VerticalBorderChar.new(options)
-      @separate_each_row = Kosi::SeparateEachRow.new(options)
-    end
-
-    def render(rows)
-      check_rows_type(rows)
-      check_each_array_length(rows)
-      header = read_header
-      max_lengths = get_max_lengths(rows, header)
-      table_format_rows = get_table_format_rows(rows, max_lengths, header)
-      table_format_rows.join("\n") + "\n"
-    end
-
-    private
-
-    def check_rows_type(rows)
-      Validators::RowType.validate(rows)
-      rows.each { |row|Validators::RowType.validate(row) }
-    end
-
-    def check_each_array_length(rows)
-      Validators::EachArrayLength.validate(rows)
-    end
-
-    def get_max_lengths(rows, header)
-      tmp_rows = rows.dup
-      tmp_rows << header unless @header.empty?
-      tmp_rows.reduce([]) do |max_lengths, row|
-        row.each_with_index do |e, i|
-          s = ascii1_other2_size(String(e))
-          next unless greater?(s, max_lengths[i])
-          max_lengths[i] = s
-        end
-        max_lengths
-      end
-    end
-
-    def greater?(one, other)
-      return true if other.nil?
-      one > other
-    end
-
-    def ascii1_other2_size(column)
-      column.split('').reduce(0) do |a, e|
-        a += half?(e) ? 1 : 2
-        a
-      end
-    end
-
-    def half?(char)
-      case char.ord
-      when 1..127, 65_377..65_439
-        true
-      else
-        false
-      end
-    end
-
-    def get_table_format_rows(rows, max_lengths, header)
-      top_bottom_line = top_bottom(max_lengths)
-      results = [top_bottom_line]
-      append_header(results, header, max_lengths, top_bottom_line)
-      rows.each do |col|
-        results += formated_row(col, max_lengths, top_bottom_line)
-      end
-      results << top_bottom_line unless @separate_each_row.value
-      results
-    end
-
-    def formated_row(col, max_lengths, top_bottom_line)
-      results = []
-      row_results = get_columns(col, max_lengths)
-      virtical = @vertical_border_char.value
-      results << "#{virtical}#{row_results.join(virtical)}#{virtical}"
-      results << top_bottom_line if @separate_each_row.value
-      results
-    end
-
-    def append_header(results, header, max_lengths, top_bottom_line)
-      unless @header.empty?
-        results << formated_header(header, max_lengths)
-        results << top_bottom_line
-      end
-    end
-
-    def top_bottom(max_lengths)
-      results = max_lengths.reduce([]) do |ret, column_size|
-        ret << @horizontal_border_char.value * column_size
-        ret
-      end
-      con = @connector_char.value
-      "#{con}#{results.join(con)}#{con}"
-    end
-
-    def read_header
-      return nil if @header.empty?
-      @header.value
-    end
-
-    def formated_header(header, max_lengths)
-      header_results = []
-      header.size.times do |i|
-        column = String(header[i])
-        diff = ascii1_other2_size(column) - column.size
-        header_results << @align.apply(column, max_lengths[i], diff)
-      end
-      virtical = @vertical_border_char.value
-      header_line = header_results.join(virtical)
-      "#{virtical}#{header_line}#{virtical}"
-    end
-
-    def get_columns(columns, max_lengths)
-      column_results = []
-      columns.size.times do |i|
-        column = String(columns[i])
-        diff = ascii1_other2_size(column) - column.size
-        column_results << @align.apply(column, max_lengths[i], diff)
-      end
-      column_results
-    end
-  end
-end
+# encoding: utf-8
+require 'kosi'
+require 'kosi/validators'
+
+# TableFormat for Terminal(Use Japanese Charactors)
+module Kosi
+  # Table
+  class Table
+    attr_reader :align, :header, :connector_char, :horizontal_border_char,
+                :vertical_border_char, :separate_each_row
+
+    def initialize(options = {})
+      @align = Kosi::Align.new(options)
+      @header = Kosi::Header.new(options)
+      @connector_char = Kosi::ConnectorChar.new(options)
+      @horizontal_border_char = Kosi::HorizontalBorderChar.new(options)
+      @vertical_border_char = Kosi::VerticalBorderChar.new(options)
+      @separate_each_row = Kosi::SeparateEachRow.new(options)
+    end
+
+    def render(rows)
+      check_rows_type(rows)
+      check_each_array_length(rows)
+      header = read_header
+      escaped_rows = escape_ansi_escape_sequence(rows)
+      max_lengths = get_max_lengths(escaped_rows, header)
+      table_format_rows = get_table_format_rows(rows, max_lengths, header)
+      table_format_rows.join("\n") + "\n"
+    end
+
+    private
+
+    def check_rows_type(rows)
+      Validators::RowType.validate(rows)
+      rows.each { |row|Validators::RowType.validate(row) }
+    end
+
+    def check_each_array_length(rows)
+      Validators::EachArrayLength.validate(rows)
+    end
+
+    def get_max_lengths(rows, header)
+      tmp_rows = rows.dup
+      tmp_rows << header unless @header.empty?
+      tmp_rows.reduce([]) do |max_lengths, row|
+        row.each_with_index do |e, i|
+          s = ascii1_other2_size(String(e))
+          next unless greater?(s, max_lengths[i])
+          max_lengths[i] = s
+        end
+        max_lengths
+      end
+    end
+
+    def greater?(one, other)
+      return true if other.nil?
+      one > other
+    end
+
+    def ascii1_other2_size(column)
+      column.split('').reduce(0) do |a, e|
+        a += half?(e) ? 1 : 2
+        a
+      end
+    end
+
+    def half?(char)
+      case char.ord
+      when 1..127, 65_377..65_439
+        true
+      else
+        false
+      end
+    end
+
+    def get_table_format_rows(rows, max_lengths, header)
+      top_bottom_line = top_bottom(max_lengths)
+      results = [top_bottom_line]
+      append_header(results, header, max_lengths, top_bottom_line)
+      rows.each do |col|
+        results += formated_row(col, max_lengths, top_bottom_line)
+      end
+      results << top_bottom_line unless @separate_each_row.value
+      results
+    end
+
+    def formated_row(col, max_lengths, top_bottom_line)
+      results = []
+      row_results = get_columns(col, max_lengths)
+      virtical = @vertical_border_char.value
+      results << "#{virtical}#{row_results.join(virtical)}#{virtical}"
+      results << top_bottom_line if @separate_each_row.value
+      results
+    end
+
+    def append_header(results, header, max_lengths, top_bottom_line)
+      unless @header.empty?
+        results << formated_header(header, max_lengths)
+        results << top_bottom_line
+      end
+    end
+
+    def top_bottom(max_lengths)
+      results = max_lengths.reduce([]) do |ret, column_size|
+        ret << @horizontal_border_char.value * column_size
+        ret
+      end
+      con = @connector_char.value
+      "#{con}#{results.join(con)}#{con}"
+    end
+
+    def read_header
+      return nil if @header.empty?
+      @header.value
+    end
+
+    def escape_ansi_escape_sequence(rows)
+      rows.reduce([]) do |r, e|
+        r << e.map do |f|f.to_s.gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '')
+            .gsub(/\x1b(\[|\(|\))[;?0-9]*[0-9A-Za-z]/, '')
+            .gsub(/(\x03|\x1a)/, '')
+        end
+        r
+      end
+    end
+
+    def formated_header(header, max_lengths)
+      header_results = []
+      header.size.times do |i|
+        column = String(header[i])
+        diff = ascii1_other2_size(column) - column.size
+        header_results << @align.apply(column, max_lengths[i], diff)
+      end
+      virtical = @vertical_border_char.value
+      header_line = header_results.join(virtical)
+      "#{virtical}#{header_line}#{virtical}"
+    end
+
+    def get_columns(columns, max_lengths)
+      column_results = []
+      columns.size.times do |i|
+        column = String(columns[i])
+        diff = ascii1_other2_size(column) - column.size
+        column_results << @align.apply(column, max_lengths[i], diff)
+      end
+      column_results
+    end
+  end
+end