columnize 0.3.6 → 0.8.9

data/test/test-hashparm.rb

@@ -3,78 +3,41 @@ require 'test/unit'
 
 # Test of Columnize module
 class TestHashFormat < Test::Unit::TestCase
-  TOP_SRC_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 
-                          '..', 'lib')
+  TOP_SRC_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
   require File.join(TOP_SRC_DIR, 'columnize.rb')
-  include Columnize
+
   def test_parse_columnize_options
-    list, default_opts = parse_columnize_options([[], {}])
-    assert list.kind_of?(Array)
-    assert default_opts.kind_of?(Hash)
-    list, opts = parse_columnize_options([[], 90])
-    assert_equal 90, opts[:displaywidth]
-    list, opts = parse_columnize_options([[], 70, '|'])
+    assert Columnize.parse_columnize_options([{}]).kind_of?(Hash)
+    assert_equal 90, Columnize.parse_columnize_options([90])[:displaywidth]
+    opts = Columnize.parse_columnize_options([70, '|'])
     assert_equal 70, opts[:displaywidth]
     assert_equal '|', opts[:colsep]
   end
 
-  def test_parse_columnize_ljust
-    list, opts = parse_columnize_options([[1.5, 2, 3], {:ljust => :auto}])
-    assert_equal false, opts[:ljust]
-    list, opts = parse_columnize_options([[1.5, 2, 3], {:ljust => false}])
-    assert_equal false, opts[:ljust]
-    list, opts = parse_columnize_options([[1.5, 2, 3], {:ljust => true}])
-    assert_equal true, opts[:ljust]
-    list, opts = parse_columnize_options([[1, 2, 'b'], {:ljust => :auto}])
-    assert_equal true, opts[:ljust]
-  end
-
   def test_new_hash
-    list, opts = parse_columnize_options([[], {:displaywidth => 40,
-                                          :colsep => ', ',
-                                          :term_adjust => true,
-                                          }])
-    [[:displaywidth, 40], [:colsep, ', '], [:term_adjust, true]].each do 
-       |field, value|
-       assert_equal(value , opts[field])
-     end
-    list, opts = parse_columnize_options([[], {:displaywidth => 40,
-                                          :colsep => ', ',
-                                          }])
-    assert_equal(false , opts[:term_adjust])
-    opts = {:colsep => ', '}
-    assert_equal("1, 2, 3\n", 
-                 Columnize::columnize([1, 2, 3], opts))
+    hash = {:displaywidth => 40, :colsep => ', ', :term_adjust => true,}
+    assert_equal(hash, Columnize.parse_columnize_options([hash]), "parse_columnize_options returns same hash it was passed")
   end
-  
+
   def test_array
     data = (0..54).to_a
-    assert_equal(
-            "[ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9\n" +
-            " 10, 11, 12, 13, 14, 15, 16, 17, 18, 19\n" +
-            " 20, 21, 22, 23, 24, 25, 26, 27, 28, 29\n" +
-            " 30, 31, 32, 33, 34, 35, 36, 37, 38, 39\n" +
-            " 40, 41, 42, 43, 44, 45, 46, 47, 48, 49\n" +
-            " 50, 51, 52, 53, 54\n" + 
-             "]\n",
-            columnize(data, 
-                      :arrange_array => true, :ljust => false,
-                      :displaywidth  => 39))
+    expected = "[ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,\n" +
+               " 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,\n" +
+               " 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,\n" +
+               " 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,\n" +
+               " 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,\n" +
+               " 50, 51, 52, 53, 54]"
+    assert_equal(expected, Columnize.columnize(data, :arrange_array => true, :ljust => false, :displaywidth  => 39))
   end
 
   def test_justify
     data = (0..54).to_a
