tablesmith 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 422060113ff10de9d77319825d7c0584b1389e3e
-  data.tar.gz: c2672e0136fe3ccad708644232db70a7f3112ddd
+  metadata.gz: a2debe86ed561ee342350d05b984e6519aafff2a
+  data.tar.gz: 64ab1246d907cb92b33e18bdf0a66ccea31047a0
 SHA512:
-  metadata.gz: 362ffe3c1d3cb37c26a521de9eea14cc4bcfb5ec42534930486d05238ecb2fb1fb90621318eb2bab75d979d9040c274601626a456464317cd6f8e2d7e8f1e340
-  data.tar.gz: 7df00f39dc421aaa159900710dc2af3de41d4d8805a8936818fbca388d64cf3dca682cbfa08b900d28616cbd9dd10136979dd06d1214bf84a1155fe9fa606280
+  metadata.gz: 5b4d1e2f5b10d150d9bb6d28c800030703a35a0a3196c4d941f7ed1e62618dfcadf89f1eaab183049b1f75284e63680ae2517489e26db578c5bc8fe0ffbd0073
+  data.tar.gz: ea5238cdeff276b012e3d7cecfbd061b486e5e3eda77e0d0c1adaaff07b7449db17289289ac7301fff132f5d4fe48178201edd2d781d49055889d005c2bafa7c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tablesmith (0.2.1)
+    tablesmith (0.2.2)
       text-table
 
 GEM
@@ -63,4 +63,4 @@ DEPENDENCIES
   tablesmith!
 
 BUNDLED WITH
-   1.15.4
+   1.16.0.pre.2

data/lib/tablesmith/array_rows_source.rb

@@ -8,14 +8,6 @@ module Tablesmith::ArrayRowsSource
     item
   end
 
-  # def flatten_hash_to_row(deep_hash, columns)
-  #   row = ActiveSupport::OrderedHash.new
-  #   columns.each do |col_or_hash|
-  #     value_from_hash(row, deep_hash, col_or_hash)
-  #   end
-  #   row
-  # end
-
   # TODO: no support for deep
   def build_columns
     @columns ||= []
@@ -29,40 +21,4 @@ module Tablesmith::ArrayRowsSource
     column_names = rows.shift
     grouped_headers(column_names) + [apply_column_aliases(column_names), :separator]
   end
-
-  # def value_from_hash(row, deep_hash, col_or_hash)
-  #   case col_or_hash
-  #     when Tablesmith::Column
-  #       row[col_or_hash.display_name] = deep_hash[col_or_hash.name]
-  #     when Hash
-  #       col_or_hash.each_pair do |sub_hash_key, cols_or_hash|
-  #         [cols_or_hash].flatten.each do |inner_col_or_hash|
-  #           value_from_hash(row, deep_hash[sub_hash_key], inner_col_or_hash)
-  #         end
-  #       end
-  #     else
-  #       nil
-  #   end
-  # rescue => e
-  #   $stderr.puts "#{e.message}: #{col_or_hash}" if @debug
-  # end
-
-  # def hash_rows_to_text_table(hash_rows)
-  #   require 'text-table'
-  #
-  #   header_row = hash_rows.first.keys
-  #   table = []
-  #   table << header_row
-  #
-  #   hash_rows.each do |hash_row|
-  #     row = []
-  #     header_row.each do |header|
-  #       row << hash_row[header]
-  #     end
-  #     table << row
-  #   end
-  #
-  #   # Array addition from text-table
-  #   table.to_table(:first_row_is_head => true)
-  # end
 end

data/lib/tablesmith/hash_rows_base.rb

@@ -7,6 +7,7 @@ module Tablesmith::HashRowsBase
   end
 
   def sort_columns(rows)
+    return if column_order.empty?
     rows.map! do |row|
       # this sort gives preference to column_order then falls back to alphabetic for leftovers.
       # this is handy when columns auto-generate based on hash data.

data/lib/tablesmith/hash_rows_source.rb

@@ -30,7 +30,7 @@ module Tablesmith::HashRowsSource
   def value_from_hash(row, deep_hash, col_or_hash)
     case col_or_hash
     when Tablesmith::Column
-      row[col_or_hash.display_name] = deep_hash[col_or_hash.name]
+      row[col_or_hash.display_name] = deep_hash[col_or_hash.name].to_s
     when Hash
       col_or_hash.each_pair do |sub_hash_key, cols_or_hash|
         [cols_or_hash].flatten.each do |inner_col_or_hash|

data/lib/tablesmith/table.rb

@@ -128,6 +128,9 @@ class Array
   def to_table
     b = Tablesmith::Table.new(self)
 
+    # TODO: redesign such that every row is reacted to appropriately,
+    # so mixed content could be supported. Maybe every cell could be
+    # rendered appropriately, with nested tables.
     if defined?(ActiveRecord) && defined?(ActiveRecord::Base)
       if b.first && b.first.is_a?(ActiveRecord::Base)
         b.extend Tablesmith::ActiveRecordSource

data/lib/tablesmith/version.rb

@@ -1,3 +1,3 @@
 module Tablesmith
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

data/spec/hash_rows_table_spec.rb

@@ -12,6 +12,28 @@ describe 'HashRowsSource' do
     [{a: 1, b: 2}].to_table.text_table.to_s.should == expected
   end
 
+  it 'outputs text table of hash row with nested Array' do
+    expected = <<~TABLE
+      +---+--------+
+      | a |   b    |
+      +---+--------+
+      | 1 | [1, 2] |
+      +---+--------+
+    TABLE
+    [{a: 1, b: [1, 2]}].to_table.text_table.to_s.should == expected
+  end
+
+  it 'outputs text table of hash row with nested Hash' do
+    expected = <<~TABLE
+      +---+---------+
+      | a |    b    |
+      +---+---------+
+      | 1 | {:c=>3} |
+      +---+---------+
+    TABLE
+    [{a: 1, b: {c: 3}}].to_table.text_table.to_s.should == expected
+  end
+
   it 'outputs text table of mixed columns hash rows with default columns' do
     expected = <<~TABLE
       +---+---+---+
@@ -30,9 +52,9 @@ describe 'HashRowsSource' do
   it 'outputs text table of deep hash rows with defined columns' do
     expected = <<~TABLE
       +---+---+---+
-      |   |   b   |
+      | a |   b   |
       +---+---+---+
-      | a | c | d |
+      |   | c | d |
       +---+---+---+
       | 1 | 2 | 2 |
       +---+---+---+
@@ -46,10 +68,25 @@ describe 'HashRowsSource' do
         ]}
       ]
     end
-    # this would be nice. Payments has some code along these lines for BraintreeBatch? or some ActiveRecordSource re-use?
+
+    # this would be nice.
     # b.text_table.to_s.should == expected
     pending
   end
 
+  it 'keeps OrderedHash keys in order' do
+    h = ActiveSupport::OrderedHash.new
+    h[:z] = 2
+    h[:y] = 1
+    expected = <<~TABLE
+      +---+---+
+      | z | y |
+      +---+---+
+      | 2 | 1 |
+      +---+---+
+    TABLE
+    h.to_table.text_table.to_s.should == expected
+  end
+
   it 'outputs text table of deep hash rows with default columns'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablesmith
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
+date: 2017-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-table
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Minimal console table