format_array 1.0 → 1.1

data/CHANGELOG

@@ -1 +1,3 @@
+v1.1. Add some trivial tests and parameterise our length
+
 v1.0. First cut

data/Manifest

@@ -1,6 +1,8 @@
 CHANGELOG
 LICENSE
+Manifest
 README
 Rakefile
 lib/format_array.rb
-Manifest
+test/test_simple.rb
+test/test_wrap.rb

data/Rakefile

@@ -1,2 +1,3 @@
+require 'rake'
 require 'echoe'
 Echoe.new('format_array')

data/format_array.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{format_array}
-  s.version = "1.0"
+  s.version = "1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = [""]
@@ -10,13 +10,14 @@ Gem::Specification.new do |s|
   s.description = %q{}
   s.email = %q{}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "lib/format_array.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "README", "Rakefile", "lib/format_array.rb", "Manifest", "format_array.gemspec"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "lib/format_array.rb", "test/test_simple.rb", "test/test_wrap.rb", "format_array.gemspec"]
   s.homepage = %q{}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Format_array", "--main", "README"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{format_array}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{}
+  s.test_files = ["test/test_simple.rb", "test/test_wrap.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/format_array.rb

@@ -1,16 +1,16 @@
 CUTOFF=120
 
-def format_array(a, p, j='; ')
+def format_array(a, p, cutoff=CUTOFF, j='; ')
     raw = a.sort.join(j)
     tmp = "#{p}: #{raw}"
 
     # don't bother formatting if we're short
-    if raw.length + p.length < CUTOFF then
+    if raw.length + p.length < cutoff then
         return [tmp]
     end
 
     # try a naive longest->shortest distribution
-    lines = raw.length / CUTOFF
+    lines = raw.length / cutoff
     sa = a.sort_by {|s| s.length}.reverse
     out = Array.new(12) { Array.new }
     while (sa.length > lines+1) do
@@ -24,24 +24,3 @@ def format_array(a, p, j='; ')
     strings = out.find_all {|i| i.length > 0}.map {|i| "#{p}: " << i.join(j)}
     return strings
 end
-
-if nil then
-test_data = <<HERE.split "\n"
-Accrington Stanley 0-2 Wycombe R
-Barnet 0-1 Morecambe R
-Bury 1-5 Milton Keynes Dons R
-Chesterfield 1-1 Chester R
-Dag & Red 0-1 Stockport R
-Macclesfield 0-1 Bradford R
-Mansfield 2-3 Brentford R
-Notts County 1-1 Grimsby R
-Rochdale 0-2 Peterborough R
-Rotherham 0-1 Hereford R
-Shrewsbury 1-2 Lincoln City R 
-HERE
-
-0.upto(5) { |i|
-    test = test_data[0..i]
-    puts format_array(test, 'DIV3').map{|k| "T#{i}: "<<k}.join("\n")
-}
-end

data/test/test_simple.rb

@@ -0,0 +1,9 @@
+require 'format_array'
+require 'test/unit'
+
+class TC_simple < Test::Unit::TestCase
+    def test_simple
+        r = format_array(['Hello','Sir'], 'TEST')
+        assert_equal('TEST: Hello; Sir', r[0])
+    end
+end

data/test/test_wrap.rb

@@ -0,0 +1,28 @@
+require 'format_array'
+require 'test/unit'
+
+class TC_simple < Test::Unit::TestCase
+    def test_wrap
+        lines="Accrington Stanley 0-2 Wycombe R
+Barnet 0-1 Morecambe R
+Bury 1-5 Milton Keynes Dons R
+Chesterfield 1-1 Chester R
+Dag & Red 0-1 Stockport R
+Macclesfield 0-1 Bradford R".split(/\n/)
+        r = format_array(lines, 'DIV2')
+        e = ["DIV2: Accrington Stanley 0-2 Wycombe R; Macclesfield 0-1 Bradford R; Dag & Red 0-1 Stockport R", "DIV2: Bury 1-5 Milton Keynes Dons R; Chesterfield 1-1 Chester R; Barnet 0-1 Morecambe R"]
+        assert_equal(e, r)
+    end
+
+    def test_wrap_short
+        lines="Accrington Stanley 0-2 Wycombe R
+Barnet 0-1 Morecambe R
+Bury 1-5 Milton Keynes Dons R
+Chesterfield 1-1 Chester R
+Dag & Red 0-1 Stockport R
+Macclesfield 0-1 Bradford R".split(/\n/)
+        r = format_array(lines, 'DIV2', 76)
+        e = ["DIV2: Accrington Stanley 0-2 Wycombe R; Chesterfield 1-1 Chester R", "DIV2: Bury 1-5 Milton Keynes Dons R; Dag & Red 0-1 Stockport R", "DIV2: Macclesfield 0-1 Bradford R; Barnet 0-1 Morecambe R"]
+        assert_equal(e, r)
+    end
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: format_array
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 1
-  - 0
-  version: "1.0"
+  - 1
+  version: "1.1"
 platform: ruby
 authors: 
 - ""
@@ -32,10 +32,12 @@ extra_rdoc_files:
 files: 
 - CHANGELOG
 - LICENSE
+- Manifest
 - README
 - Rakefile
 - lib/format_array.rb
-- Manifest
+- test/test_simple.rb
+- test/test_wrap.rb
 - format_array.gemspec
 has_rdoc: true
 homepage: ""
@@ -77,5 +79,6 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ""
-test_files: []
-
+test_files: 
+- test/test_simple.rb
+- test/test_wrap.rb