-    assert_equal(
-            "[ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9\n" +
-            " 10, 11, 12, 13, 14, 15, 16, 17, 18, 19\n" +
-            " 20, 21, 22, 23, 24, 25, 26, 27, 28, 29\n" +
-            " 30, 31, 32, 33, 34, 35, 36, 37, 38, 39\n" +
-            " 40, 41, 42, 43, 44, 45, 46, 47, 48, 49\n" +
-            " 50, 51, 52, 53, 54\n" + 
-             "]\n",
-            columnize(data, 
-                      :arrange_array => true,
-                      :displaywidth  => 39))
+    expected = "[ 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,\n" +
+               " 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,\n" +
+               " 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,\n" +
+               " 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,\n" +
+               " 40, 41, 42, 43, 44, 45, 46, 47, 48, 49,\n" +
+               " 50, 51, 52, 53, 54]"
+    assert_equal(expected, Columnize.columnize(data, :arrange_array => true, :displaywidth  => 39))
   end
-
 end

data/test/test-issue3.rb

@@ -1,37 +1,24 @@
 #!/usr/bin/env ruby
 require 'test/unit'
 
-# Test of Columnize module
+# Test of Columnize module for github issue #3
 class TestIssue3 < Test::Unit::TestCase
-  @@TOP_SRC_DIR = File.join(File.expand_path(File.dirname(__FILE__)), 
-                            '..', 'lib')
+  @@TOP_SRC_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
   require File.join(@@TOP_SRC_DIR, 'columnize.rb')
-  include Columnize
+
   # test columnize
   def test_long_column
     data = ["what's", "upppppppppppppppppp"]
-    # Try at least one test where we give the module name explicitely.
-    assert_equal("what's\nupppppppppppppppppp\n", 
-                 Columnize::columnize(data, :arrange_vertical => false,
-                                      :displaywidth => 7))
-    assert_equal("what's\nupppppppppppppppppp\n", 
-                 Columnize::columnize(data, :arrange_vertical => true,
-                                      :displaywidth => 7))
+    data.columnize_opts = Columnize::DEFAULT_OPTS.merge :displaywidth => 7, :arrange_vertical => false
+    assert_equal("what's\nupppppppppppppppppp", data.columnize)
+    assert_equal("what's\nupppppppppppppppppp", data.columnize(:arrange_vertical => true))
+  end
+
+  def test_long_column_with_ljust
     data = ["whaaaaaat's", "up"]
-    assert_equal("whaaaaaat's\n         up\n",
-                 Columnize::columnize(data, 
-                                      :arrange_vertical => false,
-                                      :ljust => false,
-                                      :displaywidth => 7))
-    assert_equal("whaaaaaat's\nup\n",
-                 Columnize::columnize(data, 
-                                      :arrange_vertical => false,
-                                      :ljust => true,
-                                      :displaywidth => 7))
-    assert_equal("whaaaaaat's\nup\n",
-                 Columnize::columnize(data, 
-                                      :arrange_vertical => true,
-                                      :ljust => true,
-                                      :displaywidth => 7))
+    data.columnize_opts = Columnize::DEFAULT_OPTS.merge :displaywidth => 7, :arrange_vertical => false, :ljust => true
+    assert_equal("whaaaaaat's\nup", data.columnize)
+    assert_equal("whaaaaaat's\n         up", data.columnize(:ljust => false))
+    assert_equal("whaaaaaat's\nup", data.columnize(:arrange_vertical => true))
   end
 end

