console_table 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 668c3bea75d37322b4d956247d640d60677182c6
-  data.tar.gz: 4362c0f568da256a1020868bae1c15b34754ab21
+  metadata.gz: 20cc9ca26b036bfe447968e6e351a9c701a22e56
+  data.tar.gz: 3dff948fbf2f07604b93189d323b6d55a69efba3
 SHA512:
-  metadata.gz: d03313dda6802650143631a93a7df42e672def160ab475075c92097540edc5f617d3b811cfb80ee60b91d5123070d34e28902acf6e6f0e1926e2fdfb95d876af
-  data.tar.gz: 3e96bdee594c595645402385863345487dc5f3285f78e11cd6557293e021c02283e73f392513f2a1bfb0055d4ce4e2eb4c29a93e8e53b1a9ebb989aeeee772b6
+  metadata.gz: 1da3fe51b14f347d17e7670840d00a13c73599e4642518f9ae94769205dc74c222676fbad746b3c4719d476c8125131eaa4a2aac6f94b1d38606f462ad4b5bd0
+  data.tar.gz: 920c48265acf2873c2ff40e86d17ea250a6ef8641b278bc4af148e380951984c625d50dd0c904b646ee3c50f0f2a9301c0ae2f31042db981ebd0033e96ed16fd

data/console_table.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "console_table"
-  spec.version       = "0.2.2"
+  spec.version       = "0.2.3"
   spec.authors       = ["Rod Hilton"]
   spec.email         = ["consoletable@rodhilton.com"]
   spec.summary       = %q{Simplifies printing tables of information to commandline consoles}

data/examples/purchases.rb

@@ -0,0 +1,41 @@
+require 'console_table'
+require 'faker'
+require 'colorize'
+
+# Just a goofy example that simulates a big table of purchase data.
+
+layout = [
+	{size: 6, title: "Pur.#"},
+	{size: 20, title: "Customer"},
+	{size: 13, title: "Product Code"},
+	{size: "*", title: "Product Name", ellipsize: true},
+	{size: 5, title: "Price", justify: :right},
+	{size: 3, title: "Qty"},
+	{size: 8, title: "Date"},
+	{size: 11, title: "Profit/Loss", justify: :right}
+]
+
+sum = 0
+
+ConsoleTable.define(layout, :title=>"Product Purchases".upcase.bold.green.underline) do |table|
+	(0..25).each do |i|
+		name = Faker::Name.name
+		profit = (rand(1*100000)-30000)/100.00
+		table << [
+			sprintf("%010d", rand(1..999999999)).blue,
+			name,
+			Faker::Code.ean.red,
+			Faker::Commerce.product_name,
+			sprintf("%#.2f", Faker::Commerce.price).bold.green,
+			rand(1..20).to_s.magenta,
+			Faker::Date.backward(14).strftime("%m/%d/%y").yellow,
+			sprintf("%#.2f", profit).colorize(profit < 0 ? :red : :green)
+		]
+
+		sum = sum + profit
+
+		sleep(rand(1..10)/20.0)
+	end
+
+	table.footer << "Total Profit: #{sprintf("%#.2f", sum).to_s.colorize(sum < 0 ? :red : :green)}"
+end

data/examples/stocks.rb

@@ -0,0 +1,48 @@
+require 'console_table'
+
+require 'json'
+require 'net/http'
+require 'open-uri'
+require 'colorize'
+
+symbols = ["YHOO", "AAPL", "GOOG", "MSFT", "C", "MMM", "KO", "WMT", "GM", "IBM", "MCD", "VZ", "HD", "DIS", "INTC"]
+
+params = symbols.collect{|s| "\"#{s}\"" }.join(",")
+url = "http://query.yahooapis.com/v1/public/yql?q=select * from yahoo.finance.quotes where symbol in (#{params})&env=http://datatables.org/alltables.env&format=json"
+uri = URI.parse(URI::encode(url))
+response = Net::HTTP.get_response(uri)
+json = JSON.parse(response.body)
+
+table_config = [
+    {:key=>:symbol, :title=>"Symbol", :size=>6},
+    {:key=>:name, :title=>"Name", :size=>17},
+    {:key=>:price, :title=>"Price", :size=>5, :justify=>:right},
+    {:key=>:change, :title=>"Change", :size=>7, :justify=>:right},
+    {:key=>:recommendation, :title=>"Recommendation", :size=>15, :justify=>:right}
+]
+
+ConsoleTable.define(table_config, :title=>"Stock Prices") do |table|
+
+    json["query"]["results"]["quote"].each do |j|
+        change = j["ChangeRealtime"]
+        if change.start_with?("+")
+            change = change.green
+        else
+            change = change.red
+        end
+
+        recommendation = (rand() <= 0.5) ? "BUY!".white.on_green.bold.underline : "Sell".yellow
+
+        table << [
+            j["Symbol"].magenta,
+            j["Name"],
+            j["LastTradePriceOnly"],
+            change,
+            recommendation
+        ]
+
+    end
+
+    table.footer << "Recommendations randomly generated"
+
+end

data/lib/console_table.rb

@@ -65,6 +65,7 @@ module ConsoleTable
       @left_margin = options[:left_margin] || 0
       @right_margin = options[:right_margin] || 0
       @headings = options[:headings].nil? ? true : options[:headings]
+      @ellipse = options[:ellipse] || "..."
 
       #Set outline, just the upper and lower lines
       if @borders
