tabular 0.0.7 → 0.2.0

data/lib/tabular/table.rb

@@ -1,8 +1,11 @@
 module Tabular
   # Simple Enumerable list of Hashes. Use Table.read(file_path) to read file.
   class Table
-    attr_reader :rows
-    
+    include Tabular::Keys
+
+    attr_reader :options, :rows
+    attr_accessor :row_mapper
+
     # +file+ : file path as String or File
     # Assumes .txt = tab-delimited, .csv = CSV, .xls = Excel. Assumes first row is the header.
     # Normalizes column names to lower-case with underscores.
@@ -13,16 +16,16 @@ module Tabular
       else
         file
       end
-      
+
       raise "Could not find '#{file_path}'" unless File.exists?(file_path)
       options = extract_options(options)
-      
+
       format = self.format_from(options.delete(:as), file_path)
       data = read_file(file_path, format)
-      
+
       Table.new data, options
     end
-    
+
     # +format+ : :csv, :txt, or :xls
     # Returns Array of Arrays
     def self.read_file(file_path, format)
@@ -54,49 +57,116 @@ module Tabular
         raise "Cannot read '#{format}' format. Expected :xls, :xlsx, :txt, or :csv"
       end
     end
-    
-    # Pass data in as +rows+. Expects rows to be an Enumerable of Enumerables. 
+
+    # Pass data in as +rows+. Expects rows to be an Enumerable of Enumerables.
     # Maps rows to Hash-like Tabular::Rows.
     #
     # Options:
     # :columns => { :original_name => :preferred_name, :column_name => { :column_type => :boolean } }
     def initialize(rows = [], *options)
-      options = Table.extract_options(options)
-      @rows = []
+      @options = Table.extract_options(options)
+      self.rows = rows
+    end
+
+    def rows
+      @rows ||= []
+    end
+    
+    def rows=(source_rows = [])
+      return [] unless source_rows
       
-      rows.each do |row|
-        if @columns
-          self << row
-        else
-          @columns = Tabular::Columns.new(row, options[:columns])
-        end
+      source_rows.each do |row|
+        self.<< row
       end
+      
+      rows
     end
-    
+
     # Return Row at zero-based index, or nil if Row is out of bounds
     def [](index)
       rows[index]
     end
-    
+
     def <<(row)
-      @rows << Tabular::Row.new(self, row)
+      if row_mapper
+        cells = row_mapper.map(row)
+      else
+        cells = row
+      end
+
+      if @columns.nil? && !cells.respond_to?(:keys)
+        @columns = Tabular::Columns.new(self, cells, options[:columns])
+        return columns
+      end
+
+      _row = Tabular::Row.new(self, cells, row)
+      _row.keys.each do |key|
+        columns << key
+      end
+      rows << _row
+      _row
     end
-    
+
     def inspect
       rows.map { |row| row.join(",") }.join("\n")
     end
-    
+
     def columns
-      @columns || Tabular::Columns.new([])
+      @columns ||= Tabular::Columns.new(self, [])
+    end
+
+    def delete_blank_columns!
+      columns.map(&:key).each do |key|
+        if rows.all? { |row| row[key].blank? || row[key].zero? }
+          delete_column key
+        end
+      end
+    end
+    
+    def delete_homogenous_columns!
+      return if rows.size < 2
+      
+      columns.map(&:key).each do |key|
+        value = rows.first[key]
+        if rows.all? { |row| row[key] == value }
+          delete_column key
+        end
+      end
+    end
+    
+    def strip!
+      rows.each do |row|
+        columns.each do |column|
+          value = row[column.key]
+          if value.respond_to?(:strip)
+            row[column.key] = value.strip
+          end
+        end
+      end
     end
     
+    def delete_column(key)
+      rows.each do |row|
+        row.delete key
+      end
+      columns.delete key
+    end
+
+    def renderer=(value)
+      columns.renderer = value
+    end
+
+    def renderers
+      columns.renderers
+    end
+
     def to_s
       "#<#{self.class} #{rows.size}>"
     end
 
 
     private
-    
+
     def self.extract_options(options)
       if options
         options.flatten.first || {}
@@ -104,7 +174,7 @@ module Tabular
         {}
       end
     end
-    
+
     def self.format_from(as_option, file_path)
       if as_option.present?
         as_option

data/tabular.gemspec

@@ -1,66 +1,71 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{tabular}
-  s.version = "0.0.7"
+  s.name = "tabular"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Willson"]
-  s.date = %q{2010-10-19}
-  s.description = %q{Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data.}
-  s.email = %q{scott.willson@gmail.cpm}
+  s.date = "2013-05-05"
+  s.description = "Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data."
+  s.email = "scott.willson@gmail.cpm"
   s.extra_rdoc_files = [
     "LICENSE",
-     "README"
+    "README"
   ]
   s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "lib/tabular.rb",
