tty-table 0.7.0 → 0.12.0

data/lib/tty/table/border/ascii.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty/table/border'
+require_relative "../border"
 
 module TTY
   class Table
@@ -11,21 +11,21 @@ module TTY
       class ASCII < Border
 
         def_border do
-          top           '-'
-          top_mid       '+'
-          top_left      '+'
-          top_right     '+'
-          bottom        '-'
-          bottom_mid    '+'
-          bottom_left   '+'
-          bottom_right  '+'
-          mid           '-'
-          mid_mid       '+'
-          mid_left      '+'
-          mid_right     '+'
-          left          '|'
-          center        '|'
-          right         '|'
+          top           "-"
+          top_mid       "+"
+          top_left      "+"
+          top_right     "+"
+          bottom        "-"
+          bottom_mid    "+"
+          bottom_left   "+"
+          bottom_right  "+"
+          mid           "-"
+          mid_mid       "+"
+          mid_left      "+"
+          mid_right     "+"
+          left          "|"
+          center        "|"
+          right         "|"
         end
 
       end # ASCII

data/lib/tty/table/border/null.rb

@@ -1,37 +1,35 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty/table/border'
+require_relative "../border"
 
 module TTY
   class Table
     class Border
       # A class that represents no border.
       class Null < Border
-
         def_border do
-          center SPACE_CHAR
-        end
-
-        # A stub top line
-        #
-        # @api private
-        def top_line
-          border_options ? super : nil
-        end
-
-        # A stub separator line
-        #
-        # @api private
-        def separator
-          return [] if border_options.separator == EACH_ROW
-          border_options ? super : nil
+          top           EMPTY_CHAR
+          top_mid       EMPTY_CHAR
+          top_left      EMPTY_CHAR
+          top_right     EMPTY_CHAR
+          bottom        EMPTY_CHAR
+          bottom_mid    EMPTY_CHAR
+          bottom_left   EMPTY_CHAR
+          bottom_right  EMPTY_CHAR
+          mid           EMPTY_CHAR
+          mid_mid       EMPTY_CHAR
+          mid_left      EMPTY_CHAR
+          mid_right     EMPTY_CHAR
+          left          EMPTY_CHAR
+          center        SPACE_CHAR
+          right         EMPTY_CHAR
         end
 
-        # A stub bottom line
+        # A stub middle line
         #
         # @api private
-        def bottom_line
-          border_options ? super : nil
+        def middle_line
+          border_options.separator ? "" : super
         end
       end # Null
     end # Border

data/lib/tty/table/border/row_line.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table
@@ -9,8 +9,9 @@ module TTY
         #
         # @api public
         def colorize(border, style)
-          colorized_chars = border.set_color(style, right, center, left)
-          self.right, self.center, self.left = colorized_chars
+          self.right = border.set_color(style, right)
+          self.center = border.set_color(style, center)
+          self.left = border.set_color(style, left)
         end
       end # RowLine
     end # Border

data/lib/tty/table/border/unicode.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'tty/table/border'
+require_relative "../border"
 
 module TTY
   class Table
@@ -11,21 +11,21 @@ module TTY
       class Unicode < Border
 
         def_border do
-          top          '─'
-          top_mid      '┬'
-          top_left     '┌'
-          top_right    '┐'
-          bottom       '─'
-          bottom_mid   '┴'
-          bottom_left  '└'
-          bottom_right '┘'
-          mid          '─'
-          mid_mid      '┼'
-          mid_left     '├'
-          mid_right    '┤'
-          left         '│'
-          center       '│'
-          right        '│'
+          top          "─"
+          top_mid      "┬"
+          top_left     "┌"
+          top_right    "┐"
+          bottom       "─"
+          bottom_mid   "┴"
+          bottom_left  "└"
+          bottom_right "┘"
+          mid          "─"
+          mid_mid      "┼"
+          mid_left     "├"
+          mid_right    "┤"
+          left         "│"
+          center       "│"
+          right        "│"
         end
 
       end # Unicode

data/lib/tty/table/border_dsl.rb

@@ -1,7 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'forwardable'
-require 'tty/table/border_options'
+require "forwardable"
+
+require_relative "border_options"
 
 module TTY
   class Table
@@ -28,15 +29,14 @@ module TTY
       # @return [undefined]
       #
       # @api private
-      def initialize(characters = nil, &block)
-        @options = TTY::Table::BorderOptions.new
-        @options.characters = characters if characters
+      def initialize(border_opts = nil, &block)
+        @options = TTY::Table::BorderOptions.from(border_opts)
         yield_or_eval(&block) if block_given?
       end
 
       # Apply style color to the border
       #
-      # @param [Symbol] style
+      # @param [Symbol] value
       #   the style color for the border
       #
       # @return [undefined]
@@ -44,19 +44,22 @@ module TTY
       # @api public
       def style(value = (not_set = true))
         return options.style if not_set
+
         options.style = value
       end
 
       # Apply table tuple separator
       #
-      # @param [Symbol] separator
+      # @param [Symbol] value
       #   the table tuple separator
       #
       # @return [undefined]
       #
       # @api public
-      def separator(value)
-        value ? options.separator = value : options.separator
+      def separator(value = (not_set = true))
+        return options.separator if not_set
+
+        options.separator = value
       end
 
       # Set top border character
