formatador 1.0.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58153bcd41291dcdd4aa4bbcfb724d233604d130470634682306fb0e8859f041
-  data.tar.gz: 20d3a52adff269f0a29fc6c1dda6dd87679151fa13bc496f0fbb1a7edc3ae07b
+  metadata.gz: 9f775eb2a13c13d00ecb5b23150628a0336716adcf9b3125c35b6d6ca3e12827
+  data.tar.gz: f9cfbb270ef4f89f465bbc09711329e379329c84ba603721c736c8ea59146c42
 SHA512:
-  metadata.gz: 12616b0af1aea1c3b5ee100440096e7b8def45f9ed5340efd98bbc958384005b80cb9dde10d16e0f443f8520b7466a67d93fe5d03a980a19988c3db9e08eef0f
-  data.tar.gz: 7fd4a23d9cd157ed4e86dcec4ad15cbd277220c1c62346f36d414af5aac1db8a634a57e952073cca1feb015c039cd777b18dbbb9fadf24c983025ee4bdbf7e01
+  metadata.gz: 39fe3363f0bb482dc4709c37323f13cfd4422d6e3ad493f4913d9da7f76683c629c61e1d4cf8bc02e89e0bbad6d72b3fa9d4dab6abcab124f7e1289ad0ee9255
+  data.tar.gz: 30d4ea6d8fd9acb1908c39851fd288b215ae11c8c4aebb089e0b1564fa0ee6a93939252f2c4a15e8ecc23e744e21850aaa0f56cb8a345d01ed43eeab96527ae2

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2013 [CONTRIBUTORS.md](https://github.com/geemus/formatador/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2009-2022 [CONTRIBUTORS.md](https://github.com/geemus/formatador/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/SECURITY.md

@@ -0,0 +1,6 @@
+## Security contact information
+
+To report a security vulnerability, please contact
+[Tidelift security](https://tidelift.com/security).
+
+Tidelift will coordinate the fix and disclosure.

data/changelog.txt

@@ -1,3 +1,25 @@
+v1.1.1 07/11/25
+===============
+
+update actions/stale
+update actions/checkout
+improve unicode support
+update ruby versions in test matrix
+add funding info
+move scheduled CI to weekly
+update tested ruby versions
+more consistently use length method in tables
+adjust expected test output for Ruby 3.4+
+
+v1.1.0 01/24/22
+===============
+
+fixes to support ruby 3+
+add options for right justifying numerics
+drop unused gemspec directive
+use https for rubygems.org in gemspec
+drop duplicate bundle install from CI setup
+
 v1.0.0 01/20/21
 ===============
 

data/formatador.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'formatador'
-  s.version           = '1.0.0'
-  s.date              = '2022-01-20'
+  s.version           = '1.1.1'
+  s.date              = '2025-07-11'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
     LICENSE.md
     README.md
     Rakefile
+    SECURITY.md
     changelog.txt
     formatador.gemspec
     lib/formatador.rb
@@ -77,8 +78,4 @@ Gem::Specification.new do |s|
     tests/tests_helper.rb
   ]
   # = MANIFEST =
-
-  ## Test files will be grabbed from the file list. Make sure the path glob
-  ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^[spec|tests]\/.*_[spec|tests]\.rb/ }
 end

data/lib/formatador/table.rb

@@ -1,20 +1,20 @@
 class Formatador
-  def display_table(hashes, keys = nil, &block)
+  def display_table(hashes, keys = nil, **options, &block)
     new_hashes = hashes.inject([]) do |accum,item|
       accum << :split unless accum.empty?
       accum << item
     end
-    display_compact_table(new_hashes, keys, &block)
+    display_compact_table(new_hashes, keys, **options, &block)
   end
 
-  def display_compact_table(hashes, keys = nil, &block)
+  def display_compact_table(hashes, keys = nil, **options, &block)
     headers = keys || []
     widths = {}
 
     # Calculate Widths
     if hashes.empty? && keys
       keys.each do |key|
-        widths[key] = key.to_s.length
+        widths[key] = length(key)
       end
     else
       hashes.each do |hash|
@@ -24,7 +24,7 @@ class Formatador
           if !keys
             headers << key
           end
-          widths[key] = [ length(key), widths[key] || 0, length(calculate_datum(key, hash)) || 0].max
+          widths[key] = [length(key), widths[key] || 0, length(calculate_datum(key, hash)) || 0].max
         end
         headers = headers.uniq
       end
@@ -52,25 +52,25 @@ class Formatador
     # Display data row
     columns = []
     headers.each do |header|
-      columns << "[bold]#{header}[/]#{' ' * (widths[header] - header.to_s.length)}"
+      columns << "[bold]#{header}[/]#{' ' * (widths[header] - length(header))}"
     end
     display_line("| #{columns.join(' | ')} |")
     display_line(split)
 
     hashes.each do |hash|
       if hash.respond_to? :keys
