array-formatter 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd2a1a21de7b4f6f5797a5b457283f7c8154dc3
-  data.tar.gz: 21e2c5ca9fb9223f76cc9a6e14dede1562f83e28
+  metadata.gz: e91718a160882cac0e81852a8dafe5e634dc2dea
+  data.tar.gz: dc6e3d1f8063bac2689cf50dadec9bbe7bb62aca
 SHA512:
-  metadata.gz: b13479ed1888e51b59a08c4c0785a6205462fb899d6456c83ceb6beedd948fadf269f42acad179bdeb774e4c98232d700bd6ccf863f0e8e4e7f158ac60159a58
-  data.tar.gz: c9725d423fe73a85cb8a276e53c2b317d83dc495d809faee897fab949c77d6ce88cdb070a07fd0f68ffecfde3d37631d6d78026b5e701984cef4c72d0d297125
+  metadata.gz: 34da8710b7fe5533b336ced22b52f28f5591db8489008b7b676b23e011bfa7150acaf45be409569d72e262af39ac99f76c5eab7aa5c3022fd31e6ce2fffe9ab4
+  data.tar.gz: d5b8ae5563f6a72fd1b40d3c4c4a733f6c064b348e2f142b78af470eb91ae28be60f381e93bfcb178f883993a3681f34253075548d67b26d47a7aed33a615be1

data/Gemfile.lock

@@ -1,12 +1,14 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.5)
-    builder (3.2.2)
-    descendants_tracker (0.0.3)
-    faraday (0.9.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    builder (3.2.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
+    git (1.3.0)
     github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
@@ -15,37 +17,42 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    hashie (2.0.5)
-    highline (1.6.21)
-    jeweler (2.0.1)
+    hashie (3.5.1)
+    highline (1.7.8)
+    jeweler (2.3.3)
       builder
       bundler (>= 1.0)
       git (>= 1.2.5)
-      github_api
+      github_api (~> 0.11.0)
       highline (>= 1.6.15)
       nokogiri (>= 1.5.10)
+      psych (~> 2.2)
       rake
       rdoc
-    json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.2)
-    minitest (5.3.0)
-    multi_json (1.9.2)
-    multi_xml (0.5.5)
+      semver2
+    json (1.8.6)
+    jwt (1.5.6)
+    mini_portile2 (2.1.0)
+    minitest (5.10.1)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+    nokogiri (1.6.8.1)
+      mini_portile2 (~> 2.1.0)
+    oauth2 (1.3.0)
+      faraday (>= 0.8, < 0.11)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
-      rack (~> 1.2)
-    rack (1.5.2)
-    rake (10.3.1)
+      rack (>= 1.2, < 3)
+    psych (2.2.2)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    rake (12.0.0)
     rdoc (3.12.2)
       json (~> 1.4)
+    semver2 (3.4.2)
+    thread_safe (0.3.5)
 
 PLATFORMS
   ruby
@@ -54,3 +61,6 @@ DEPENDENCIES
   jeweler (~> 2.0)
   minitest (~> 5.3)
   rdoc (~> 3.12)
+
+BUNDLED WITH
+   1.14.3

data/README.md

@@ -28,7 +28,9 @@ Or install it yourself as:
     array.to_table [CHARTYPE]
     array.to_csv
     array.to_html
-    array.to_yaml
+    array.to_yml
+
+> Note: the `YAML` standard Ruby class defines a `to_yaml` method on arrays.
 
 With the `to_table` method, `CHARTYPE` is one of following, and defaults
 to `:ascii`:

data/Rakefile

@@ -18,7 +18,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://guides.rubygems.org/specification-reference/ for more options
   gem.name        = "array-formatter"
-  gem.homepage    = "https://bitbucket.org/aks_/array-formatter"
+  gem.homepage    = "https://github.com/aks/array-formatter"
   gem.license     = "MIT"
   gem.version     = Array::Formatter::VERSION
   gem.summary     = %Q{Format an array of arrays in one of serveral string formats}

data/array-formatter.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: array-formatter 1.1.0 ruby lib
+# stub: array-formatter 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "array-formatter"
-  s.version = "1.1.0"
+  s.name = "array-formatter".freeze
+  s.version = "1.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Alan K. Stebbens"]
-  s.date = "2014-05-04"
-  s.description = "    A simple gem to reformat an array of arrays into one of several string\n    formats: HTML table; CSV; ASCII table; YAML\n"
-  s.email = "aks@stebbens.org"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Alan K. Stebbens".freeze]
+  s.date = "2017-02-02"
+  s.description = "    A simple gem to reformat an array of arrays into one of several string\n    formats: HTML table; CSV; ASCII table; YAML\n".freeze
+  s.email = "aks@stebbens.org".freeze
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -36,6 +36,7 @@ Gem::Specification.new do |s|
     "test/ref/a-unicode.txt",
     "test/ref/a-unicode_single.txt",
     "test/ref/a-yaml.txt",