@@ -68,7 +71,7 @@ module TTY
       #
       # @api public
       def top(value)
-        options.characters['top'] = value
+        characters["top"] = value
       end
 
       # Set top middle border character
@@ -80,7 +83,7 @@ module TTY
       #
       # @api public
       def top_mid(value)
-        options.characters['top_mid'] = value
+        characters["top_mid"] = value
       end
 
       # Set top left corner border character
@@ -92,7 +95,7 @@ module TTY
       #
       # @api public
       def top_left(value)
-        options.characters['top_left'] = value
+        characters["top_left"] = value
       end
 
       # Set top right corner border character
@@ -104,7 +107,7 @@ module TTY
       #
       # @api public
       def top_right(value)
-        options.characters['top_right'] = value
+        characters["top_right"] = value
       end
 
       # Set bottom border character
@@ -116,7 +119,7 @@ module TTY
       #
       # @api public
       def bottom(value)
-        options.characters['bottom'] = value
+        characters["bottom"] = value
       end
 
       # Set bottom middle border character
@@ -128,7 +131,7 @@ module TTY
       #
       # @api public
       def bottom_mid(value)
-        options.characters['bottom_mid'] = value
+        characters["bottom_mid"] = value
       end
 
       # Set bottom left corner border character
@@ -140,7 +143,7 @@ module TTY
       #
       # @api public
       def bottom_left(value)
-        options.characters['bottom_left'] = value
+        characters["bottom_left"] = value
       end
 
       # Set bottom right corner border character
@@ -152,7 +155,7 @@ module TTY
       #
       # @api public
       def bottom_right(value)
-        options.characters['bottom_right'] = value
+        characters["bottom_right"] = value
       end
 
       # Set middle border character
@@ -164,7 +167,7 @@ module TTY
       #
       # @api public
       def mid(value)
-        options.characters['mid'] = value
+        characters["mid"] = value
       end
 
       # Set middle border character
@@ -176,7 +179,7 @@ module TTY
       #
       # @api public
       def mid_mid(value)
-        options.characters['mid_mid'] = value
+        characters["mid_mid"] = value
       end
 
       # Set middle left corner border character
@@ -188,7 +191,7 @@ module TTY
       #
       # @api public
       def mid_left(value)
-        options.characters['mid_left'] = value
+        characters["mid_left"] = value
       end
 
       # Set middle right corner border character
@@ -200,7 +203,7 @@ module TTY
       #
       # @api public
       def mid_right(value)
-        options.characters['mid_right'] = value
+        characters["mid_right"] = value
       end
 
       # Set left border character
@@ -212,7 +215,7 @@ module TTY
       #
       # @api public
       def left(value)
-        options.characters['left'] = value
+        characters["left"] = value
       end
 
       # Set center border character
@@ -224,7 +227,7 @@ module TTY
       #
       # @api public
       def center(value)
-        options.characters['center'] = value
+        characters["center"] = value
       end
 
       # Set right border character
@@ -236,7 +239,7 @@ module TTY
       #
       # @api public
       def right(value)
-        options.characters['right'] = value
+        characters["right"] = value
       end
 
       private

data/lib/tty/table/border_options.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module TTY
   class Table
@@ -7,46 +7,71 @@ module TTY
     # Used internally by {Table::Border} to manage options such as style
     #
     # @api private
-    class BorderOptions < Struct.new(:characters, :separator, :style)
-      # Initialize a BorderOptions
+    class BorderOptions
+      # Create options instance from hash
       #
       # @api public
-      def initialize(*args)
-        super(*args)
-        self.characters = {} unless characters
+      def self.from(options)
+        return new if options.nil?
+
+        opts = case options
+               when self.class
+                 options.to_hash
+               else
+                 options
+               end
+        new(**opts)
       end
 
-      # Create options instance from hash
+      attr_accessor :characters
+
+      attr_accessor :separator
+
+      attr_accessor :style
+
+      # Initialize a BorderOptions
+      #
+      # @param [String] style
+      #   the style like :red
+      # @param [String] separator
+      #   the separator character
+      # @param [Hash] characters
+      #   the border characters
       #
       # @api public
-      def self.from(value)
-        value ? new.update(value) : new
+      def initialize(characters: {}, separator: nil, style: nil)
+        @characters = characters
+        @separator = separator
+        @style = style
       end
 
-      # Set all accessors with hash attributes
-      #
-      # @param [Hash, BorderOptions] obj
+      # Convert to hash
       #
-      # @return [BorderOptions]
+      # @return [Hash]
       #
       # @api public
-      def update(obj)
-        obj.each_pair do |key, value|
-          send("#{key}=", value)
-        end
-        self
+      def to_hash
+        { characters: characters, separator: separator, style: style }
       end
 
-      # Convert to hash
+      # Check if there should be a separator AFTER this line
+      #
+      # @param [Integer] line
+      #
+      # @return [Boolean]
       #
       # @api public
-      def to_hash
-        hash = {}
-        members.each do |key|
-          value = send(key)
-          hash[key.to_sym] = value if value
+      def separator?(line)
+        case separator
+        when TTY::Table::Border::EACH_ROW
+          true
+        when Array
+          separator.include?(line)
+        when Proc
+          separator.call(line)
+        else
+          false
         end
-        hash
       end
     end # BorderOptions
   end # Table