swak 0.1.4 → 0.1.5

data/lib/swak/table.rb

@@ -1,43 +1,84 @@
 module Swak
   module Table
-    def Table.read(io_or_fn, opts={:has_header => false, :type => String, :delim => "\t"})
+    class SmartRow
+      attr_reader :header, :fields, :colmap
+
+      def initialize(header, fields)
+        if header.size != fields.size
+          raise "Header and field size mismatch in SmartRow.new #{header.inspect} vs #{fields.inspect}"
+        end
+
+        @header = header
+        @fields = fields
+        @colmap = {}
+        header.each_with_index {|fieldname, i| @colmap[fieldname] = i}
+        if @colmap.size != @header.size
+          raise "Duplicate field names not allowed in SmartRow header"
+        end
+      end
+
+      def [](*args)
+        if args.size == 1 && args[0].is_a?(String)
+          @fields[@colmap[args[0]]]
+        else
+          @fields[*args]
+        end
+      end
+
+      def []=(*args)
+        if args.size == 2 && args[0].is_a?(String)
+          @fields[@colmap[args[0]]] = args[-1]
+        else
+          @fields.[]=(*args)
+        end
+      end
+
+      def method_missing(sym, *args, &block)
+        @fields.send(sym, *args, &block)
+      end
+    end
+
+
+    def Table.read(io_or_fn, opts={:has_header => false, :type => String, :delim => "\t", :smart => false})
       if io_or_fn.is_a?(String)
         io = File.new(io_or_fn)
       else
         io = io_or_fn
       end
-      if opts[:has_header]
-        header = io.gets 
-        opts[:header] = header.chomp
+      if opts[:has_header] || opts[:smart]
+        header = io.gets.chomp 
+        opts[:header] = header
       end
       
       table = []
       delim = opts[:delim] || "\t"
 
-      if (opts[:type] == Integer)
-        for line in io
-          line.chomp!
-          f = line.split(delim)
-          table << f.map{|x| x.to_i_strict}
-        end
-      elsif (opts[:type] == Float)
-        for line in io
-          line.chomp!
-          f = line.chomp.split(delim)
-          table << f.map{|x| x.to_f_strict}
-        end
-      else # Assume String
-        for line in io
-          line.chomp!
-          table << line.split(delim)
-        end
+      case opts[:type].to_s
+      when "Integer"
+        ele_proc = Proc.new{|ele| ele.to_i_strict}
+      when "Float"
+        ele_proc = Proc.new{|ele| ele.to_f_strict}
+      else
+        ele_proc = Proc.new{|ele| ele} # By default, don't format
+      end
+
+      if opts[:smart]
+        row_proc = Proc.new{|row| SmartRow.new(header.split(delim), row) }
+      else
+        row_proc = Proc.new{|row| row}
+      end
+
+      for line in io
+        line.chomp!
+        f = line.split(delim)
+        table << row_proc.call(f.map(&ele_proc))
       end
 
       return table
     end
 
     def Table.write(table, io_or_fn, opts={:header => nil, :fmt => nil, :delim => "\t"})
-      raise "Illegal fmt in Swak::Table.write" if !opts[:fmt].nil? && !opts[:fmt].is_a?(String)
+      raise "Illegal fmt in Swak::Table.write: #{opts.inspect}" if !opts[:fmt].nil? && !opts[:fmt].is_a?(String)
 
       delim = opts[:delim] || "\t"
 
@@ -68,6 +109,7 @@ module Swak
 
     def Table.transpose(table)
       raise "Error in Swak::Table.transpose(): Cannot transpose nil table" if table.nil?
+      raise "Error in Swak::Table.transpose(): Cannot transpose a SmartRow table (yet)" if table.size > 0 && table[0].is_a?(SmartRow)
       return [] if table.size == 0
 
       num_rows = table.size
@@ -92,5 +134,9 @@ module Swak
 
       return out_mat
     end
+
+    def Table.column(table, col)
+      table.map {|row| row[col]}
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: swak
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Jesse Rodriguez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-16 00:00:00 Z
+date: 2012-07-22 00:00:00 Z
 dependencies: []
 
 description: Random tools and mixins