collimator 0.0.1 → 0.0.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    collimator (0.0.1)
+    collimator (0.0.2)
       colored
 
 GEM

data/README.md

@@ -22,7 +22,61 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+### Table
+see a few samples in `examples`.
+
+    Table.header("Collimator")
+    Table.header("Usage Example")
+    Table.header("Can have lots of headers")
+
+    Table.column('',        :width => 18, :padding => 2, :justification => :right)
+    Table.column('numbers', :width => 14, :justification => :center)
+    Table.column('words',   :width => 12, :justification => :left, :padding => 2)
+    Table.column('decimal', :width => 12, :justification => :decimal)
+
+    Table.row(['george', 123, 'holla', 12.5])
+    Table.row(['jim', 8, 'hi', 76.58])
+    Table.row(['robert', 10000, 'greetings', 0.2])
+
+    Table.footer("gotta love it", :justification => :center)
+
+    Table.tabulate
+
+will result in...
+
+    +---------------------------------------------------------------+
+    |                          Collimator                           |
+    |                         Usage Example                         |
+    |                   Can have lots of headers                    |
+    +---------------------------------------------------------------+
+    |                    |   numbers    |  words       |  decimal   |
+    |--------------------+--------------+--------------+------------|
+    |            george  |     123      |  holla       |    12.5    |
+    |               jim  |      8       |  hi          |    76.58   |
+    |            robert  |    10000     |  greetings   |     0.2    |
+    +---------------------------------------------------------------+
+    |                         gotta love it                         |
+    +---------------------------------------------------------------+
+
+### Spinner
+
+    Spinner.spin
+    # ...
+    Spinner.stop
+
+### Progress Bar
+
+    ProgressBar.start({:min => 0, :max => 100, :method => :percent, :step_size => 10})
+
+    0.upto(10) do
+      # ...
+      ProgressBar.increment
+    end
+
+    ProgressBar.complete
+
+
+Better usage coming. in the mean time, tests might show best how to use.
 
 ## Contributing
 

data/examples/progress_bar.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require 'collimator'
+
+include Collimator
+
+ProgressBar.start({:min => 0, :max => 100, :method => :percent, :step_size => 10})
+0.upto(10) do
+  sleep 0.5
+  ProgressBar.increment
+end
+
+sleep 0.5
+ProgressBar.complete

data/examples/spinner.rb

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require 'collimator'
+
+include Collimator
+
+Spinner.spin
+sleep 5
+Spinner.stop

data/examples/table.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+require "rubygems"
+require 'collimator'
+
+include Collimator
+
+Table.header("Collimator")
+Table.header("Usage Example")
+Table.header("Can have lots of headers")
+
+Table.column('',        :width => 18, :padding => 2, :justification => :right)
+Table.column('numbers', :width => 14, :justification => :center)
+Table.column('words',   :width => 12, :justification => :left, :padding => 2)
+Table.column('decimal', :width => 12, :justification => :decimal)
+
+Table.row(['george', 123, 'holla', 12.5])
+Table.row(['jim', 8, 'hi', 76.58])
+Table.row(['robert', 10000, 'greetings', 0.2])
+
+Table.footer("gotta love it", :justification => :center)
+
+Table.tabulate

data/lib/collimator/version.rb

@@ -1,3 +1,3 @@
 module Collimator
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/collimator.rb

@@ -25,6 +25,7 @@ module Collimator
     @table_string = []
     @use_capture_string = false
     @use_capture_html = false
+    @last_header_color = '#EEEEEE'
 
     def self.live_update=(live_upate)
       @live_update = live_upate
@@ -51,9 +52,9 @@ module Collimator
     end
 
     def self.header(text, opts = {})
-      width, padding, justification = parse_options(opts)
+      width, padding, justification, color = parse_options(opts)
 
-      @headers << { :text => text, :padding => padding, :justification => justification }
+      @headers << { :text => text, :padding => padding, :justification => justification , :color => color}
     end
 
     def self.footer(text, opts)
@@ -125,7 +126,7 @@ module Collimator
 
     def self.prep_html_table
       @table_string = []
-      @table_string << "<table>"
+      @table_string << "<table STYLE=\"font-family: helvetica, verdana, tahoma; border-collapse: collapse;\">"
     end
 
     def self.complete_html_table
@@ -317,11 +318,40 @@ module Collimator
       put_horizontal_line_with_dividers
     end
 
-    def self.put_column_heading_text_html
-      out = "<tr>\n"
+    def self.style_color(rgb)
+      luminance = get_luminance(rgb)
+      color = luminance < 50 ? '#EEEEEE' : '#222222'
+      color_style = "color: #{color};"
+    end
+
+    def self.style_header_border(rgb)
+      luminance = get_luminance(rgb)
+      color = luminance < 50 ? '#EEEEEE' : '#222222'
+      color_style = "border-bottom: 1px solid #{color};"
+    end
+
+    def self.get_luminance(rgb)
+      rgb_temp = rgb.gsub("#", '')
+      luminance = 0
+      if rgb_temp.length == 6
+        r = rgb_temp[0..1].hex
+        g = rgb_temp[2..3].hex
+        b = rgb_temp[4..5].hex
+        luminance = (0.299*r + 0.587*g + 0.114*b)
+      end
+      luminance
+    end
 
+    def self.put_column_heading_text_html
+      c = @last_header_color
+      text_color = style_color(c)
+      border_color = style_header_border(c)
+      out = "<tr STYLE=\"background-color: #{@last_header_color}; #{text_color} #{border_color}\">\n"
+      column = 0
       @column_names.each do |cname|