data/test/test-min_rows_and_colwidths.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+
+# Test of Columnize#min_rows_and_colwidths
+class TestComputeRowsAndColwidths < Test::Unit::TestCase
+  # Ruby 1.8 form of require_relative
+  TOP_SRC_DIR = File.join(File.expand_path(File.dirname(__FILE__)), '..', 'lib')
+  require File.join(TOP_SRC_DIR, 'columnize.rb')
+
+  VOPTS = Columnize::DEFAULT_OPTS.merge(:displaywidth => 80)
+  HOPTS = VOPTS.merge(:arrange_vertical => false)
+
+  def min_rows_and_colwidths(list, opts)
+    Columnize::Columnizer.new(list, opts).min_rows_and_colwidths
+  end
+
+  def test_colwidths
+     data = ["one",      "two",         "three",
+            "four",      "five",        "six",
+            "seven",     "eight",       "nine",
+            "ten",       "eleven",      "twelve",
+            "thirteen",  "fourteen",    "fifteen",
+            "sixteen",   "seventeen",   "eightteen",
+            "nineteen",  "twenty",      "twentyone",
+            "twentytwo", "twentythree", "twentyfour",
+            "twentyfive","twentysix",   "twentyseven"]
+
+    [['horizontal', HOPTS, [10, 9, 11, 9, 11, 10], 5, 6],
+     ['vertical'  , VOPTS, [5, 5, 6, 8, 9, 11, 11], 4, 7]].each do
+      |direction, opts, expect_colwidths, expect_rows, expect_cols|
+      rows, colwidths = min_rows_and_colwidths(data, opts)
+      assert_equal(expect_colwidths, colwidths, "colwidths - #{direction}")
+      assert_equal(expect_rows, rows.length,
+                   "number of rows - #{direction}")
+      assert_equal(expect_cols, rows.first.length,
+                 "number of cols - #{direction}")
+    end
+  end
+
+  def test_horizontal_vs_vertical
+    data = (0..54).map{|i| i.to_s}
+
+    [['horizontal', HOPTS.merge(:displaywidth => 39), [2,2,2,2,2,2,2,2,2,2]],
+     ['vertical'  , VOPTS.merge(:displaywidth => 39), [1,2,2,2,2,2,2,2,2,2]]].each do
+      |direction, opts, expect|
+      rows, colwidths = min_rows_and_colwidths(data, opts)
+      assert_equal(expect, colwidths, "colwidths #{direction}")
+      assert_equal(6, rows.length, "number of rows - #{direction}")
+      assert_equal(10, rows.first.length, "number of cols - #{direction}")
+    end
+  end
+
+  def test_displaywidth_smaller_than_largest_atom
+    data = ['a' * 100, 'b', 'c', 'd', 'e']
+
+    [['horizontal', HOPTS],
+     ['vertical'  , VOPTS]].each do
+      |direction, opts|
+       rows, colwidths = min_rows_and_colwidths(data, opts)
+       assert_equal([100], colwidths, "colwidths #{direction}")
+       assert_equal(5, rows.length, "number of rows - #{direction}")
+       assert_equal(1, rows.first.length, "number of cols - #{direction}")
+     end
+  end
+end

metadata

@@ -1,91 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: columnize
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 6
-  version: 0.3.6
+version: !ruby/object:Gem::Version
+  version: 0.8.9
+  prerelease: 
 platform: ruby
-authors: 
-- R. Bernstein
+authors:
+- Rocky Bernstein
 autorequire: 
 bindir: bin
 cert_chain: []
+date: 2014-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! '
+
+  In showing a long lists, sometimes one would prefer to see the value
+
+  arranged aligned in columns. Some examples include listing methods
 
-date: 2011-12-17 00:00:00 -05:00
-default_executable: 
-dependencies: []
+  of an object or debugger commands.
 
-description: "\n\
-  In showing a long lists, sometimes one would prefer to see the value\n\
-  arranged aligned in columns. Some examples include listing methods\n\
-  of an object or debugger commands. \n\
-  See Examples in the rdoc documentation for examples.\n"
+  See Examples in the rdoc documentation for examples.
+
+'
 email: rockyb@rubyforge.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - lib/columnize.rb
 - COPYING
-files: 
+- THANKS
+files:
 - .gitignore
+- .travis.yml
 - AUTHORS
 - COPYING
 - ChangeLog
+- Gemfile
+- Gemfile.lock
 - Makefile
 - NEWS
 - README.md
 - Rakefile
+- THANKS
 - columnize.gemspec
 - lib/Makefile
 - lib/columnize.rb
 - lib/columnize/Makefile
+- lib/columnize/columnize.rb
+- lib/columnize/opts.rb
 - lib/columnize/version.rb
+- test/test-columnize-array.rb
 - test/test-columnize.rb
+- test/test-columnizer.rb
 - test/test-hashparm.rb
 - test/test-issue3.rb
-has_rdoc: true
+- test/test-min_rows_and_colwidths.rb
 homepage: https://github.com/rocky/columnize
-licenses: 
+licenses:
 - Ruby
 - GPL2
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README
 - --title
-- Columnize 0.3.6 Documentation
-require_paths: 
+- Columnize 0.8.9 Documentation
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 2
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: columnize
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Module to format an Array as an Array of String aligned in columns
 test_files: []
-