tty 0.0.6 → 0.0.7

data/lib/tty/table/border.rb

@@ -7,8 +7,6 @@ module TTY
     class Border
       include Unicode
 
-      NEWLINE = "\n"
-
       # The row cell widths
       #
       # @api private
@@ -21,26 +19,53 @@ module TTY
       attr_reader :row
       private :row
 
+      class << self
+        # Store characters for border
+        #
+        # @api private
+        attr_accessor :characters
+      end
+
       # Instantiate a new object
       #
       # @return [Object]
       #
       # @api private
-      def initialize(*)
+      def initialize(row=nil)
         if self.class == Border
           raise NotImplementedError, "#{self} is an abstract class"
         else
-          super
+          @row = row
+          @widths = row.map { |cell| cell.chars.to_a.size }
         end
       end
 
+      # Define border characters
+      #
+      # @api public
+      def self.def_border(&block)
+        @characters = block
+      end
+
+      # Retrive individula character by type
+      #
+      # @param [String] type
+      #   the character type
+      #
+      # @return [String]
+      #
+      # @api private
+      def [](type)
+        self.class.characters.call[type] || ''
+      end
+
       # A line spanning all columns marking top of a table.
       #
       # @return [String]
       #
       # @api private
       def top_line
-        render :top
+        (result = render(:top)).empty? ? nil : result
       end
 
       # A line spanning all columns delemeting rows in a table.
@@ -49,7 +74,7 @@ module TTY
       #
       # @api private
       def separator
-        render :mid
+        (result = render(:mid)).empty? ? nil : result
       end
 
       # A line spanning all columns delemeting cells in a row.
@@ -58,7 +83,8 @@ module TTY
       #
       # @api private
       def row_line
-        self['left'] + row.join(self['right']) + self['right']
+        result = self['left'] + row.join(self['right']) + self['right']
+        result.empty? ? nil : result
       end
 
       # A line spannig all columns marking bottom of a table.
@@ -67,7 +93,7 @@ module TTY
       #
       # @api private
       def bottom_line
-        render :bottom
+        (result = render(:bottom)).empty? ? nil : result
       end
 
       protected

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

@@ -7,32 +7,23 @@ module TTY
       # A class that represents an ascii border.
       class ASCII < Border
 
-        BORDER_TYPE = {
-        'top'          => '-',
-        'top_mid'      => '+',
-        'top_left'     => '+',
-        'top_right'    => '+',
-        'bottom'       => '-',
-        'bottom_mid'   => '+',
-        'bottom_left'  => '+',
-        'bottom_right' => '+',
-        'mid'          => '-',
-        'mid_mid'      => '+',
-        'mid_left'     => '+',
-        'mid_right'    => '+',
-        'left'         => '|',
-        'right'        => '|'
+        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'         => '|',
+          'right'        => '|'
         }
-
-        # @api private
-        def [](type)
-          BORDER_TYPE[type]
-        end
-
-        # @api private
-        def initialize(row)
-          @row = row
-          @widths = row.map { |cell| cell.chars.to_a.size }
         end
 
       end # ASCII

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

@@ -7,12 +7,6 @@ module TTY
       # A class that represents no border.
       class Null < Border
 
-        # @api private
-        def initialize(row)
-          @row = row
-          @widths = row.map { |cell| cell.chars.to_a.size }
-        end
-
         # A stub top line
         #
         # @api private

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

@@ -7,32 +7,23 @@ module TTY
       # A class that represents a unicode border.
       class Unicode < Border
 
-        BORDER_TYPE = {
-        'top'          => '─',
-        'top_mid'      => '┬',
-        'top_left'     => '┌',
-        'top_right'    => '┐',
-        'bottom'       => '─',
-        'bottom_mid'   => '┴',
-        'bottom_left'  => '└',
-        'bottom_right' => '┘',
-        'mid'          => '─',
-        'mid_mid'      => '┼',
-        'mid_left'     => '├',
-        'mid_right'    => '┤',
-        'left'         => '│',
-        'right'        => '│'
+        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'         => '│',
+          'right'        => '│'
         }
-
-        # @api private
-        def [](type)
-          BORDER_TYPE[type]
-        end
-
-        # @api private
-        def initialize(row)
-          @row = row
-          @widths = row.map { |cell| cell.chars.to_a.size }
         end
 
       end # Unicode

data/lib/tty/table/column_set.rb

@@ -31,7 +31,7 @@ module TTY
       #
       # @api private
       def extract_widths!
-        return column_widths unless column_widths.empty?
+        return column_widths if (column_widths && !column_widths.empty?)
 
         rows     = table.to_a
         data     = table.header ? rows + [table.header] : rows

data/lib/tty/table/error.rb

@@ -6,5 +6,15 @@ module TTY
     # Raised when inserting into table with a mismatching row(s)
     class DimensionMismatchError < ArgumentError; end
 
+    # Raised when reading non-existent element from a table
+    class TupleMissing < IndexError
+      attr_reader :i, :j
+
+      def initialize(i, j)
+        @i, @j = i, j
+        super("element at(#{i},#{j}) not found")
+      end
+    end
+
   end # Table
 end # TTY

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

@@ -27,12 +27,6 @@ module TTY
           end
         end
 
