tabular 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/tabular/table.rb

@@ -8,21 +8,16 @@ module Tabular
     def self.read(file_path, *options)
       raise "Could not find '#{file_path}'" unless File.exists?(file_path)
       options = extract_options(options)
-      as = options.delete(:as)
       
-      if as.present?
-        format = as
-      else
-        format = case File.extname(file_path)
-        when ".xls", ".xlsx"
-          :xls
-        when ".txt"
-          :txt
-        when ".csv"
-          :csv
-        end
-      end
+      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)
       case format
       when :xls
         require "spreadsheet"
@@ -31,17 +26,25 @@ module Tabular
         Spreadsheet.open(file_path).worksheets.first.each do |excel_row|
           data << excel_row.inject([]) { |row, cell| row << cell; row }
         end
+        data
       when :txt
         require "csv"
-        data = ::CSV.open(file_path, "r","\t").collect { |row| row }
+        if RUBY_VERSION < "1.9"
+          ::CSV.open(file_path, "r","\t").collect { |row| row }
+        else
+          CSV.read(file_path)
+        end
       when :csv
-        require "fastercsv"
-        data = FasterCSV.read(file_path)
+        if RUBY_VERSION < "1.9"
+          require "fastercsv"
+          FasterCSV.read(file_path)
+        else
+          require "csv"
+          CSV.read(file_path)
+        end
       else
         raise "Cannot read '#{format}' format. Expected :xls, :xlsx, :txt, or :csv"
       end
-      
-      Table.new data, options
     end
     
     # Pass data in as +rows+. Expects rows to be an Enumerable of Enumerables. 
@@ -93,5 +96,20 @@ module Tabular
         {}
       end
     end
+    
+    def self.format_from(as_option, file_path)
+      if as_option.present?
+        as_option
+      else
+        case File.extname(file_path)
+        when ".xls", ".xlsx"
+          :xls
+        when ".txt"
+          :txt
+        when ".csv"
+          :csv
+        end
+      end
+    end
   end
 end

data/tabular.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tabular}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott Willson"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2010-06-08}
   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.extra_rdoc_files = [

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: tabular
 version: !ruby/object:Gem::Version 
-  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Scott Willson
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 -07:00
+date: 2010-06-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -64,7 +63,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -73,7 +71,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"