tabular 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613698738bcb1e47f94bb2600a19439357aed5e0
-  data.tar.gz: c3f3d79bdb8f172af73e920ee452cb26edf0fa4e
+  metadata.gz: 24ea155d9007a4c02fb223ef654916c81ca40a8a
+  data.tar.gz: 67bf2a31432324f4d9dd1a4545c91d925df0ed95
 SHA512:
-  metadata.gz: 9fa062b915278c8f56758f6ab63358df965f6174a97f32d7d3036a4c53764a7f3e8aedf7eae12ecb79f1bed014d4fc76e344731697a970de7175d3a5d558836a
-  data.tar.gz: ff2bcd9376d0297e7a9a73ce3b1d1dbeb9b8e981ab2ff2aae053a58356d38f1565a01fcf0a6779e0378fdcc4ab6224d54ee6142baae211e3d7e07b40bc125fc0
+  metadata.gz: 97d41fd3815402be84700509fc51db7ff53ed392327c2168faf4fb5f8e389e0d5861b1d154b9ada63dd445410ca396a4beb7d7d804f473e6da393955175c8cc8
+  data.tar.gz: 9202f7626394eaf0b6af0fcb3c2cb202f6e507390b14a8b1d6f849b586f73cd1f715e73c4a9ddf72ac1c7c2c62aae8fe101434fd48ab54adac5f0ed7f7b9c15c

data/README

@@ -62,6 +62,7 @@ There's basic test coverage. More comprehensive test coverage needs to be extrac
 
 Changes
 -------
+0.4.0 rchristensen: Add sheet argument to Table.read
 0.3.0 Revise Table creation methods to something sensible. Use Roo to read
       spreadsheets. Support for xlsx.
 0.2.7 Add Table#to_space_delimited for space-padded fixed layout

data/Rakefile

@@ -1,21 +1,6 @@
 require 'rubygems'
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "tabular"
-    gemspec.summary = "Read, write, and manipulate CSV, tab-delimited and Excel data"
-    gemspec.description = "Tabular is a Ruby library for reading, writing, and manipulating CSV, tab-delimited and Excel data."
-    gemspec.email = "scott.willson@gmail.cpm"
-    gemspec.homepage = "http://github.com/scottwillson/tabular"
-    gemspec.authors = ["Scott Willson"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end
-
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'

data/lib/tabular/table.rb

@@ -13,7 +13,7 @@ module Tabular
 
     def self.read(file, options = {})
       table = Table.new
-      table.read file, options[:as]
+      table.read file, options[:as], options[:sheet]
       table
     end
 

data/lib/tabular/tables/file_reading.rb

@@ -5,14 +5,17 @@ module Tabular
       # Assumes .txt = tab-delimited, .csv = CSV, .xls = Excel. Assumes first row is the header.
       # Normalizes column names to lower-case with underscores.
       # +format+ : :csv, :txt, or :xls
+      # +sheet+: integer, specifies the desired worksheet of an .xls/xlsx file, 0 by default.
       # Returns Array of Arrays
-      def read(file, format = nil)
+      def read(file, format = nil, sheet = nil)
         file_path = to_file_path(file)
         format ||= format_from(format, file_path)
 
         self.rows = case format
         when :xls, :xlsx
-          read_spreadsheet file_path, format
+          # Set to first sheet if undefined.
+          sheet ||= 0
+          read_spreadsheet file_path, format, sheet
         when :txt
           read_txt file_path
         when :csv
@@ -52,7 +55,7 @@ module Tabular
         file_path
       end
 
-      def read_spreadsheet(file_path, format)
+      def read_spreadsheet(file_path, format, sheet)
         require "roo"
 
         if format == :xls
@@ -64,7 +67,7 @@ module Tabular
 
         # Row#to_a coerces Excel data to Strings, but we want Dates and Numbers
         data = []
-        excel.sheet(0).each do |excel_row|
+        excel.sheet(sheet).each do |excel_row|
           data << excel_row.inject([]) { |row, cell| row << cell; row }
         end
         data

data/lib/tabular/version.rb

@@ -1,3 +1,3 @@
 module Tabular
-  VERSION = "0.3.5"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabular
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Read, write, and manipulate CSV, tab-delimited and Excel data