-        private
-
-        def actual_length(string)
-          string.to_s.gsub(/\e\[\d{1,2}m/, '').length
-        end
-
       end # Wrapped
     end # Operation
   end # Table

data/lib/tty/table/orientation.rb

@@ -0,0 +1,57 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+
+    # A class representing table orientation
+    class Orientation
+
+      # The name for the orientation
+      #
+      # @api public
+      attr_reader :name
+
+      # Initialize an Orientation
+      #
+      # @api public
+      def initialize(name)
+        @name = name
+      end
+
+      # Coerce the name argument into an orientation
+      #
+      # @param [Symbol] name
+      #
+      # @api public
+      def self.coerce(name)
+        case name.to_s
+        when /h|horiz(ontal)?/i
+          Horizontal.new :horizontal
+        when /v|ert(ical)?/i
+          Vertical.new :vertical
+        else
+          raise InvalidOrientationError, "orientation must be one of :horizontal, :vertical"
+        end
+      end
+
+      # Check if orientation is vertical
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def vertical?
+        name == :vertical
+      end
+
+      # Check if orientation is horizontal
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def horizontal?
+        name == :horizontal
+      end
+
+    end # Orientation
+  end # Table
+end # TTY

data/lib/tty/table/orientation/horizontal.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+
+    # A class representing table orientation
+    class Orientation
+
+      class Horizontal < Orientation
+
+        def transform(table)
+          table.rotate_horizontal
+        end
+
+      end # Horizontal
+
+   end # Orientation
+  end # Table
+end # TTY

data/lib/tty/table/orientation/vertical.rb

@@ -0,0 +1,19 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+
+    # A class representing table orientation
+    class Orientation
+
+      class Vertical < Orientation
+
+        def transform(table)
+          table.rotate_vertical
+        end
+
+      end # Vertical
+
+    end # Orientation
+  end # Table
+end # TTY

data/lib/tty/table/renderer.rb

@@ -80,6 +80,13 @@ module TTY
         @renderer = renderer
       end
 
+      # Add custom border for the renderer
+      #
+      # @api public
+      def renders_with(klass)
+        @border_class = klass
+      end
+
       delegatable_method :renderer, *RENDERER_DELEGATED_METHODS
 
     end # Renderer

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

@@ -5,7 +5,7 @@ module TTY
     module Renderer
       class ASCII < Basic
 
-        def render(table, border=nil)
+        def render(table)
           super table, TTY::Table::Border::ASCII
         end
 

data/lib/tty/table/renderer/basic.rb

@@ -87,7 +87,7 @@ module TTY
         # @api public
         def render(table, border_class=Border::Null)
           @table = table
-          @border_class = border_class
+          @border_class = table.border_class || border_class
 
           return if table.to_a.empty?
           # setup(options)
@@ -113,7 +113,7 @@ module TTY
         # @api private
         def render_header
           header = table.header
-          if header
+          if header && !header.empty?
             aligned = alignments.align_header header,
                                               :column_widths => column_widths
             border = border_class.new(aligned)

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

@@ -5,7 +5,7 @@ module TTY
     module Renderer
       class Unicode < Basic
 
-        def render(table, border=nil)
+        def render(table)
           super table, TTY::Table::Border::Unicode
         end
 

data/lib/tty/table/validatable.rb

@@ -29,6 +29,26 @@ module TTY
       def assert_string_values(rows)
       end
 
+      # Check if options are of required type
+      #
+      # @api private
+      def validate_options!(options)
+        if (header = options[:header]) &&
+           (!header.kind_of?(Array) || header.empty?)
+          raise InvalidArgument, ":header must be a non-empty array"
+        end
+
+        if (rows = options[:rows]) &&
+          !(rows.kind_of?(Array) || rows.kind_of?(Hash))
+          raise InvalidArgument, ":rows must be a non-empty array or hash"
+        end
+
+        if (column_widths = options[:column_widths]) &&
+           (!column_widths.kind_of?(Array) || column_widths.empty?)
+          raise InvalidArgument, ":column_widths must be a non-empty array"
+        end
+      end
+
     end # Validatable
   end # Table
 end # TTY

data/lib/tty/terminal.rb

@@ -28,6 +28,7 @@ module TTY
 
     def initialize
       @color = TTY::Terminal::Color.new(self.color?)
+      @echo  = TTY::Terminal::Echo.new
       @default_width  = 80
       @default_height = 24
     end
@@ -148,26 +149,26 @@ module TTY
       %x{tput colors 2>/dev/null}.to_i > 2
     end
 
+    def echo_on
+      @echo.on
+    end
+
+    def echo_off
+      @echo.off
+    end
+
+    # @api public
+    def echo(is_on=true, &block)
+      @echo.echo(is_on, &block)
+    end
+
     # Find user home directory
     #
     # @return [String]
     #
     # @api public
     def home
-      @home ||= if (env_home = ENV['HOME'])
-        env_home
-      else
-        begin
-          require 'etc'
-          File.expand_path("~#{Etc.getlogin}")
-        rescue
-          if TTY::System.windows?
-            "C:/"
-          else
-            "/"
-          end
-        end
-      end
+      @home ||= Home.new.home
     end
 
   end # Terminal