tablesmith 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b2cd809d21c4144fbb28e472f12e4f77510817d
-  data.tar.gz: 664d3bb41153050b8476ac761e1b4063594c7327
+  metadata.gz: 45818202ea467196502cd88dabbba91262f0476d
+  data.tar.gz: b6ece78a22c856daee3f1aab6b1eeb13cfe0201f
 SHA512:
-  metadata.gz: 9ef5411a7defaefa9dd1246d985a6a063479832836d41a48a1f715aa9922833f049163ccb2e3cf44b5679a1acf212bdfa7bac9c6776eefe6f752de0ecb0367f0
-  data.tar.gz: 972584036fd2a3a4208a4aa82c06e39686c5cab70c9e47b53594d95d52f9120f5da4ff2d6b98f14bd776ee681534062d77c0fc558d76695b1e7184545afdfd0c
+  metadata.gz: 43d69277e17bb8909aa962b96f97a6d02a14bdce203bacd37e4be3d07031fa8a8fa8adec62a58ca2b9ff0fa66a30cd0dba750ee5057c6b13157b264f0bf93ee9
+  data.tar.gz: b6345a15062ebcb554494558880bff872fba9f96424bc4ae1ddeb43003d3137da96afbce0ea1210a0cc0e0c1ed4334895bb43a117517c932aaeb51440d867db8

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle/
+.idea/
 bin/
 pkg/

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-source "http://geminabox.lsqa.net"
 
 # Specify your gem's dependencies in tablesmith.gemspec
 gemspec

data/Gemfile.lock

@@ -1,12 +1,11 @@
 PATH
   remote: .
   specs:
-    tablesmith (0.1.0)
+    tablesmith (0.1.2)
       text-table
 
 GEM
   remote: https://rubygems.org/
-  remote: http://geminabox.lsqa.net/
   specs:
     activemodel (3.2.22.5)
       activesupport (= 3.2.22.5)
@@ -64,4 +63,4 @@ DEPENDENCIES
   tablesmith!
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/lib/tablesmith.rb

@@ -1,4 +1,5 @@
 require 'tablesmith/batch'
 require 'tablesmith/active_record_source'
+require 'tablesmith/array_rows_source'
 require 'tablesmith/hash_rows_source'
 require 'tablesmith/version'

data/lib/tablesmith/array_rows_source.rb

@@ -0,0 +1,68 @@
+module Tablesmith::ArrayRowsSource
+  def text_table
+    build_columns if columns.nil?
+    super
+  end
+
+  def convert_item_to_hash_row(item)
+    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 ||= []
+    self.map do |array_row|
+      @columns << array_row.map { |item| Tablesmith::Column.new(name: item) }
+    end
+    @columns.flatten!
+  end
+
+  def create_headers(rows)
+    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/batch.rb

@@ -33,43 +33,43 @@ module Tablesmith
 
       normalize_keys(rows)
 
-      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.
-        row.sort do |a, b|
-          a_col_name, b_col_name = [a.first, b.first]
-          a_col_index, b_col_index = [column_order.index(a_col_name), column_order.index(b_col_name)]
-
-          if a_col_index.nil? && b_col_index.nil?
-            a_col_name <=> b_col_name
-          else
-            (a_col_index || 999) <=> (b_col_index || 999)
-          end
-        end
-      end
+      sort_columns(rows)
 
-      rows = create_headers(rows) + (rows.map { |r| r.map(&:last) })
+      rows = create_headers(rows) + (rows.map { |row| row_values(row) })
       rows.to_text_table
     end
 
+    # override in subclass or mixin
+    def row_values(row)
+      row
+    end
+
+    # override in subclass or mixin
+    def sort_columns(rows)
+    end
+
     # override in subclass or mixin
     def convert_item_to_hash_row(item)
       item
     end
 
+    # override in subclass or mixin
+    def normalize_keys(rows)
+    end
+
     # override in subclass or mixin
     def column_order
       []
     end
 
-
     # TODO: resolve with column_order
     def columns
       @columns
     end
 
     def create_headers(rows)
-      column_names = rows.first.map(&:first)
+      top_row = rows.first
+      column_names = top_row.first.is_a?(Array) ? top_row.map(&:first) : top_row
       grouped_headers(column_names) + [apply_column_aliases(column_names), :separator]
     end
 
@@ -100,12 +100,6 @@ module Tablesmith
         {:value => value, :align => :center}
       end
     end
