simplexls 0.1.5 → 0.2.0

data/README.markdown

@@ -5,13 +5,19 @@ This gem builds HTML tables which makes easy import data into Excel, OpenOffice
 
 ## Example
 
-
     xls = SimpleXLS.new ['header1','header2','header3']
-
+	
     xls.push [1,2,3]
     xls.push [4,5]
     xls.push [6,7,8]
 
-    File.open('output.xls', 'w+') { |f|
-      f.puts xls
-    }
+    File.open('output.xls', 'w+') { |f| f.puts xls }
+	
+### Add Collection 
+
+    xls = SimpleXLS.new ['a','b','c']
+	
+	xls.add([[1,2,3], [4,5,6]])
+	xls.add([ { :a => 1, :b => 2, :c => 3}, { :a => 4, :b => 5, :c => 6}])
+	
+The `add` method will accept an array of arrays or an array of hashes. When hashes are used, it will attempt to extract the values from the `Hash` using the header values as keys (first trying as a `String` then again as a `Symbol`). Since the headers are enumerated, order is preseved.

data/Rakefile

@@ -0,0 +1,8 @@
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.libs << ['lib', 'test']
+  t.test_files = ENV['TEST'] || Dir['test/test_*.rb']
+  t.verbose = true
+  #t.warning = true
+end

data/lib/simplexls.rb

@@ -2,25 +2,35 @@ class SimpleXLS
   attr_accessor :headers, :rows
   
   def initialize(headers)
-    raise ArugmentError('Row must be an Array') unless headers.is_a?(Array)
+    raise ArgumentError.new('headers must be an Array') unless Array === headers
 
-    @headers = headers.nil? ? [] : headers.dup
+    @headers = headers.dup
     @rows = []
   end
-  
+  # TODO fill out array here is needed rather than when we build the string
+  #      also, slice the array is longer than headers
   def push(row)
-    raise ArugmentError('Row must be an Array') unless row.is_a?(Array)
-    @rows.push(row.dup)
+    raise ArgumentError.new('row must be an Array') unless Array === row
+    
+    row = row.dup
+    row += Array.new(headers.size - row.size) if row.size < headers.size
+    
+    @rows.push row
+  end
+
+  alias :<< :push
+  
+  # TODO test this!
+  def add(collection)
+    collection.each do |obj|
+      self << (Hash === obj ? headers.map { |key| obj[key] || obj[key.to_sym] } : obj.to_a)
+    end
   end
   
   def to_s
     output = "<table><thead><tr>"
     output << @headers.collect { |hr| "<th>#{hr}</th>" }.join << "</tr></thead><tbody>"
-    output << @rows.collect { |row|
-      # even out the row if needed
-      row += Array.new(headers.size - row.size) if row.size != headers.size
-      "<tr>#{row.collect { |cell| "<td>#{cell}</td>"}.join}</tr>"
-    }.join
+    output << @rows.collect { |row| "<tr>#{row.collect { |cell| "<td>#{cell}</td>"}.join}</tr>" }.join
     output << "</tbody></table>"
   end
-end
+end

data/test/test_simple_xls.rb

@@ -0,0 +1,92 @@
+require 'simplexls'
+require 'test/unit'
+
+class SimpleXlsTest < Test::Unit::TestCase
+  def test_initialize
+    headers = ['a', 'b', 'c']
+    xls = SimpleXLS.new(headers)
+    
+    assert_equal headers, xls.headers
+  end
+  
+  def test_initialize_dups_headers
+    headers = ['a', 'b', 'c']
+    xls = SimpleXLS.new(headers)
+    
+    assert_not_same headers, xls.headers
+  end
+  
+  def test_row_push
+    xls = SimpleXLS.new(['a', 'b', 'c'])
+    row = [1,2,3]
+    
+    xls.push(row)
+    
+    assert_equal row, xls.rows.first
+  end
+  
+  def test_row_push_alias
+     xls = SimpleXLS.new(['a','b','c'])
+    
+     assert_equal xls.method(:push), xls.method(:<<)
+  end
+  
+  def test_evens_out_row
+    xls = SimpleXLS.new(['a','b','c'])
+    row = [1,2]
+    
+    xls.push(row)
+    
+    assert_equal 3, xls.rows.first.size
+    assert_equal [1,2,nil], xls.rows.first
+  end
+  
+  def test_row_push_dups_row
+    xls = SimpleXLS.new(['a', 'b', 'c'])
+    row = [1,2,3]
+    
+    xls.push(row)
+    
+    assert_not_same row, xls.rows.first
+  end
+  
+  def test_add_collection
+    xls = SimpleXLS.new(['a', 'b', 'c'])
+    rows = [[1,2,3], [4,5,6]]
+    
+    xls.add(rows)
+    
+    assert_equal rows.first, xls.rows.first
+    assert_equal rows.last, xls.rows.last
+  end
+  
+  def test_add_collection_with_hash
+    xls = SimpleXLS.new(['a', 'b', 'c'])
+    
+    rows = [{:a => 1, :b => 2, :c => 3}, {:a => 4, :b => 5, :d => 7}]
+    xls.add(rows)
+    
+    assert_equal rows.first.values, xls.rows.first
+    assert_equal [4,5,nil], xls.rows.last
+    
+    rows = [{:a => 1, :b => 2, :c => 3}, {:a => 4, :c => 5, :d => 7}]
+    xls.add(rows)
+    
+    assert_equal rows.first.values, xls.rows.first
+    assert_equal [4,nil,5], xls.rows.last    
+  end
+  
+  def test_output
+    xls = SimpleXLS.new(['a', 'b', 'c'])
+    xls.push([1,2,3])
+    
+    output = xls.to_s
+    
+    assert output.include?('<table><thead>')
+    assert output.include?('<th>a</th><th>b</th><th>c</th>')
+    assert output.include?('<td>1</td><td>2</td><td>3</td>')
+    assert output.include?('</tbody></table>')
+
+    assert_equal 2, output.scan(/<tr>/).size
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simplexls
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000 -04:00
-default_executable: 
+date: 2012-02-29 00:00:00.000000000Z
 dependencies: []
 description: 
 email: mikeycgto@gmail.com
@@ -18,9 +17,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - README.markdown
 - lib/simplexls.rb
-has_rdoc: 'false'
+- test/test_simple_xls.rb
 homepage: http://github.com/mikeycgto/simple-xls
 licenses: []
 post_install_message: 
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple XLS