-     "lib/tabular/column.rb",
-     "lib/tabular/columns.rb",
-     "lib/tabular/row.rb",
-     "lib/tabular/support/object.rb",
-     "lib/tabular/table.rb",
-     "tabular.gemspec",
-     "test/column_test.rb",
-     "test/columns_test.rb",
-     "test/fixtures/blank.txt",
-     "test/fixtures/excel.xls",
-     "test/fixtures/quoted.txt",
-     "test/fixtures/sample.csv",
-     "test/fixtures/sample.lif",
-     "test/helper.rb",
-     "test/row_test.rb",
-     "test/table_test.rb"
-  ]
-  s.homepage = %q{http://github.com/scottwillson/tabular}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Read, write, and manipulate CSV, tab-delimited and Excel data}
-  s.test_files = [
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README",
+    "Rakefile",
+    "VERSION",
+    "lib/tabular.rb",
+    "lib/tabular/column.rb",
+    "lib/tabular/columns.rb",
+    "lib/tabular/keys.rb",
+    "lib/tabular/renderer.rb",
+    "lib/tabular/row.rb",
+    "lib/tabular/support/object.rb",
+    "lib/tabular/support/zero.rb",
+    "lib/tabular/table.rb",
+    "tabular.gemspec",
     "test/column_test.rb",
-     "test/columns_test.rb",
-     "test/helper.rb",
-     "test/row_test.rb",
-     "test/table_test.rb"
+    "test/columns_test.rb",
+    "test/fixtures/blank.txt",
+    "test/fixtures/excel.xls",
+    "test/fixtures/quoted.txt",
+    "test/fixtures/sample.csv",
+    "test/fixtures/sample.lif",
+    "test/helper.rb",
+    "test/row_test.rb",
+    "test/table_test.rb",
+    "test/zero_test.rb"
   ]
+  s.homepage = "http://github.com/scottwillson/tabular"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.25"
+  s.summary = "Read, write, and manipulate CSV, tab-delimited and Excel data"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<ruby-ole>, [">= 0"])
+      s.add_runtime_dependency(%q<spreadsheet>, [">= 0"])
+      s.add_runtime_dependency(%q<jeweler>, [">= 0"])
     else