-        out += "<th>#{cname}</th>\n"
+        padding_style = @columns[column][:padding] ? "STYLE=\"padding-left: #{@columns[column][:padding]}em; padding-right: #{@columns[column][:padding]}em;\"" : ""
+        out += "<th #{padding_style}>#{cname}</th>\n"
+        column += 1
       end
 
       out += "</tr>\n"
@@ -368,8 +398,11 @@ module Collimator
     end
 
     def self.make_header_line_html(data)
+      @last_header_color = data[:color] || @last_header_color
+
+      text_color = style_color(@last_header_color)
       header_line =  "<tr>"
-      header_line += "<th colspan='#{@column_names.count + 1}'>#{data[:text]}</th>"
+      header_line += "<th STYLE=\"background-color: #{@last_header_color}; #{text_color}\" colspan='#{@column_names.count + 1}'>#{data[:text]}</th>"
       header_line += "</tr>"
       header_line
     end
@@ -404,7 +437,9 @@ module Collimator
       row_string = "<tr>\n"
 
       row_data.each do | val |
-        row_string += "<td>#{val}</td>\n"
+        style_info = @columns[column][:padding] ? " STYLE=\"padding-left: #{@columns[column][:padding]}em; padding-right: #{@columns[column][:padding]}em;\"" : ''
+        row_string += "<td#{style_info}>#{val}</td>\n"
+        column += 1
       end
 
       row_string += "</tr>"

data/test/table_test.rb

@@ -1,5 +1,6 @@
 require 'test/unit'
-require 'collimator'
+require File.expand_path("../../lib/collimator", __FILE__)
+
 require 'date'
 require 'stringio'
 require 'test_helper'
@@ -640,8 +641,56 @@ class TestTable < Test::Unit::TestCase
     assert_equal '+--------------------------------------------+', table_lines[13]
   end
 
-  def test_html_output
+  def test_html_output_formatted
+    header_text = ['a', 'b', 'c', 'd']
+
+    table_header = 'header'
+
+    Table.header(table_header, :color => '#FF9933')
+
+    (0..header_text.length - 1).each do |i|
+      Table.column(header_text[i], :width => 10, :padding => 1.2, :justification => :center)
+    end
+
+    Table.row([1, 2, 3, 4])
+    Table.row([1.1, 2.1, 3.1, 4.1])
 
+    table_text = Table.tabulate_to_html
+
+    # puts table_text
+
+    table_lines = table_text.split("\n")
+    assert_equal 25, table_lines.length, 'the number of lines in the table output'
+
+    assert_equal '<table STYLE="font-family: helvetica, verdana, tahoma; border-collapse: collapse;">',      table_lines[0]
+    assert_equal '<thead>',                                                                                  table_lines[1]
+    assert_equal "<tr><th STYLE=\"background-color: #FF9933; color: #222222;\" colspan='5'>header</th></tr>", table_lines[2]
+    assert_equal '<tr STYLE="background-color: #FF9933; color: #222222; border-bottom: 1px solid #222222;">', table_lines[3]
+    assert_equal '<th STYLE="padding-left: 1.2em; padding-right: 1.2em;">a</th>',                                                                               table_lines[4]
+    assert_equal '<th STYLE="padding-left: 1.2em; padding-right: 1.2em;">b</th>',                                                                               table_lines[5]
+    assert_equal '<th STYLE="padding-left: 1.2em; padding-right: 1.2em;">c</th>',                                                                               table_lines[6]
+    assert_equal '<th STYLE="padding-left: 1.2em; padding-right: 1.2em;">d</th>',                                                                               table_lines[7]
+    assert_equal '</tr>',                                                                                    table_lines[8]
+    assert_equal '</thead>',                                                                                 table_lines[9]
+    assert_equal '<tbody>',                                                                                  table_lines[10]
+    assert_equal '<tr>',                                                                                     table_lines[11]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">1</td>',                            table_lines[12]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">2</td>',                            table_lines[13]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">3</td>',                            table_lines[14]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">4</td>',                            table_lines[15]
+    assert_equal '</tr>',                                                                                    table_lines[16]
+    assert_equal '<tr>',                                                                                     table_lines[17]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">1.1</td>',                          table_lines[18]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">2.1</td>',                          table_lines[19]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">3.1</td>',                          table_lines[20]
+    assert_equal '<td STYLE="padding-left: 1.2em; padding-right: 1.2em;">4.1</td>',                          table_lines[21]
+    assert_equal '</tr>',                                                                                    table_lines[22]
+    assert_equal '</tbody>',                                                                                 table_lines[23]
+    assert_equal '</table>',                                                                                 table_lines[24]
+
+  end
+
+  def xtest_html_output
     header_text = ['a', 'b', 'c', 'd']
 
     table_header = 'header'
@@ -657,8 +706,6 @@ class TestTable < Test::Unit::TestCase
 
     table_text = Table.tabulate_to_html
 
-    #assert_equal "booty", table_text
-
     table_lines = table_text.split("\n")
     assert_equal 25, table_lines.length, 'the number of lines in the table output'
 
@@ -687,8 +734,6 @@ class TestTable < Test::Unit::TestCase
     assert_equal '</tr>',                                table_lines[22]
     assert_equal '</tbody>',                             table_lines[23]
     assert_equal '</table>',                             table_lines[24]
-
-
   end
 
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: collimator
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - geordie
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-01 00:00:00 Z
+date: 2013-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -29,11 +30,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,11 +46,11 @@ dependencies:
         - 2
         version: 0.9.2
   type: :development
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: colored
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,8 +60,7 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
 description: Collimator
 email: 
 - george.speake@gmail.com
@@ -79,6 +79,9 @@ files:
 - README.md
 - Rakefile
 - collimator.gemspec
+- examples/progress_bar.rb
+- examples/spinner.rb
+- examples/table.rb
 - lib/collimator.rb
 - lib/collimator/version.rb
 - test/progressbar_test.rb