simple-sql 0.5.13 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77b3c1274f0022bc282c46ce72e510abb34817a97808e4eb2b2341d8977c3228
-  data.tar.gz: 730f0a6008beafdd8aa7e6137510357aa994965725739e959dab848d552b62f7
+  metadata.gz: c2cf9ed788b6ea018998b2a6e97d0a6144fe223f86234812387a86eaf65d2485
+  data.tar.gz: d722f3cfb44f0029ec51ccd2d54dbbe609fd6036b57431dc2c2481d8496ecf50
 SHA512:
-  metadata.gz: dcd150904f6ace82f964d803231fb1c249c1eea80f8775b80907a3369da43b097a999bc8c19f4d949d549838484515902b78d346715f93029003387de337470d
-  data.tar.gz: c5e65cc327d238fc815ff992660b538e3b5c218033240f254ad0350aa325e9328d2afabf9e6477786a08b9e25fbd17a40236a2333434b1ac0dc01b160476458c
+  metadata.gz: 2c94eaa1fe5651b0355ff6c614bd26a51a6f33d3b5c6f6ca5d832883d570e8e2434f63dc73a5f7e138f3d6eb9eef1ab3b43b5e137af282a55a21c38b8f7a8f09
+  data.tar.gz: 6e25c1fbc93fd05964d6bf3aae02df55047bf67f90ff19e0fed2ccbf327cbafa0871913591c58d4bc9169069c2299f89005ebc1f3192767d694f7a3fc81d54cd

data/lib/simple/sql/connection/base.rb

@@ -61,11 +61,14 @@ class Simple::SQL::Connection
   end
 
   # Runs a query and prints the results via "table_print"
-  def print(sql, *args, into: nil)
-    raise ArgumentError, "You cannot call Simple::SQL.print with into: #{into.inspect}" unless into.nil?
+  def print(sql, *args, io: STDOUT, width: :auto)
+    if sql.is_a?(Array) && args.empty?
+      records = sql
+    else
+      records = all sql, *args, into: Hash
+    end
 
-    records = all sql, *args, into: Hash
-    Simple::SQL::Helpers::Printer.print records
+    Simple::SQL::Helpers::Printer.print(records, width: width, io: io)
     records
   end
 

data/lib/simple/sql/helpers/printer.rb

@@ -1,56 +1,78 @@
-# rubocop:disable Metrics/AbcSize
+# rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
 # private
 module Simple::SQL::Helpers::Printer
   extend self
 
-  def print(records)
-    if table_print?
-      tp records
-    else
-      lp records
+  ROW_SEPARATOR = " | "
+
+  def self.print(records, io: STDOUT, width: :auto)
+    # check args
+
+    return if records.empty?
+    return if records.first.keys.empty?
+
+    if width == :auto && io.isatty
+      width = `tput cols`.to_i
     end
+    width = nil if width && width <= 0
+
+    # prepare printing
+
+    rows = materialize_rows(records)
+    column_widths = calculate_column_widths(rows)
+    column_widths = optimize_column_widths(column_widths, width, rows.first.length) if width
+
+    # print
+
+    print_records(rows, io, column_widths)
   end
 
-  def lp(records)
-    return if records.empty?
+  private
 
+  def materialize_rows(records)
     keys = records.first.keys
-    return if keys.empty?
 
     rows = []
-    rows << keys
-
+    rows << keys.map(&:to_s)
     records.each do |rec|
       rows << rec.values_at(*keys).map(&:to_s)
     end
+    rows
+  end
 
-    max_lengths = rows.inject([0] * keys.count) do |ary, row|
+  def calculate_column_widths(rows)
+    rows.inject([0] * rows.first.length) do |ary, row|
       ary.zip(row.map(&:length)).map(&:max)
     end
+  end
+
+  def optimize_column_widths(column_widths, width, column_count)
+    required_width = column_widths.sum + column_count * ROW_SEPARATOR.length
+    overflow = required_width - width
+    return column_widths if overflow <= 0
+
+    # TODO: Use d'hondt with a minimum percentage for a fairer distribution
+    # The following is just a quick hack...
+    overflow += 40
+
+    column_widths.map do |col_width|
+      (col_width - overflow * col_width * 1.0 / required_width).to_i
+    end
+  end
 
+  def print_records(rows, io, column_widths)
     rows.each_with_index do |row, idx|
-      parts = row.zip(max_lengths).map do |value, max_length|
-        " %-#{max_length}s " % value
+      parts = row.zip(column_widths).map do |value, col_width|
+        s = "%-#{col_width}s " % value
+        s[0..col_width]
       end
 
-      STDERR.puts parts.join("|")
+      io.puts parts.join(ROW_SEPARATOR)
 
       if idx == 0
-        STDERR.puts parts.join("|").gsub(/[^|]/, "-")
+        io.puts parts.join(ROW_SEPARATOR).gsub(/[^|]/, "-")
       end
     end
   end
-
-  def table_print?
-    load_table_print unless instance_variable_defined? :@table_print
-    @table_print
-  end
-
-  def load_table_print
-    require "table_print"
-    @table_print = true
-  rescue LoadError
-    @table_print = false
-  end
 end

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.5.13"
+    VERSION = "0.5.14"
   end
 end

data/simple-sql.gemspec

@@ -43,7 +43,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rubocop', '~> 0.61.1'
   gem.add_development_dependency 'database_cleaner', '~> 1'
   gem.add_development_dependency 'simplecov', '~> 0'
-  gem.add_development_dependency 'awesome_print', '~> 0'
 
   gem.add_development_dependency 'memory_profiler', '~> 0.9.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.13
+  version: 0.5.14
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-08 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -165,20 +165,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: memory_profiler
   requirement: !ruby/object:Gem::Requirement