-        columns = []
-        headers.each do |header|
+        columns = headers.map do |header|
           datum = calculate_datum(header, hash)
           width = widths[header] - length(datum)
           width = width < 0 ? 0 : width
-          columns << "#{datum}#{' ' * width}"
+
+          datum.is_a?(Numeric) && options[:numeric_rjust] ? "#{' ' * width}#{datum}" : "#{datum}#{' ' * width}"
         end
         display_line("| #{columns.join(' | ')} |")
       else
         if hash == :split
           display_line(split)
-        end 
+        end
       end
       nil
     end
@@ -80,7 +80,7 @@ class Formatador
   private
 
   def length(value)
-    if Module.const_defined?(:Unicode)
+    if Module.const_defined?(:Unicode) && Unicode.respond_to?(:width)
       Unicode.width(value.to_s.gsub(PARSE_REGEX, ''))
     else
       value.to_s.gsub(PARSE_REGEX, '').chars.reduce(0) { |sum, char| sum += char.bytesize > 1 ? 2 : 1 }

data/lib/formatador.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'formatador', 'progressbar')
 
 class Formatador
 
-  VERSION = '1.0.0'
+  VERSION = '1.1.1'
 
   STYLES = {
     :"\/"             => "0",
@@ -119,7 +119,7 @@ class Formatador
     string.gsub(PARSE_REGEX, '').gsub(INDENT_REGEX) { indentation }
   end
 
-  %w{display display_line display_lines display_table display_compact_table indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
+  %w{display display_line display_lines indent parse redisplay redisplay_line new_line redisplay_progressbar}.each do |method|
     eval <<-DEF
       def self.#{method}(*args, &block)
         Thread.current[:formatador] ||= new
@@ -128,4 +128,13 @@ class Formatador
     DEF
   end
 
+  %w{display_table display_compact_table}.each do |method|
+    eval <<-DEF
+      def self.#{method}(*args, **kwargs, &block)
+        Thread.current[:formatador] ||= new
+        Thread.current[:formatador].#{method}(*args, **kwargs, &block)
+      end
+    DEF
+  end
+
 end

data/tests/table_tests.rb

@@ -64,6 +64,16 @@ output = Formatador.parse(output)
     end
   end
 
+
+if (RUBY_VERSION.split('.').map(&:to_i) <=> [3, 4, 0]).positive?
+output = <<-OUTPUT
+    +---+----------------+
+    | [bold]a[/] | [bold]nested[/]         |
+    +---+----------------+
+    | 1 | {key: "value"} |
+    +---+----------------+
+OUTPUT
+else
 output = <<-OUTPUT
     +---+-----------------+
     | [bold]a[/] | [bold]nested[/]          |
@@ -71,6 +81,7 @@ output = <<-OUTPUT
     | 1 | {:key=>"value"} |
     +---+-----------------+
 OUTPUT
+end
 output = Formatador.parse(output)
 
   tests("#display_table([{:a => 1, :nested => {:key => 'value'}}])").returns(output) do
@@ -94,6 +105,36 @@ output = Formatador.parse(output)
     end
   end
 
+output = <<-OUTPUT
+    +-------------------------+----------------+
+    | [bold]right-justify a numeric[/] | [bold]standard value[/] |
+    +-------------------------+----------------+
+    |                   12345 | value          |
+    +-------------------------+----------------+
+OUTPUT
+output = Formatador.parse(output)
+
+  tests("#display_table([{'right-justify a numeric' => 12345, 'standard value' => 'standard value'}], numeric_rjust: true)").returns(output) do
+    capture_stdout do
+      Formatador.display_table([{'right-justify a numeric' => 12345, 'standard value' => 'value'}], numeric_rjust: true)
+    end
+  end
+
+output = <<-OUTPUT
+    +--------+------------+
+    | [bold]header[/] | [bold]nested.key[/] |
+    +--------+------------+
+    |  12345 | value      |
+    +--------+------------+
+OUTPUT
+output = Formatador.parse(output)
+
+  tests("#display_table([{:header => 12345, :nested => {:key => value}}], [:header, :'nested.key'], numeric_rjust: true)").returns(output) do
+    capture_stdout do
+      Formatador.display_table([{:header => 12345, :nested => {:key => 'value'}}], [:header, :'nested.key'], numeric_rjust: true)
+    end
+  end
+
 
 output = <<-OUTPUT
     +------+

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: formatador
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.1
 platform: ruby
 authors:
 - geemus (Wesley Beary)
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2025-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -65,6 +64,7 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
+- SECURITY.md
 - changelog.txt
 - formatador.gemspec
 - lib/formatador.rb
@@ -77,7 +77,6 @@ homepage: https://github.com/geemus/formatador
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -93,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 2
 summary: Ruby STDOUT text formatting
 test_files: []