@@ -335,8 +336,10 @@ module ConsoleTable
       uncolorized = uncolorize(text)
       if uncolorized.length > length
 
+        ellipsize = false if uncolorize(@ellipse).length >= length
+
         if ellipsize
-          goal_length = length-3
+          goal_length = length-uncolorize(@ellipse).length
         else
           goal_length = length
         end
@@ -367,7 +370,7 @@ module ConsoleTable
           current_index = current_index + 1
         end
 
-        final_string_parts << "..." if ellipsize
+        final_string_parts << @ellipse if ellipsize
         final_string_parts << "\e[0m" if color_active
 
         final_string_parts.join("")

data/test/test_console_table.rb

@@ -7,6 +7,9 @@ require 'minitest/autorun'
 #--
 # TODO: if you're doing center or right-justification, should it trim from the sides or
 #   from the left, respectively?
+# TODO: "compact" option, which when true makes tables output like they do here, but when
+#   compact is FALSE and borders is true, there's an extra space between the | and the text
+#   but only in the middle - on the sides the | goes up against the margin
 #++
 class ConsoleTableTest < Minitest::Test
 
@@ -1471,6 +1474,129 @@ Fake:...  Fake: 1
     assert_output_equal expected, @mock_out.string
   end
 
+  def test_can_custom_ellipse
+    table_config = [
+        {:key => :col1, :size => 10, :title => "Column 1", :ellipsize=>true},
+        {:key => :col2, :size => 10, :title => "Column 2",  :ellipsize=>true, :justify=>:right},
+    ]
+
+    ConsoleTable.define(table_config, :width => 100, :ellipse=>"…", :output=>@mock_out) do |table|
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
+
+      table << {
+          :col1 => {text: "Row 2, Column 1", :ellipsize=>false},
+          :col2 => {text: "Row 2, Column 1", :ellipsize=>false}
+      }
+    end
+
+    expected=<<-END
+=====================
+Column 1     Column 2
+---------------------
+Row 1, Co… Row 1, Co…
+Row 2, Col Row 2, Col
+=====================
+    END
+
+    assert_output_equal expected, @mock_out.string
+  end
+
+  def test_can_use_colorized_custom_ellipse_for_some_reason
+    table_config = [
+        {:key => :col1, :size => 10, :title => "Column 1", :ellipsize=>true},
+        {:key => :col2, :size => 10, :title => "Column 2",  :ellipsize=>true, :justify=>:right},
+    ]
+
+    ConsoleTable.define(table_config, :width => 100, :ellipse=>"…".red, :output=>@mock_out) do |table|
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
+
+      table << {
+          :col1 => {text: "Row 2, Column 1", :ellipsize=>false},
+          :col2 => {text: "Row 2, Column 1", :ellipsize=>false}
+      }
+    end
+
+    expected=<<-END
+=====================
+Column 1     Column 2
+---------------------
+Row 1, Co… Row 1, Co…
+Row 2, Col Row 2, Col
+=====================
+    END
+
+    assert_includes @mock_out.string, "\e[0;31;49m…\e[0m"
+
+    assert_output_equal expected, @mock_out.string
+  end
+
+  def test_can_use_extra_long_ellipse
+    table_config = [
+        {:key => :col1, :size => 10, :title => "Column 1", :ellipsize=>true},
+        {:key => :col2, :size => 10, :title => "Column 2",  :ellipsize=>true, :justify=>:right},
+    ]
+
+    ConsoleTable.define(table_config, :width => 100, :ellipse=>" (cont)", :output=>@mock_out) do |table|
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
+
+      table << {
+          :col1 => {text: "Row 2, Column 1", :ellipsize=>false},
+          :col2 => {text: "Row 2, Column 1", :ellipsize=>false}
+      }
+    end
+
+    expected=<<-END
+=====================
+Column 1     Column 2
+---------------------
+Row (cont) Row (cont)
+Row 2, Col Row 2, Col
+=====================
+    END
+
+
+    assert_output_equal expected, @mock_out.string
+  end
+
+  def test_ellipse_char_too_long_for_area_is_ignored_entirely
+    table_config = [
+        {:key => :col1, :size => 10, :title => "Column 1", :ellipsize=>true},
+        {:key => :col2, :size => 10, :title => "Column 2",  :ellipsize=>true, :justify=>:right},
+    ]
+
+    ConsoleTable.define(table_config, :width => 100, :ellipse=>" (this is a long ellipse)", :output=>@mock_out) do |table|
+      table << {
+          :col1 => "Row 1, Column 1",
+          :col2 => "Row 1, Column 2"
+      }
+
+      table << {
+          :col1 => {text: "Row 2, Column 1", :ellipsize=>false},
+          :col2 => {text: "Row 2, Column 1", :ellipsize=>false}
+      }
+    end
+
+    expected=<<-END
+=====================
+Column 1     Column 2
+---------------------
+Row 1, Col Row 1, Col
+Row 2, Col Row 2, Col
+=====================
+    END
+
+    assert_output_equal expected, @mock_out.string
+  end
+
   private
   def assert_output_equal(expected, actual)
     expected_lines = expected.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console_table
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rod Hilton
@@ -111,6 +111,8 @@ files:
 - Rakefile
 - console_table.gemspec
 - console_table_screenshot.png
+- examples/purchases.rb
+- examples/stocks.rb
 - lib/console_table.rb
 - test/test_console_table.rb
 homepage: https://github.com/rodhilton/console_table