-
-    # not all resulting rows will have data in all columns, so make sure all rows pad out missing columns
-    def normalize_keys(rows)
-      all_keys = rows.map { |hash_row| hash_row.keys }.flatten.uniq
-      rows.map { |hash_row| all_keys.each { |key| hash_row[key] ||= '' } }
-    end
   end
 
   class Column
@@ -131,14 +125,20 @@ class Array
   def to_batch
     b = Tablesmith::Batch.new(self)
 
-    if b.first && b.first.is_a?(ActiveRecord::Base)
-      b.extend Tablesmith::ActiveRecordSource
+    if defined?(ActiveRecord) && defined?(ActiveRecord::Base)
+      if b.first && b.first.is_a?(ActiveRecord::Base)
+        b.extend Tablesmith::ActiveRecordSource
+      end
     end
 
     if b.first && b.first.is_a?(Hash)
       b.extend Tablesmith::HashRowsSource
     end
 
+    if b.first && b.first.is_a?(Array)
+      b.extend Tablesmith::ArrayRowsSource
+    end
+
     b
   end
 end

data/lib/tablesmith/hash_rows_source.rb

@@ -60,4 +60,36 @@ module Tablesmith::HashRowsSource
     # Array addition from text-table
     table.to_table(:first_row_is_head => true)
   end
+
+  # not all resulting rows will have data in all columns, so make sure all rows pad out missing columns
+  def normalize_keys(rows)
+    all_keys = rows.map { |hash_row| hash_row.keys }.flatten.uniq
+    rows.map { |hash_row| all_keys.each { |key| hash_row[key] ||= '' } }
+  end
+
+  def sort_columns(rows)
+    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.
+      row.sort do |a, b|
+        a_col_name, b_col_name = [a.first, b.first]
+        a_col_index, b_col_index = [column_order.index(a_col_name), column_order.index(b_col_name)]
+
+        if a_col_index.nil? && b_col_index.nil?
+          a_col_name <=> b_col_name
+        else
+          (a_col_index || 999) <=> (b_col_index || 999)
+        end
+      end
+    end
+  end
+
+  def row_values(row)
+    row.map(&:last)
+  end
+
+  def create_headers(rows)
+    column_names = rows.first.map(&:first)
+    grouped_headers(column_names) + [apply_column_aliases(column_names), :separator]
+  end
 end

data/lib/tablesmith/version.rb

@@ -1,3 +1,3 @@
 module Tablesmith
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 end

data/spec/array_batch_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe 'Array Source' do
+  it 'just works in a console' do
+    expected = <<-TABLE
++---+---+---+
+| a | b | c |
++---+---+---+
+| d | e | f |
++---+---+---+
+    TABLE
+    [%w(a b c), %w(d e f)].to_batch.text_table.to_s.should == expected
+  end
+end

data/spec/batch_spec.rb

@@ -29,4 +29,17 @@ describe Batch do
     TEXT
     [].to_batch.text_table.to_s.should == expected
   end
+
+  it 'should handle a simple two row Array' do
+    a = [%w(a b c), %w(d e f)]
+    actual = a
+    expected = <<-TABLE
++---+---+---+
+| a | b | c |
++---+---+---+
+| d | e | f |
++---+---+---+
+    TABLE
+    actual.to_batch.text_table.to_s.should == expected
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tablesmith
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - chrismo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: text-table
@@ -125,11 +125,12 @@ files:
 - Rakefile
 - lib/tablesmith.rb
 - lib/tablesmith/active_record_source.rb
+- lib/tablesmith/array_rows_source.rb
 - lib/tablesmith/batch.rb
 - lib/tablesmith/hash_rows_source.rb
 - lib/tablesmith/version.rb
 - spec/active_record_batch_spec.rb
-- spec/array_spec.rb
+- spec/array_batch_spec.rb
 - spec/batch_spec.rb
 - spec/fixtures.rb
 - spec/hash_rows_batch_spec.rb
@@ -155,13 +156,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Minimal console table
 test_files:
 - spec/active_record_batch_spec.rb
-- spec/array_spec.rb
+- spec/array_batch_spec.rb
 - spec/batch_spec.rb
 - spec/fixtures.rb
 - spec/hash_rows_batch_spec.rb

data/spec/array_spec.rb

@@ -1 +0,0 @@
-# Want stuff to work with plain Arrays