csvgen 1.0 → 1.0.1

data/lib/csvgen.rb

@@ -18,16 +18,10 @@ class CSVDoc
     self.quote = '"'
   end
   
-  def row(*args)
-    length = args[0] || 0
-    r = CSVRow.new(self)
-    r.length = length
-    begin
-      yield(r)
-      @rows.push(r)
-    rescue
-      @rows.push("Error in row: #{$!.inspect}")
-    end
+  def row(len_or_headers)
+    r = CSVRow.new(self, len_or_headers)
+    yield(r)
+    @rows.push(r)
     self
   end
   
@@ -50,15 +44,28 @@ class CSVDoc
 end
 
 class CSVRow
-  def initialize(file)
+  def initialize(file, len_or_headers)
     @file = file
     @cols = []
+    @headers = {}
+    if len_or_headers.is_a? Numeric then
+      self.length = len_or_headers
+    else
+      self.headers = len_or_headers
+      self.length = len_or_headers.length
+    end
   end
-  
-  def col(*args)
-    val = args[0]
-    opts = args[1] || {:quote => true}
-    @cols.push(val)
+
+  def headers=(hdrs)
+    hdrs.each_with_index do |h, ii|
+      @headers[h] = ii
+    end
+  end
+
+  def push(*args)
+    args.each do |x|
+      @cols.push(x)
+    end
     self
   end
 
@@ -67,16 +74,16 @@ class CSVRow
   end
 
   def []=(idx, val)
-    @cols[idx] = val
+    if idx.is_a? Numeric then
+      @cols[idx] = val
+    else
+      hidx = @headers[idx]
+      raise "Header field #{idx.inspect} not found" if hidx.nil?
+      @cols[hidx] = val
+    end
   end
   
   def to_s
     @cols.collect { |c| @file.enquote(c) }.join(@file.sep)
   end
-
-  def skip(n)
-    n.times do |nn|
-      col(nil)
-    end
-  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: csvgen
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  version: "1.0"
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - John Cromartie