+      s.add_dependency(%q<ruby-ole>, [">= 0"])
+      s.add_dependency(%q<spreadsheet>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
+    s.add_dependency(%q<ruby-ole>, [">= 0"])
+    s.add_dependency(%q<spreadsheet>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/test/column_test.rb

@@ -3,37 +3,78 @@ require "helper"
 module Tabular
   class ColumnTest < Test::Unit::TestCase
     def test_new_nil
-      column = Column.new
-      assert_equal nil, column.to_s, "blank column to_s"
+      column = Column.new(nil, nil)
+      assert_equal "", column.to_s, "blank column to_s"
       assert_equal nil, column.key, "blank column key"
     end
-    
+
     def test_new
-      assert_equal :date, Column.new("date").key, "column key"
-      assert_equal :date, Column.new(:date).key, "column key"
-      assert_equal :date, Column.new("Date").key, "column key"
-      assert_equal :date, Column.new(" Date  ").key, "column key"
-      assert_equal :date, Column.new("DATE").key, "column key"
-      assert_equal :start_date, Column.new("StartDate").key, "column key"
-      assert_equal :start_date, Column.new("Start Date").key, "column key"
-    end
-    
+      assert_equal :date, Column.new(nil, nil, "date").key, "column key"
+      assert_equal :date, Column.new(nil, nil, :date).key, "column key"
+      assert_equal :date, Column.new(nil, nil, "Date").key, "column key"
+      assert_equal :date, Column.new(nil, nil, " Date  ").key, "column key"
+      assert_equal :date, Column.new(nil, nil, "DATE").key, "column key"
+      assert_equal :start_date, Column.new(nil, nil, "StartDate").key, "column key"
+      assert_equal :start_date, Column.new(nil, nil, "Start Date").key, "column key"
+    end
+
     def test_mapping
-      assert_equal :city, Column.new(:location, :location => :city).key, "column key"
+      assert_equal :city, Column.new(nil, nil, :location, :location => :city).key, "column key"
     end
-    
+
     def test_type
-      column = Column.new("name")
+      column = Column.new(nil, nil, "name")
       assert_equal :name, column.key, "key"
       assert_equal :string, column.column_type, "column_type"
-      
-      column = Column.new("date")
+
+      column = Column.new(nil, nil, "date")
       assert_equal :date, column.key, "key"
       assert_equal :date, column.column_type, "column_type"
 
-      column = Column.new("phone", :phone => { :column_type => :integer })
+      column = Column.new(nil, nil, "phone", :phone => { :column_type => :integer })
       assert_equal :phone, column.key, "key"
       assert_equal :integer, column.column_type, "column_type"
     end
+
+    def test_cells
+      data = [
+        { :place => "1", :name => "Bernard Hinault" },
+        { :place => "2", :name => "Greg Lemond" }
+      ]
+      table = Table.new(data)
+      column = table.columns[:place]
+      assert_equal [ "1", "2" ], column.cells
+    end
+
+    def test_max
+      data = [
+        { :place => "1", :name => "Bernard Hinault" },
+        { :place => "2", :name => "Greg Lemond" }
+      ]
+      table = Table.new(data)
+
+      assert_equal "2", table.columns[:place].max
+      assert_equal "Greg Lemond", table.columns[:name].max
+    end
+
+    def test_precision
+      data = [
+        { :place => "1", :age => 22, :points => 10.75 },
+        { :place => "2", :age => 30, :points => 12.000 }
+      ]
+      table = Table.new(data)
+
+      assert_equal 0, table.columns[:place].precision
+      assert_equal 0, table.columns[:age].precision
+      assert_equal 2, table.columns[:points].precision
+    end
+
+    def test_precision_with_mixed_zeros
+      data = [
+        { :place => "1", :age => 22, :points => 12.001 }
+      ]
+      table = Table.new(data)
+      assert_equal 3, table.columns[:points].precision
+    end
   end
 end

data/test/columns_test.rb

@@ -3,7 +3,7 @@ require "helper"
 module Tabular
   class ColumnsTest < Test::Unit::TestCase
     def test_new_blank
-      columns = Columns.new([])
+      columns = Columns.new(nil, [])
       assert_equal false, columns.has_key?(:name), "has_key? :name"
       assert_equal nil, columns[:name], "[:name]"
       assert_equal nil, columns.index(nil), "index"
@@ -11,36 +11,54 @@ module Tabular
       assert_equal nil, columns.index(:name), "index"
       columns.each { |c| c.nil? }
     end
-    
+
     def test_new
-      columns = Columns.new(["date", "first name", "LastName"])
+      columns = Columns.new(nil, ["date", "first name", "LastName"])
       assert_equal false, columns.has_key?(:location), "has_key? :location"
       assert_equal true, columns.has_key?(:date), "has_key? :date"
       assert_equal true, columns.has_key?(:first_name), "has_key? :first_name"
       assert_equal true, columns.has_key?(:last_name), "has_key? :last_name"
       assert_equal false, columns.has_key?("first name"), "has_key? 'first name'"
-      
+
       column = columns[:first_name]
       assert_equal :first_name, column.key, "column[:first_name] Column key"
 
       assert_equal 1, columns.index(:first_name), "index of :first_name"
     end
-    
+
     def test_columns_map
-      columns = Columns.new(["date"], :start_date => :date)
+      columns = Columns.new(nil, ["date"], :start_date => :date)
       assert_equal true, columns.has_key?(:date), "has_key? :date"
       assert_equal false, columns.has_key?(:start_date), "has_key? :start_date"
     end
-    
-    def test_each
-      columns = Columns.new(["date", "first name", "LastName"])
+
+    def test_render
+      columns = Columns.new(nil, ["date", "first name", "LastName"])
+      assert_equal "date", columns.first.render
+    end
+
+    def test_renderer
+      columns = Columns.new(nil, ["date", "first name", "LastName"])
+      columns.renderer = TestRenderer
+      assert_equal "Date", columns.first.render
+    end
+
+    def test_delete
+      columns = Columns.new(nil, ["date", "first name", "LastName"])
+      columns.delete :date
+      
       columns_from_each = []
       columns.each { |c| columns_from_each << c.key }
-      assert_equal [ :date, :first_name, :last_name ], columns_from_each, "column keys from #each"
+      assert_equal [ :first_name, :last_name ], columns_from_each, "column keys from #each"
+
+      assert_equal false, columns.has_key?(:date), "has_key? :date"
+      assert_equal true, columns.has_key?(:first_name), "has_key? :first_name"
+      assert_equal 0, columns.index(:first_name), "index of :first_name"
+      assert_equal 1, columns.index(:last_name), "index of :last_name"
     end
-    
+
     def test_push_onto_blank
-      columns = Columns.new([])
+      columns = Columns.new(nil, [])
       columns << "city state"
       assert_equal true, columns.has_key?(:city_state), "has_key? :city_state"
       assert_equal 0, columns.index(:city_state), "index of new column"
@@ -48,9 +66,9 @@ module Tabular
       column = columns[:city_state]
       assert_equal :city_state, column.key, "column[:city_state] Column key"
     end
-    
+
     def test_push
-      columns = Columns.new(["first", "second"])
+      columns = Columns.new(nil, ["first", "second"])
       columns << "third"
       assert_equal true, columns.has_key?(:third), "has_key? :third"
       assert_equal 0, columns.index(:first), "index of existing column"
@@ -60,5 +78,12 @@ module Tabular
       column = columns[:third]
       assert_equal :third, column.key, "column[:third] Column key"
     end
+
+    class TestRenderer
+      def self.render_header(column)
+        key = column.key.to_s
+        (key.slice(0) || key.chars('')).upcase + (key.slice(1..-1) || key.chars('')).downcase
+      end
+    end
   end
 end