tty 0.0.1 → 0.0.2

data/lib/tty/table/error.rb

@@ -0,0 +1,10 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+
+    # Raised when inserting into table with a mismatching row(s)
+    class DimensionMismatchError < ArgumentError; end
+
+  end # Table
+end # TTY

data/lib/tty/table/renderer.rb

@@ -5,7 +5,7 @@ module TTY
 
     # @api public
     def self.renderer
-      @renderer ||= if TTY::Color.color?
+      @renderer ||= if TTY.terminal.color?
         TTY::Table::Renderer::Color
       else
         TTY::Table::Renderer::Basic
@@ -23,11 +23,14 @@ module TTY
     #
     # @api public
     module Renderer
+      extend TTY::Delegatable
 
       autoload :Basic,   'tty/table/renderer/basic'
       autoload :Color,   'tty/table/renderer/color'
       autoload :Unicode, 'tty/table/renderer/unicode'
 
+      RENDERER_DELEGATED_METHODS = [ :render, :extract_column_widths, :total_width]
+
       RENDERER_MAPPER = {
         :basic   => TTY::Table::Renderer::Basic,
         :color   => TTY::Table::Renderer::Color,
@@ -43,13 +46,18 @@ module TTY
       end
 
       def pick_renderer(renderer)
-      if renderer
-        RENDERER_MAPPER[renderer].new
-      else
-        self.renderer
-      end
+        if renderer
+          RENDERER_MAPPER[renderer].new
+        else
+          self.renderer
+        end
       end
 
+      # Return the default renderer
+      #
+      # @return [TTY::Table::Renderer]
+      #
+      # @api public
       def renderer
         @renderer ||= TTY::Table.renderer.new
       end
@@ -58,6 +66,8 @@ module TTY
         @renderer = renderer
       end
 
+      delegatable_method :renderer, *RENDERER_DELEGATED_METHODS
+
     end # Renderer
 
   end # Table

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

@@ -9,6 +9,10 @@ module TTY
 
         attr_reader :indent
 
+        attr_reader :column_widths
+
+        attr_reader :rows
+
         # @param [Hash] options
         #   :indent - Indent the first column by indent value
         #   :padding - Pad out the row cell by padding value
@@ -16,9 +20,10 @@ module TTY
         #
         # @return [Table::Renderer::Basic]
         def initialize(options={})
-          @padding    = options.fetch :padding, 0
+          @padding    = 0
           @indent     = options.fetch :indent, 0
-          @col_widths = options.fetch :col_widths, []
+          @column_widths = []
+          @column_aligns = options.fetch :column_aligns, []
         end
 
         # Sets the output padding,
@@ -36,12 +41,6 @@ module TTY
           new(options).render(rows)
         end
 
-        # @api private
-        def extract_column_widths
-          # TODO Calculate column widths if none provided
-          # throw an error if too many columns as compared to terminal width
-        end
-
         # Renders table
         #
         # @param [Enumerable] rows
@@ -50,24 +49,65 @@ module TTY
         # @return [String] string representation of table
         #
         # @api public
-        def render(rows)
+        def render(rows, options={})
           return if rows.empty?
-
+          # TODO: Decide about table orientation
+          @rows = rows
           body = []
           unless rows.length.zero?
-            rows.each do |row|
-              line = ""
-              row.each_with_index do |column, index|
-                if index == row.size - 1
-                  line << "#{column.to_s}"
-                else
-                  line << "#{column.to_s} "
-                end
+            extract_column_widths(rows)
+            body += render_rows
+          end
+          body.join("\n")
+        end
+
+        # Calcualte total table width
+        #
+        # @return [Integer]
+        #
+        # @api public
+        def total_width
+          column_widths.reduce(:+)
+        end
+
+        # Calcualte maximum column widths
+        #
+        # @return [Array] column widths
+        #
+        # @api private
+        def extract_column_widths(rows)
+          # TODO: throw an error if too many columns as compared to terminal width
+          colcount = rows.max{ |a,b| a.size <=> b.size }.size
+          maximas = []
+          start = 0
+
+          start.upto(colcount - 1) do |index|
+            maximum = rows.map { |row|
+              row[index] ? (row[index].to_s.size) : 0
+            }.max
+            maximas << maximum
+          end
+          @column_widths = maximas
+        end
+
+        # Adjust the rows to maximum widths
+        #
+        # @return [Arrays[String]]
+        #
+        # @api private
+        def render_rows
+          rows.map do |row|
+            line = ""
+            row.each_with_index do |column, index|
+              column_width = column_widths[index]
+              if index == row.size - 1
+                line <<  "%-#{column_width}s" % column.to_s
+              else
+                line << "%-#{column_width}s " % column.to_s
               end
-              body << line
             end
+            line
           end
-          body.join("\n")
         end
 
       end # Basic

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

@@ -3,7 +3,7 @@
 module TTY
   class Table
     module Renderer
-      class Color
+      class Color < Basic
 
         def initialize
 

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

@@ -3,7 +3,7 @@
 module TTY
   class Table
     module Renderer
-      class Unicode
+      class Unicode < Basic
 
         def initialize
 

data/lib/tty/table/validatable.rb

@@ -0,0 +1,34 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Table
+    module Validatable
+
+      MIN_CELL_WIDTH = 3.freeze
+
+      # Check if table rows are the equal size
+      #
+      # @raise [DimensionMismatchError]
+      #   if the rows are not equal length
+      #
+      # @return [nil]
+      #
+      # @api private
+      def assert_row_sizes(rows)
+        size = (rows[0] || []).size
+        rows.each do |row|
+          if not row.size == size
+            raise TTY::Table::DimensionMismatchError, "row size differs (#{row.size} should be #{size})"
+          end
+        end
+      end
+
+      def assert_matching_widths(rows)
+      end
+
+      def assert_string_values(rows)
+      end
+
+    end # Validatable
+  end # Table
+end # TTY

data/lib/tty/terminal.rb

@@ -0,0 +1,149 @@
+# -*- encoding: utf-8 -*-
+
+module TTY
+  class Terminal
+
+    @@default_width  = 80
+
+    @@default_height = 24
+
+    # Return default width of terminal
+    #
+    # @example
+    #   default_width = TTY::Terminal.default_width
+    #
+    # @return [Integer]
+    #
+    # @api public
+    def default_width
+      @@default_width
+    end
+
+    # Set default width of terminal
+    #
+    # @param [Integer] width
+    #
+    # @return [Integer]
+    #
+    # @api public
+    def default_width=(width)
+      @@default_width = width
+    end
+
+    # Return default height of terminal
+    #
+    # @example
+    #   default_height = TTY::Terminal.default_height
+    #
+    # @return [Integer]
+    #
+    # @api public
+    def default_height
+      @@default_height
+    end
+
+    # Set default height of terminal
+    #
+    # @example
+    #   default_height = TTY::Terminal.default_height
+    #
+    # @return [Integer]
+    #
+    # @api public
+    def default_height=(height)
+      @@default_height = height
+    end
+
+    # Determine current width
+    #
+    # @return [Integer] width
+    #
+    # @api width
+    def width
+      if ENV['TTY_COLUMNS'] =~ /^\d+$/
+        result = ENV['TTY_COLUMNS'].to_i
+      else
+        result = TTY::System.unix? ? dynamic_width : default_width
+      end
+    rescue
+      default_width
+    end
+
+    # Determine current height
+    #
+    # @api public
+    def height
+      if ENV['TTY_LINES'] =~ /^\d+$/
+        result = ENV['TTY_LINES'].to_i
+      else
+        result = TTY::System.unix? ? dynamic_height : self.default_height
+      end
+    rescue
+      self.default_height
+    end
+
+    # Calculate dynamic width of the terminal
+    #
+    # @return [Integer] width
+    #
+    # @api public
+    def dynamic_width
+      @dynamic_width ||= (dynamic_width_stty.nonzero? || dynamic_width_tput)
+    end
+
+    # Calculate dynamic height of the terminal
+    #
+    # @return [Integer] height
+    #
+    # @api public
+    def dynamic_height
+      @dynamic_height ||= (dynamic_height_stty.nonzero? || dynamic_height_tput)
+    end
+
+    # Detect terminal width with stty utility
+    #
+    # @return [Integer] width
+    #
+    # @api public
+    def dynamic_width_stty
+      %x{stty size 2>/dev/null}.split[1].to_i
+    end
+
+    # Detect terminal height with stty utility
+    #
+    # @return [Integer] height
+    #
+    # @api public
+    def dynamic_height_stty
+      %x{stty size 2>/dev/null}.split[0].to_i
+    end
+
+    # Detect terminal width with tput utility
+    #
+    # @return [Integer] width
+    #
+    # @api public
+    def dynamic_width_tput
+      %x{tput cols 2>/dev/null}.to_i
+    end
+
+    # Detect terminal height with tput utility
+    #
+    # @return [Integer] height
+    #
+    # @api public
+    def dynamic_height_tput
+      %x{tput lines 2>/dev/null}.to_i
+    end
+
+    # Check if terminal supports color
+    #
+    # @return [Boolean]
+    #
+    # @api public
+    def color?
+      %x{tput colors 2>/dev/null}.to_i > 2
+    end
+
+  end # Terminal
+end # TTY

data/lib/tty/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module TTY
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/tty/support/conversion_spec.rb

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+
+describe TTY::Conversion do
+  let(:described_class) { Class.new { include TTY::Conversion } }
+  let(:object) { described_class.new }
+  let(:enumerable) { [] }
+
+  subject { object.convert_to_array(enumerable) }
+
+  context 'Array type' do
+    it { should == enumerable }
+  end
+
+  context 'Hash type' do
+    let(:enumerable) { {:a => 1, :b => 2} }
+
+    it { should include([:a, 1]) }
+
+    it { should include([:b, 2]) }
+  end
+
+  context 'responds to #to_ary' do
+    let(:converted) { [] }
+    let(:enumerable) { mock('Enumerable', :to_ary => converted) }
+
+    it { should == converted }
+  end
+
+  context 'does not respond to #to_ary' do
+    let(:enumerable) { mock('Enumerable') }
+
+    it 'raises error' do
+      expect { subject}.to raise_error(TTY::TypeError)
+    end
+  end
+end

data/spec/tty/support/delegatable_spec.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+require 'spec_helper'
+require File.expand_path('../fixtures/classes', __FILE__)
+
+describe TTY::Delegatable do
+  let(:target)      { :test }
+  let(:methods)     { [:output] }
+  let(:object)      { Class.new(DelegetableSpec::Object)}
+  let(:delegatable) { object.new }
+
+  subject { object.delegatable_method target, *methods }
+
+  it 'creates a method #output' do
+    expect { subject }.to change { delegatable.respond_to?(:output) }.
+      from(false).
+      to(true)
+  end
+
+  it 'delegates #output to #test' do
+    subject
+    value = mock('value')
+    delegatable.should_receive(:output).and_return(value)
+    delegatable.output.should == value
+  end
+end