+    "test/ref/a-yml.txt",
     "test/ref/b-ascii.txt",
     "test/ref/b-csv.txt",
     "test/ref/b-html.txt",
@@ -43,36 +44,37 @@ Gem::Specification.new do |s|
     "test/ref/b-unicode_double.txt",
     "test/ref/b-unicode_mixed.txt",
     "test/ref/b-yaml.txt",
+    "test/ref/b-yml.txt",
     "test/test-array-formatter.rb"
   ]
-  s.homepage = "https://bitbucket.org/aks_/array-formatter"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Format an array of arrays in one of serveral string formats"
-  s.test_files = ["test/helper.rb", "test/ref/a-ascii.txt", "test/ref/a-csv.txt", "test/ref/a-html.txt", "test/ref/a-unicode.txt", "test/ref/a-unicode_single.txt", "test/ref/a-yaml.txt", "test/ref/b-ascii.txt", "test/ref/b-csv.txt", "test/ref/b-html.txt", "test/ref/b-unicode.txt", "test/ref/b-unicode_double.txt", "test/ref/b-unicode_mixed.txt", "test/ref/b-yaml.txt", "test/test-array-formatter.rb"]
+  s.homepage = "https://github.com/aks/array-formatter".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.7".freeze
+  s.summary = "Format an array of arrays in one of serveral string formats".freeze
+  s.test_files = ["test/helper.rb".freeze, "test/ref/a-ascii.txt".freeze, "test/ref/a-csv.txt".freeze, "test/ref/a-html.txt".freeze, "test/ref/a-unicode.txt".freeze, "test/ref/a-unicode_single.txt".freeze, "test/ref/a-yaml.txt".freeze, "test/ref/a-yml.txt".freeze, "test/ref/b-ascii.txt".freeze, "test/ref/b-csv.txt".freeze, "test/ref/b-html.txt".freeze, "test/ref/b-unicode.txt".freeze, "test/ref/b-unicode_double.txt".freeze, "test/ref/b-unicode_mixed.txt".freeze, "test/ref/b-yaml.txt".freeze, "test/ref/b-yml.txt".freeze, "test/test-array-formatter.rb".freeze]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 5.3"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.3"])
-      s.add_development_dependency(%q<rake>, ["~> 0"])
+      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.3"])
+      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_development_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+      s.add_development_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      s.add_development_dependency(%q<rake>.freeze, ["~> 0"])
     else
