table-formatter 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d7d117511c03581216fed4ed7b730af3dc2735
-  data.tar.gz: b11665ac25129a1a455bce648b330ea715dedfdd
+  metadata.gz: f48b45d64b37cf9717740bccbfcbe9f2b27461c6
+  data.tar.gz: 9d701c6f18c4d13bfde273231bf379d60adadd9f
 SHA512:
-  metadata.gz: d1f349c1b04c4eaf618b486d464d1bfdd48af3200a5d66403458700305ea1a1156024684db35daa230fd1eb2df468b241f4f253fdf98ed39b4f433d08351e049
-  data.tar.gz: 48a4e9f34f2f5ba660ed19703c7f5f90c3fb3ce598886f05f0d4ae8869affba15bbbf164cb289d130dc453be6c29a5a40e24cbd7bd1c717b89f11274c95e6a25
+  metadata.gz: 4c55a34ec74104aa1a0e3d5acbfe685497d87c753ea3a094076c2a4df76582963f889e0f803bc32a4b0886d5853dc7e9740c5014535be9a5a95978b3b52a8798
+  data.tar.gz: f61e9e5a884e020296b45ed9c49a1f182779c56c7e6aef01f755f45dfda5b9d8a9a363dff8ba6900b540c8a3ac31de6d68bb1c6de3b9dcb555cb8fd46444d5df

data/lib/table-formatter.rb

@@ -6,15 +6,14 @@ class TableFormatter
 
   attr_accessor :source, :labels, :border, :divider
   
-  def initialize(opt={})    
+  def initialize(source: nil, labels: nil, border: true, nowrap: false, divider: nil)    
 
-    o = {source: nil, labels: nil, border: true, nowrap: false}.merge(opt)
     super()
-    @source = o[:source]
-    @raw_labels = o[:labels] if o[:labels]
-    @border = o[:border]
-    @nowrap = o[:nowrap]
-    @divider = o[:divider] if o[:divider]
+    @source = source
+    @raw_labels = labels
+    @border = border
+    @nowrap = nowrap
+    @divider = divider
     @maxwidth = 60
   end
   
@@ -70,17 +69,19 @@ class TableFormatter
     d.map{|x| x.max_by(&:length).length}
   end
 
-  def format_cols(row, col_widths)
+  def format_cols(row, col_widths, bar='')
 
-    bar = ''
-    bar = '|' if border == true
-
-    buffer = bar 
+    outer_bar = ''
+    outer_bar = bar = '|' if border == true
+    col_spacer = @divider ? 1 : 2
+    
+    buffer = outer_bar
 
     row.each_with_index do |col, i|
 
       align = @align_cols ? @align_cols[i] : :ljust
-      buffer += col.method(align).call(col_widths[i] + 2) + bar
+      next_bar = (i < row.length - 1 || border)  ? bar : ''   
+      buffer += col.method(align).call(col_widths[i] + col_spacer) + next_bar
     end
 
     buffer
@@ -100,13 +101,8 @@ class TableFormatter
       end
     end
 
-    a.map do |row| 
-      if divider then
-        row.join(divider)
-      else
-        format_cols(row, col_widths)
-      end
-    end
+    a.map {|row| format_cols(row, col_widths, divider) }
+
   end
 
   def just(x)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - James Robertson
@@ -10,26 +10,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDY1MloXDTE0MDIwNjIxMDY1MlowSDESMBAG
+  8ixkARkWAmV1MB4XDTE0MDMyNTIxMDUxNVoXDTE1MDMyNTIxMDUxNVowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBALgjhlz4+TumoDfbnHY77I+Otn5CE+J14DajXS2t3EyF54k3IaZC//x/7McA
-  NdtyW+sT3WRvuUoeWmGjmwxl/Q8Dk0EPY62YczJO400/N5dkqPj1iIvvWi38zGbk
-  2z5ZVLz9IlQQWlNMwSVHb34LMw1i+QNgfY/qdyJs2Ut9yaGS6rtDqFK+pmasDf+R
-  Zhauxnvhz6gGnfU6zYNwOWO+vy0pyVT4fYMeUNAbmcqk2QffCF6p3mqLzY4S5V/8
-  MQbWwq7bYnJ9Ag/GT5L38bIw7KV9V5SXwwrxJXYNW8x7sM/JxRW+5kbLVkYtH6kE
-  LL5BESm+WpGKU/5V/NCO0AFAl0kCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUJ+TBDikX+8T5UvcZigHyJqxAoqswCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQBWXRzHwn/3iOGtGoNjogIdyebK8oDdjdP95sRNA0R5Rjq/itTyMgVs
-  y4OIMGabZZ4h8R29FA9WcN33T7/vnk8IS+fMLnoYSeo0pJ6nE+69YZRuIIHSg4xZ
-  wNG7VeLwnz/AjYlrRF+4c1fgAdUabn24VQCmnU1ZUckkkA9+xSnSihrbSBA5TkdI
-  j8e/RNDmQcPoIPixwMNHNHP1GlmpApL7UR8dU2z3/SfqdyumfwgmkMnYUJvH7/GE
-  87MJlDPDYzp5yHAWkCW+L5wNO0Z0kdkibE/RZ9yGgZ7rSPRUUBqwsxNfwvyVh8Gl
-  Ld73E8JjE0JpECfuT5M6ch5PUBtf1txl
+  ggEBAOXdjaMKyhp+NrAreBd7rhk4gaA0tLVHXyFZBjGJItv7df4aXrWoVApeat5p
+  v4bvGWVL4mLfWETs5z+vtWDTvicz3qX+V1KDAZDDq+wQ4h1WSSZkGFfF3M7aJUNG
+  vAiGwDltwsWiY2AYlAdvfwk2GNW4tqX99+XzAzuGCdvInIUChviC2ai1BHcInPY9
+  xmc4ZA5oI4T59xMXsapT4jN8Wljy1IWcKlan1JDjY34TBJI9XC6IqHvJkkVcD9cr
+  uZpSRVAAFs/sKHBoE1037QTnECh6KSxKLxFel7zOoBcjOQDab2PyJpC5UNrdbF6R
+  t6PYTY5cjMOGKkNj2b4/kQ28A6UCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQUI97NPNbdiCYSclmyMqKJr7LtpEYwJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAswyKuUaQ
+  zaalcas2asWXnUh5T/zbKVmymHIEG9kvXH0rMA51P4sRVEXpvqlYPBZioEzCn5f0
+  re+bscYJS5XmScGZHjTH9Gr5eahV6AWQTpBFdI5d416db4RuOtHZ8Ek+qr2us0VD
+  Kxqfb7yOCHMxQVNUD42DSBIsK+n2uX0++ltsnW8o8ZQvL4nrUdxMBUF28m3Z+V3o
+  ZWtCoj2zbSQLZzmPNIy9RAzn4Z64XB651zDe432QymDfLSEVi6n5YKixjsDOfa91
+  xMYZkElOttvQm8M6uUy483IxDueFvAWV/BnpYc9uzT6Rb9VtyMgUXX9pi/WwGjoF
+  0vXd6ZyRHRSlpQ==
   -----END CERTIFICATE-----
-date: 2014-01-05 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: james@r0bertson.co.uk