tabular 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24ea155d9007a4c02fb223ef654916c81ca40a8a
-  data.tar.gz: 67bf2a31432324f4d9dd1a4545c91d925df0ed95
+  metadata.gz: 06bed6b335edf9465b7f56b489f5544ec11b4ee4
+  data.tar.gz: 8679fb4cd37f748c6f9f0f6e9fe80e01af31cb49
 SHA512:
-  metadata.gz: 97d41fd3815402be84700509fc51db7ff53ed392327c2168faf4fb5f8e389e0d5861b1d154b9ada63dd445410ca396a4beb7d7d804f473e6da393955175c8cc8
-  data.tar.gz: 9202f7626394eaf0b6af0fcb3c2cb202f6e507390b14a8b1d6f849b586f73cd1f715e73c4a9ddf72ac1c7c2c62aae8fe101434fd48ab54adac5f0ed7f7b9c15c
+  metadata.gz: 70e496dbbf3fce7bc1350905279fb895d64197f8f4403de65572317661b6d64024ee94d2377aa0e5225840e5c9a8cc80ae3bf1fe9b09d5fca4b44ff142ac7ab3
+  data.tar.gz: 3a35d6603c2c8fe97b8db93ed19817e347530f2b596d2cf9fc8a6b681e55a26f05271fbca172581f8e36123d48457038a82a347e1320e16b5d237b834a110c0c

data/README

@@ -62,6 +62,7 @@ There's basic test coverage. More comprehensive test coverage needs to be extrac
 
 Changes
 -------
+0.4.2 Refactor minor ugly things. No behavior 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.

data/lib/tabular/column_mapper.rb

@@ -15,7 +15,7 @@ module Tabular
           gsub(/([a-z\d])([A-Z])/,'\1_\2').
           tr("-", "_").
           gsub(/ +/, "_").
-          gsub(";", "").
+          delete(";").
           downcase.
           to_sym
       rescue

data/lib/tabular/row.rb

@@ -115,7 +115,7 @@ module Tabular
     def to_space_delimited
       _cells = []
 
-      hash.each do |key, value|
+      hash.each do |key, _|
         _cells << (render(key) || "").ljust(columns[key].width)
       end
 
@@ -134,45 +134,61 @@ module Tabular
     protected
 
     def hash #:nodoc:
-      unless @hash
-        @hash = Hash.new
-        columns.each do |column|
-          index = columns.index(column.key)
-          if index
-            case column.column_type
-            when :boolean
-              @hash[column.key] = [1, "1", true, "true"].include?(@array[index])
-            when :date
-              if @array[index].is_a?(Date) || @array[index].is_a?(DateTime) || @array[index].is_a?(Time)
-                @hash[column.key] = @array[index]
-              else
-                begin
-                  if @array[index]
-                    @hash[column.key] = Date.parse(@array[index].to_s, true)
-                  else
-                    @hash[column.key] = nil
-                  end
-                rescue ArgumentError
-                  date = parse_invalid_date(@array[index])
-                  if date
-                    @hash[column.key] = date
-                  else
-                    raise ArgumentError, "'#{column.key}' index #{index} #{@array[index]}' is not a valid date"
-                  end
-                end
-              end
-            else
-              @hash[column.key] = @array[index]
-            end
-          end
+      @hash ||= build_hash
+    end
+
+    def build_hash #:nodoc:
+      _hash = Hash.new
+      columns.each do |column|
+        if column.key
+          _hash[column.key] = value_for_hash(column)
+        end
+      end
+      _hash
+    end
+
+    def value_for_hash(column) #:nodoc:
+      index = columns.index(column.key)
+      return nil unless index
+
+      value = @array[index]
+
+      case column.column_type
+      when :boolean
+        [ 1, "1", true, "true" ].include?(value)
+      when :date
+        if date?(value)
+          value
+        else
+          parse_date value, column.key, index
         end
+      else
+        value
       end
-      @hash
     end
 
 
     private
 
+    def date?(value)
+      value.is_a?(Date) || value.is_a?(DateTime) || value.is_a?(Time)
+    end
+
+    def parse_date(value, key, index)
+      return nil unless value
+
+      begin
+        Date.parse(value.to_s, true)
+      rescue ArgumentError
+        date = parse_invalid_date(value)
+        if date
+          date
+        else
+          raise ArgumentError, "'#{key}' index #{index} #{value}' is not a valid date"
+        end
+      end
+    end
+
     # Handle common m/d/yy case that Date.parse dislikes
     def parse_invalid_date(value)
       return unless value
@@ -183,19 +199,23 @@ module Tabular
       month = parts[0].to_i
       day = parts[1].to_i
       year = parts[2].to_i
-      return unless month >=1 && month <= 12 && day >= 1 && day <= 31
+      return unless month >= 1 && month <= 12 && day >= 1 && day <= 31
+
+      year = add_century_to(year)
 
-      if year == 0
-        year = 2000
-      elsif year > 0 && year < 69
-        year = 2000 + year
+      Date.new(year, month, day)
+    end
+
+    def add_century_to(year)
+      if year >= 0 && year < 69
+        2000 + year
       elsif year > 69 && year < 100
-        year = 1900 + year
+        1900 + year
       elsif year < 1900 || year > 2050
-        return nil
+        nil
+      else
+        year
       end
-
-      Date.new(year, month, day)
     end
   end
 end

data/lib/tabular/tables/file_reading.rb

@@ -50,7 +50,7 @@ module Tabular
           file
         end
 
-        raise "Could not find '#{file_path}'" unless File.exists?(file_path)
+        raise "Could not find '#{file_path}'" unless File.exist?(file_path)
 
         file_path
       end

data/lib/tabular/version.rb

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

data/tabular.gemspec

@@ -37,6 +37,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.summary = "Read, write, and manipulate CSV, tab-delimited and Excel data"
 
-  s.add_development_dependency "roo", "~> 1.3"
-  s.add_development_dependency "roo-xls"
+  s.add_development_dependency "roo", "~> 2.0"
+  s.add_development_dependency "roo-xls", "~> 0.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tabular
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors:
 - Scott Willson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roo
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: roo-xls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.1
 description: Tabular is a Ruby library for reading, writing, and manipulating CSV,
   tab-delimited and Excel data.
 email: scott.willson@gmail.com