-      s.add_dependency(%q<minitest>, ["~> 5.3"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<jeweler>, ["~> 2.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.3"])
-      s.add_dependency(%q<rake>, ["~> 0"])
+      s.add_dependency(%q<minitest>.freeze, ["~> 5.3"])
+      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+      s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+      s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+      s.add_dependency(%q<rake>.freeze, ["~> 0"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 5.3"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<jeweler>, ["~> 2.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.3"])
-    s.add_dependency(%q<rake>, ["~> 0"])
+    s.add_dependency(%q<minitest>.freeze, ["~> 5.3"])
+    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
+    s.add_dependency(%q<jeweler>.freeze, ["~> 2.0"])
+    s.add_dependency(%q<bundler>.freeze, ["~> 1.3"])
+    s.add_dependency(%q<rake>.freeze, ["~> 0"])
   end
 end
 

data/lib/array/formatter.rb

@@ -5,9 +5,12 @@
 # ARRAY.to_html  -- format an array of arrays into an HTML table string
 # ARRAY.to_csv   -- format an array of arrays into a CSV string
 # ARRAY.to_table -- format an array of arrays into an ASCII table string
-# ARRAY.to_yaml  -- format an array of arrays as a YAML string
+# ARRAY.to_yml   -- format an array of arrays as a YAML string
 #
 
+autoload :YAML, 'yaml'
+autoload :CGI,  'cgi'
+
 class Array
 
   # string = ARRAY.to_html indent=0
@@ -16,18 +19,16 @@ class Array
   # HTML table.  If indent given, indent the <table> by that
   # many spaces.
 
-  def to_html indent=0
-    require 'cgi'
-    s = self.wrap_map_html_data("table", indent + 0) do |row,   rx|
-         row.wrap_map_html_data("tr",    indent + 1) do |field, fx|
-           tag = rx == 0 ? 'th' : 'td'
-           (' ' *                       (indent + 2)) +   # indention
-           "<#{tag}>"                                 +   # open tag
-           (field && CGI.escapeHTML(field) || '')     +   # cell text
-           "</#{tag}>\n"                                  # close tag
-         end
-    end
-    s
+  def to_html(indent=0)
+    wrap_map_html_data("table", indent + 0) do |row,   rx|
+      row.wrap_map_html_data("tr",    indent + 1) do |field, fx|
+        tag = rx == 0 ? 'th' : 'td'
+        (' ' *                       (indent + 2)) +   # indention
+        "<#{tag}>"                                 +   # open tag
+        (field && CGI.escapeHTML(field) || '')     +   # cell text
+        "</#{tag}>\n"                                  # close tag
+      end
+   end
   end
 
   # string = ARRAY.wrap_map_html_data TAG, INDENT {|DATA, INDEX| block}
@@ -36,11 +37,11 @@ class Array
   # <TAG> and ending with </TAG>, and invoking the block on each array item,
   # passing the DATA item with its INDEX.
 
-  def wrap_map_html_data tag, indent=0
+  def wrap_map_html_data(tag, indent=0)
     s = ''
     prefix = ' ' * indent
     s << prefix + "<#{tag}>\n"
-    self.each_with_index {|data, x| s << ((yield data, x) || '') }
+    each_with_index {|data, x| s << ((yield data, x) || '') }
     s << prefix + "</#{tag}>\n"
     s
   end
@@ -54,19 +55,18 @@ class Array
   # characters.
 
   def to_csv
-    self.map {|row|
+    map {|row|
       row.map {|f|
         f =~ /[[:punct:]]/ ?  '"' + f.gsub(/"/, '""') + '"' : f }.
       join(",")}.
     join("\n")
   end
 
-  # string = ARRAY.to_yaml
+  # string = ARRAY.to_yml
   #
   # Convert an array of arrays to YAML (using built-in core methods)
 
-  def to_yaml
-    require 'yaml'
+  def to_yml
     YAML.dump(self)
   end
 
@@ -109,7 +109,7 @@ class Array
     @@table_chars = {}
     @@table_char_names = %w( tlb tb tib trb ldb idb rdb lib ib mib rib blb bb bib brb ).map{|n|n.intern}
 
-    def initialize name, fmt_chars, start=nil, stop=nil
+    def initialize(name, fmt_chars, start=nil, stop=nil)
       @chars = self
       @@table_chars[name] = @chars
       if fmt_chars.class == Symbol
@@ -131,13 +131,13 @@ class Array
     #
     # Return the TableChars object for NAME, or nil
 
-    def self.get name
+    def self.get(name)
       @chars = @@table_chars[name]
     end
 
     attr_reader :start, :stop
 
-    def wrap text
+    def wrap(text)
       (@start || '') + text + (@stop || '')
     end
 
@@ -190,14 +190,13 @@ class Array
   TableChars.new :unicode, :unicode_single
   TableChars.new :dos,     :dos_single
 
-
-  def to_table name=:ascii
+  def to_table(name=:ascii)
     @chars = TableChars.get name
 
     # compute the maximum widths and the alignment of each column
     @widths = []
     @align = []
-    self.each_with_index do |row,rx|
+    each_with_index do |row,rx|
       row.each_with_index do |col,cx|
         @widths[cx] ||= 0
         l = col.to_s.length
@@ -219,7 +218,7 @@ class Array
 
     # now format each row
     s = ''
-    self.each_with_index do |row, rx|
+    each_with_index do |row, rx|
       s << table_line(rx == 0 ? :top : :middle)
       s << table_data(row)
     end
@@ -232,7 +231,7 @@ class Array
   #
   # generate a table line for position (:top, :middle, :bottom)
   #
-  def table_line position
+  def table_line(position)
     c = @chars
     left, line, mid, right = case position
                              when :top     then [c[:tlb], c[:tb], c[:tib], c[:trb]]
@@ -248,7 +247,7 @@ class Array
   #
   # generate a data row as part of a table
 
-  def table_data data
+  def table_data(data)
     left, middle, right = [@chars[:ldb], @chars[:idb], @chars[:rdb]]
     a = []
     data.each_with_index do |item, x|

data/lib/array/formatter/version.rb

@@ -1,3 +1,3 @@
 class Array::Formatter
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/test/helper.rb

@@ -14,7 +14,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'array/formatter'
 
-class MiniTest::Unit::TestCase
+class Minitest::Test
 end
 
-MiniTest::Unit.autorun
+MiniTest.autorun

data/test/ref/a-yml.txt

@@ -0,0 +1,21 @@
+---
+- - Company
+  - Name
+  - Address
+  - Phone
+  - Email
+- - New Company
+  - First Last
+  - Somewhere, US
+  - 123-45-6789
+  - user@sample.com
+- - Old Company
+  - First2 Last2
+  - Somewhere else, US
+  - 987-65-4321
+  - user2@sample.com
+- - No Company
+  - First3 Last3
+  - Elsewhere ZZ
+  - 763-34-1234
+  - user3@sample.com

data/test/ref/b-yml.txt

@@ -0,0 +1,25 @@
+---
+- - Region
+  - State
+  - Sales
+- - Northwest
+  - WA
+  - "$2,100,500"
+- - Northwest
+  - OR
+  - "$900,800"
+- - Northeast
+  - NY
+  - "$8,120,000"
+- - Northeast
+  - MN
+  - "$489,500"
+- - Southeast
+  - GA
+  - "$2,111,200"
+- - Southeast
+  - FL
+  - "$9,388,000"
+- - Southwest
+  - AZ
+  - "$7,377,000"

data/test/test-array-formatter.rb

@@ -19,15 +19,15 @@ ARGV.each_with_index do |arg, x|
 end
 
 require 'helper'
-#require 'array/formatter'
+require 'array/formatter'
 
-class Test_Array_Formatter < MiniTest::Unit::TestCase
+class Test_Array_Formatter < MiniTest::Test
 
-  def ref_filename name, kind
+  def ref_filename(name, kind)
     "#{$refdir}/#{name}-#{kind}.txt"
   end
 
-  def read_ref name, kind
+  def read_ref(name, kind)
     filename = ref_filename(name, kind)
     ref = nil
     if File.exist?(filename)
@@ -36,7 +36,7 @@ class Test_Array_Formatter < MiniTest::Unit::TestCase
     ref
   end
 
-  def write_ref name, kind, out
+  def write_ref(name, kind, out)
     filename = ref_filename(name, kind)
     unless Dir.exist?($refdir)
       Dir.mkdir $refdir
@@ -46,7 +46,7 @@ class Test_Array_Formatter < MiniTest::Unit::TestCase
     printf "%d lines written to %s\n", (out.count("\n")+1), filename
   end
 
-  def check actual, name, kind
+  def check(actual, name, kind)
     if $verbose
       puts ""
       puts actual
@@ -56,7 +56,7 @@ class Test_Array_Formatter < MiniTest::Unit::TestCase
       if expected
         assert_equal actual.strip, expected.strip, "Error: at #{caller.first}:"
       else
-        puts "No reference output to compare with"
+        puts "No reference output to compare with (at #{caller.first})"
       end
     else
       write_ref name, kind, actual
@@ -93,7 +93,6 @@ class Test_Array_Formatter < MiniTest::Unit::TestCase
     check s, :a, :unicode_single
   end
 
-
   def test_b_table_ascii
     s = @@b.to_table
     check s, :b, :ascii
@@ -130,12 +129,12 @@ class Test_Array_Formatter < MiniTest::Unit::TestCase
     check @@b.to_html, :b, :html
   end
 
-  def test_a_to_yaml
-    check @@a.to_yaml, :a, :yaml
+  def test_a_to_yml
+    check @@a.to_yml, :a, :yml
   end
 
-  def test_b_to_yaml
-    check @@b.to_yaml, :b, :yaml
+  def test_b_to_yml
+    check @@b.to_yml, :b, :yml
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: array-formatter
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Alan K. Stebbens
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-04 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -107,6 +107,7 @@ files:
 - test/ref/a-unicode.txt
 - test/ref/a-unicode_single.txt
 - test/ref/a-yaml.txt
+- test/ref/a-yml.txt
 - test/ref/b-ascii.txt
 - test/ref/b-csv.txt
 - test/ref/b-html.txt
@@ -114,8 +115,9 @@ files:
 - test/ref/b-unicode_double.txt
 - test/ref/b-unicode_mixed.txt
 - test/ref/b-yaml.txt
+- test/ref/b-yml.txt
 - test/test-array-formatter.rb
-homepage: https://bitbucket.org/aks_/array-formatter
+homepage: https://github.com/aks/array-formatter
 licenses:
 - MIT
 metadata: {}
@@ -135,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Format an array of arrays in one of serveral string formats
@@ -147,6 +149,7 @@ test_files:
 - test/ref/a-unicode.txt
 - test/ref/a-unicode_single.txt
 - test/ref/a-yaml.txt
+- test/ref/a-yml.txt
 - test/ref/b-ascii.txt
 - test/ref/b-csv.txt
 - test/ref/b-html.txt
@@ -154,4 +157,5 @@ test_files:
 - test/ref/b-unicode_double.txt
 - test/ref/b-unicode_mixed.txt
 - test/ref/b-yaml.txt
+- test/ref/b-yml.txt
 - test/test-array-formatter.rb